@rippling/rippling-sdk 0.2.0-alpha.50 → 0.2.0-alpha.52

package/src/functions.ts

@@ -23,6 +23,36 @@ export class FunctionResponse {
 }
 
 export type FunctionEvent = Record<string, any>;
+export type DurableDuration = number | string;
+export type DurableTimestamp = number | Date | string;
+export interface DurableWaitForEventOptions {
+  type: string;
+  timeout?: DurableDuration;
+}
+export interface DurableFailureOptions {
+  code?: string;
+  details?: unknown;
+}
+export interface DurableWaitForEventEventResult<T = unknown> {
+  kind: 'event';
+  waitName: string;
+  eventType: string;
+  payload: T;
+}
+export interface DurableWaitForEventTimeoutResult {
+  kind: 'timeout';
+  waitName: string;
+  eventType: string;
+}
+export interface DurableWaitForEventResultHelpers<T = unknown> {
+  isEvent(): this is DurableWaitForEventEventResult<T> & DurableWaitForEventResultHelpers<T>;
+  isTimeout(): this is DurableWaitForEventTimeoutResult & DurableWaitForEventResultHelpers<T>;
+  throwTimeout(this: DurableWaitForEventTimeoutResult & DurableWaitForEventResultHelpers<T>): never;
+}
+export type DurableWaitForEventResult<T = unknown> =
+  | (DurableWaitForEventEventResult<T> & DurableWaitForEventResultHelpers<T>)
+  | (DurableWaitForEventTimeoutResult & DurableWaitForEventResultHelpers<T>);
+
 export interface FunctionContext {
   env: {
     // Set to the Rippling user's bearer token when the function is triggered by a user.
@@ -35,10 +65,22 @@ export interface FunctionContext {
     function_id: string;
     function_version_id: string;
     run_id: string;
+    role_id?: string;
   };
   settings: Record<string, string | boolean | number>;
 }
 
+export interface DurableFunctionContext extends FunctionContext {
+  step<T>(name: string, fn: () => Promise<T> | T, opts?: unknown): Promise<T>;
+  sleep(name: string, duration: DurableDuration): Promise<void>;
+  sleepUntil(name: string, timestamp: DurableTimestamp): Promise<void>;
+  waitForEvent<T = unknown>(
+    name: string,
+    opts: DurableWaitForEventOptions,
+  ): Promise<DurableWaitForEventResult<T>>;
+  fail(message: string, opts?: DurableFailureOptions): never;
+}
+
 export class DataBridgeRecord {
   id: string;
   version: string;

package/src/lib/manifest/custom-object-page-layout.ts

@@ -160,8 +160,8 @@ export interface FieldsSection extends PageLayoutSectionOptions {
   type: 'fields_section';
   /** Field section metadata for the fields displayed in this layout section. Required. */
   section: CustomObjectFieldSection;
-  /** Stable layout section key. Derived from `section.getSectionId()` on the wire. */
-  key?: never;
+  /** Stable layout section key. Optional. Defaults to `section.getSectionId()`. */
+  key?: SectionKey;
   /** Display name of the layout section. Optional. Defaults to the field section name. */
   name?: string;
   /** Fields to display in this section. Required. */
@@ -382,13 +382,13 @@ export interface AddCustomPageLayoutFieldOptions extends AddPageLayoutFieldOptio
    * across the layout.
    */
   tabKey?: string;
-  /** Field section to add the field to. Required for custom layout sections. */
-  section: CustomObjectFieldSection;
-  /** Raw section keys are only accepted for built-in system sections. */
-  sectionKey?: never;
+  /** Field-section metadata used to find typed custom layout sections and assign field metadata. */
+  section?: CustomObjectFieldSection;
+  /** Layout section key. Optional escape hatch for ambiguous custom sections. */
+  sectionKey?: SectionKey;
   /** Deprecated. Use `section`. */
   fieldSection?: never;
-  /** Custom layout sections are selected by `section`; `sectionKey` is only for system sections. */
+  /** Custom layout sections are selected by `section`; `sectionKey` can disambiguate. */
   systemSection?: false;
 }
 
@@ -432,9 +432,9 @@ export interface RemoveCustomPageLayoutFieldOptions extends RemovePageLayoutFiel
   tabKey?: string;
   /** Limit removal to one field section. Optional. */
   section?: CustomObjectFieldSection;
-  /** Raw section keys are only accepted for built-in system sections. */
-  sectionKey?: never;
-  /** Custom layout sections are selected by `section`; `sectionKey` is only for system sections. */
+  /** Limit removal to one layout section key. Optional. */
+  sectionKey?: SectionKey;
+  /** Custom layout sections are selected by `section`; `sectionKey` can disambiguate. */
   systemSection?: false;
 }
 
@@ -480,7 +480,7 @@ export interface RemovePageLayoutSectionOptions {
    * more than once throws. Optional. @default true
    */
   removeAll?: boolean;
-  /** Custom layout sections are selected by `CustomObjectFieldSection`; raw keys are only for system sections. */
+  /** Custom layout sections are selected by layout section key or `CustomObjectFieldSection`. */
   systemSection?: false;
 }
 
@@ -592,6 +592,8 @@ export interface CustomObjectPageLayoutLoadFromExistingOptions extends ExistingM
   customObjectApiName?: string;
 }
 
+type ResolveFieldSectionId = (fieldRqlName: string) => string | undefined;
+
 interface SerializedSectionField extends SectionFieldOptions {
   fieldRqlName: string;
 }
@@ -656,21 +658,25 @@ function isFieldRef(value: SectionFieldInput): value is SectionField {
   return candidate != null && typeof candidate === 'object' && isField(candidate.field);
 }
 
-const FIELD_SECTION_ID = Symbol('CustomObjectPageLayout.fieldSectionId');
+const LAYOUT_SECTION_KEY = Symbol('CustomObjectPageLayout.layoutSectionKey');
 
 function isCustomObjectFieldSection(value: unknown): value is CustomObjectFieldSection {
   return value instanceof CustomObjectFieldSection;
 }
 
-function attachFieldSectionId(section: SerializedFieldsSection, sectionId: string): SerializedFieldsSection {
-  if (section.key != null && section.key !== sectionId) {
-    throw new Error(
-      `CustomObjectPageLayout fields_section key "${section.key}" does not match field section "${sectionId}".`,
-    );
-  }
-  section.key = sectionId;
-  Object.defineProperty(section, FIELD_SECTION_ID, {
-    value: sectionId,
+function explicitLayoutSectionKey(section: { key?: string }): string | undefined {
+  const record = section as unknown as Record<string, unknown>;
+  const key = section.key ?? record['layout_section_key'] ?? record['layoutSectionKey'];
+  return typeof key === 'string' ? key : undefined;
+}
+
+function attachLayoutSectionKey(
+  section: SerializedFieldsSection,
+  sectionKey: string,
+): SerializedFieldsSection {
+  if (explicitLayoutSectionKey(section) == null) section.key = sectionKey;
+  Object.defineProperty(section, LAYOUT_SECTION_KEY, {
+    value: sectionKey,
     enumerable: false,
     configurable: true,
   });
@@ -679,8 +685,8 @@ function attachFieldSectionId(section: SerializedFieldsSection, sectionId: strin
 
 function layoutSectionKey(section: { key?: string }): string | undefined {
   return (
-    section.key ??
-    (section as unknown as Record<typeof FIELD_SECTION_ID, string | undefined>)[FIELD_SECTION_ID]
+    explicitLayoutSectionKey(section) ??
+    (section as unknown as Record<typeof LAYOUT_SECTION_KEY, string | undefined>)[LAYOUT_SECTION_KEY]
   );
 }
 
@@ -688,11 +694,6 @@ function layoutSectionMatches(section: { key?: string }, sectionKey: string): bo
   return layoutSectionKey(section) === sectionKey;
 }
 
-function inputFieldsSectionHasKey(input: FieldsSection): boolean {
-  const record = input as unknown as Record<string, unknown>;
-  return Object.prototype.hasOwnProperty.call(record, 'key') && record['key'] != null;
-}
-
 function isSerializedFieldsSection(section: SerializedPageLayoutSection): section is SerializedFieldsSection {
   return section.type === 'fields_section';
 }
@@ -783,23 +784,20 @@ function normalizeSectionField(
 
 function normalizeFieldsSection(customObject: CustomObject, input: FieldsSection): SerializedFieldsSection {
   assertSectionBelongsTo(customObject, input.section);
-  const sectionId = input.section.getSectionId();
-  if (inputFieldsSectionHasKey(input)) {
-    throw new Error('CustomObjectPageLayout fields_section key is not supported. Omit key.');
-  }
+  const sectionKey = input.key ?? input.section.getSectionId();
   const name = input.name ?? input.section.getName();
   const normalized = copySectionOptions<SerializedFieldsSection>(
     {
       name,
       type: 'fields_section',
       fields: input.fields.map((field) =>
-        normalizeSectionField(customObject, input.section, sectionId, field),
+        normalizeSectionField(customObject, input.section, sectionKey, field),
       ),
     },
     input,
   );
   if (input.layout != null) normalized.layout = input.layout;
-  return attachFieldSectionId(normalized, sectionId);
+  return attachLayoutSectionKey(normalized, sectionKey);
 }
 
 function normalizeSection(
@@ -1010,6 +1008,11 @@ interface MutableFieldContainer {
   label: string;
 }
 
+interface FieldSectionLayoutSection {
+  tabKey: string;
+  sectionKey: string;
+}
+
 function isTabWithSections(tab: SerializedPageLayoutTab): tab is SerializedTabWithSections {
   return tab.type === 'tab_with_sections';
 }
@@ -1040,72 +1043,126 @@ function fieldRqlNameOf(entry: unknown): string | undefined {
   if (typeof entry === 'string') return entry;
   if (entry == null || typeof entry !== 'object') return undefined;
   const record = entry as Record<string, any>;
-  const fieldRqlName = record['fieldRqlName'] ?? record['field_rql_name'];
+  const fieldRqlName =
+    record['fieldRqlName'] ?? record['field_rql_name'] ?? record['apiName'] ?? record['api_name'];
   return typeof fieldRqlName === 'string' ? fieldRqlName : undefined;
 }
 
-function explicitFieldSectionId(entry: unknown): string | undefined {
-  if (entry == null || typeof entry !== 'object') return undefined;
-  const record = entry as Record<string, any>;
-  const fieldSectionId = record['fieldSection'] ?? record['field_section'];
-  return typeof fieldSectionId === 'string' ? fieldSectionId : undefined;
+function addFieldSectionLayoutSection(
+  index: Map<string, FieldSectionLayoutSection[]>,
+  fieldSectionId: string,
+  entry: FieldSectionLayoutSection,
+): void {
+  const entries = index.get(fieldSectionId) ?? [];
+  if (
+    !entries.some((existing) => existing.tabKey === entry.tabKey && existing.sectionKey === entry.sectionKey)
+  ) {
+    entries.push(entry);
+  }
+  index.set(fieldSectionId, entries);
 }
 
-function inferredSectionIdFromFields(
-  section: SerializedFieldsSection,
-  resolveFieldSectionId?: (fieldApiName: string) => string | undefined,
-): string | undefined {
-  const sectionIds = new Set<string>();
-  for (const field of section.fields ?? []) {
-    const explicitSectionId = explicitFieldSectionId(field);
-    if (explicitSectionId != null) {
-      sectionIds.add(explicitSectionId);
-      continue;
-    }
+function indexFieldsSectionInput(
+  index: Map<string, FieldSectionLayoutSection[]>,
+  tabKey: string,
+  section: FieldsSection,
+): void {
+  addFieldSectionLayoutSection(index, section.section.getSectionId(), {
+    tabKey,
+    sectionKey: section.key ?? section.section.getSectionId(),
+  });
+}
+
+function indexPageLayoutSectionInput(
+  index: Map<string, FieldSectionLayoutSection[]>,
+  tabKey: string,
+  section: PageLayoutSection,
+): void {
+  if (section.type === 'fields_section') indexFieldsSectionInput(index, tabKey, section);
+}
+
+function buildFieldSectionLayoutIndexFromProps(
+  tabEdits: TabEdits | undefined,
+): Map<string, FieldSectionLayoutSection[]> {
+  const index = new Map<string, FieldSectionLayoutSection[]>();
+  if (tabEdits == null) return index;
 
-    const fieldApiName = fieldRqlNameOf(field);
-    if (fieldApiName == null || resolveFieldSectionId == null) continue;
-    const resolvedSectionId = resolveFieldSectionId(fieldApiName);
-    if (resolvedSectionId != null) sectionIds.add(resolvedSectionId);
+  for (const tab of tabEdits.newTabs ?? []) {
+    if (tab.type !== 'tab_with_sections') continue;
+    for (const section of tab.sections) indexPageLayoutSectionInput(index, tab.key, section);
+  }
+
+  for (const [tabKey, tabEdit] of Object.entries(tabEdits.systemTabEdits ?? {})) {
+    for (const section of tabEdit.newSections ?? []) {
+      indexPageLayoutSectionInput(index, tabKey, section);
+    }
   }
-  return sectionIds.size === 1 ? [...sectionIds][0] : undefined;
+
+  return index;
 }
 
-function annotateLoadedFieldsSection(
+function indexLoadedFieldsSection(
+  index: Map<string, FieldSectionLayoutSection[]>,
+  tabKey: string,
   section: SerializedFieldsSection,
-  resolveFieldSectionId?: (fieldApiName: string) => string | undefined,
-): SerializedFieldsSection {
-  const explicitSectionId = layoutSectionKey(section);
-  const inferredSectionId = inferredSectionIdFromFields(section, resolveFieldSectionId);
-  if (explicitSectionId != null && inferredSectionId != null && explicitSectionId !== inferredSectionId) {
-    throw new Error(
-      `CustomObjectPageLayout fields_section key "${explicitSectionId}" does not match ` +
-        `field section "${inferredSectionId}".`,
-    );
+  resolveFieldSectionId: ResolveFieldSectionId | undefined,
+): void {
+  const sectionKey = layoutSectionKey(section);
+  if (sectionKey == null || resolveFieldSectionId == null) return;
+
+  for (const field of section.fields ?? []) {
+    const fieldRqlName = fieldRqlNameOf(field);
+    if (fieldRqlName == null) continue;
+    const fieldSectionId = resolveFieldSectionId(fieldRqlName);
+    if (fieldSectionId != null) {
+      addFieldSectionLayoutSection(index, fieldSectionId, { tabKey, sectionKey });
+    }
   }
-  const sectionId = explicitSectionId ?? inferredSectionId;
-  return sectionId == null ? section : attachFieldSectionId(section, sectionId);
 }
 
-function annotateLoadedTabEdits(
+function buildFieldSectionLayoutIndexFromLoadedTabEdits(
   tabEdits: SerializedTabEdits,
-  resolveFieldSectionId?: (fieldApiName: string) => string | undefined,
-): SerializedTabEdits {
+  resolveFieldSectionId: ResolveFieldSectionId | undefined,
+): Map<string, FieldSectionLayoutSection[]> {
+  const index = new Map<string, FieldSectionLayoutSection[]>();
+
+  for (const tab of tabEdits.newTabs ?? []) {
+    if (!isTabWithSections(tab)) continue;
+    for (const section of tab.sections) {
+      if (isSerializedFieldsSection(section)) {
+        indexLoadedFieldsSection(index, tab.key, section, resolveFieldSectionId);
+      }
+    }
+  }
+
+  for (const [tabKey, tabEdit] of Object.entries(tabEdits.systemTabEdits ?? {})) {
+    for (const section of tabEdit.newSections ?? []) {
+      if (isSerializedFieldsSection(section)) {
+        indexLoadedFieldsSection(index, tabKey, section, resolveFieldSectionId);
+      }
+    }
+  }
+
+  return index;
+}
+
+function annotateLoadedFieldsSection(section: SerializedFieldsSection): SerializedFieldsSection {
+  const sectionKey = layoutSectionKey(section);
+  return sectionKey == null ? section : attachLayoutSectionKey(section, sectionKey);
+}
+
+function annotateLoadedTabEdits(tabEdits: SerializedTabEdits): SerializedTabEdits {
   for (const tab of tabEdits.newTabs ?? []) {
     if (!isTabWithSections(tab)) continue;
     tab.sections = tab.sections.map((section) =>
-      isSerializedFieldsSection(section) ?
-        annotateLoadedFieldsSection(section, resolveFieldSectionId)
-      : section,
+      isSerializedFieldsSection(section) ? annotateLoadedFieldsSection(section) : section,
     );
   }
 
   for (const tabEdit of Object.values(tabEdits.systemTabEdits ?? {})) {
     if (tabEdit.newSections != null) {
       tabEdit.newSections = tabEdit.newSections.map((section) =>
-        isSerializedFieldsSection(section) ?
-          annotateLoadedFieldsSection(section, resolveFieldSectionId)
-        : section,
+        isSerializedFieldsSection(section) ? annotateLoadedFieldsSection(section) : section,
       );
     }
   }
@@ -1228,6 +1285,7 @@ export class CustomObjectPageLayout {
   private readonly _headerEdits: SerializedHeaderEdits;
   private readonly _visibilityConditions: VisibilityConditions;
   private readonly _blueprintKey: string | undefined;
+  private readonly _fieldSectionLayoutSections: Map<string, FieldSectionLayoutSection[]>;
 
   /**
    * @param customObject - The custom object this layout belongs to.
@@ -1242,6 +1300,7 @@ export class CustomObjectPageLayout {
     this._customObjectApiName = customObject.getApiName();
     this._name = props.name;
     this._tabEdits = normalizeTabEdits(customObject, props.tabEdits ?? {});
+    this._fieldSectionLayoutSections = buildFieldSectionLayoutIndexFromProps(props.tabEdits);
     this._headerEdits = normalizeHeaderEdits(props.headerEdits ?? {});
     this._visibilityConditions = props.visibilityConditions ?? {};
     this._blueprintKey = props.blueprintKey;
@@ -1266,9 +1325,10 @@ export class CustomObjectPageLayout {
   static _fromExistingComponent(
     customObject: CustomObject,
     component: Record<string, any>,
-    resolveFieldSectionId?: (fieldApiName: string) => string | undefined,
+    resolveFieldSectionId?: ResolveFieldSectionId,
   ): CustomObjectPageLayout {
     const layout = Object.create(CustomObjectPageLayout.prototype) as CustomObjectPageLayout;
+    const tabEdits = annotateLoadedTabEdits(cloneJson(component['tab_edits'] ?? {}));
     Object.assign(layout as Record<string, any>, {
       _layoutId: requireStringComponentField(component, 'layout_id', CustomObjectPageLayout.componentType),
       _apiName: requireStringComponentField(component, 'api_name', CustomObjectPageLayout.componentType),
@@ -1278,10 +1338,14 @@ export class CustomObjectPageLayout {
         CustomObjectPageLayout.componentType,
       ),
       _name: requireStringComponentField(component, 'name', CustomObjectPageLayout.componentType),
-      _tabEdits: annotateLoadedTabEdits(cloneJson(component['tab_edits'] ?? {}), resolveFieldSectionId),
+      _tabEdits: tabEdits,
       _headerEdits: cloneJson(component['header_edits'] ?? {}),
       _visibilityConditions: cloneJson(component['visibility_conditions'] ?? {}),
       _blueprintKey: component['blueprint_key'],
+      _fieldSectionLayoutSections: buildFieldSectionLayoutIndexFromLoadedTabEdits(
+        tabEdits,
+        resolveFieldSectionId,
+      ),
     });
     customObject._register(layout);
     return layout;
@@ -1322,8 +1386,8 @@ export class CustomObjectPageLayout {
    * Adds multiple fields to an existing layout section.
    *
    * Fields are inserted in the order provided. For custom layout sections,
-   * pass `options.section` so TypeScript and runtime validation agree on the
-   * target `CUSTOM_OBJECT_FIELD_SECTION`.
+   * pass `section` to choose the typed field section. Use `sectionKey` only
+   * when a field section maps to multiple layout sections.
    */
   addFields(fields: Field[], options: AddPageLayoutFieldsOptions): this {
     if (fields.length === 0) return this;
@@ -1346,25 +1410,25 @@ export class CustomObjectPageLayout {
           return this.ensureSystemSectionFieldContainer(options.tabKey, options.sectionKey);
         })()
       : (() => {
-          assertOptionAbsent(
-            options,
-            'sectionKey',
-            'CustomObjectPageLayout addField sectionKey is only supported with systemSection: true. ' +
-              'Pass section: CustomObjectFieldSection for custom layout sections.',
-          );
           assertOptionAbsent(
             options,
             'fieldSection',
             'CustomObjectPageLayout addField fieldSection is no longer supported. ' +
               'Pass section: CustomObjectFieldSection instead.',
           );
-          const section = requireFieldSectionOption(
-            options.section,
-            'CustomObjectPageLayout addField section',
-          );
-          this.assertFieldSectionBelongsToLayout(section);
-          fieldSectionForMutation = section;
-          return this.requireOneFieldContainer(options.tabKey, section.getSectionId(), section);
+          const section =
+            options.section == null ?
+              undefined
+            : requireFieldSectionOption(options.section, 'CustomObjectPageLayout addField section');
+          if (section != null) {
+            this.assertFieldSectionBelongsToLayout(section);
+            fieldSectionForMutation = section;
+          }
+          const sectionKey =
+            options.sectionKey ??
+            (section == null ? undefined : this.layoutSectionKeyForFieldSection(options.tabKey, section)) ??
+            section?.getSectionId();
+          return this.requireOneFieldContainer(options.tabKey, sectionKey, section);
         })();
     const entries = fields.map((field) =>
       this.serializeFieldForMutation(
@@ -1413,19 +1477,15 @@ export class CustomObjectPageLayout {
       );
       sectionKey = options.sectionKey;
     } else {
-      assertOptionAbsent(
-        options,
-        'sectionKey',
-        'CustomObjectPageLayout removeField sectionKey is only supported with systemSection: true. ' +
-          'Pass section: CustomObjectFieldSection for custom layout sections.',
-      );
+      sectionKey = options.sectionKey;
       if (options.section != null) {
         const section = requireFieldSectionOption(
           options.section,
           'CustomObjectPageLayout removeField section',
         );
         this.assertFieldSectionBelongsToLayout(section);
-        sectionKey = section.getSectionId();
+        sectionKey ??= this.layoutSectionKeyForFieldSection(options.tabKey, section);
+        sectionKey ??= section.getSectionId();
       }
     }
 
@@ -1499,6 +1559,9 @@ export class CustomObjectPageLayout {
       const sectionsOrder = this.ensureSystemSectionsOrder(tabEdit);
       insertAt(sections, normalized, options.position);
       insertUniqueAt(sectionsOrder, layoutSectionKey(normalized), options.position);
+      if (section.type === 'fields_section') {
+        this.rememberFieldSectionLayoutSection(section.section, options.tabKey, layoutSectionKey(normalized));
+      }
       return this;
     }
 
@@ -1516,6 +1579,9 @@ export class CustomObjectPageLayout {
       options.allowDuplicate,
     );
     insertAt(tab.sections, normalized, options.position);
+    if (section.type === 'fields_section') {
+      this.rememberFieldSectionLayoutSection(section.section, tab.key, layoutSectionKey(normalized));
+    }
     return this;
   }
 
@@ -1526,6 +1592,7 @@ export class CustomObjectPageLayout {
    * `systemSectionEdits[sectionKey].deleted`.
    */
   removeSection(section: CustomObjectFieldSection, options?: RemovePageLayoutSectionOptions): this;
+  removeSection(sectionKey: string, options?: RemovePageLayoutSectionOptions): this;
   removeSection(sectionKey: string, options: RemoveSystemPageLayoutSectionOptions): this;
   removeSection(
     sectionOrKey: CustomObjectFieldSection | string,
@@ -1547,9 +1614,14 @@ export class CustomObjectPageLayout {
       return this;
     }
 
-    const section = requireFieldSectionOption(sectionOrKey, 'CustomObjectPageLayout removeSection section');
-    this.assertFieldSectionBelongsToLayout(section);
-    const sectionKey = section.getSectionId();
+    let sectionKey: string;
+    if (typeof sectionOrKey === 'string') {
+      sectionKey = sectionOrKey;
+    } else {
+      const section = requireFieldSectionOption(sectionOrKey, 'CustomObjectPageLayout removeSection section');
+      this.assertFieldSectionBelongsToLayout(section);
+      sectionKey = this.layoutSectionKeyForFieldSection(options.tabKey, section) ?? section.getSectionId();
+    }
     const matches: Array<{
       sections: SerializedPageLayoutSection[];
       section: SerializedFieldsSection;
@@ -1609,6 +1681,10 @@ export class CustomObjectPageLayout {
     const tabsOrder = this.ensureTabsOrder();
     insertAt(newTabs, normalized, options.position);
     insertUniqueAt(tabsOrder, normalized.key, options.position);
+    if (tab.type === 'tab_with_sections') {
+      for (const section of tab.sections)
+        indexPageLayoutSectionInput(this._fieldSectionLayoutSections, tab.key, section);
+    }
     return this;
   }
 
@@ -1805,23 +1881,20 @@ export class CustomObjectPageLayout {
 
     this.assertFieldSectionBelongsToLayout(input.section);
 
-    const sectionId = input.section.getSectionId();
-    if (inputFieldsSectionHasKey(input)) {
-      throw new Error('CustomObjectPageLayout fields_section key is not supported. Omit key.');
-    }
+    const sectionKey = input.key ?? input.section.getSectionId();
     const name = input.name ?? input.section.getName();
     const normalized = copySectionOptions<SerializedFieldsSection>(
       {
         name,
         type: 'fields_section',
         fields: input.fields.map((field) =>
-          this.normalizeSectionFieldForMutation(input.section, sectionId, field),
+          this.normalizeSectionFieldForMutation(input.section, sectionKey, field),
         ),
       },
       input,
     );
     if (input.layout != null) normalized.layout = input.layout;
-    return attachFieldSectionId(normalized, sectionId);
+    return attachLayoutSectionKey(normalized, sectionKey);
   }
 
   private normalizeTabForMutation(tab: PageLayoutTab): SerializedPageLayoutTab {
@@ -1884,6 +1957,35 @@ export class CustomObjectPageLayout {
     }
   }
 
+  private rememberFieldSectionLayoutSection(
+    section: CustomObjectFieldSection,
+    tabKey: string,
+    sectionKey: string | undefined,
+  ): void {
+    if (sectionKey == null) return;
+    addFieldSectionLayoutSection(this._fieldSectionLayoutSections, section.getSectionId(), {
+      tabKey,
+      sectionKey,
+    });
+  }
+
+  private layoutSectionKeyForFieldSection(
+    tabKey: string | undefined,
+    section: CustomObjectFieldSection,
+  ): string | undefined {
+    const entries = this._fieldSectionLayoutSections.get(section.getSectionId()) ?? [];
+    const matches = tabKey == null ? entries : entries.filter((entry) => entry.tabKey === tabKey);
+    const sectionKeys = [...new Set(matches.map((entry) => entry.sectionKey))];
+    if (sectionKeys.length === 0) return undefined;
+    if (sectionKeys.length === 1) return sectionKeys[0];
+
+    const scope = tabKey == null ? '' : ` in tab "${tabKey}"`;
+    throw new Error(
+      `CustomObjectPageLayout field section "${section.getSectionId()}" maps to multiple layout sections${scope}: ` +
+        `${sectionKeys.join(', ')}. Pass sectionKey to choose one.`,
+    );
+  }
+
   private requireOneFieldContainer(
     tabKey: string | undefined,
     sectionKey: string | undefined,
@@ -1913,8 +2015,8 @@ export class CustomObjectPageLayout {
           const container = unkeyedContainers[0] as MutableFieldContainer & {
             section: SerializedFieldsSection;
           };
-          attachFieldSectionId(container.section, fallbackFieldSection.getSectionId());
-          container.sectionKey = fallbackFieldSection.getSectionId();
+          attachLayoutSectionKey(container.section, sectionKey);
+          container.sectionKey = sectionKey;
           container.label = `${container.tabKey}.${container.sectionKey}`;
           return container;
         }

package/src/lib/manifest/existing-manifest-context.ts

@@ -417,11 +417,9 @@ export class ExistingManifestContext {
     return this.getOrLoad(cacheKey, () => {
       const customObject = this.loadCustomObject(customObjectApiName);
       this.loadPageLayoutDependencies(customObjectApiName, component);
-      return CustomObjectPageLayout._fromExistingComponent(customObject, component, (fieldApiName) => {
-        const fieldComponent = this.findFieldComponent(customObjectApiName, fieldApiName);
-        const sectionId = fieldComponent?.['section'];
-        return typeof sectionId === 'string' ? sectionId : undefined;
-      });
+      return CustomObjectPageLayout._fromExistingComponent(customObject, component, (fieldApiName) =>
+        this.fieldSectionIdForField(customObjectApiName, fieldApiName),
+      );
     });
   }
 
@@ -522,6 +520,12 @@ export class ExistingManifestContext {
     return matches[0] as Record<string, any>;
   }
 
+  private fieldSectionIdForField(customObjectApiName: string, fieldApiName: string): string | undefined {
+    const field = this.findFieldComponent(customObjectApiName, fieldApiName);
+    const section = field?.['section'];
+    return typeof section === 'string' && section.length > 0 ? section : undefined;
+  }
+
   private loadFieldReferenceComponent(component: Record<string, any>): Field {
     const cacheKey = this.cacheKey(
       'CUSTOM_OBJECT_FIELD_REF',
@@ -670,7 +674,8 @@ export class ExistingManifestContext {
     if (field == null || typeof field !== 'object') return;
     const record = field as Record<string, any>;
     const fieldSection = record['fieldSection'] ?? record['field_section'];
-    const fieldApiName = record['fieldRqlName'] ?? record['field_rql_name'];
+    const fieldApiName =
+      record['fieldRqlName'] ?? record['field_rql_name'] ?? record['apiName'] ?? record['api_name'];
     if (typeof fieldSection === 'string') {
       const fieldLabel = typeof fieldApiName === 'string' ? ` ${fieldApiName}` : '';
       this.loadRequiredFieldSection(