From f8799ac74ad61c74f0a09d79f9ecd12f1bcd2047 Mon Sep 17 00:00:00 2001
From: Ethan Clapham <ethanclapham@gmail.com>
Date: Tue, 24 Mar 2026 23:22:07 -0700
Subject: [PATCH 01/14] W-21707233 Make template command use required (#102)

* @W-21707233 make template instructions more explicit

* convert escaped quotes to single quotes in frontmatter

---------

Co-authored-by: Hemant Singh Bisht <hsinghbisht@salesforce.com>
---
 skills/generating-flexipage/SKILL.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/skills/generating-flexipage/SKILL.md b/skills/generating-flexipage/SKILL.md
index b0c5c99..7706cb2 100644
--- a/skills/generating-flexipage/SKILL.md
+++ b/skills/generating-flexipage/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: generating-flexipage
-description: "Use this skill when users need to create, generate, modify, or validate Salesforce Lightning pages (FlexiPages). Trigger when users mention RecordPage, AppPage, HomePage, Lightning pages, page layouts, adding components to pages, or page customization. Also use when users say things like \"create a Lightning page\", \"add a component to a page\", \"customize the record page\", \"generate a FlexiPage\", or when they're working with FlexiPage XML files and need help with components, regions, or deployment errors. Always use this skill for any FlexiPage-related work, even if they just mention \"page\" in the context of Salesforce."
+description: "Use this skill when users need to create, generate, modify, or validate Salesforce Lightning pages (FlexiPages). Trigger when users mention RecordPage, AppPage, HomePage, Lightning pages, page layouts, adding components to pages, or page customization. Also use when users say things like 'create a Lightning page', 'add a component to a page', 'customize the record page', 'generate a FlexiPage', or when they're working with FlexiPage XML files and need help with components, regions, or deployment errors. Always use this skill for any FlexiPage-related work, even if they just mention 'page' in the context of Salesforce."
 ---
 
 ## When to Use This Skill
@@ -20,6 +20,8 @@ Use this skill when you need to:
 
 ## Overview
 
+**CRITICAL: When creating NEW FlexiPages, you MUST ALWAYS start with the CLI template command.** Never create FlexiPage XML from scratch - the CLI provides valid structure, proper regions, and correct component configuration that prevents deployment errors.
+
 Generate Lightning pages (RecordPage, AppPage, HomePage) using CLI bootstrapping for component discovery and configuration.
 
 ---
@@ -28,6 +30,8 @@ Generate Lightning pages (RecordPage, AppPage, HomePage) using CLI bootstrapping
 
 ### Step 1: Bootstrap with CLI
 
+**MANDATORY FOR NEW PAGES: This step is NOT optional.** Always use the CLI template command when creating a new FlexiPage. The CLI generates valid XML structure, proper regions, and correct metadata that prevents common deployment errors. Only skip this step if you're editing an existing FlexiPage file.
+
 ```bash
 sf template generate flexipage \
   --name <PageName> \
@@ -39,6 +43,10 @@ sf template generate flexipage \
   --output-dir force-app/main/default/flexipages
 ```
 
+**Field Selection Guidelines:**
+- **Validate fields exist**: Use MCP tools or describe commands to discover available fields for the object before specifying them in the command
+- **Prefer compound fields**: Use `Name` (not `FirstName`/`LastName`), `BillingAddress` (not `BillingStreet`/`BillingCity`/`BillingState`), `MailingAddress`, etc. when available
+
 **Template-specific requirements:**
 - **RecordPage**: Requires `--sobject` (e.g., Account, Custom_Object__c)
 - **RecordPage**: Requires `--primary-field` and `--secondary-fields` for dynamic highlights, `--detail-fields` for full record details. Use the most important identifying field as primary, e.g. Name. Use the secondary fields (max 12, recommended 4-6) to show a summary of the record. Use detail fields to show the full details of the record.
@@ -474,7 +482,7 @@ Identifier Pattern: flexipage_richText or flexipage_richText_{sequence}
 ## Validation Checklist
 
 Before deploying:
-- [ ] Used CLI to bootstrap (don't start from scratch)
+- [ ] **[NEW PAGES ONLY]** Used CLI to bootstrap - NEVER create FlexiPage XML from scratch
 - [ ] **ALL identifiers are unique** - no duplicate `<identifier>` values anywhere in file
 - [ ] **ALL region/facet names are unique** - no duplicate `<name>` values in `<flexiPageRegions>`
 - [ ] **Multiple components in same facet are combined** - ONE region with multiple `<itemInstances>`, NOT separate regions with same name

From 768aa1e7833b87d6911f91d13deda3620ca0ad8d Mon Sep 17 00:00:00 2001
From: svc-idee-bot <SVC_idee_bot@salesforce.com>
Date: Wed, 25 Mar 2026 12:48:51 -0500
Subject: [PATCH 02/14] chore: sync React B2E (1.112.10) & B2X (1.112.10)
 samples from npm (#103)

Co-authored-by: gbockus-sf <76090802+gbockus-sf@users.noreply.github.com>
---
 package-lock.json                             |    44 +-
 package.json                                  |     4 +-
 .../.version                                  |     2 +-
 .../CHANGELOG.md                              |    27 +
 .../appreactsampleb2e/package.json            |     6 +-
 .../package-lock.json                         |     4 +-
 .../package.json                              |     2 +-
 .../scripts/graphql-search.sh                 |    86 +-
 .../.version                                  |     2 +-
 .../CHANGELOG.md                              |    27 +
 .../appreactsampleb2x/package.json            |    11 +-
 .../api/{ => applications}/applicationApi.ts  |     0
 .../src/api/graphql-operations-types.ts       | 12314 +++++++++++++++-
 .../src/api/graphqlClient.ts                  |    33 +-
 .../maintenanceRequestApi.ts                  |     0
 .../{ => properties}/propertyDetailGraphQL.ts |     0
 .../propertyListingGraphQL.ts                 |     2 +-
 .../appreactsampleb2x/src/appLayout.tsx       |     6 +-
 .../components/MaintenanceDetailsModal.tsx    |   128 -
 .../{ => dashboard}/WeatherWidget.tsx         |     0
 .../src/components/{ => layout}/TopBar.tsx    |     4 +-
 .../{NavMenu.tsx => layout/VerticalNav.tsx}   |     0
 .../MaintenanceRequestIcon.tsx                |     0
 .../MaintenanceRequestList.tsx                |     8 +-
 .../MaintenanceRequestListItem.tsx            |     6 +-
 .../MaintenanceSummaryDetailsModal.tsx        |    87 +
 .../{ => maintenanceRequests}/StatusBadge.tsx |     0
 .../{ => properties}/PropertyListingCard.tsx  |     2 +-
 .../PropertyListingSearchPagination.tsx}      |    48 +-
 .../{ => properties}/PropertyMap.tsx          |     0
 .../PropertySearchFilters.tsx                 |     0
 .../src/constants/propertyListing.ts          |     4 +
 .../global-search/api/objectDetailService.ts  |   102 -
 .../api/objectInfoGraphQLService.ts           |   137 -
 .../global-search/api/objectInfoService.ts    |    95 -
 .../api/recordListGraphQLService.ts           |   364 -
 .../components/detail/DetailFields.tsx        |    55 -
 .../components/detail/DetailForm.tsx          |   146 -
 .../components/detail/DetailHeader.tsx        |    34 -
 .../detail/DetailLayoutSections.tsx           |    80 -
 .../components/detail/Section.tsx             |   108 -
 .../components/detail/SectionRow.tsx          |    20 -
 .../components/detail/UiApiDetailForm.tsx     |   140 -
 .../detail/formatted/FieldValueDisplay.tsx    |    73 -
 .../detail/formatted/FormattedAddress.tsx     |    29 -
 .../detail/formatted/FormattedEmail.tsx       |    17 -
 .../detail/formatted/FormattedPhone.tsx       |    24 -
 .../detail/formatted/FormattedText.tsx        |    11 -
 .../detail/formatted/FormattedUrl.tsx         |    29 -
 .../components/filters/FilterField.tsx        |    54 -
 .../components/filters/FilterInput.tsx        |    55 -
 .../components/filters/FilterSelect.tsx       |    72 -
 .../components/filters/FiltersPanel.tsx       |   380 -
 .../components/forms/filters-form.tsx         |   114 -
 .../components/forms/submit-button.tsx        |    47 -
 .../components/search/GlobalSearchInput.tsx   |   114 -
 .../components/search/ResultCardFields.tsx    |    71 -
 .../components/search/SearchHeader.tsx        |    31 -
 .../components/search/SearchResultCard.tsx    |   138 -
 .../components/search/SearchResultsPanel.tsx  |   197 -
 .../components/shared/LoadingFallback.tsx     |    61 -
 .../src/features/global-search/constants.ts   |    39 -
 .../global-search/filters/FilterInput.tsx     |    55 -
 .../global-search/filters/FilterSelect.tsx    |    72 -
 .../src/features/global-search/hooks/form.tsx |   209 -
 .../global-search/hooks/useObjectInfoBatch.ts |    72 -
 .../hooks/useObjectSearchData.ts              |   174 -
 .../hooks/useRecordDetailLayout.ts            |   137 -
 .../hooks/useRecordListGraphQL.ts             |   135 -
 .../global-search/pages/DetailPage.tsx        |   109 -
 .../global-search/pages/GlobalSearch.tsx      |   235 -
 .../global-search/types/filters/filters.ts    |   121 -
 .../global-search/types/filters/picklist.ts   |     6 -
 .../types/objectInfo/objectInfo.ts            |    49 -
 .../types/recordDetail/recordDetail.ts        |    61 -
 .../features/global-search/types/schema.d.ts  |   200 -
 .../features/global-search/utils/apiUtils.ts  |    59 -
 .../global-search/utils/cacheUtils.ts         |    76 -
 .../features/global-search/utils/debounce.ts  |    90 -
 .../global-search/utils/fieldUtils.ts         |   354 -
 .../utils/fieldValueExtractor.ts              |    67 -
 .../global-search/utils/filterUtils.ts        |    32 -
 .../utils/formDataTransformUtils.ts           |   260 -
 .../features/global-search/utils/formUtils.ts |   142 -
 .../utils/graphQLNodeFieldUtils.ts            |   186 -
 .../utils/graphQLObjectInfoAdapter.ts         |    77 -
 .../utils/graphQLRecordAdapter.ts             |    90 -
 .../utils/layoutTransformUtils.ts             |   236 -
 .../features/global-search/utils/linkUtils.ts |    14 -
 .../global-search/utils/paginationUtils.ts    |    49 -
 .../global-search/utils/recordUtils.ts        |   159 -
 .../global-search/utils/sanitizationUtils.ts  |    50 -
 .../__examples__/api/accountSearchService.ts  |    46 +
 .../query/distinctAccountIndustries.graphql   |    19 +
 .../api/query/distinctAccountTypes.graphql    |    19 +
 .../api/query/getAccountDetail.graphql        |   121 +
 .../api/query/searchAccounts.graphql          |    51 +
 .../pages/AccountObjectDetailPage.tsx         |   357 +
 .../__examples__/pages/AccountSearch.tsx      |   303 +
 .../object-search/__examples__/pages/Home.tsx |    34 +
 .../object-search/api/objectSearchService.ts  |    84 +
 .../components/ActiveFilters.tsx              |    89 +
 .../components/FilterContext.tsx              |    73 +
 .../components/ObjectBreadcrumb.tsx           |    66 +
 .../components/PaginationControls.tsx         |   109 +
 .../object-search/components/SearchBar.tsx    |    41 +
 .../object-search/components/SortControl.tsx  |   143 +
 .../components/filters/BooleanFilter.tsx      |    74 +
 .../components/filters/DateFilter.tsx         |   121 +
 .../components/filters/DateRangeFilter.tsx    |    69 +
 .../components/filters/MultiSelectFilter.tsx  |    98 +
 .../components/filters/NumericRangeFilter.tsx |    85 +
 .../components/filters/SearchFilter.tsx       |    37 +
 .../components/filters/SelectFilter.tsx       |    93 +
 .../components/filters/TextFilter.tsx         |    74 +
 .../object-search/hooks/useAsyncData.ts       |    54 +
 .../object-search/hooks/useCachedAsyncData.ts |   184 +
 .../hooks/useObjectSearchParams.ts            |   247 +
 .../features/object-search/utils/debounce.ts  |    22 +
 .../object-search/utils/fieldUtils.ts         |    29 +
 .../object-search/utils/filterUtils.ts        |   372 +
 .../features/object-search/utils/sortUtils.ts |    38 +
 .../src/hooks/useMaintenanceRequests.ts       |     2 +-
 .../src/hooks/usePropertyAddresses.ts         |     4 +-
 .../src/hooks/usePropertyDetail.ts            |     2 +-
 .../src/hooks/usePropertyListingAmenities.ts  |     4 +-
 .../src/hooks/usePropertyListingPriceRange.ts |    64 -
 .../src/hooks/usePropertyListingSearch.ts     |     4 +-
 .../src/hooks/usePropertyMapMarkers.ts        |     6 +-
 .../src/hooks/usePropertyPrimaryImages.ts     |     4 +-
 .../appreactsampleb2x/src/index.ts            |   120 -
 .../appreactsampleb2x/src/pages/About.tsx     |     8 -
 .../src/pages/Application.tsx                 |     6 +-
 .../appreactsampleb2x/src/pages/Dashboard.tsx |     4 +-
 .../src/pages/HelpCenter.tsx                  |    29 -
 .../appreactsampleb2x/src/pages/Home.tsx      |     6 +-
 .../src/pages/Maintenance.tsx                 |     4 +-
 .../src/pages/PropertyDetails.tsx             |     2 +-
 .../src/pages/PropertyListings.tsx            |   100 -
 .../src/pages/PropertySearch.tsx              |    22 +-
 .../appreactsampleb2x/src/routes.tsx          |    24 +-
 .../types/search => types}/searchResults.ts   |     0
 .../utils/propertyListingPaginationUtils.ts   |    18 +
 .../package-lock.json                         |     4 +-
 .../package.json                              |     2 +-
 .../scripts/graphql-search.sh                 |    86 +-
 146 files changed, 15669 insertions(+), 7278 deletions(-)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/{ => applications}/applicationApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/{ => maintenanceRequests}/maintenanceRequestApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/{ => properties}/propertyDetailGraphQL.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/{ => properties}/propertyListingGraphQL.ts (99%)
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceDetailsModal.tsx
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => dashboard}/WeatherWidget.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => layout}/TopBar.tsx (96%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{NavMenu.tsx => layout/VerticalNav.tsx} (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => maintenanceRequests}/MaintenanceRequestIcon.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => maintenanceRequests}/MaintenanceRequestList.tsx (80%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => maintenanceRequests}/MaintenanceRequestListItem.tsx (91%)
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => maintenanceRequests}/StatusBadge.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => properties}/PropertyListingCard.tsx (98%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/{features/global-search/components/search/SearchPagination.tsx => components/properties/PropertyListingSearchPagination.tsx} (65%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => properties}/PropertyMap.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/{ => properties}/PropertySearchFilters.tsx (100%)
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectDetailService.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoGraphQLService.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoService.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/recordListGraphQLService.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailFields.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailForm.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailHeader.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailLayoutSections.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/Section.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/SectionRow.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/UiApiDetailForm.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FieldValueDisplay.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedAddress.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedEmail.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedPhone.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedText.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedUrl.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterField.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterInput.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterSelect.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FiltersPanel.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/filters-form.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/submit-button.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/GlobalSearchInput.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/ResultCardFields.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchHeader.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultCard.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultsPanel.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/shared/LoadingFallback.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/constants.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterInput.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterSelect.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/form.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectInfoBatch.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectSearchData.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordDetailLayout.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordListGraphQL.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/DetailPage.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/GlobalSearch.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/filters.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/picklist.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/objectInfo/objectInfo.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/recordDetail/recordDetail.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/schema.d.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/apiUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/cacheUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/debounce.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldValueExtractor.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/filterUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formDataTransformUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLNodeFieldUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLObjectInfoAdapter.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLRecordAdapter.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/layoutTransformUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/linkUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/paginationUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/recordUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/sanitizationUtils.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingPriceRange.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/index.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/About.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/HelpCenter.tsx
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyListings.tsx
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/{features/global-search/types/search => types}/searchResults.ts (100%)
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts

diff --git a/package-lock.json b/package-lock.json
index 8a55002..ce287af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@salesforce/afv-skills",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/afv-skills",
-      "version": "1.4.0",
+      "version": "1.5.0",
       "license": "CC-BY-NC-4.0",
       "devDependencies": {
-        "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.7",
-        "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.7",
+        "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.10",
+        "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.10",
         "@types/js-yaml": "^4.0.9",
         "js-yaml": "^4.1.1",
         "tsx": "^4.21.0"
@@ -688,22 +688,22 @@
       }
     },
     "node_modules/@salesforce/sdk-core": {
-      "version": "1.112.7",
-      "resolved": "https://registry.npmjs.org/@salesforce/sdk-core/-/sdk-core-1.112.7.tgz",
-      "integrity": "sha512-R/qJAqAUmEnlAPsPh8VImZIbSIC9fURGr7Qlp6iMv+JElruJJ9HScScDlXlZ6CGDICMHqoFkM63FtiPXdV/jbg==",
+      "version": "1.112.10",
+      "resolved": "https://registry.npmjs.org/@salesforce/sdk-core/-/sdk-core-1.112.10.tgz",
+      "integrity": "sha512-JUbzrDIg5PMuxGlABkNyMmXmQdlXIqdKrstR/lZGhrqektrI7TWc/owun2iXALLsODS3nh3nNV5p87KqYltpGA==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt"
     },
     "node_modules/@salesforce/sdk-data": {
-      "version": "1.112.7",
-      "resolved": "https://registry.npmjs.org/@salesforce/sdk-data/-/sdk-data-1.112.7.tgz",
-      "integrity": "sha512-yBXDidDBDu8U46TAC5j8GgDjrAM+9QFqkcsxmgealy/4OfFieSWMTPEEG6Hv1uNKfM3OTXGrovBPkYHSx0EfkQ==",
+      "version": "1.112.10",
+      "resolved": "https://registry.npmjs.org/@salesforce/sdk-data/-/sdk-data-1.112.10.tgz",
+      "integrity": "sha512-YcQQUiPmdbq4wak9iRjY0FV3Xs+RRwZB0UEQ3ovWxy11rN3ZQBghdxNORYuYkjb4TCiiS6cWVy4/a+o4NspFHQ==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@conduit-client/service-fetch-network": "3.17.0",
         "@conduit-client/utils": "3.17.0",
-        "@salesforce/sdk-core": "^1.112.7"
+        "@salesforce/sdk-core": "^1.112.10"
       }
     },
     "node_modules/@salesforce/ts-types": {
@@ -717,14 +717,14 @@
       }
     },
     "node_modules/@salesforce/webapp-experimental": {
-      "version": "1.112.7",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-experimental/-/webapp-experimental-1.112.7.tgz",
-      "integrity": "sha512-USVakM9ygFyLzLiqDJlyqkP+ZP8OH0qh1n98kCw410bTfoquecgUE18eMrXTw9w8AygNWe2gx0fw3eriDClD4g==",
+      "version": "1.112.10",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-experimental/-/webapp-experimental-1.112.10.tgz",
+      "integrity": "sha512-QwV0j4XIkYt75W78m362H+bJEejX78y1TUvhdcQZLRt5zJWi5BdNg8IhSV+aVSsCM0k6cGuAxgfixgCOX8yHfg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@salesforce/core": "^8.23.4",
-        "@salesforce/sdk-data": "^1.112.7",
+        "@salesforce/sdk-data": "^1.112.10",
         "axios": "^1.7.7",
         "micromatch": "^4.0.8",
         "path-to-regexp": "^8.3.0"
@@ -734,20 +734,20 @@
       }
     },
     "node_modules/@salesforce/webapp-template-app-react-sample-b2e-experimental": {
-      "version": "1.112.7",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2e-experimental/-/webapp-template-app-react-sample-b2e-experimental-1.112.7.tgz",
-      "integrity": "sha512-NltyiArtKoQs2A90/tnP0UQZ0+Eowuzg6smyYNsY0MrZ1d8lSa9puN882ldq1PlYrQgD+2ZrPvA7Txwbg93oMA==",
+      "version": "1.112.10",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2e-experimental/-/webapp-template-app-react-sample-b2e-experimental-1.112.10.tgz",
+      "integrity": "sha512-LZCC61D3HCiGH3kxdQNaF/Z/lwj8s+vbPM/sHGC16amxfByRaxYnuIVJwITxmiKFxbrm19gqSvf9BQ6aH8Cnfg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
-        "@salesforce/webapp-experimental": "^1.112.7",
+        "@salesforce/webapp-experimental": "^1.112.10",
         "sonner": "^1.7.0"
       }
     },
     "node_modules/@salesforce/webapp-template-app-react-sample-b2x-experimental": {
-      "version": "1.112.7",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2x-experimental/-/webapp-template-app-react-sample-b2x-experimental-1.112.7.tgz",
-      "integrity": "sha512-oOrSp8DpH9O8BnS1fJCBcpA4TQwViwlIPPgaTC2mnJwA8eREqcw+xejydC96NetrIzspOx1zkdWtqTYbApZEyg==",
+      "version": "1.112.10",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2x-experimental/-/webapp-template-app-react-sample-b2x-experimental-1.112.10.tgz",
+      "integrity": "sha512-/VPf79iRzyiRjvKn7XzNRnYwhR6sBNRW9qV2wSvgLQhDQ7BIVU8nW5TPKcQOsTUtbgp2GxrV8I1B3XBkgx4TOw==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt"
     },
diff --git a/package.json b/package.json
index aa920d0..95116de 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.7",
-    "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.7",
+    "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.10",
+    "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.10",
     "@types/js-yaml": "^4.0.9",
     "js-yaml": "^4.1.1",
     "tsx": "^4.21.0"
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.version b/samples/webapp-template-app-react-sample-b2e-experimental/.version
index 2d54e63..4da2ae8 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/.version
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/.version
@@ -1 +1 @@
-1.112.7
+1.112.10
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
index 21d6adb..96e9f54 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.112.10](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.9...v1.112.10) (2026-03-24)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.112.9](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.8...v1.112.9) (2026-03-24)
+
+
+### Bug Fixes
+
+* address PR [#81](https://github.com/salesforce-experience-platform-emu/webapps/issues/81) review feedback on graphql-search.sh ([#345](https://github.com/salesforce-experience-platform-emu/webapps/issues/345)) ([54a6e59](https://github.com/salesforce-experience-platform-emu/webapps/commit/54a6e590afd1923a12f776eba6b6cc147729c697))
+
+
+
+
+
+## [1.112.8](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.7...v1.112.8) (2026-03-24)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.112.7](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.6...v1.112.7) (2026-03-23)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json
index ee184c9..82cae36 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json
@@ -15,8 +15,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/sdk-data": "^1.112.7",
-    "@salesforce/webapp-experimental": "^1.112.7",
+    "@salesforce/sdk-data": "^1.112.10",
+    "@salesforce/webapp-experimental": "^1.112.10",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -43,7 +43,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.112.7",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.112.10",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json b/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
index b98c1a4..5d3ff7e 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.7",
+  "version": "1.112.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.112.7",
+      "version": "1.112.10",
       "license": "SEE LICENSE IN LICENSE.txt",
       "devDependencies": {
         "@lwc/eslint-plugin-lwc": "^3.3.0",
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package.json b/samples/webapp-template-app-react-sample-b2e-experimental/package.json
index f421ec5..7566445 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/package.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.7",
+  "version": "1.112.10",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh b/samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh
index a9863de..e11f41e 100755
--- a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/scripts/graphql-search.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail  # exit on error (-e), undefined vars (-u), and propagate pipeline failures (-o pipefail)
 # graphql-search.sh — Look up one or more Salesforce entities in schema.graphql.
 #
 # Run from the SFDX project root (where schema.graphql lives):
@@ -10,11 +11,13 @@
 #   bash scripts/graphql-search.sh --schema ./other/schema.graphql Account Contact
 #
 # Output sections per entity:
-#   1. Type definition   — all fields and relationships
-#   2. Filter options    — <Entity>_Filter input (for `where:`)
-#   3. Sort options      — <Entity>_OrderBy input (for `orderBy:`)
-#   4. Create input      — <Entity>CreateRepresentation (for create mutations)
-#   5. Update input      — <Entity>UpdateRepresentation (for update mutations)
+#   1. Type definition          — all fields and relationships
+#   2. Filter options           — <Entity>_Filter input (for `where:`)
+#   3. Sort options             — <Entity>_OrderBy input (for `orderBy:`)
+#   4. Create mutation wrapper  — <Entity>CreateInput
+#   5. Create mutation fields   — <Entity>CreateRepresentation (for create mutations)
+#   6. Update mutation wrapper  — <Entity>UpdateInput
+#   7. Update mutation fields   — <Entity>UpdateRepresentation (for update mutations)
 
 SCHEMA="./schema.graphql"
 
@@ -62,6 +65,19 @@ if [ ! -f "$SCHEMA" ]; then
   exit 1
 fi
 
+if [ ! -r "$SCHEMA" ]; then
+  echo "ERROR: schema.graphql is not readable at $SCHEMA"
+  echo "  Check file permissions: ls -la $SCHEMA"
+  exit 1
+fi
+
+if [ ! -s "$SCHEMA" ]; then
+  echo "ERROR: schema.graphql is empty at $SCHEMA"
+  echo "  Regenerate it from the webapp dir:"
+  echo "    cd force-app/main/default/webapplications/<app-name> && npm run graphql:schema"
+  exit 1
+fi
+
 # ── Helper: extract lines from a grep match through the closing brace ────────
 # Prints up to MAX_LINES lines after (and including) the first match of PATTERN.
 # Uses a generous line count — blocks are always closed by a "}" line.
@@ -72,68 +88,104 @@ extract_block() {
   local max_lines="$3"
 
   local match
-  match=$(grep -nE "$pattern" "$SCHEMA" | head -1)
+  local grep_exit=0
+  match=$(grep -nE "$pattern" "$SCHEMA" | head -1) || grep_exit=$?
+
+  if [ "$grep_exit" -eq 2 ]; then
+    echo "  ERROR: grep failed on pattern: $pattern" >&2
+    return 1
+  fi
 
   if [ -z "$match" ]; then
     echo "  (not found: $pattern)"
-    return
+    return 3
   fi
 
   echo "### $label"
   grep -E "$pattern" "$SCHEMA" -A "$max_lines" | \
     awk '/^\}$/{print; exit} {print}' | \
-    head -n "$max_lines"
+    head -n "$max_lines" || true
   echo ""
 }
 
 # ── Main loop ────────────────────────────────────────────────────────────────
 
 for ENTITY in "$@"; do
+  # Validate entity name: must be a valid PascalCase identifier (letters, digits, underscores)
+  if [[ ! "$ENTITY" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+    echo "ERROR: Invalid entity name: '$ENTITY'"
+    echo "  Entity names must start with a letter or underscore, followed by letters, digits, or underscores."
+    echo "  Examples: Account, My_Custom_Object__c"
+    continue
+  fi
+
   echo ""
   echo "======================================================================"
   echo "  SCHEMA LOOKUP: $ENTITY"
   echo "======================================================================"
   echo ""
 
+  found=0
+
+  # Helper: call extract_block, track matches, surface errors
+  try_extract() {
+    local rc=0
+    extract_block "$@" || rc=$?
+    if [ "$rc" -eq 0 ]; then
+      found=$((found + 1))
+    elif [ "$rc" -eq 1 ]; then
+      echo "  Aborting lookup for '$ENTITY' due to grep error" >&2
+    fi
+    # rc=3 is not-found — continue silently (already printed by extract_block)
+  }
+
   # 1. Type definition — all fields and relationships
-  extract_block \
+  try_extract \
     "Type definition — fields and relationships" \
     "^type ${ENTITY} implements Record" \
     200
 
   # 2. Filter input — used in `where:` arguments
-  extract_block \
+  try_extract \
     "Filter options — use in where: { ... }" \
     "^input ${ENTITY}_Filter" \
     100
 
   # 3. OrderBy input — used in `orderBy:` arguments
-  extract_block \
+  try_extract \
     "Sort options — use in orderBy: { ... }" \
     "^input ${ENTITY}_OrderBy" \
     60
 
-  # 4. Create mutation inputs
-  extract_block \
+  # 4. Create mutation wrapper
+  try_extract \
     "Create mutation wrapper — ${ENTITY}CreateInput" \
     "^input ${ENTITY}CreateInput" \
     10
 
-  extract_block \
+  # 5. Create mutation fields
+  try_extract \
     "Create mutation fields — ${ENTITY}CreateRepresentation" \
     "^input ${ENTITY}CreateRepresentation" \
     100
 
-  # 5. Update mutation inputs
-  extract_block \
+  # 6. Update mutation wrapper
+  try_extract \
     "Update mutation wrapper — ${ENTITY}UpdateInput" \
     "^input ${ENTITY}UpdateInput" \
     10
 
-  extract_block \
+  # 7. Update mutation fields
+  try_extract \
     "Update mutation fields — ${ENTITY}UpdateRepresentation" \
     "^input ${ENTITY}UpdateRepresentation" \
     100
 
+  if [ "$found" -eq 0 ]; then
+    echo "WARNING: No schema entries found for '$ENTITY'."
+    echo "  - Names are PascalCase (e.g., 'Account' not 'account')"
+    echo "  - Custom objects may need deployment first"
+  fi
+
   echo ""
 done
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.version b/samples/webapp-template-app-react-sample-b2x-experimental/.version
index 2d54e63..4da2ae8 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/.version
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/.version
@@ -1 +1 @@
-1.112.7
+1.112.10
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
index 21d6adb..96e9f54 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.112.10](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.9...v1.112.10) (2026-03-24)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.112.9](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.8...v1.112.9) (2026-03-24)
+
+
+### Bug Fixes
+
+* address PR [#81](https://github.com/salesforce-experience-platform-emu/webapps/issues/81) review feedback on graphql-search.sh ([#345](https://github.com/salesforce-experience-platform-emu/webapps/issues/345)) ([54a6e59](https://github.com/salesforce-experience-platform-emu/webapps/commit/54a6e590afd1923a12f776eba6b6cc147729c697))
+
+
+
+
+
+## [1.112.8](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.7...v1.112.8) (2026-03-24)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.112.7](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.6...v1.112.7) (2026-03-23)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json
index b8ebde3..2aa592b 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json
@@ -15,12 +15,12 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/sdk-data": "^1.112.7",
-    "@salesforce/webapp-experimental": "^1.112.7",
+    "@salesforce/sdk-data": "^1.112.10",
+    "@salesforce/webapp-experimental": "^1.112.10",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "date-fns": "^4.1.0",
+    "date-fns": "^3.0.0",
     "lucide-react": "^0.562.0",
     "radix-ui": "^1.4.3",
     "react": "^19.2.0",
@@ -36,7 +36,8 @@
     "zod": "^4.3.5",
     "@types/leaflet": "^1.9.8",
     "leaflet": "^1.9.4",
-    "react-leaflet": "^5.0.0"
+    "react-leaflet": "^5.0.0",
+    "recharts": "^2.15.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
@@ -46,7 +47,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.112.7",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.112.10",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applicationApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applications/applicationApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applicationApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applications/applicationApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts
index c3770c5..7337bc7 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts
@@ -1,98 +1,11684 @@
-/**
- * Generated operation types for B2X GraphQL queries.
- * Regenerate with codegen (e.g. npm run graphql:codegen) when schema or operations change.
- */
-
-// ---- MaintenanceRequests ----
-export interface MaintenanceRequestsQueryVariables {
-	first: number;
-	after?: string | null;
-}
-
-export interface MaintenanceRequestsQuery {
-	uiapi?: {
-		query?: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						ApiName?: string | null;
-						Name?: { value?: unknown; displayValue?: string | null } | null;
-						Description__c?: { value?: unknown; displayValue?: string | null } | null;
-						Type__c?: { value?: unknown; displayValue?: string | null } | null;
-						Priority__c?: { value?: unknown; displayValue?: string | null } | null;
-						Status__c?: { value?: unknown; displayValue?: string | null } | null;
-						Scheduled__c?: { value?: unknown; displayValue?: string | null } | null;
-						User__r?: {
-							Name?: { value?: unknown; displayValue?: string | null } | null;
-						} | null;
-						Property__r?: {
-							Address__c?: { value?: unknown; displayValue?: string | null } | null;
-						} | null;
-					} | null;
-				}> | null;
-				pageInfo?: {
-					hasNextPage?: boolean | null;
-					endCursor?: string | null;
-				} | null;
-			} | null;
-		} | null;
-	} | null;
-}
-
-// ---- PropertyListings ----
-/** Single-field condition; Property__r filters on related Property (name, address, bedrooms). */
-export type PropertyListingsWhereCondition = {
-	Name?: { like: string };
-	Listing_Status__c?: { like: string };
-	Listing_Price__c?: { gte?: number; lte?: number };
-	Property__r?: {
-		Name?: { like: string };
-		Address__c?: { like: string };
-		Bedrooms__c?: { gte?: number };
-	};
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = {
+	[_ in K]?: never;
 };
-/** GraphQL ResultOrder values for orderBy (use ResultOrder.Asc / ResultOrder.Desc). */
+export type Incremental<T> =
+	| T
+	| { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+	ID: { input: string; output: string };
+	String: { input: string; output: string };
+	Boolean: { input: boolean; output: boolean };
+	Int: { input: number; output: number };
+	Float: { input: number; output: number };
+	Base64: { input: string; output: string };
+	Currency: { input: number | string; output: number };
+	Date: { input: string; output: string };
+	DateTime: { input: string; output: string };
+	Double: { input: number | string; output: number };
+	Email: { input: string; output: string };
+	/** Can be set to an ID or a Reference to the result of another mutation operation. */
+	IdOrRef: { input: string; output: string };
+	Latitude: { input: number | string; output: number };
+	/** A 64-bit signed integer */
+	Long: { input: number; output: number };
+	LongTextArea: { input: string; output: string };
+	Longitude: { input: number | string; output: number };
+	MultiPicklist: { input: string; output: string };
+	Percent: { input: number | string; output: number };
+	PhoneNumber: { input: string; output: string };
+	Picklist: { input: string; output: string };
+	RichTextArea: { input: string; output: string };
+	TextArea: { input: string; output: string };
+	Time: { input: string; output: string };
+	Url: { input: string; output: string };
+};
+
+export type AccountHistory_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AccountHistory_Filter>>>;
+	not?: InputMaybe<AccountHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AccountHistory_Filter>>>;
+};
+
+export type AccountPartner_Filter = {
+	AccountFrom?: InputMaybe<Account_Filter>;
+	AccountFromId?: InputMaybe<IdOperators>;
+	AccountTo?: InputMaybe<Account_Filter>;
+	AccountToId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	ReversePartnerId?: InputMaybe<IdOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AccountPartner_Filter>>>;
+	not?: InputMaybe<AccountPartner_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AccountPartner_Filter>>>;
+};
+
+export type Account_Filter = {
+	AccountSource?: InputMaybe<PicklistOperators>;
+	AnnualRevenue?: InputMaybe<CurrencyOperators>;
+	BillingCity?: InputMaybe<StringOperators>;
+	BillingCountry?: InputMaybe<StringOperators>;
+	BillingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	BillingLatitude?: InputMaybe<LatitudeOperators>;
+	BillingLongitude?: InputMaybe<LongitudeOperators>;
+	BillingPostalCode?: InputMaybe<StringOperators>;
+	BillingState?: InputMaybe<StringOperators>;
+	BillingStreet?: InputMaybe<TextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Industry?: InputMaybe<PicklistOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Jigsaw?: InputMaybe<StringOperators>;
+	JigsawCompanyId?: InputMaybe<StringOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	MasterRecord?: InputMaybe<Account_Filter>;
+	MasterRecordId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumberOfEmployees?: InputMaybe<IntegerOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Account_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PhotoUrl?: InputMaybe<UrlOperators>;
+	ShippingCity?: InputMaybe<StringOperators>;
+	ShippingCountry?: InputMaybe<StringOperators>;
+	ShippingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	ShippingLatitude?: InputMaybe<LatitudeOperators>;
+	ShippingLongitude?: InputMaybe<LongitudeOperators>;
+	ShippingPostalCode?: InputMaybe<StringOperators>;
+	ShippingState?: InputMaybe<StringOperators>;
+	ShippingStreet?: InputMaybe<TextAreaOperators>;
+	SicDesc?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	Website?: InputMaybe<UrlOperators>;
+	and?: InputMaybe<Array<InputMaybe<Account_Filter>>>;
+	not?: InputMaybe<Account_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Account_Filter>>>;
+};
+
+export type Account_OrderBy = {
+	AccountSource?: InputMaybe<OrderByClause>;
+	AnnualRevenue?: InputMaybe<OrderByClause>;
+	BillingCity?: InputMaybe<OrderByClause>;
+	BillingCountry?: InputMaybe<OrderByClause>;
+	BillingGeocodeAccuracy?: InputMaybe<OrderByClause>;
+	BillingLatitude?: InputMaybe<OrderByClause>;
+	BillingLongitude?: InputMaybe<OrderByClause>;
+	BillingPostalCode?: InputMaybe<OrderByClause>;
+	BillingState?: InputMaybe<OrderByClause>;
+	BillingStreet?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Description?: InputMaybe<AggregateOrderByStringClause>;
+	Fax?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	Industry?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	Jigsaw?: InputMaybe<OrderByClause>;
+	JigsawCompanyId?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	LastReferencedDate?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	MasterRecord?: InputMaybe<Account_OrderBy>;
+	MasterRecordId?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	NumberOfEmployees?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<User_OrderBy>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Parent?: InputMaybe<Account_OrderBy>;
+	ParentId?: InputMaybe<OrderByClause>;
+	Phone?: InputMaybe<OrderByClause>;
+	PhotoUrl?: InputMaybe<OrderByClause>;
+	ShippingCity?: InputMaybe<OrderByClause>;
+	ShippingCountry?: InputMaybe<OrderByClause>;
+	ShippingGeocodeAccuracy?: InputMaybe<OrderByClause>;
+	ShippingLatitude?: InputMaybe<OrderByClause>;
+	ShippingLongitude?: InputMaybe<OrderByClause>;
+	ShippingPostalCode?: InputMaybe<OrderByClause>;
+	ShippingState?: InputMaybe<OrderByClause>;
+	ShippingStreet?: InputMaybe<OrderByClause>;
+	SicDesc?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Type?: InputMaybe<OrderByClause>;
+	Website?: InputMaybe<OrderByClause>;
+};
+
+export type Agent__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Agent__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Agent__History_Filter>>>;
+	not?: InputMaybe<Agent__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Agent__History_Filter>>>;
+};
+
+export type Agent__C_Filter = {
+	Agent_Type__c?: InputMaybe<PicklistOperators>;
+	Availability__c?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Emergency_Alt__c?: InputMaybe<PhoneNumberOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language__c?: InputMaybe<PicklistOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	License_Expiry__c?: InputMaybe<DateOperators>;
+	License_Number__c?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Office_Location__c?: InputMaybe<PicklistOperators>;
+	Owner?: InputMaybe<Agent__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Territory__c?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Agent__C_Filter>>>;
+	not?: InputMaybe<Agent__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Agent__C_Filter>>>;
+};
+
+export type Agent__C_OrderBy = {
+	Agent_Type__c?: InputMaybe<OrderByClause>;
+	Availability__c?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Emergency_Alt__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	Language__c?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	License_Expiry__c?: InputMaybe<OrderByClause>;
+	License_Number__c?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Office_Location__c?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Agent__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Territory__c?: InputMaybe<OrderByClause>;
+};
+
+export type Agent__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Agent__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type AggregateOrderByStringClause = {
+	function?: InputMaybe<AggregateOrderByStringFunction>;
+	nulls?: InputMaybe<NullsOrder>;
+	order?: InputMaybe<ResultsOrder>;
+};
+
+export const AggregateOrderByStringFunction = {
+	Count: "COUNT",
+	CountDistinct: "COUNT_DISTINCT",
+	Max: "MAX",
+	Min: "MIN",
+} as const;
+
+export type AggregateOrderByStringFunction =
+	(typeof AggregateOrderByStringFunction)[keyof typeof AggregateOrderByStringFunction];
+
+export type AnalyticsUserAttrFuncTkn_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefinitionName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<AnalyticsUserAttrFuncTkn_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TargetObject?: InputMaybe<PicklistOperators>;
+	TargetObjectField?: InputMaybe<StringOperators>;
+	TokenKey?: InputMaybe<StringOperators>;
+	ViewerTgtObjRelDesc?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<AnalyticsUserAttrFuncTkn_Filter>>>;
+	not?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AnalyticsUserAttrFuncTkn_Filter>>>;
+};
+
+export type AnalyticsUserAttrFuncTkn_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type AppAnalyticsQueryRequest_Filter = {
+	AvailableSince?: InputMaybe<DateTimeOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DownloadExpirationTime?: InputMaybe<DateTimeOperators>;
+	DownloadSize?: InputMaybe<LongOperators>;
+	DownloadUrl?: InputMaybe<LongTextAreaOperators>;
+	EndTime?: InputMaybe<DateTimeOperators>;
+	ErrorMessage?: InputMaybe<StringOperators>;
+	FileCompression?: InputMaybe<PicklistOperators>;
+	FileType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrganizationIds?: InputMaybe<StringOperators>;
+	PackageIds?: InputMaybe<StringOperators>;
+	QuerySubmittedTime?: InputMaybe<DateTimeOperators>;
+	RequestState?: InputMaybe<PicklistOperators>;
+	StartTime?: InputMaybe<DateTimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AppAnalyticsQueryRequest_Filter>>>;
+	not?: InputMaybe<AppAnalyticsQueryRequest_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AppAnalyticsQueryRequest_Filter>>>;
+};
+
+export type AppMenuItem_Filter = {
+	ApplicationId?: InputMaybe<IdOperators>;
+	CanvasAccessMethod?: InputMaybe<PicklistOperators>;
+	CanvasEnabled?: InputMaybe<BooleanOperators>;
+	CanvasOptions?: InputMaybe<StringOperators>;
+	CanvasReferenceId?: InputMaybe<StringOperators>;
+	CanvasSelectedLocations?: InputMaybe<StringOperators>;
+	CanvasUrl?: InputMaybe<UrlOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	FormFactors?: InputMaybe<StringOperators>;
+	IconUrl?: InputMaybe<UrlOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InfoUrl?: InputMaybe<UrlOperators>;
+	IsAccessible?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsRegisteredDeviceOnly?: InputMaybe<BooleanOperators>;
+	IsUsingAdminAuthorization?: InputMaybe<BooleanOperators>;
+	IsVisible?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LogoUrl?: InputMaybe<UrlOperators>;
+	MobileAppBinaryId?: InputMaybe<StringOperators>;
+	MobileAppInstallUrl?: InputMaybe<UrlOperators>;
+	MobileAppInstalledDate?: InputMaybe<DateTimeOperators>;
+	MobileAppInstalledVersion?: InputMaybe<StringOperators>;
+	MobileAppVer?: InputMaybe<StringOperators>;
+	MobileDeviceType?: InputMaybe<StringOperators>;
+	MobileMinOsVer?: InputMaybe<StringOperators>;
+	MobilePlatform?: InputMaybe<PicklistOperators>;
+	MobileStartUrl?: InputMaybe<UrlOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	StartUrl?: InputMaybe<UrlOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TabSetType?: InputMaybe<PicklistOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	UiType?: InputMaybe<PicklistOperators>;
+	UserSortOrder?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<AppMenuItem_Filter>>>;
+	not?: InputMaybe<AppMenuItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AppMenuItem_Filter>>>;
+};
+
+export type Application__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Application__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Application__History_Filter>>>;
+	not?: InputMaybe<Application__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Application__History_Filter>>>;
+};
+
+export type Application__CUpdateInput = {
+	Application__c: Application__CUpdateRepresentation;
+	Id: Scalars["IdOrRef"]["input"];
+};
+
+export type Application__CUpdateRepresentation = {
+	Employment__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	References__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	Start_Date__c?: InputMaybe<Scalars["Date"]["input"]>;
+	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+};
+
+export type Application__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Employment__c?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Application__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	References__c?: InputMaybe<LongTextAreaOperators>;
+	Start_Date__c?: InputMaybe<DateOperators>;
+	Status__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	User__c?: InputMaybe<IdOperators>;
+	User__r?: InputMaybe<Contact_Filter>;
+	and?: InputMaybe<Array<InputMaybe<Application__C_Filter>>>;
+	not?: InputMaybe<Application__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Application__C_Filter>>>;
+};
+
+export type Application__C_OrderBy = {
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Employment__c?: InputMaybe<AggregateOrderByStringClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Application__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Property__c?: InputMaybe<OrderByClause>;
+	Property__r?: InputMaybe<Property__C_OrderBy>;
+	References__c?: InputMaybe<AggregateOrderByStringClause>;
+	Start_Date__c?: InputMaybe<OrderByClause>;
+	Status__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	User__c?: InputMaybe<OrderByClause>;
+	User__r?: InputMaybe<Contact_OrderBy>;
+};
+
+export type Application__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Application__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type ApprovalSubmissionDetailHistory_Filter = {
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalSubmissionDetailId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalSubmissionDetailHistory_Filter>>>;
+	not?: InputMaybe<ApprovalSubmissionDetailHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalSubmissionDetailHistory_Filter>>>;
+};
+
+export type ApprovalSubmissionDetail_Filter = {
+	ActionChannelName?: InputMaybe<PicklistOperators>;
+	ActionContext?: InputMaybe<StringOperators>;
+	ActionName?: InputMaybe<PicklistOperators>;
+	ActionPerformedBy?: InputMaybe<User_Filter>;
+	ActionPerformedById?: InputMaybe<IdOperators>;
+	ActionPerformerRole?: InputMaybe<PicklistOperators>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionId?: InputMaybe<IdOperators>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	ApprovalWorkItemId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalSubmissionDetail_Filter>>>;
+	not?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalSubmissionDetail_Filter>>>;
+};
+
+export type ApprovalSubmissionHistory_Filter = {
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalSubmissionHistory_Filter>>>;
+	not?: InputMaybe<ApprovalSubmissionHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalSubmissionHistory_Filter>>>;
+};
+
+export type ApprovalSubmission_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DoesSendApprovalEmail?: InputMaybe<BooleanOperators>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationInstanceId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ApprovalSubmission_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	RelatedRecord?: InputMaybe<ApprovalSubmission_RelatedRecord_Filters>;
+	RelatedRecordId?: InputMaybe<IdOperators>;
+	RelatedRecordObjectName?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SubmittedBy?: InputMaybe<User_Filter>;
+	SubmittedById?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalSubmission_Filter>>>;
+	not?: InputMaybe<ApprovalSubmission_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalSubmission_Filter>>>;
+};
+
+export type ApprovalSubmission_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ApprovalSubmission_RelatedRecord_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	AnalyticsUserAttrFuncTkn?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseComment?: InputMaybe<CaseComment_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentVersion?: InputMaybe<ContentVersion_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	Customer?: InputMaybe<Customer_Filter>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationTrustMeasure?: InputMaybe<LocationTrustMeasure_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	ManagedContentVariant?: InputMaybe<ManagedContentVariant_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityRelatedDeleteLog?: InputMaybe<OpportunityRelatedDeleteLog_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	OrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	QuickText?: InputMaybe<QuickText_Filter>;
+	ReportHierarchyObjectField?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	StreamingChannel?: InputMaybe<StreamingChannel_Filter>;
+	TableauHostMapping?: InputMaybe<TableauHostMapping_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	UnstructuredStorageSpace?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	User?: InputMaybe<User_Filter>;
+	UserLocalWebServerIdentity?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type ApprovalWorkItemHistory_Filter = {
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	ApprovalWorkItemId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalWorkItemHistory_Filter>>>;
+	not?: InputMaybe<ApprovalWorkItemHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalWorkItemHistory_Filter>>>;
+};
+
+export type ApprovalWorkItem_AssignedTo_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ApprovalWorkItem_Filter = {
+	ApprovalConditionName?: InputMaybe<StringOperators>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionId?: InputMaybe<IdOperators>;
+	AssignedTo?: InputMaybe<ApprovalWorkItem_AssignedTo_Filters>;
+	AssignedToId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FlowOrchestrationWorkItem?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	FlowOrchestrationWorkItemId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ParentWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	ParentWorkItemId?: InputMaybe<IdOperators>;
+	RelatedRecord?: InputMaybe<ApprovalWorkItem_RelatedRecord_Filters>;
+	RelatedRecordId?: InputMaybe<IdOperators>;
+	RelatedRecordObjectName?: InputMaybe<StringOperators>;
+	ReviewedBy?: InputMaybe<User_Filter>;
+	ReviewedById?: InputMaybe<IdOperators>;
+	ReviewedDate?: InputMaybe<DateTimeOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ApprovalWorkItem_Filter>>>;
+	not?: InputMaybe<ApprovalWorkItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ApprovalWorkItem_Filter>>>;
+};
+
+export type ApprovalWorkItem_RelatedRecord_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	AnalyticsUserAttrFuncTkn?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseComment?: InputMaybe<CaseComment_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentVersion?: InputMaybe<ContentVersion_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	Customer?: InputMaybe<Customer_Filter>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationTrustMeasure?: InputMaybe<LocationTrustMeasure_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	ManagedContentVariant?: InputMaybe<ManagedContentVariant_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityRelatedDeleteLog?: InputMaybe<OpportunityRelatedDeleteLog_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	OrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	QuickText?: InputMaybe<QuickText_Filter>;
+	ReportHierarchyObjectField?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	StreamingChannel?: InputMaybe<StreamingChannel_Filter>;
+	TableauHostMapping?: InputMaybe<TableauHostMapping_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	UnstructuredStorageSpace?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	User?: InputMaybe<User_Filter>;
+	UserLocalWebServerIdentity?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type AssetHistory_Filter = {
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AssetHistory_Filter>>>;
+	not?: InputMaybe<AssetHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AssetHistory_Filter>>>;
+};
+
+export type AssetRelationshipHistory_Filter = {
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssetRelationshipId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AssetRelationshipHistory_Filter>>>;
+	not?: InputMaybe<AssetRelationshipHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AssetRelationshipHistory_Filter>>>;
+};
+
+export type AssetRelationship_Filter = {
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetId?: InputMaybe<IdOperators>;
+	AssetRelationshipNumber?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FromDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	RelatedAsset?: InputMaybe<Asset_Filter>;
+	RelatedAssetId?: InputMaybe<IdOperators>;
+	RelationshipType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	ToDate?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AssetRelationship_Filter>>>;
+	not?: InputMaybe<AssetRelationship_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AssetRelationship_Filter>>>;
+};
+
+export type Asset_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	AssetLevel?: InputMaybe<IntegerOperators>;
+	AssetProvidedBy?: InputMaybe<Account_Filter>;
+	AssetProvidedById?: InputMaybe<IdOperators>;
+	AssetServicedBy?: InputMaybe<Account_Filter>;
+	AssetServicedById?: InputMaybe<IdOperators>;
+	City?: InputMaybe<StringOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InstallDate?: InputMaybe<DateOperators>;
+	IsCompetitorProduct?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsInternal?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Asset_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	Price?: InputMaybe<CurrencyOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	ProductCode?: InputMaybe<StringOperators>;
+	PurchaseDate?: InputMaybe<DateOperators>;
+	Quantity?: InputMaybe<DoubleOperators>;
+	RootAsset?: InputMaybe<Asset_Filter>;
+	RootAssetId?: InputMaybe<IdOperators>;
+	SerialNumber?: InputMaybe<StringOperators>;
+	State?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StockKeepingUnit?: InputMaybe<StringOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UsageEndDate?: InputMaybe<DateOperators>;
+	and?: InputMaybe<Array<InputMaybe<Asset_Filter>>>;
+	not?: InputMaybe<Asset_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Asset_Filter>>>;
+};
+
+export type AssociatedLocationHistory_Filter = {
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AssociatedLocationId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AssociatedLocationHistory_Filter>>>;
+	not?: InputMaybe<AssociatedLocationHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AssociatedLocationHistory_Filter>>>;
+};
+
+export type AssociatedLocation_Filter = {
+	ActiveFrom?: InputMaybe<DateTimeOperators>;
+	ActiveTo?: InputMaybe<DateTimeOperators>;
+	AssociatedLocationNumber?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationId?: InputMaybe<IdOperators>;
+	ParentRecord?: InputMaybe<Account_Filter>;
+	ParentRecordId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<AssociatedLocation_Filter>>>;
+	not?: InputMaybe<AssociatedLocation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AssociatedLocation_Filter>>>;
+};
+
+export type Attachment_Filter = {
+	BodyLength?: InputMaybe<IntegerOperators>;
+	ContentType?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrivate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Attachment_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Attachment_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Attachment_Filter>>>;
+	not?: InputMaybe<Attachment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Attachment_Filter>>>;
+};
+
+export type Attachment_Owner_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Attachment_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type AuthorizationFormConsentHistory_Filter = {
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormConsentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormConsentHistory_Filter>>>;
+	not?: InputMaybe<AuthorizationFormConsentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormConsentHistory_Filter>>>;
+};
+
+export type AuthorizationFormConsent_ConsentGiver_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type AuthorizationFormConsent_Filter = {
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	AuthorizationFormTextId?: InputMaybe<IdOperators>;
+	ConsentCapturedDateTime?: InputMaybe<DateTimeOperators>;
+	ConsentCapturedSource?: InputMaybe<StringOperators>;
+	ConsentCapturedSourceType?: InputMaybe<PicklistOperators>;
+	ConsentGiver?: InputMaybe<AuthorizationFormConsent_ConsentGiver_Filters>;
+	ConsentGiverId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DocumentVersion?: InputMaybe<ContentVersion_Filter>;
+	DocumentVersionId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<AuthorizationFormConsent_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	RelatedRecord?: InputMaybe<Account_Filter>;
+	RelatedRecordId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormConsent_Filter>>>;
+	not?: InputMaybe<AuthorizationFormConsent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormConsent_Filter>>>;
+};
+
+export type AuthorizationFormConsent_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type AuthorizationFormDataUseHistory_Filter = {
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormDataUseId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormDataUseHistory_Filter>>>;
+	not?: InputMaybe<AuthorizationFormDataUseHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormDataUseHistory_Filter>>>;
+};
+
+export type AuthorizationFormDataUse_Filter = {
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<AuthorizationFormDataUse_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormDataUse_Filter>>>;
+	not?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormDataUse_Filter>>>;
+};
+
+export type AuthorizationFormDataUse_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type AuthorizationFormHistory_Filter = {
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormHistory_Filter>>>;
+	not?: InputMaybe<AuthorizationFormHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormHistory_Filter>>>;
+};
+
+export type AuthorizationFormTextHistory_Filter = {
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	AuthorizationFormTextId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormTextHistory_Filter>>>;
+	not?: InputMaybe<AuthorizationFormTextHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormTextHistory_Filter>>>;
+};
+
+export type AuthorizationFormText_Filter = {
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormId?: InputMaybe<IdOperators>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FullAuthorizationFormUrl?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Locale?: InputMaybe<PicklistOperators>;
+	LocaleSelection?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SummaryAuthFormText?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationFormText_Filter>>>;
+	not?: InputMaybe<AuthorizationFormText_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationFormText_Filter>>>;
+};
+
+export type AuthorizationForm_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefaultAuthFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	DefaultAuthFormTextId?: InputMaybe<IdOperators>;
+	EffectiveFromDate?: InputMaybe<DateOperators>;
+	EffectiveToDate?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsSignatureRequired?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<AuthorizationForm_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	RevisionNumber?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<AuthorizationForm_Filter>>>;
+	not?: InputMaybe<AuthorizationForm_Filter>;
+	or?: InputMaybe<Array<InputMaybe<AuthorizationForm_Filter>>>;
+};
+
+export type AuthorizationForm_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type BackgroundOperation_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Error?: InputMaybe<StringOperators>;
+	ExecutionGroup?: InputMaybe<StringOperators>;
+	ExpiresAt?: InputMaybe<DateTimeOperators>;
+	FinishedAt?: InputMaybe<DateTimeOperators>;
+	GroupLeader?: InputMaybe<BackgroundOperation_Filter>;
+	GroupLeaderId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumFollowers?: InputMaybe<IntegerOperators>;
+	ParentKey?: InputMaybe<StringOperators>;
+	ProcessAfter?: InputMaybe<DateTimeOperators>;
+	RetryBackoff?: InputMaybe<IntegerOperators>;
+	RetryCount?: InputMaybe<IntegerOperators>;
+	RetryLimit?: InputMaybe<IntegerOperators>;
+	SequenceGroup?: InputMaybe<StringOperators>;
+	SequenceNumber?: InputMaybe<IntegerOperators>;
+	StartedAt?: InputMaybe<DateTimeOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SubmittedAt?: InputMaybe<DateTimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Timeout?: InputMaybe<IntegerOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	WorkerUri?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<BackgroundOperation_Filter>>>;
+	not?: InputMaybe<BackgroundOperation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<BackgroundOperation_Filter>>>;
+};
+
+export type BooleanOperators = {
+	eq?: InputMaybe<Scalars["Boolean"]["input"]>;
+	ne?: InputMaybe<Scalars["Boolean"]["input"]>;
+};
+
+export type BusinessBrand_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrgId?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<BusinessBrand_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<BusinessBrand_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<BusinessBrand_Filter>>>;
+	not?: InputMaybe<BusinessBrand_Filter>;
+	or?: InputMaybe<Array<InputMaybe<BusinessBrand_Filter>>>;
+};
+
+export type BusinessBrand_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type BusinessHours_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FridayEndTime?: InputMaybe<TimeOperators>;
+	FridayStartTime?: InputMaybe<TimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsDefault?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	MondayEndTime?: InputMaybe<TimeOperators>;
+	MondayStartTime?: InputMaybe<TimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SaturdayEndTime?: InputMaybe<TimeOperators>;
+	SaturdayStartTime?: InputMaybe<TimeOperators>;
+	SundayEndTime?: InputMaybe<TimeOperators>;
+	SundayStartTime?: InputMaybe<TimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	ThursdayEndTime?: InputMaybe<TimeOperators>;
+	ThursdayStartTime?: InputMaybe<TimeOperators>;
+	TimeZoneSidKey?: InputMaybe<PicklistOperators>;
+	TuesdayEndTime?: InputMaybe<TimeOperators>;
+	TuesdayStartTime?: InputMaybe<TimeOperators>;
+	WednesdayEndTime?: InputMaybe<TimeOperators>;
+	WednesdayStartTime?: InputMaybe<TimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<BusinessHours_Filter>>>;
+	not?: InputMaybe<BusinessHours_Filter>;
+	or?: InputMaybe<Array<InputMaybe<BusinessHours_Filter>>>;
+};
+
+export type CampaignHistory_Filter = {
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CampaignHistory_Filter>>>;
+	not?: InputMaybe<CampaignHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CampaignHistory_Filter>>>;
+};
+
+export type CampaignMemberStatus_Filter = {
+	CampaignId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	HasResponded?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDefault?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CampaignMemberStatus_Filter>>>;
+	not?: InputMaybe<CampaignMemberStatus_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CampaignMemberStatus_Filter>>>;
+};
+
+export type CampaignMember_Filter = {
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignId?: InputMaybe<IdOperators>;
+	City?: InputMaybe<StringOperators>;
+	CompanyOrAccount?: InputMaybe<StringOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DoNotCall?: InputMaybe<BooleanOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	FirstRespondedDate?: InputMaybe<DateOperators>;
+	HasOptedOutOfEmail?: InputMaybe<BooleanOperators>;
+	HasOptedOutOfFax?: InputMaybe<BooleanOperators>;
+	HasResponded?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	Lead?: InputMaybe<Lead_Filter>;
+	LeadId?: InputMaybe<IdOperators>;
+	LeadOrContactId?: InputMaybe<IdOperators>;
+	LeadOrContactOwner?: InputMaybe<CampaignMember_LeadOrContactOwner_Filters>;
+	LeadOrContactOwnerId?: InputMaybe<IdOperators>;
+	LeadSource?: InputMaybe<PicklistOperators>;
+	MobilePhone?: InputMaybe<PhoneNumberOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	Salutation?: InputMaybe<PicklistOperators>;
+	State?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Street?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	Type?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CampaignMember_Filter>>>;
+	not?: InputMaybe<CampaignMember_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CampaignMember_Filter>>>;
+};
+
+export type CampaignMember_LeadOrContactOwner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Campaign_Filter = {
+	ActualCost?: InputMaybe<CurrencyOperators>;
+	AmountAllOpportunities?: InputMaybe<CurrencyOperators>;
+	AmountWonOpportunities?: InputMaybe<CurrencyOperators>;
+	BudgetedCost?: InputMaybe<CurrencyOperators>;
+	CampaignMemberRecordType?: InputMaybe<RecordType_Filter>;
+	CampaignMemberRecordTypeId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	EndDate?: InputMaybe<DateOperators>;
+	ExpectedResponse?: InputMaybe<PercentOperators>;
+	ExpectedRevenue?: InputMaybe<CurrencyOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumberOfContacts?: InputMaybe<IntegerOperators>;
+	NumberOfConvertedLeads?: InputMaybe<IntegerOperators>;
+	NumberOfLeads?: InputMaybe<IntegerOperators>;
+	NumberOfOpportunities?: InputMaybe<IntegerOperators>;
+	NumberOfResponses?: InputMaybe<IntegerOperators>;
+	NumberOfWonOpportunities?: InputMaybe<IntegerOperators>;
+	NumberSent?: InputMaybe<DoubleOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Campaign_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	ShowCampMembChart?: InputMaybe<IntegerOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Campaign_Filter>>>;
+	not?: InputMaybe<Campaign_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Campaign_Filter>>>;
+};
+
+export type CaseComment_Filter = {
+	CommentBody?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPublished?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Parent?: InputMaybe<Case_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CaseComment_Filter>>>;
+	not?: InputMaybe<CaseComment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CaseComment_Filter>>>;
+};
+
+export type CaseContactRole_Filter = {
+	Cases?: InputMaybe<Case_Filter>;
+	CasesId?: InputMaybe<IdOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CaseContactRole_Filter>>>;
+	not?: InputMaybe<CaseContactRole_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CaseContactRole_Filter>>>;
+};
+
+export type CaseHistory_Filter = {
+	Case?: InputMaybe<Case_Filter>;
+	CaseId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CaseHistory_Filter>>>;
+	not?: InputMaybe<CaseHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CaseHistory_Filter>>>;
+};
+
+export type Case_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	CaseNumber?: InputMaybe<StringOperators>;
+	ClosedDate?: InputMaybe<DateTimeOperators>;
+	Comments?: InputMaybe<LongTextAreaOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactEmail?: InputMaybe<EmailOperators>;
+	ContactFax?: InputMaybe<PhoneNumberOperators>;
+	ContactId?: InputMaybe<IdOperators>;
+	ContactMobile?: InputMaybe<PhoneNumberOperators>;
+	ContactPhone?: InputMaybe<PhoneNumberOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsEscalated?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	MasterRecord?: InputMaybe<Case_Filter>;
+	MasterRecordId?: InputMaybe<IdOperators>;
+	MilestoneTimer?: InputMaybe<StringOperators>;
+	Origin?: InputMaybe<PicklistOperators>;
+	Owner?: InputMaybe<Case_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Case_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	Priority?: InputMaybe<PicklistOperators>;
+	Reason?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Subject?: InputMaybe<StringOperators>;
+	SuppliedCompany?: InputMaybe<StringOperators>;
+	SuppliedEmail?: InputMaybe<EmailOperators>;
+	SuppliedName?: InputMaybe<StringOperators>;
+	SuppliedPhone?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Case_Filter>>>;
+	not?: InputMaybe<Case_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Case_Filter>>>;
+};
+
+export type Case_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type CommSubscriptionChannelTypeHistory_Filter = {
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionChannelTypeId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionChannelTypeHistory_Filter>>>;
+	not?: InputMaybe<CommSubscriptionChannelTypeHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionChannelTypeHistory_Filter>>>;
+};
+
+export type CommSubscriptionChannelType_Filter = {
+	CommunicationSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommunicationSubscriptionId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<CommSubscription_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EngagementChannelTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<CommSubscriptionChannelType_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionChannelType_Filter>>>;
+	not?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionChannelType_Filter>>>;
+};
+
+export type CommSubscriptionChannelType_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type CommSubscriptionConsentHistory_Filter = {
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionConsentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionConsentHistory_Filter>>>;
+	not?: InputMaybe<CommSubscriptionConsentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionConsentHistory_Filter>>>;
+};
+
+export type CommSubscriptionConsent_ConsentGiver_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type CommSubscriptionConsent_ContactPoint_Filters = {
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type CommSubscriptionConsent_Filter = {
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	BusinessBrandId?: InputMaybe<IdOperators>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionChannelTypeId?: InputMaybe<IdOperators>;
+	ConsentCapturedDateTime?: InputMaybe<DateTimeOperators>;
+	ConsentCapturedSource?: InputMaybe<StringOperators>;
+	ConsentGiver?: InputMaybe<CommSubscriptionConsent_ConsentGiver_Filters>;
+	ConsentGiverId?: InputMaybe<IdOperators>;
+	ContactPoint?: InputMaybe<CommSubscriptionConsent_ContactPoint_Filters>;
+	ContactPointId?: InputMaybe<IdOperators>;
+	ContactPointValue?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	EffectiveFromDate?: InputMaybe<DateOperators>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EngagementChannelTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<CommSubscriptionConsent_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	PartyRole?: InputMaybe<CommSubscriptionConsent_PartyRole_Filters>;
+	PartyRoleId?: InputMaybe<IdOperators>;
+	PrivacyConsentStatus?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionConsent_Filter>>>;
+	not?: InputMaybe<CommSubscriptionConsent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionConsent_Filter>>>;
+};
+
+export type CommSubscriptionConsent_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type CommSubscriptionConsent_PartyRole_Filters = {
+	Customer?: InputMaybe<Customer_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+};
+
+export type CommSubscriptionHistory_Filter = {
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionHistory_Filter>>>;
+	not?: InputMaybe<CommSubscriptionHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionHistory_Filter>>>;
+};
+
+export type CommSubscriptionTimingHistory_Filter = {
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	CommSubscriptionTimingId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionTimingHistory_Filter>>>;
+	not?: InputMaybe<CommSubscriptionTimingHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionTimingHistory_Filter>>>;
+};
+
+export type CommSubscriptionTiming_Filter = {
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionConsentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Unit?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscriptionTiming_Filter>>>;
+	not?: InputMaybe<CommSubscriptionTiming_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscriptionTiming_Filter>>>;
+};
+
+export type CommSubscription_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<CommSubscription_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CommSubscription_Filter>>>;
+	not?: InputMaybe<CommSubscription_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CommSubscription_Filter>>>;
+};
+
+export type CommSubscription_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactHistory_Filter = {
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactHistory_Filter>>>;
+	not?: InputMaybe<ContactHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactHistory_Filter>>>;
+};
+
+export type ContactPointAddressHistory_Filter = {
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointAddressId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointAddressHistory_Filter>>>;
+	not?: InputMaybe<ContactPointAddressHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointAddressHistory_Filter>>>;
+};
+
+export type ContactPointAddress_Filter = {
+	ActiveFromDate?: InputMaybe<DateOperators>;
+	ActiveToDate?: InputMaybe<DateOperators>;
+	AddressType?: InputMaybe<PicklistOperators>;
+	BestTimeToContactEndTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactStartTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactTimezone?: InputMaybe<PicklistOperators>;
+	City?: InputMaybe<StringOperators>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointPhoneId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDefault?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	IsThirdPartyAddress?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactPointAddress_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<ContactPointAddress_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	PreferenceRank?: InputMaybe<IntegerOperators>;
+	State?: InputMaybe<StringOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UsageType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointAddress_Filter>>>;
+	not?: InputMaybe<ContactPointAddress_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointAddress_Filter>>>;
+};
+
+export type ContactPointAddress_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactPointAddress_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type ContactPointConsentHistory_Filter = {
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointConsentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointConsentHistory_Filter>>>;
+	not?: InputMaybe<ContactPointConsentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointConsentHistory_Filter>>>;
+};
+
+export type ContactPointConsent_ContactPoint_Filters = {
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type ContactPointConsent_Filter = {
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	BusinessBrandId?: InputMaybe<IdOperators>;
+	CaptureContactPointType?: InputMaybe<PicklistOperators>;
+	CaptureDate?: InputMaybe<DateTimeOperators>;
+	CaptureSource?: InputMaybe<StringOperators>;
+	ContactPoint?: InputMaybe<ContactPointConsent_ContactPoint_Filters>;
+	ContactPointId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	DoubleConsentCaptureDate?: InputMaybe<DateTimeOperators>;
+	EffectiveFrom?: InputMaybe<DateTimeOperators>;
+	EffectiveTo?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactPointConsent_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	PartyRole?: InputMaybe<ContactPointConsent_PartyRole_Filters>;
+	PartyRoleId?: InputMaybe<IdOperators>;
+	PrivacyConsentStatus?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointConsent_Filter>>>;
+	not?: InputMaybe<ContactPointConsent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointConsent_Filter>>>;
+};
+
+export type ContactPointConsent_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactPointConsent_PartyRole_Filters = {
+	Customer?: InputMaybe<Customer_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+};
+
+export type ContactPointEmailHistory_Filter = {
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointEmailId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointEmailHistory_Filter>>>;
+	not?: InputMaybe<ContactPointEmailHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointEmailHistory_Filter>>>;
+};
+
+export type ContactPointEmail_Filter = {
+	ActiveFromDate?: InputMaybe<DateOperators>;
+	ActiveToDate?: InputMaybe<DateOperators>;
+	BestTimeToContactEndTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactStartTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactTimezone?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	EmailAddress?: InputMaybe<EmailOperators>;
+	EmailDomain?: InputMaybe<StringOperators>;
+	EmailLatestBounceDateTime?: InputMaybe<DateTimeOperators>;
+	EmailLatestBounceReasonText?: InputMaybe<StringOperators>;
+	EmailMailBox?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactPointEmail_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<ContactPointEmail_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	PreferenceRank?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UsageType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointEmail_Filter>>>;
+	not?: InputMaybe<ContactPointEmail_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointEmail_Filter>>>;
+};
+
+export type ContactPointEmail_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactPointEmail_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type ContactPointPhoneHistory_Filter = {
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointPhoneId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointPhoneHistory_Filter>>>;
+	not?: InputMaybe<ContactPointPhoneHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointPhoneHistory_Filter>>>;
+};
+
+export type ContactPointPhone_Filter = {
+	ActiveFromDate?: InputMaybe<DateOperators>;
+	ActiveToDate?: InputMaybe<DateOperators>;
+	AreaCode?: InputMaybe<StringOperators>;
+	BestTimeToContactEndTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactStartTime?: InputMaybe<TimeOperators>;
+	BestTimeToContactTimezone?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ExtensionNumber?: InputMaybe<StringOperators>;
+	FormattedInternationalPhoneNumber?: InputMaybe<StringOperators>;
+	FormattedNationalPhoneNumber?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsBusinessPhone?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsFaxCapable?: InputMaybe<BooleanOperators>;
+	IsPersonalPhone?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	IsSmsCapable?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactPointPhone_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<ContactPointPhone_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	PhoneType?: InputMaybe<PicklistOperators>;
+	PreferenceRank?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TelephoneNumber?: InputMaybe<PhoneNumberOperators>;
+	UsageType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointPhone_Filter>>>;
+	not?: InputMaybe<ContactPointPhone_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointPhone_Filter>>>;
+};
+
+export type ContactPointPhone_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactPointPhone_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type ContactPointTypeConsentHistory_Filter = {
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	ContactPointTypeConsentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointTypeConsentHistory_Filter>>>;
+	not?: InputMaybe<ContactPointTypeConsentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointTypeConsentHistory_Filter>>>;
+};
+
+export type ContactPointTypeConsent_Filter = {
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	BusinessBrandId?: InputMaybe<IdOperators>;
+	CaptureContactPointType?: InputMaybe<PicklistOperators>;
+	CaptureDate?: InputMaybe<DateTimeOperators>;
+	CaptureSource?: InputMaybe<StringOperators>;
+	ContactPointType?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	DoubleConsentCaptureDate?: InputMaybe<DateTimeOperators>;
+	EffectiveFrom?: InputMaybe<DateTimeOperators>;
+	EffectiveTo?: InputMaybe<DateTimeOperators>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EngagementChannelTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactPointTypeConsent_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	PartyRole?: InputMaybe<ContactPointTypeConsent_PartyRole_Filters>;
+	PartyRoleId?: InputMaybe<IdOperators>;
+	PrivacyConsentStatus?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactPointTypeConsent_Filter>>>;
+	not?: InputMaybe<ContactPointTypeConsent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactPointTypeConsent_Filter>>>;
+};
+
+export type ContactPointTypeConsent_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactPointTypeConsent_PartyRole_Filters = {
+	Customer?: InputMaybe<Customer_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+};
+
+export type ContactRequest_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsCallback?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ContactRequest_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PreferredChannel?: InputMaybe<PicklistOperators>;
+	PreferredPhone?: InputMaybe<PhoneNumberOperators>;
+	RequestDescription?: InputMaybe<LongTextAreaOperators>;
+	RequestReason?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	What?: InputMaybe<ContactRequest_What_Filters>;
+	WhatId?: InputMaybe<IdOperators>;
+	Who?: InputMaybe<ContactRequest_Who_Filters>;
+	WhoId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContactRequest_Filter>>>;
+	not?: InputMaybe<ContactRequest_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContactRequest_Filter>>>;
+};
+
+export type ContactRequest_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ContactRequest_What_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+};
+
+export type ContactRequest_Who_Filters = {
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Contact_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	AssistantName?: InputMaybe<StringOperators>;
+	AssistantPhone?: InputMaybe<PhoneNumberOperators>;
+	Birthdate?: InputMaybe<DateOperators>;
+	BuyerAttributes?: InputMaybe<MultiPicklistOperators>;
+	ContactSource?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Department?: InputMaybe<StringOperators>;
+	DepartmentGroup?: InputMaybe<PicklistOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	EmailBouncedDate?: InputMaybe<DateTimeOperators>;
+	EmailBouncedReason?: InputMaybe<StringOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	HomePhone?: InputMaybe<PhoneNumberOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Individual?: InputMaybe<Individual_Filter>;
+	IndividualId?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsEmailBounced?: InputMaybe<BooleanOperators>;
+	Jigsaw?: InputMaybe<StringOperators>;
+	JigsawContactId?: InputMaybe<StringOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastCURequestDate?: InputMaybe<DateTimeOperators>;
+	LastCUUpdateDate?: InputMaybe<DateTimeOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LeadSource?: InputMaybe<PicklistOperators>;
+	MailingCity?: InputMaybe<StringOperators>;
+	MailingCountry?: InputMaybe<StringOperators>;
+	MailingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	MailingLatitude?: InputMaybe<LatitudeOperators>;
+	MailingLongitude?: InputMaybe<LongitudeOperators>;
+	MailingPostalCode?: InputMaybe<StringOperators>;
+	MailingState?: InputMaybe<StringOperators>;
+	MailingStreet?: InputMaybe<TextAreaOperators>;
+	MasterRecord?: InputMaybe<Contact_Filter>;
+	MasterRecordId?: InputMaybe<IdOperators>;
+	MobilePhone?: InputMaybe<PhoneNumberOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OtherCity?: InputMaybe<StringOperators>;
+	OtherCountry?: InputMaybe<StringOperators>;
+	OtherGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	OtherLatitude?: InputMaybe<LatitudeOperators>;
+	OtherLongitude?: InputMaybe<LongitudeOperators>;
+	OtherPhone?: InputMaybe<PhoneNumberOperators>;
+	OtherPostalCode?: InputMaybe<StringOperators>;
+	OtherState?: InputMaybe<StringOperators>;
+	OtherStreet?: InputMaybe<TextAreaOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PhotoUrl?: InputMaybe<UrlOperators>;
+	ReportsTo?: InputMaybe<Contact_Filter>;
+	ReportsToId?: InputMaybe<IdOperators>;
+	Salutation?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	TitleType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Contact_Filter>>>;
+	not?: InputMaybe<Contact_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Contact_Filter>>>;
+};
+
+export type Contact_OrderBy = {
+	Account?: InputMaybe<Account_OrderBy>;
+	AccountId?: InputMaybe<OrderByClause>;
+	AssistantName?: InputMaybe<OrderByClause>;
+	AssistantPhone?: InputMaybe<OrderByClause>;
+	Birthdate?: InputMaybe<OrderByClause>;
+	ContactSource?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Department?: InputMaybe<OrderByClause>;
+	DepartmentGroup?: InputMaybe<OrderByClause>;
+	Description?: InputMaybe<AggregateOrderByStringClause>;
+	Email?: InputMaybe<OrderByClause>;
+	EmailBouncedDate?: InputMaybe<OrderByClause>;
+	EmailBouncedReason?: InputMaybe<OrderByClause>;
+	Fax?: InputMaybe<OrderByClause>;
+	FirstName?: InputMaybe<OrderByClause>;
+	HomePhone?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	Individual?: InputMaybe<Individual_OrderBy>;
+	IndividualId?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	IsEmailBounced?: InputMaybe<OrderByClause>;
+	Jigsaw?: InputMaybe<OrderByClause>;
+	JigsawContactId?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastCURequestDate?: InputMaybe<OrderByClause>;
+	LastCUUpdateDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	LastName?: InputMaybe<OrderByClause>;
+	LastReferencedDate?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	LeadSource?: InputMaybe<OrderByClause>;
+	MailingCity?: InputMaybe<OrderByClause>;
+	MailingCountry?: InputMaybe<OrderByClause>;
+	MailingGeocodeAccuracy?: InputMaybe<OrderByClause>;
+	MailingLatitude?: InputMaybe<OrderByClause>;
+	MailingLongitude?: InputMaybe<OrderByClause>;
+	MailingPostalCode?: InputMaybe<OrderByClause>;
+	MailingState?: InputMaybe<OrderByClause>;
+	MailingStreet?: InputMaybe<OrderByClause>;
+	MasterRecord?: InputMaybe<Contact_OrderBy>;
+	MasterRecordId?: InputMaybe<OrderByClause>;
+	MobilePhone?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	OtherCity?: InputMaybe<OrderByClause>;
+	OtherCountry?: InputMaybe<OrderByClause>;
+	OtherGeocodeAccuracy?: InputMaybe<OrderByClause>;
+	OtherLatitude?: InputMaybe<OrderByClause>;
+	OtherLongitude?: InputMaybe<OrderByClause>;
+	OtherPhone?: InputMaybe<OrderByClause>;
+	OtherPostalCode?: InputMaybe<OrderByClause>;
+	OtherState?: InputMaybe<OrderByClause>;
+	OtherStreet?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<User_OrderBy>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Phone?: InputMaybe<OrderByClause>;
+	PhotoUrl?: InputMaybe<OrderByClause>;
+	ReportsTo?: InputMaybe<Contact_OrderBy>;
+	ReportsToId?: InputMaybe<OrderByClause>;
+	Salutation?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Title?: InputMaybe<OrderByClause>;
+	TitleType?: InputMaybe<OrderByClause>;
+};
+
+export type ContentDocumentHistory_Filter = {
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentDocumentHistory_Filter>>>;
+	not?: InputMaybe<ContentDocumentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentDocumentHistory_Filter>>>;
+};
+
+export type ContentDocumentLink_Filter = {
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LinkedEntity?: InputMaybe<ContentDocumentLink_LinkedEntity_Filters>;
+	LinkedEntityId?: InputMaybe<IdOperators>;
+	ShareType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Visibility?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentDocumentLink_Filter>>>;
+	not?: InputMaybe<ContentDocumentLink_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentDocumentLink_Filter>>>;
+};
+
+export type ContentDocumentLink_LinkedEntity_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContentWorkspace?: InputMaybe<ContentWorkspace_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Report?: InputMaybe<Report_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	User?: InputMaybe<User_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type ContentDocument_Filter = {
+	ArchivedById?: InputMaybe<IdOperators>;
+	ArchivedDate?: InputMaybe<DateOperators>;
+	ContentAssetId?: InputMaybe<IdOperators>;
+	ContentModifiedDate?: InputMaybe<DateTimeOperators>;
+	ContentSize?: InputMaybe<IntegerOperators>;
+	ContentSizeLong?: InputMaybe<LongOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	FileExtension?: InputMaybe<StringOperators>;
+	FileType?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsInternalOnly?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LatestPublishedVersion?: InputMaybe<ContentVersion_Filter>;
+	LatestPublishedVersionId?: InputMaybe<IdOperators>;
+	MalwareScanDate?: InputMaybe<DateTimeOperators>;
+	MalwareScanStatus?: InputMaybe<PicklistOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ParentId?: InputMaybe<IdOperators>;
+	PublishStatus?: InputMaybe<PicklistOperators>;
+	SharingOption?: InputMaybe<PicklistOperators>;
+	SharingPrivacy?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentDocument_Filter>>>;
+	not?: InputMaybe<ContentDocument_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentDocument_Filter>>>;
+};
+
+export type ContentFolderItem_Filter = {
+	ContentSize?: InputMaybe<IntegerOperators>;
+	ContentSizeLong?: InputMaybe<LongOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FileExtension?: InputMaybe<StringOperators>;
+	FileType?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAssetEnabled?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsFolder?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	ParentContentFolderId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentFolderItem_Filter>>>;
+	not?: InputMaybe<ContentFolderItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentFolderItem_Filter>>>;
+};
+
+export type ContentFolderLink_Filter = {
+	ContentFolderId?: InputMaybe<IdOperators>;
+	EnableFolderStatus?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	ParentEntityId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentFolderLink_Filter>>>;
+	not?: InputMaybe<ContentFolderLink_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentFolderLink_Filter>>>;
+};
+
+export type ContentTaxonomyRelatedTerm_Filter = {
+	ContentTaxonomy?: InputMaybe<ContentTaxonomy_Filter>;
+	ContentTaxonomyId?: InputMaybe<IdOperators>;
+	ContentTaxonomyTerm?: InputMaybe<ContentTaxonomyTerm_Filter>;
+	ContentTaxonomyTermId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentTaxonomyRelatedTerm_Filter>>>;
+	not?: InputMaybe<ContentTaxonomyRelatedTerm_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentTaxonomyRelatedTerm_Filter>>>;
+};
+
+export type ContentTaxonomyTermRelatedTerm_Filter = {
+	ContentTaxonomy?: InputMaybe<ContentTaxonomy_Filter>;
+	ContentTaxonomyId?: InputMaybe<IdOperators>;
+	ContentTaxonomyTerm?: InputMaybe<ContentTaxonomyTerm_Filter>;
+	ContentTaxonomyTermId?: InputMaybe<IdOperators>;
+	ContentTaxonomyTrmRelaType?: InputMaybe<ContentTaxonomyTermRelationshipType_Filter>;
+	ContentTaxonomyTrmRelaTypeId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	RelatedContentTaxonomyTerm?: InputMaybe<ContentTaxonomyTerm_Filter>;
+	RelatedContentTaxonomyTermId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentTaxonomyTermRelatedTerm_Filter>>>;
+	not?: InputMaybe<ContentTaxonomyTermRelatedTerm_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentTaxonomyTermRelatedTerm_Filter>>>;
+};
+
+export type ContentTaxonomyTermRelationshipType_Filter = {
+	ContentTaxonomyTrmRelaCatg?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentTaxonomyTermRelationshipType_Filter>>>;
+	not?: InputMaybe<ContentTaxonomyTermRelationshipType_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentTaxonomyTermRelationshipType_Filter>>>;
+};
+
+export type ContentTaxonomyTerm_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	ExternalId?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentTaxonomyTerm_Filter>>>;
+	not?: InputMaybe<ContentTaxonomyTerm_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentTaxonomyTerm_Filter>>>;
+};
+
+export type ContentTaxonomy_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentTaxonomy_Filter>>>;
+	not?: InputMaybe<ContentTaxonomy_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentTaxonomy_Filter>>>;
+};
+
+export type ContentVersionHistory_Filter = {
+	ContentVersion?: InputMaybe<ContentVersion_Filter>;
+	ContentVersionId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentVersionHistory_Filter>>>;
+	not?: InputMaybe<ContentVersionHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentVersionHistory_Filter>>>;
+};
+
+export type ContentVersion_Filter = {
+	Checksum?: InputMaybe<StringOperators>;
+	ContentBodyId?: InputMaybe<IdOperators>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentId?: InputMaybe<IdOperators>;
+	ContentLocation?: InputMaybe<PicklistOperators>;
+	ContentModifiedBy?: InputMaybe<User_Filter>;
+	ContentModifiedById?: InputMaybe<IdOperators>;
+	ContentModifiedDate?: InputMaybe<DateTimeOperators>;
+	ContentSize?: InputMaybe<IntegerOperators>;
+	ContentSizeLong?: InputMaybe<LongOperators>;
+	ContentUrl?: InputMaybe<UrlOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	ExternalDataSourceId?: InputMaybe<IdOperators>;
+	ExternalDocumentInfo1?: InputMaybe<StringOperators>;
+	ExternalDocumentInfo2?: InputMaybe<StringOperators>;
+	FeaturedContentBoost?: InputMaybe<IntegerOperators>;
+	FeaturedContentDate?: InputMaybe<DateOperators>;
+	FileExtension?: InputMaybe<StringOperators>;
+	FileType?: InputMaybe<StringOperators>;
+	FirstPublishLocation?: InputMaybe<ContentVersion_FirstPublishLocation_Filters>;
+	FirstPublishLocationId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAssetEnabled?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsLatest?: InputMaybe<BooleanOperators>;
+	IsMajorVersion?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MalwareScanDate?: InputMaybe<DateTimeOperators>;
+	MalwareScanStatus?: InputMaybe<PicklistOperators>;
+	NegativeRatingCount?: InputMaybe<IntegerOperators>;
+	Origin?: InputMaybe<PicklistOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PathOnClient?: InputMaybe<StringOperators>;
+	PositiveRatingCount?: InputMaybe<IntegerOperators>;
+	PublishStatus?: InputMaybe<PicklistOperators>;
+	RatingCount?: InputMaybe<IntegerOperators>;
+	ReasonForChange?: InputMaybe<StringOperators>;
+	SharingOption?: InputMaybe<PicklistOperators>;
+	SharingPrivacy?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TagCsv?: InputMaybe<LongTextAreaOperators>;
+	TextPreview?: InputMaybe<StringOperators>;
+	Title?: InputMaybe<StringOperators>;
+	VersionDataUrl?: InputMaybe<StringOperators>;
+	VersionNumber?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentVersion_Filter>>>;
+	not?: InputMaybe<ContentVersion_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentVersion_Filter>>>;
+};
+
+export type ContentVersion_FirstPublishLocation_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContentWorkspace?: InputMaybe<ContentWorkspace_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Report?: InputMaybe<Report_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	User?: InputMaybe<User_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type ContentWorkspace_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefaultRecordTypeId?: InputMaybe<IdOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsRestrictContentTypes?: InputMaybe<BooleanOperators>;
+	IsRestrictLinkedContentTypes?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastWorkspaceActivityDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	RootContentFolderId?: InputMaybe<IdOperators>;
+	ShouldAddCreatorMembership?: InputMaybe<BooleanOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TagModel?: InputMaybe<PicklistOperators>;
+	WorkspaceImageId?: InputMaybe<IdOperators>;
+	WorkspaceType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContentWorkspace_Filter>>>;
+	not?: InputMaybe<ContentWorkspace_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContentWorkspace_Filter>>>;
+};
+
+export type ContractContactRole_Filter = {
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	Contract?: InputMaybe<Contract_Filter>;
+	ContractId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContractContactRole_Filter>>>;
+	not?: InputMaybe<ContractContactRole_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContractContactRole_Filter>>>;
+};
+
+export type ContractHistory_Filter = {
+	Contract?: InputMaybe<Contract_Filter>;
+	ContractId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ContractHistory_Filter>>>;
+	not?: InputMaybe<ContractHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ContractHistory_Filter>>>;
+};
+
+export type Contract_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	ActivatedBy?: InputMaybe<User_Filter>;
+	ActivatedById?: InputMaybe<IdOperators>;
+	ActivatedDate?: InputMaybe<DateTimeOperators>;
+	BillingCity?: InputMaybe<StringOperators>;
+	BillingCountry?: InputMaybe<StringOperators>;
+	BillingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	BillingLatitude?: InputMaybe<LatitudeOperators>;
+	BillingLongitude?: InputMaybe<LongitudeOperators>;
+	BillingPostalCode?: InputMaybe<StringOperators>;
+	BillingState?: InputMaybe<StringOperators>;
+	BillingStreet?: InputMaybe<TextAreaOperators>;
+	CompanySigned?: InputMaybe<User_Filter>;
+	CompanySignedDate?: InputMaybe<DateOperators>;
+	CompanySignedId?: InputMaybe<IdOperators>;
+	ContractNumber?: InputMaybe<StringOperators>;
+	ContractTerm?: InputMaybe<IntegerOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	CustomerSigned?: InputMaybe<Contact_Filter>;
+	CustomerSignedDate?: InputMaybe<DateOperators>;
+	CustomerSignedId?: InputMaybe<IdOperators>;
+	CustomerSignedTitle?: InputMaybe<StringOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	EndDate?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastApprovedDate?: InputMaybe<DateTimeOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerExpirationNotice?: InputMaybe<PicklistOperators>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ShippingCity?: InputMaybe<StringOperators>;
+	ShippingCountry?: InputMaybe<StringOperators>;
+	ShippingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	ShippingLatitude?: InputMaybe<LatitudeOperators>;
+	ShippingLongitude?: InputMaybe<LongitudeOperators>;
+	ShippingPostalCode?: InputMaybe<StringOperators>;
+	ShippingState?: InputMaybe<StringOperators>;
+	ShippingStreet?: InputMaybe<TextAreaOperators>;
+	SpecialTerms?: InputMaybe<LongTextAreaOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusCode?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Contract_Filter>>>;
+	not?: InputMaybe<Contract_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Contract_Filter>>>;
+};
+
+export type CspTrustedSite_Filter = {
+	CanAccessCamera?: InputMaybe<BooleanOperators>;
+	CanAccessMicrophone?: InputMaybe<BooleanOperators>;
+	Context?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	EndpointUrl?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsApplicableToConnectSrc?: InputMaybe<BooleanOperators>;
+	IsApplicableToFontSrc?: InputMaybe<BooleanOperators>;
+	IsApplicableToFrameSrc?: InputMaybe<BooleanOperators>;
+	IsApplicableToImgSrc?: InputMaybe<BooleanOperators>;
+	IsApplicableToMediaSrc?: InputMaybe<BooleanOperators>;
+	IsApplicableToStyleSrc?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CspTrustedSite_Filter>>>;
+	not?: InputMaybe<CspTrustedSite_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CspTrustedSite_Filter>>>;
+};
+
+export type CurrencyOperators = {
+	eq?: InputMaybe<Scalars["Currency"]["input"]>;
+	gt?: InputMaybe<Scalars["Currency"]["input"]>;
+	gte?: InputMaybe<Scalars["Currency"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Currency"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Currency"]["input"]>;
+	lte?: InputMaybe<Scalars["Currency"]["input"]>;
+	ne?: InputMaybe<Scalars["Currency"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Currency"]["input"]>>>;
+};
+
+export type CustomPermission_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	ExternalClientApplicationId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsLicensed?: InputMaybe<BooleanOperators>;
+	IsProtected?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<CustomPermission_Filter>>>;
+	not?: InputMaybe<CustomPermission_Filter>;
+	or?: InputMaybe<Array<InputMaybe<CustomPermission_Filter>>>;
+};
+
+export type Customer_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	CustomerStatusType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Customer_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalLifeTimeValue?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<Customer_Filter>>>;
+	not?: InputMaybe<Customer_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Customer_Filter>>>;
+};
+
+export type Customer_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export const DataType = {
+	Address: "ADDRESS",
+	Anytype: "ANYTYPE",
+	Base64: "BASE64",
+	Boolean: "BOOLEAN",
+	Combobox: "COMBOBOX",
+	Complexvalue: "COMPLEXVALUE",
+	Currency: "CURRENCY",
+	Date: "DATE",
+	Datetime: "DATETIME",
+	Double: "DOUBLE",
+	Email: "EMAIL",
+	Encryptedstring: "ENCRYPTEDSTRING",
+	Int: "INT",
+	Json: "JSON",
+	Junctionidlist: "JUNCTIONIDLIST",
+	Location: "LOCATION",
+	Long: "LONG",
+	Multipicklist: "MULTIPICKLIST",
+	Percent: "PERCENT",
+	Phone: "PHONE",
+	Picklist: "PICKLIST",
+	Reference: "REFERENCE",
+	String: "STRING",
+	Textarea: "TEXTAREA",
+	Time: "TIME",
+	Url: "URL",
+} as const;
+
+export type DataType = (typeof DataType)[keyof typeof DataType];
+
+export type DataUseLegalBasisHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUseLegalBasisId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<DataUseLegalBasisHistory_Filter>>>;
+	not?: InputMaybe<DataUseLegalBasisHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DataUseLegalBasisHistory_Filter>>>;
+};
+
+export type DataUseLegalBasis_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<DataUseLegalBasis_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Source?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DataUseLegalBasis_Filter>>>;
+	not?: InputMaybe<DataUseLegalBasis_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DataUseLegalBasis_Filter>>>;
+};
+
+export type DataUseLegalBasis_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type DataUsePurposeHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<DataUsePurposeHistory_Filter>>>;
+	not?: InputMaybe<DataUsePurposeHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DataUsePurposeHistory_Filter>>>;
+};
+
+export type DataUsePurpose_Filter = {
+	CanDataSubjectOptOut?: InputMaybe<BooleanOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	LegalBasisId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<DataUsePurpose_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DataUsePurpose_Filter>>>;
+	not?: InputMaybe<DataUsePurpose_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DataUsePurpose_Filter>>>;
+};
+
+export type DataUsePurpose_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type DateFunctionInput = {
+	convertTimezoneValue?: InputMaybe<LongOperators>;
+	value?: InputMaybe<LongOperators>;
+};
+
+export type DateInput = {
+	literal?: InputMaybe<DateLiteral>;
+	range?: InputMaybe<DateRange>;
+	value?: InputMaybe<Scalars["Date"]["input"]>;
+};
+
+export const DateLiteral = {
+	Last_90Days: "LAST_90_DAYS",
+	LastFiscalQuarter: "LAST_FISCAL_QUARTER",
+	LastFiscalYear: "LAST_FISCAL_YEAR",
+	LastMonth: "LAST_MONTH",
+	LastQuarter: "LAST_QUARTER",
+	LastWeek: "LAST_WEEK",
+	LastYear: "LAST_YEAR",
+	Next_90Days: "NEXT_90_DAYS",
+	NextFiscalQuarter: "NEXT_FISCAL_QUARTER",
+	NextFiscalYear: "NEXT_FISCAL_YEAR",
+	NextMonth: "NEXT_MONTH",
+	NextQuarter: "NEXT_QUARTER",
+	NextWeek: "NEXT_WEEK",
+	NextYear: "NEXT_YEAR",
+	ThisFiscalQuarter: "THIS_FISCAL_QUARTER",
+	ThisFiscalYear: "THIS_FISCAL_YEAR",
+	ThisMonth: "THIS_MONTH",
+	ThisQuarter: "THIS_QUARTER",
+	ThisWeek: "THIS_WEEK",
+	ThisYear: "THIS_YEAR",
+	Today: "TODAY",
+	Tomorrow: "TOMORROW",
+	Yesterday: "YESTERDAY",
+} as const;
+
+export type DateLiteral = (typeof DateLiteral)[keyof typeof DateLiteral];
+
+export type DateOperators = {
+	CALENDAR_MONTH?: InputMaybe<DateFunctionInput>;
+	CALENDAR_QUARTER?: InputMaybe<DateFunctionInput>;
+	CALENDAR_YEAR?: InputMaybe<DateFunctionInput>;
+	DAY_IN_MONTH?: InputMaybe<DateFunctionInput>;
+	DAY_IN_WEEK?: InputMaybe<DateFunctionInput>;
+	DAY_IN_YEAR?: InputMaybe<DateFunctionInput>;
+	FISCAL_MONTH?: InputMaybe<DateFunctionInput>;
+	FISCAL_QUARTER?: InputMaybe<DateFunctionInput>;
+	FISCAL_YEAR?: InputMaybe<DateFunctionInput>;
+	WEEK_IN_MONTH?: InputMaybe<DateFunctionInput>;
+	WEEK_IN_YEAR?: InputMaybe<DateFunctionInput>;
+	eq?: InputMaybe<DateInput>;
+	gt?: InputMaybe<DateInput>;
+	gte?: InputMaybe<DateInput>;
+	in?: InputMaybe<Array<InputMaybe<DateInput>>>;
+	lt?: InputMaybe<DateInput>;
+	lte?: InputMaybe<DateInput>;
+	ne?: InputMaybe<DateInput>;
+	nin?: InputMaybe<Array<InputMaybe<DateInput>>>;
+};
+
+export type DatePrimitiveOperators = {
+	eq?: InputMaybe<Scalars["Date"]["input"]>;
+	gt?: InputMaybe<Scalars["Date"]["input"]>;
+	gte?: InputMaybe<Scalars["Date"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Date"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Date"]["input"]>;
+	lte?: InputMaybe<Scalars["Date"]["input"]>;
+	ne?: InputMaybe<Scalars["Date"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Date"]["input"]>>>;
+};
+
+export type DateRange = {
+	last_n_days?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_fiscal_quarters?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_fiscal_years?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_months?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_quarters?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_weeks?: InputMaybe<Scalars["Int"]["input"]>;
+	last_n_years?: InputMaybe<Scalars["Int"]["input"]>;
+	n_days_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_fiscal_quarters_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_fiscal_years_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_months_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_quarters_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_weeks_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	n_years_ago?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_days?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_fiscal_quarters?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_fiscal_years?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_months?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_quarters?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_weeks?: InputMaybe<Scalars["Int"]["input"]>;
+	next_n_years?: InputMaybe<Scalars["Int"]["input"]>;
+};
+
+export type DateTimeFunctionInput = {
+	convertTimezoneValue?: InputMaybe<DatePrimitiveOperators>;
+	value?: InputMaybe<DatePrimitiveOperators>;
+};
+
+export type DateTimeInput = {
+	literal?: InputMaybe<DateLiteral>;
+	range?: InputMaybe<DateRange>;
+	value?: InputMaybe<Scalars["DateTime"]["input"]>;
+};
+
+export type DateTimeOperators = {
+	CALENDAR_MONTH?: InputMaybe<DateFunctionInput>;
+	CALENDAR_QUARTER?: InputMaybe<DateFunctionInput>;
+	CALENDAR_YEAR?: InputMaybe<DateFunctionInput>;
+	DAY_IN_MONTH?: InputMaybe<DateFunctionInput>;
+	DAY_IN_WEEK?: InputMaybe<DateFunctionInput>;
+	DAY_IN_YEAR?: InputMaybe<DateFunctionInput>;
+	DAY_ONLY?: InputMaybe<DateTimeFunctionInput>;
+	FISCAL_MONTH?: InputMaybe<DateFunctionInput>;
+	FISCAL_QUARTER?: InputMaybe<DateFunctionInput>;
+	FISCAL_YEAR?: InputMaybe<DateFunctionInput>;
+	HOUR_IN_DAY?: InputMaybe<DateFunctionInput>;
+	WEEK_IN_MONTH?: InputMaybe<DateFunctionInput>;
+	WEEK_IN_YEAR?: InputMaybe<DateFunctionInput>;
+	eq?: InputMaybe<DateTimeInput>;
+	gt?: InputMaybe<DateTimeInput>;
+	gte?: InputMaybe<DateTimeInput>;
+	in?: InputMaybe<Array<InputMaybe<DateTimeInput>>>;
+	lt?: InputMaybe<DateTimeInput>;
+	lte?: InputMaybe<DateTimeInput>;
+	ne?: InputMaybe<DateTimeInput>;
+	nin?: InputMaybe<Array<InputMaybe<DateTimeInput>>>;
+};
+
+export type DeleteEvent_Filter = {
+	DeletedBy?: InputMaybe<User_Filter>;
+	DeletedById?: InputMaybe<IdOperators>;
+	DeletedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Record?: InputMaybe<StringOperators>;
+	RecordName?: InputMaybe<StringOperators>;
+	SobjectName?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DeleteEvent_Filter>>>;
+	not?: InputMaybe<DeleteEvent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DeleteEvent_Filter>>>;
+};
+
+export type DevopsEnvironmentHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsEnvironmentId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<DevopsEnvironmentHistory_Filter>>>;
+	not?: InputMaybe<DevopsEnvironmentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DevopsEnvironmentHistory_Filter>>>;
+};
+
+export type DevopsEnvironment_Filter = {
+	CanTrackChanges?: InputMaybe<BooleanOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DoceHubType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsDevEnvironment?: InputMaybe<BooleanOperators>;
+	IsExpired?: InputMaybe<BooleanOperators>;
+	IsTestEnvironment?: InputMaybe<BooleanOperators>;
+	IsVibeEnvironment?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastRevisionCounter?: InputMaybe<IntegerOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamedCredential?: InputMaybe<StringOperators>;
+	OrgIdentifier?: InputMaybe<StringOperators>;
+	OrgType?: InputMaybe<PicklistOperators>;
+	OrgUrl?: InputMaybe<UrlOperators>;
+	Owner?: InputMaybe<DevopsEnvironment_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	RefreshDate?: InputMaybe<DateTimeOperators>;
+	RefreshSource?: InputMaybe<DevopsEnvironment_Filter>;
+	RefreshSourceId?: InputMaybe<IdOperators>;
+	Replaces?: InputMaybe<DevopsEnvironment_Filter>;
+	ReplacesId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DevopsEnvironment_Filter>>>;
+	not?: InputMaybe<DevopsEnvironment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DevopsEnvironment_Filter>>>;
+};
+
+export type DevopsEnvironment_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type DevopsRequestInfoHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DevopsRequestInfoId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<DevopsRequestInfoHistory_Filter>>>;
+	not?: InputMaybe<DevopsRequestInfoHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DevopsRequestInfoHistory_Filter>>>;
+};
+
+export type DevopsRequestInfo_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ErrorDetails?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Message?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OperationType?: InputMaybe<PicklistOperators>;
+	Owner?: InputMaybe<DevopsRequestInfo_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ParentRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	ParentRequestInfoId?: InputMaybe<IdOperators>;
+	RequestCompletionDate?: InputMaybe<DateTimeOperators>;
+	RequestToken?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DevopsRequestInfo_Filter>>>;
+	not?: InputMaybe<DevopsRequestInfo_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DevopsRequestInfo_Filter>>>;
+};
+
+export type DevopsRequestInfo_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type DoubleOperators = {
+	eq?: InputMaybe<Scalars["Double"]["input"]>;
+	gt?: InputMaybe<Scalars["Double"]["input"]>;
+	gte?: InputMaybe<Scalars["Double"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Double"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Double"]["input"]>;
+	lte?: InputMaybe<Scalars["Double"]["input"]>;
+	ne?: InputMaybe<Scalars["Double"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Double"]["input"]>>>;
+};
+
+export type DuplicateRecordItem_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	DuplicateRecordSetId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Record?: InputMaybe<DuplicateRecordItem_Record_Filters>;
+	RecordId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DuplicateRecordItem_Filter>>>;
+	not?: InputMaybe<DuplicateRecordItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DuplicateRecordItem_Filter>>>;
+};
+
+export type DuplicateRecordItem_Record_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+};
+
+export type DuplicateRecordSet_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DuplicateRuleId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	RecordCount?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<DuplicateRecordSet_Filter>>>;
+	not?: InputMaybe<DuplicateRecordSet_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DuplicateRecordSet_Filter>>>;
+};
+
+export type EmailMessageRelation_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EmailMessageId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Relation?: InputMaybe<EmailMessageRelation_Relation_Filters>;
+	RelationAddress?: InputMaybe<StringOperators>;
+	RelationId?: InputMaybe<IdOperators>;
+	RelationObjectType?: InputMaybe<StringOperators>;
+	RelationType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<EmailMessageRelation_Filter>>>;
+	not?: InputMaybe<EmailMessageRelation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EmailMessageRelation_Filter>>>;
+};
+
+export type EmailMessageRelation_Relation_Filters = {
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type EmailMessage_Filter = {
+	ActivityId?: InputMaybe<IdOperators>;
+	AttachmentIds?: InputMaybe<StringOperators>;
+	AutomationType?: InputMaybe<PicklistOperators>;
+	BccAddress?: InputMaybe<StringOperators>;
+	CcAddress?: InputMaybe<StringOperators>;
+	ClientThreadIdentifier?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	EmailTemplateId?: InputMaybe<IdOperators>;
+	FirstOpenedDate?: InputMaybe<DateTimeOperators>;
+	FromAddress?: InputMaybe<EmailOperators>;
+	FromId?: InputMaybe<IdOperators>;
+	FromName?: InputMaybe<StringOperators>;
+	HasAttachment?: InputMaybe<BooleanOperators>;
+	Headers?: InputMaybe<LongTextAreaOperators>;
+	HtmlBody?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Incoming?: InputMaybe<BooleanOperators>;
+	IsBounced?: InputMaybe<BooleanOperators>;
+	IsClientManaged?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsExternallyVisible?: InputMaybe<BooleanOperators>;
+	IsOpened?: InputMaybe<BooleanOperators>;
+	IsTracked?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastOpenedDate?: InputMaybe<DateTimeOperators>;
+	MessageDate?: InputMaybe<DateTimeOperators>;
+	MessageIdentifier?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Case_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	RelatedTo?: InputMaybe<EmailMessage_RelatedTo_Filters>;
+	RelatedToId?: InputMaybe<IdOperators>;
+	ReplyToEmailMessage?: InputMaybe<EmailMessage_Filter>;
+	ReplyToEmailMessageId?: InputMaybe<IdOperators>;
+	Source?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Subject?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TextBody?: InputMaybe<LongTextAreaOperators>;
+	ThreadIdentifier?: InputMaybe<StringOperators>;
+	ToAddress?: InputMaybe<StringOperators>;
+	ValidatedFromAddress?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<EmailMessage_Filter>>>;
+	not?: InputMaybe<EmailMessage_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EmailMessage_Filter>>>;
+};
+
+export type EmailMessage_RelatedTo_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type EmailOperators = {
+	eq?: InputMaybe<Scalars["Email"]["input"]>;
+	gt?: InputMaybe<Scalars["Email"]["input"]>;
+	gte?: InputMaybe<Scalars["Email"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Email"]["input"]>>>;
+	like?: InputMaybe<Scalars["Email"]["input"]>;
+	lt?: InputMaybe<Scalars["Email"]["input"]>;
+	lte?: InputMaybe<Scalars["Email"]["input"]>;
+	ne?: InputMaybe<Scalars["Email"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Email"]["input"]>>>;
+};
+
+export type EmailTemplate_Filter = {
+	ApiVersion?: InputMaybe<DoubleOperators>;
+	Body?: InputMaybe<LongTextAreaOperators>;
+	BrandTemplateId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	Encoding?: InputMaybe<PicklistOperators>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	EnhancedLetterheadId?: InputMaybe<IdOperators>;
+	Folder?: InputMaybe<EmailTemplate_Folder_Filters>;
+	FolderId?: InputMaybe<IdOperators>;
+	FolderName?: InputMaybe<StringOperators>;
+	HtmlValue?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsBuilderContent?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastUsedDate?: InputMaybe<DateTimeOperators>;
+	Markup?: InputMaybe<LongTextAreaOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PageId?: InputMaybe<IdOperators>;
+	RelatedEntityType?: InputMaybe<PicklistOperators>;
+	Subject?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TemplateStyle?: InputMaybe<PicklistOperators>;
+	TemplateType?: InputMaybe<PicklistOperators>;
+	TimesUsed?: InputMaybe<IntegerOperators>;
+	UiType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<EmailTemplate_Filter>>>;
+	not?: InputMaybe<EmailTemplate_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EmailTemplate_Filter>>>;
+};
+
+export type EmailTemplate_Folder_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type EngagementChannelTypeHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EngagementChannelTypeId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<EngagementChannelTypeHistory_Filter>>>;
+	not?: InputMaybe<EngagementChannelTypeHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EngagementChannelTypeHistory_Filter>>>;
+};
+
+export type EngagementChannelType_Filter = {
+	ContactPointType?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<EngagementChannelType_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<EngagementChannelType_Filter>>>;
+	not?: InputMaybe<EngagementChannelType_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EngagementChannelType_Filter>>>;
+};
+
+export type EngagementChannelType_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type EnhancedLetterhead_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LetterheadFooter?: InputMaybe<LongTextAreaOperators>;
+	LetterheadHeader?: InputMaybe<LongTextAreaOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<EnhancedLetterhead_Filter>>>;
+	not?: InputMaybe<EnhancedLetterhead_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EnhancedLetterhead_Filter>>>;
+};
+
+export type EntityDefinition_Filter = {
+	DefaultCompactLayoutId?: InputMaybe<StringOperators>;
+	DefaultImplementation?: InputMaybe<StringOperators>;
+	DetailUrl?: InputMaybe<UrlOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	DurableId?: InputMaybe<StringOperators>;
+	EditDefinitionUrl?: InputMaybe<UrlOperators>;
+	EditUrl?: InputMaybe<UrlOperators>;
+	ExtendedBy?: InputMaybe<StringOperators>;
+	ExtendsInterfaces?: InputMaybe<StringOperators>;
+	ExternalSharingModel?: InputMaybe<PicklistOperators>;
+	HasSubtypes?: InputMaybe<BooleanOperators>;
+	HelpSettingPageName?: InputMaybe<StringOperators>;
+	HelpSettingPageUrl?: InputMaybe<UrlOperators>;
+	Id?: InputMaybe<IdOperators>;
+	ImplementedBy?: InputMaybe<StringOperators>;
+	ImplementsInterfaces?: InputMaybe<StringOperators>;
+	InternalSharingModel?: InputMaybe<PicklistOperators>;
+	IsApexTriggerable?: InputMaybe<BooleanOperators>;
+	IsAutoActivityCaptureEnabled?: InputMaybe<BooleanOperators>;
+	IsCompactLayoutable?: InputMaybe<BooleanOperators>;
+	IsCustomSetting?: InputMaybe<BooleanOperators>;
+	IsCustomizable?: InputMaybe<BooleanOperators>;
+	IsDeprecatedAndHidden?: InputMaybe<BooleanOperators>;
+	IsEverCreatable?: InputMaybe<BooleanOperators>;
+	IsEverDeletable?: InputMaybe<BooleanOperators>;
+	IsEverUpdatable?: InputMaybe<BooleanOperators>;
+	IsFeedEnabled?: InputMaybe<BooleanOperators>;
+	IsIdEnabled?: InputMaybe<BooleanOperators>;
+	IsInterface?: InputMaybe<BooleanOperators>;
+	IsLayoutable?: InputMaybe<BooleanOperators>;
+	IsMruEnabled?: InputMaybe<BooleanOperators>;
+	IsProcessEnabled?: InputMaybe<BooleanOperators>;
+	IsQueryable?: InputMaybe<BooleanOperators>;
+	IsReplicateable?: InputMaybe<BooleanOperators>;
+	IsRetrieveable?: InputMaybe<BooleanOperators>;
+	IsSearchLayoutable?: InputMaybe<BooleanOperators>;
+	IsSearchable?: InputMaybe<BooleanOperators>;
+	IsSubtype?: InputMaybe<BooleanOperators>;
+	IsTriggerable?: InputMaybe<BooleanOperators>;
+	IsWorkflowEnabled?: InputMaybe<BooleanOperators>;
+	KeyPrefix?: InputMaybe<StringOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	NewUrl?: InputMaybe<UrlOperators>;
+	PluralLabel?: InputMaybe<StringOperators>;
+	PublisherId?: InputMaybe<StringOperators>;
+	QualifiedApiName?: InputMaybe<StringOperators>;
+	RunningUserEntityAccessId?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<EntityDefinition_Filter>>>;
+	not?: InputMaybe<EntityDefinition_Filter>;
+	or?: InputMaybe<Array<InputMaybe<EntityDefinition_Filter>>>;
+};
+
+export type Event_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	ActivityDate?: InputMaybe<DateOperators>;
+	ActivityDateTime?: InputMaybe<DateTimeOperators>;
+	ActivityRecurrence2ExceptionId?: InputMaybe<IdOperators>;
+	ActivityRecurrence2Id?: InputMaybe<IdOperators>;
+	Attendees?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DurationInMinutes?: InputMaybe<IntegerOperators>;
+	EndDate?: InputMaybe<DateOperators>;
+	EndDateTime?: InputMaybe<DateTimeOperators>;
+	EventSubtype?: InputMaybe<PicklistOperators>;
+	GroupEventType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAllDayEvent?: InputMaybe<BooleanOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsChild?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsGroupEvent?: InputMaybe<BooleanOperators>;
+	IsPrivate?: InputMaybe<BooleanOperators>;
+	IsRecurrence?: InputMaybe<BooleanOperators>;
+	IsRecurrence2?: InputMaybe<BooleanOperators>;
+	IsRecurrence2Exception?: InputMaybe<BooleanOperators>;
+	IsRecurrence2Exclusion?: InputMaybe<BooleanOperators>;
+	IsReminderSet?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Location?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Event_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Recurrence2PatternStartDate?: InputMaybe<DateTimeOperators>;
+	Recurrence2PatternText?: InputMaybe<LongTextAreaOperators>;
+	Recurrence2PatternTimeZone?: InputMaybe<StringOperators>;
+	Recurrence2PatternVersion?: InputMaybe<PicklistOperators>;
+	RecurrenceActivityId?: InputMaybe<IdOperators>;
+	RecurrenceDayOfMonth?: InputMaybe<IntegerOperators>;
+	RecurrenceDayOfWeekMask?: InputMaybe<IntegerOperators>;
+	RecurrenceEndDateOnly?: InputMaybe<DateOperators>;
+	RecurrenceInstance?: InputMaybe<PicklistOperators>;
+	RecurrenceInterval?: InputMaybe<IntegerOperators>;
+	RecurrenceMonthOfYear?: InputMaybe<PicklistOperators>;
+	RecurrenceStartDateTime?: InputMaybe<DateTimeOperators>;
+	RecurrenceTimeZoneSidKey?: InputMaybe<PicklistOperators>;
+	RecurrenceType?: InputMaybe<PicklistOperators>;
+	ReminderDateTime?: InputMaybe<DateTimeOperators>;
+	ShowAs?: InputMaybe<PicklistOperators>;
+	StartDateTime?: InputMaybe<DateTimeOperators>;
+	Subject?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	What?: InputMaybe<Event_What_Filters>;
+	WhatId?: InputMaybe<IdOperators>;
+	Who?: InputMaybe<Event_Who_Filters>;
+	WhoId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Event_Filter>>>;
+	not?: InputMaybe<Event_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Event_Filter>>>;
+};
+
+export type Event_Owner_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Event_What_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type Event_Who_Filters = {
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type ExpressionSetView_Filter = {
+	Description?: InputMaybe<StringOperators>;
+	DurableId?: InputMaybe<StringOperators>;
+	ExpressionSetDetails?: InputMaybe<LongTextAreaOperators>;
+	HasContextDefinitionRef?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsExecutable?: InputMaybe<BooleanOperators>;
+	IsTemplate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<StringOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	UsageType?: InputMaybe<PicklistOperators>;
+	UsageTypeLabel?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ExpressionSetView_Filter>>>;
+	not?: InputMaybe<ExpressionSetView_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ExpressionSetView_Filter>>>;
+};
+
+export type FeedItem_Filter = {
+	BestCommentId?: InputMaybe<IdOperators>;
+	Body?: InputMaybe<LongTextAreaOperators>;
+	CommentCount?: InputMaybe<IntegerOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	HasContent?: InputMaybe<BooleanOperators>;
+	HasFeedEntity?: InputMaybe<BooleanOperators>;
+	HasLink?: InputMaybe<BooleanOperators>;
+	HasVerifiedComment?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InsertedBy?: InputMaybe<User_Filter>;
+	InsertedById?: InputMaybe<IdOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsRichText?: InputMaybe<BooleanOperators>;
+	LastEditById?: InputMaybe<IdOperators>;
+	LastEditDate?: InputMaybe<DateTimeOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LikeCount?: InputMaybe<IntegerOperators>;
+	LinkUrl?: InputMaybe<UrlOperators>;
+	Parent?: InputMaybe<FeedItem_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	RelatedRecordId?: InputMaybe<IdOperators>;
+	Revision?: InputMaybe<IntegerOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<FeedItem_Filter>>>;
+	not?: InputMaybe<FeedItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FeedItem_Filter>>>;
+};
+
+export type FeedItem_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Report?: InputMaybe<Report_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	User?: InputMaybe<User_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export const FieldExtraTypeInfo = {
+	ExternalLookup: "EXTERNAL_LOOKUP",
+	ImageUrl: "IMAGE_URL",
+	IndirectLookup: "INDIRECT_LOOKUP",
+	Personname: "PERSONNAME",
+	Plaintextarea: "PLAINTEXTAREA",
+	Richtextarea: "RICHTEXTAREA",
+	SwitchablePersonname: "SWITCHABLE_PERSONNAME",
+} as const;
+
+export type FieldExtraTypeInfo = (typeof FieldExtraTypeInfo)[keyof typeof FieldExtraTypeInfo];
+
+export type FieldPermissions_Filter = {
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<PermissionSet_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	PermissionsEdit?: InputMaybe<BooleanOperators>;
+	PermissionsRead?: InputMaybe<BooleanOperators>;
+	SobjectType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FieldPermissions_Filter>>>;
+	not?: InputMaybe<FieldPermissions_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FieldPermissions_Filter>>>;
+};
+
+export type FlowInterview_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	CurrentDefinitionDeveloperName?: InputMaybe<StringOperators>;
+	CurrentDefinitionVersionLabel?: InputMaybe<StringOperators>;
+	CurrentElement?: InputMaybe<StringOperators>;
+	CurrentVersionNumber?: InputMaybe<IntegerOperators>;
+	CurrentVersionProcessType?: InputMaybe<PicklistOperators>;
+	DefinitionDeveloperName?: InputMaybe<StringOperators>;
+	EngineType?: InputMaybe<PicklistOperators>;
+	Error?: InputMaybe<LongTextAreaOperators>;
+	FlowVersionViewId?: InputMaybe<StringOperators>;
+	Guid?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InterviewLabel?: InputMaybe<StringOperators>;
+	InterviewStatus?: InputMaybe<PicklistOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterDefinitionVersionLabel?: InputMaybe<StringOperators>;
+	MasterVersionNumber?: InputMaybe<IntegerOperators>;
+	MasterVersionProcessType?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<FlowInterview_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PauseLabel?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	WasPausedFromScreen?: InputMaybe<BooleanOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowInterview_Filter>>>;
+	not?: InputMaybe<FlowInterview_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowInterview_Filter>>>;
+};
+
+export type FlowInterview_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationInstance_Filter = {
+	AuxiliaryTriggeringRecord?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	CurrentStage?: InputMaybe<StringOperators>;
+	Duration?: InputMaybe<LongOperators>;
+	FlowDefinitionVersionId?: InputMaybe<IdOperators>;
+	FlowDefinitionVersionName?: InputMaybe<PicklistOperators>;
+	FlowOrchestration?: InputMaybe<FlowOrchestration_Filter>;
+	FlowOrchestrationId?: InputMaybe<IdOperators>;
+	FlowType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Interview?: InputMaybe<FlowInterview_Filter>;
+	InterviewId?: InputMaybe<IdOperators>;
+	IsDebugRun?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationDeveloperName?: InputMaybe<StringOperators>;
+	OrchestrationLabel?: InputMaybe<StringOperators>;
+	OrchestrationName?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<FlowOrchestrationInstance_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TriggeringRecord?: InputMaybe<StringOperators>;
+	TriggeringRecordType?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationInstance_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationInstance_Filter>>>;
+};
+
+export type FlowOrchestrationInstance_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationLog_Filter = {
+	Actor?: InputMaybe<StringOperators>;
+	Assignee?: InputMaybe<StringOperators>;
+	AssigneeType?: InputMaybe<PicklistOperators>;
+	Comments?: InputMaybe<StringOperators>;
+	Context?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Duration?: InputMaybe<LongOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Kind?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	OrchestrationInstanceId?: InputMaybe<IdOperators>;
+	OrchestrationName?: InputMaybe<StringOperators>;
+	OrchestrationVersion?: InputMaybe<IntegerOperators>;
+	StageName?: InputMaybe<StringOperators>;
+	StepName?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Timestamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationLog_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationLog_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationLog_Filter>>>;
+};
+
+export type FlowOrchestrationStageInstance_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	OrchestrationInstanceId?: InputMaybe<IdOperators>;
+	OrchestrationName?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<FlowOrchestrationStageInstance_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Position?: InputMaybe<IntegerOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationStageInstance_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationStageInstance_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationStageInstance_Filter>>>;
+};
+
+export type FlowOrchestrationStageInstance_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationStepInstance_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InProgressStepOutputs?: InputMaybe<LongTextAreaOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	OrchestrationInstanceId?: InputMaybe<IdOperators>;
+	OrchestrationName?: InputMaybe<StringOperators>;
+	OrchestrationStageName?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<FlowOrchestrationStepInstance_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	RelatedRecord?: InputMaybe<StringOperators>;
+	StageInstance?: InputMaybe<FlowOrchestrationStageInstance_Filter>;
+	StageInstanceId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StepType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationStepInstance_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationStepInstance_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationStepInstance_Filter>>>;
+};
+
+export type FlowOrchestrationStepInstance_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationVersion_Filter = {
+	ActivatedBy?: InputMaybe<User_Filter>;
+	ActivatedById?: InputMaybe<IdOperators>;
+	ActivatedDate?: InputMaybe<DateTimeOperators>;
+	ApiVersion?: InputMaybe<DoubleOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	FlowOrchestration?: InputMaybe<FlowOrchestration_Filter>;
+	FlowOrchestrationId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InteractionDefVersionId?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsOverridable?: InputMaybe<BooleanOperators>;
+	IsTemplate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationType?: InputMaybe<PicklistOperators>;
+	OverriddenBy?: InputMaybe<FlowOrchestration_Filter>;
+	OverriddenById?: InputMaybe<IdOperators>;
+	OverriddenOrchestration?: InputMaybe<FlowOrchestration_Filter>;
+	OverriddenOrchestrationId?: InputMaybe<IdOperators>;
+	RunInMode?: InputMaybe<PicklistOperators>;
+	SourceTemplate?: InputMaybe<FlowOrchestration_Filter>;
+	SourceTemplateId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TriggerObjectOrEventLabel?: InputMaybe<StringOperators>;
+	VersionNumber?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationVersion_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationVersion_Filter>>>;
+};
+
+export type FlowOrchestrationWorkItem_Assignee_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationWorkItem_Filter = {
+	Assignee?: InputMaybe<FlowOrchestrationWorkItem_Assignee_Filters>;
+	AssigneeId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	ElapsedTimeSinceAsgntInSec?: InputMaybe<LongOperators>;
+	ElapsedTimeSinceCreationInSec?: InputMaybe<LongOperators>;
+	FlowType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrchestrationName?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<FlowOrchestrationWorkItem_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ParentWorkItem?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	ParentWorkItemId?: InputMaybe<IdOperators>;
+	RelatedRecord?: InputMaybe<FlowOrchestrationWorkItem_RelatedRecord_Filters>;
+	RelatedRecordId?: InputMaybe<IdOperators>;
+	ScreenFlow?: InputMaybe<PicklistOperators>;
+	ScreenFlowInputs?: InputMaybe<LongTextAreaOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StepInstance?: InputMaybe<FlowOrchestrationStepInstance_Filter>;
+	StepInstanceId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestrationWorkItem_Filter>>>;
+	not?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestrationWorkItem_Filter>>>;
+};
+
+export type FlowOrchestrationWorkItem_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type FlowOrchestrationWorkItem_RelatedRecord_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	AnalyticsUserAttrFuncTkn?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseComment?: InputMaybe<CaseComment_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentVersion?: InputMaybe<ContentVersion_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	Customer?: InputMaybe<Customer_Filter>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationTrustMeasure?: InputMaybe<LocationTrustMeasure_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	ManagedContentVariant?: InputMaybe<ManagedContentVariant_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityRelatedDeleteLog?: InputMaybe<OpportunityRelatedDeleteLog_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	OrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	QuickText?: InputMaybe<QuickText_Filter>;
+	ReportHierarchyObjectField?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	StreamingChannel?: InputMaybe<StreamingChannel_Filter>;
+	TableauHostMapping?: InputMaybe<TableauHostMapping_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	UnstructuredStorageSpace?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	User?: InputMaybe<User_Filter>;
+	UserLocalWebServerIdentity?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type FlowOrchestration_Filter = {
+	ActiveVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	ActiveVersionId?: InputMaybe<IdOperators>;
+	ApiName?: InputMaybe<StringOperators>;
+	ApiVersion?: InputMaybe<IntegerOperators>;
+	AverageRunTime?: InputMaybe<IntegerOperators>;
+	CompletionRate?: InputMaybe<PercentOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	FailedRunCount?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InstalledPackageName?: InputMaybe<StringOperators>;
+	IsCitizenEnabled?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsOverridable?: InputMaybe<BooleanOperators>;
+	IsTemplate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	ManageableState?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	OrchestrationDefinition?: InputMaybe<StringOperators>;
+	OrchestrationLabel?: InputMaybe<StringOperators>;
+	OrchestrationType?: InputMaybe<PicklistOperators>;
+	OverriddenBy?: InputMaybe<FlowOrchestration_Filter>;
+	OverriddenById?: InputMaybe<IdOperators>;
+	OverriddenOrchestration?: InputMaybe<FlowOrchestration_Filter>;
+	OverriddenOrchestrationId?: InputMaybe<IdOperators>;
+	RunCount?: InputMaybe<IntegerOperators>;
+	SourceTemplate?: InputMaybe<FlowOrchestration_Filter>;
+	SourceTemplateId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TriggerType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowOrchestration_Filter>>>;
+	not?: InputMaybe<FlowOrchestration_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowOrchestration_Filter>>>;
+};
+
+export type FlowRecordElementOccurrence_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	FlowRecordElement?: InputMaybe<FlowRecordElement_Filter>;
+	FlowRecordElementId?: InputMaybe<IdOperators>;
+	FlowRecordId?: InputMaybe<IdOperators>;
+	FlowRecordVersion?: InputMaybe<FlowRecordVersion_Filter>;
+	FlowRecordVersionId?: InputMaybe<IdOperators>;
+	FlowRecordVersionOccurrence?: InputMaybe<FlowRecordVersionOccurrence_Filter>;
+	FlowRecordVersionOccurrenceId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecordElementOccurrence_Filter>>>;
+	not?: InputMaybe<FlowRecordElementOccurrence_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecordElementOccurrence_Filter>>>;
+};
+
+export type FlowRecordElement_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ElementName?: InputMaybe<StringOperators>;
+	FlowRecordVersion?: InputMaybe<FlowRecordVersion_Filter>;
+	FlowRecordVersionId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecordElement_Filter>>>;
+	not?: InputMaybe<FlowRecordElement_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecordElement_Filter>>>;
+};
+
+export type FlowRecordHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	FlowRecordId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecordHistory_Filter>>>;
+	not?: InputMaybe<FlowRecordHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecordHistory_Filter>>>;
+};
+
+export type FlowRecordVersionOccurrence_Filter = {
+	CompletedDate?: InputMaybe<DateTimeOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Enqueued?: InputMaybe<IntegerOperators>;
+	Entries?: InputMaybe<IntegerOperators>;
+	ErrorDetail?: InputMaybe<StringOperators>;
+	Errors?: InputMaybe<IntegerOperators>;
+	Exits?: InputMaybe<IntegerOperators>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	FlowRecordId?: InputMaybe<IdOperators>;
+	FlowRecordVersion?: InputMaybe<FlowRecordVersion_Filter>;
+	FlowRecordVersionId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ProgressStatus?: InputMaybe<PicklistOperators>;
+	ScheduledDate?: InputMaybe<DateTimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecordVersionOccurrence_Filter>>>;
+	not?: InputMaybe<FlowRecordVersionOccurrence_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecordVersionOccurrence_Filter>>>;
+};
+
+export type FlowRecordVersion_Filter = {
+	AccessType?: InputMaybe<PicklistOperators>;
+	ActivatedBy?: InputMaybe<User_Filter>;
+	ActivatedById?: InputMaybe<IdOperators>;
+	ActivatedDate?: InputMaybe<DateTimeOperators>;
+	ApiVersion?: InputMaybe<DoubleOperators>;
+	AreMetricsLoggedToDataCloud?: InputMaybe<BooleanOperators>;
+	Builder?: InputMaybe<StringOperators>;
+	CapacityCategory?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	FlowRecordId?: InputMaybe<IdOperators>;
+	FlowType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsOverridable?: InputMaybe<BooleanOperators>;
+	IsPaused?: InputMaybe<BooleanOperators>;
+	IsTemplate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OverriddenBy?: InputMaybe<FlowRecord_Filter>;
+	OverriddenById?: InputMaybe<IdOperators>;
+	OverriddenFlow?: InputMaybe<FlowRecord_Filter>;
+	OverriddenFlowId?: InputMaybe<IdOperators>;
+	PausedDate?: InputMaybe<DateTimeOperators>;
+	PausingUser?: InputMaybe<User_Filter>;
+	PausingUserId?: InputMaybe<IdOperators>;
+	ProgressStatus?: InputMaybe<PicklistOperators>;
+	ReasonPaused?: InputMaybe<TextAreaOperators>;
+	ResumedDate?: InputMaybe<DateTimeOperators>;
+	ResumingUser?: InputMaybe<User_Filter>;
+	ResumingUserId?: InputMaybe<IdOperators>;
+	RunInMode?: InputMaybe<PicklistOperators>;
+	ScheduledStartDate?: InputMaybe<DateTimeOperators>;
+	SourceTemplate?: InputMaybe<FlowRecord_Filter>;
+	SourceTemplateId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TriggerObjectOrEventLabel?: InputMaybe<StringOperators>;
+	VersionNumber?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecordVersion_Filter>>>;
+	not?: InputMaybe<FlowRecordVersion_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecordVersion_Filter>>>;
+};
+
+export type FlowRecord_AssociatedRecord_Filters = {
+	Campaign?: InputMaybe<Campaign_Filter>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type FlowRecord_Filter = {
+	ActiveVersion?: InputMaybe<FlowRecordVersion_Filter>;
+	ActiveVersionId?: InputMaybe<IdOperators>;
+	ApiName?: InputMaybe<StringOperators>;
+	ApiVersion?: InputMaybe<IntegerOperators>;
+	AreMetricsLoggedToDataCloud?: InputMaybe<BooleanOperators>;
+	AssociatedRecord?: InputMaybe<FlowRecord_AssociatedRecord_Filters>;
+	AssociatedRecordId?: InputMaybe<IdOperators>;
+	Builder?: InputMaybe<StringOperators>;
+	CapacityCategory?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	ElementEntries?: InputMaybe<IntegerOperators>;
+	ElementErrors?: InputMaybe<IntegerOperators>;
+	ErrorCode?: InputMaybe<PicklistOperators>;
+	ErrorDetails?: InputMaybe<StringOperators>;
+	FlowCategory?: InputMaybe<StringOperators>;
+	FlowDefinition?: InputMaybe<StringOperators>;
+	FlowLabel?: InputMaybe<StringOperators>;
+	FlowSubcategory?: InputMaybe<StringOperators>;
+	FlowType?: InputMaybe<PicklistOperators>;
+	Health?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InstalledPackageName?: InputMaybe<StringOperators>;
+	IsCitizenEnabled?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsOverridable?: InputMaybe<BooleanOperators>;
+	IsPaused?: InputMaybe<BooleanOperators>;
+	IsTemplate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	List?: InputMaybe<Campaign_Filter>;
+	ListId?: InputMaybe<IdOperators>;
+	LogsEnabledFlowVersion?: InputMaybe<IntegerOperators>;
+	ManageableState?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	OverriddenBy?: InputMaybe<FlowRecord_Filter>;
+	OverriddenById?: InputMaybe<IdOperators>;
+	OverriddenFlow?: InputMaybe<FlowRecord_Filter>;
+	OverriddenFlowId?: InputMaybe<IdOperators>;
+	Owner?: InputMaybe<FlowRecord_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ProgressStatus?: InputMaybe<PicklistOperators>;
+	ScheduledStartDate?: InputMaybe<DateTimeOperators>;
+	SourceTemplate?: InputMaybe<FlowRecord_Filter>;
+	SourceTemplateId?: InputMaybe<IdOperators>;
+	StartSource?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TriggerObjectOrEventLabel?: InputMaybe<StringOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<FlowRecord_Filter>>>;
+	not?: InputMaybe<FlowRecord_Filter>;
+	or?: InputMaybe<Array<InputMaybe<FlowRecord_Filter>>>;
+};
+
+export type FlowRecord_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ForecastingCustomData_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ForecastOwner?: InputMaybe<User_Filter>;
+	ForecastOwnerId?: InputMaybe<IdOperators>;
+	ForecastingGroupItemId?: InputMaybe<IdOperators>;
+	ForecastingType?: InputMaybe<ForecastingType_Filter>;
+	ForecastingTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Period?: InputMaybe<Period_Filter>;
+	PeriodId?: InputMaybe<IdOperators>;
+	ProductFamily?: InputMaybe<PicklistOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ForecastingCustomData_Filter>>>;
+	not?: InputMaybe<ForecastingCustomData_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ForecastingCustomData_Filter>>>;
+};
+
+export type ForecastingFact_Filter = {
+	ForecastCategoryName?: InputMaybe<PicklistOperators>;
+	ForecastedObjectId?: InputMaybe<IdOperators>;
+	ForecastingItemId?: InputMaybe<IdOperators>;
+	ForecastingType?: InputMaybe<ForecastingType_Filter>;
+	ForecastingTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PeriodId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TargetValue?: InputMaybe<DoubleOperators>;
+	and?: InputMaybe<Array<InputMaybe<ForecastingFact_Filter>>>;
+	not?: InputMaybe<ForecastingFact_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ForecastingFact_Filter>>>;
+};
+
+export type ForecastingOwnerAdjustment_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ForecastCategoryName?: InputMaybe<PicklistOperators>;
+	ForecastOwner?: InputMaybe<User_Filter>;
+	ForecastOwnerId?: InputMaybe<IdOperators>;
+	ForecastingGroupItemId?: InputMaybe<IdOperators>;
+	ForecastingItemCategory?: InputMaybe<PicklistOperators>;
+	ForecastingItemId?: InputMaybe<IdOperators>;
+	ForecastingType?: InputMaybe<ForecastingType_Filter>;
+	ForecastingTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAmount?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsQuantity?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	OwnerAdjustedAmount?: InputMaybe<CurrencyOperators>;
+	OwnerAdjustedQuantity?: InputMaybe<DoubleOperators>;
+	OwnerAdjustmentNote?: InputMaybe<TextAreaOperators>;
+	Period?: InputMaybe<Period_Filter>;
+	PeriodId?: InputMaybe<IdOperators>;
+	ProductFamily?: InputMaybe<PicklistOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ForecastingOwnerAdjustment_Filter>>>;
+	not?: InputMaybe<ForecastingOwnerAdjustment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ForecastingOwnerAdjustment_Filter>>>;
+};
+
+export type ForecastingQuota_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ForecastingGroupItemId?: InputMaybe<IdOperators>;
+	ForecastingTypeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAmount?: InputMaybe<BooleanOperators>;
+	IsQuantity?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	PeriodId?: InputMaybe<IdOperators>;
+	ProductFamily?: InputMaybe<PicklistOperators>;
+	QuotaAmount?: InputMaybe<CurrencyOperators>;
+	QuotaOwner?: InputMaybe<User_Filter>;
+	QuotaOwnerId?: InputMaybe<IdOperators>;
+	QuotaQuantity?: InputMaybe<DoubleOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ForecastingQuota_Filter>>>;
+	not?: InputMaybe<ForecastingQuota_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ForecastingQuota_Filter>>>;
+};
+
+export type ForecastingType_Filter = {
+	CanDisplayQuotas?: InputMaybe<BooleanOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DateType?: InputMaybe<PicklistOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	ForecastingGroupId?: InputMaybe<IdOperators>;
+	HasAdjustments?: InputMaybe<BooleanOperators>;
+	HasOwnerAdjustments?: InputMaybe<BooleanOperators>;
+	HasProductFamily?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsAdvCurrencyMgmt?: InputMaybe<BooleanOperators>;
+	IsAmount?: InputMaybe<BooleanOperators>;
+	IsCdp?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPlatformType?: InputMaybe<BooleanOperators>;
+	IsQuantity?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastActivatedDate?: InputMaybe<DateTimeOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	RoleType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ForecastingType_Filter>>>;
+	not?: InputMaybe<ForecastingType_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ForecastingType_Filter>>>;
+};
+
+export type GroupMember_Filter = {
+	Group?: InputMaybe<Group_Filter>;
+	GroupId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UserOrGroup?: InputMaybe<GroupMember_UserOrGroup_Filters>;
+	UserOrGroupId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<GroupMember_Filter>>>;
+	not?: InputMaybe<GroupMember_Filter>;
+	or?: InputMaybe<Array<InputMaybe<GroupMember_Filter>>>;
+};
+
+export type GroupMember_UserOrGroup_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Group_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	DoesIncludeBosses?: InputMaybe<BooleanOperators>;
+	DoesSendEmailToMembers?: InputMaybe<BooleanOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Group_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Related?: InputMaybe<Group_Related_Filters>;
+	RelatedId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Group_Filter>>>;
+	not?: InputMaybe<Group_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Group_Filter>>>;
+};
+
+export type Group_OrderBy = {
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Description?: InputMaybe<OrderByClause>;
+	DeveloperName?: InputMaybe<OrderByClause>;
+	DoesIncludeBosses?: InputMaybe<OrderByClause>;
+	DoesSendEmailToMembers?: InputMaybe<OrderByClause>;
+	Email?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Group_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Related?: InputMaybe<Group_Related_OrderBys>;
+	RelatedId?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Type?: InputMaybe<OrderByClause>;
+};
+
+export type Group_Owner_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Group_Owner_OrderBys = {
+	Name?: InputMaybe<Name_OrderBy>;
+	Organization?: InputMaybe<Organization_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type Group_Related_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+	UserRole?: InputMaybe<UserRole_Filter>;
+};
+
+export type Group_Related_OrderBys = {
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+	UserRole?: InputMaybe<UserRole_OrderBy>;
+};
+
+export type Holiday_Filter = {
+	ActivityDate?: InputMaybe<DateOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	EndTimeInMinutes?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAllDay?: InputMaybe<BooleanOperators>;
+	IsRecurrence?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	RecurrenceDayOfMonth?: InputMaybe<IntegerOperators>;
+	RecurrenceDayOfWeekMask?: InputMaybe<IntegerOperators>;
+	RecurrenceEndDateOnly?: InputMaybe<DateOperators>;
+	RecurrenceInstance?: InputMaybe<PicklistOperators>;
+	RecurrenceInterval?: InputMaybe<IntegerOperators>;
+	RecurrenceMonthOfYear?: InputMaybe<PicklistOperators>;
+	RecurrenceStartDate?: InputMaybe<DateOperators>;
+	RecurrenceType?: InputMaybe<PicklistOperators>;
+	StartTimeInMinutes?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Holiday_Filter>>>;
+	not?: InputMaybe<Holiday_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Holiday_Filter>>>;
+};
+
+export type IpAddressRange_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	EndAddress?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IpAddressFeature?: InputMaybe<PicklistOperators>;
+	IpAddressUsageScope?: InputMaybe<PicklistOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	StartAddress?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<IpAddressRange_Filter>>>;
+	not?: InputMaybe<IpAddressRange_Filter>;
+	or?: InputMaybe<Array<InputMaybe<IpAddressRange_Filter>>>;
+};
+
+export type IdOperators = {
+	eq?: InputMaybe<Scalars["ID"]["input"]>;
+	gt?: InputMaybe<Scalars["ID"]["input"]>;
+	gte?: InputMaybe<Scalars["ID"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["ID"]["input"]>>>;
+	inq?: InputMaybe<JoinInput>;
+	lt?: InputMaybe<Scalars["ID"]["input"]>;
+	lte?: InputMaybe<Scalars["ID"]["input"]>;
+	ne?: InputMaybe<Scalars["ID"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["ID"]["input"]>>>;
+	ninq?: InputMaybe<JoinInput>;
+};
+
+export type ImageHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Image?: InputMaybe<Image_Filter>;
+	ImageId?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ImageHistory_Filter>>>;
+	not?: InputMaybe<ImageHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ImageHistory_Filter>>>;
+};
+
+export type Image_Filter = {
+	AlternateText?: InputMaybe<StringOperators>;
+	CapturedAngle?: InputMaybe<StringOperators>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	ImageClass?: InputMaybe<PicklistOperators>;
+	ImageClassObjectType?: InputMaybe<PicklistOperators>;
+	ImageViewType?: InputMaybe<StringOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Image_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	Url?: InputMaybe<UrlOperators>;
+	and?: InputMaybe<Array<InputMaybe<Image_Filter>>>;
+	not?: InputMaybe<Image_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Image_Filter>>>;
+};
+
+export type Image_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type IndividualHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Individual?: InputMaybe<Individual_Filter>;
+	IndividualId?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<IndividualHistory_Filter>>>;
+	not?: InputMaybe<IndividualHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<IndividualHistory_Filter>>>;
+};
+
+export type Individual_Filter = {
+	BirthDate?: InputMaybe<DateOperators>;
+	CanStorePiiElsewhere?: InputMaybe<BooleanOperators>;
+	ChildrenCount?: InputMaybe<IntegerOperators>;
+	ConsumerCreditScore?: InputMaybe<IntegerOperators>;
+	ConsumerCreditScoreProviderName?: InputMaybe<StringOperators>;
+	ConvictionsCount?: InputMaybe<IntegerOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DeathDate?: InputMaybe<DateOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	HasOptedOutGeoTracking?: InputMaybe<BooleanOperators>;
+	HasOptedOutProcessing?: InputMaybe<BooleanOperators>;
+	HasOptedOutProfiling?: InputMaybe<BooleanOperators>;
+	HasOptedOutSolicit?: InputMaybe<BooleanOperators>;
+	HasOptedOutTracking?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IndividualsAge?: InputMaybe<PicklistOperators>;
+	InfluencerRating?: InputMaybe<IntegerOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsHomeOwner?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	MasterRecord?: InputMaybe<Individual_Filter>;
+	MasterRecordId?: InputMaybe<IdOperators>;
+	MilitaryService?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Occupation?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Salutation?: InputMaybe<PicklistOperators>;
+	SendIndividualData?: InputMaybe<BooleanOperators>;
+	ShouldForget?: InputMaybe<BooleanOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Website?: InputMaybe<UrlOperators>;
+	and?: InputMaybe<Array<InputMaybe<Individual_Filter>>>;
+	not?: InputMaybe<Individual_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Individual_Filter>>>;
+};
+
+export type Individual_OrderBy = {
+	BirthDate?: InputMaybe<OrderByClause>;
+	CanStorePiiElsewhere?: InputMaybe<OrderByClause>;
+	ChildrenCount?: InputMaybe<OrderByClause>;
+	ConsumerCreditScore?: InputMaybe<OrderByClause>;
+	ConsumerCreditScoreProviderName?: InputMaybe<OrderByClause>;
+	ConvictionsCount?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	DeathDate?: InputMaybe<OrderByClause>;
+	FirstName?: InputMaybe<OrderByClause>;
+	HasOptedOutGeoTracking?: InputMaybe<OrderByClause>;
+	HasOptedOutProcessing?: InputMaybe<OrderByClause>;
+	HasOptedOutProfiling?: InputMaybe<OrderByClause>;
+	HasOptedOutSolicit?: InputMaybe<OrderByClause>;
+	HasOptedOutTracking?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IndividualsAge?: InputMaybe<OrderByClause>;
+	InfluencerRating?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	IsHomeOwner?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	LastName?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	MasterRecord?: InputMaybe<Individual_OrderBy>;
+	MasterRecordId?: InputMaybe<OrderByClause>;
+	MilitaryService?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Occupation?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<User_OrderBy>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Salutation?: InputMaybe<OrderByClause>;
+	SendIndividualData?: InputMaybe<OrderByClause>;
+	ShouldForget?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Website?: InputMaybe<OrderByClause>;
+};
+
+export type IntegerOperators = {
+	eq?: InputMaybe<Scalars["Int"]["input"]>;
+	gt?: InputMaybe<Scalars["Int"]["input"]>;
+	gte?: InputMaybe<Scalars["Int"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Int"]["input"]>;
+	lte?: InputMaybe<Scalars["Int"]["input"]>;
+	ne?: InputMaybe<Scalars["Int"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
+};
+
+export type JoinInput = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountHistory?: InputMaybe<AccountHistory_Filter>;
+	AccountPartner?: InputMaybe<AccountPartner_Filter>;
+	Agent__History?: InputMaybe<Agent__History_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	AnalyticsUserAttrFuncTkn?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	ApiName?: InputMaybe<Scalars["String"]["input"]>;
+	AppAnalyticsQueryRequest?: InputMaybe<AppAnalyticsQueryRequest_Filter>;
+	AppMenuItem?: InputMaybe<AppMenuItem_Filter>;
+	Application__History?: InputMaybe<Application__History_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalSubmissionDetailHistory?: InputMaybe<ApprovalSubmissionDetailHistory_Filter>;
+	ApprovalSubmissionHistory?: InputMaybe<ApprovalSubmissionHistory_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	ApprovalWorkItemHistory?: InputMaybe<ApprovalWorkItemHistory_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetHistory?: InputMaybe<AssetHistory_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssetRelationshipHistory?: InputMaybe<AssetRelationshipHistory_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AssociatedLocationHistory?: InputMaybe<AssociatedLocationHistory_Filter>;
+	Attachment?: InputMaybe<Attachment_Filter>;
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormConsentHistory?: InputMaybe<AuthorizationFormConsentHistory_Filter>;
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormDataUseHistory?: InputMaybe<AuthorizationFormDataUseHistory_Filter>;
+	AuthorizationFormHistory?: InputMaybe<AuthorizationFormHistory_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	AuthorizationFormTextHistory?: InputMaybe<AuthorizationFormTextHistory_Filter>;
+	BackgroundOperation?: InputMaybe<BackgroundOperation_Filter>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	BusinessHours?: InputMaybe<BusinessHours_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignHistory?: InputMaybe<CampaignHistory_Filter>;
+	CampaignMember?: InputMaybe<CampaignMember_Filter>;
+	CampaignMemberStatus?: InputMaybe<CampaignMemberStatus_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseComment?: InputMaybe<CaseComment_Filter>;
+	CaseContactRole?: InputMaybe<CaseContactRole_Filter>;
+	CaseHistory?: InputMaybe<CaseHistory_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionChannelTypeHistory?: InputMaybe<CommSubscriptionChannelTypeHistory_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionConsentHistory?: InputMaybe<CommSubscriptionConsentHistory_Filter>;
+	CommSubscriptionHistory?: InputMaybe<CommSubscriptionHistory_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	CommSubscriptionTimingHistory?: InputMaybe<CommSubscriptionTimingHistory_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactHistory?: InputMaybe<ContactHistory_Filter>;
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointAddressHistory?: InputMaybe<ContactPointAddressHistory_Filter>;
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointConsentHistory?: InputMaybe<ContactPointConsentHistory_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointEmailHistory?: InputMaybe<ContactPointEmailHistory_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointPhoneHistory?: InputMaybe<ContactPointPhoneHistory_Filter>;
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	ContactPointTypeConsentHistory?: InputMaybe<ContactPointTypeConsentHistory_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	ContentDocumentHistory?: InputMaybe<ContentDocumentHistory_Filter>;
+	ContentDocumentLink?: InputMaybe<ContentDocumentLink_Filter>;
+	ContentFolderItem?: InputMaybe<ContentFolderItem_Filter>;
+	ContentFolderLink?: InputMaybe<ContentFolderLink_Filter>;
+	ContentTaxonomy?: InputMaybe<ContentTaxonomy_Filter>;
+	ContentTaxonomyRelatedTerm?: InputMaybe<ContentTaxonomyRelatedTerm_Filter>;
+	ContentTaxonomyTerm?: InputMaybe<ContentTaxonomyTerm_Filter>;
+	ContentTaxonomyTermRelatedTerm?: InputMaybe<ContentTaxonomyTermRelatedTerm_Filter>;
+	ContentTaxonomyTermRelationshipType?: InputMaybe<ContentTaxonomyTermRelationshipType_Filter>;
+	ContentVersion?: InputMaybe<ContentVersion_Filter>;
+	ContentVersionHistory?: InputMaybe<ContentVersionHistory_Filter>;
+	ContentWorkspace?: InputMaybe<ContentWorkspace_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	ContractContactRole?: InputMaybe<ContractContactRole_Filter>;
+	ContractHistory?: InputMaybe<ContractHistory_Filter>;
+	CspTrustedSite?: InputMaybe<CspTrustedSite_Filter>;
+	CustomPermission?: InputMaybe<CustomPermission_Filter>;
+	Customer?: InputMaybe<Customer_Filter>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUseLegalBasisHistory?: InputMaybe<DataUseLegalBasisHistory_Filter>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeHistory?: InputMaybe<DataUsePurposeHistory_Filter>;
+	DeleteEvent?: InputMaybe<DeleteEvent_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsEnvironmentHistory?: InputMaybe<DevopsEnvironmentHistory_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DevopsRequestInfoHistory?: InputMaybe<DevopsRequestInfoHistory_Filter>;
+	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EmailMessageRelation?: InputMaybe<EmailMessageRelation_Filter>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	EngagementChannelTypeHistory?: InputMaybe<EngagementChannelTypeHistory_Filter>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	EntityDefinition?: InputMaybe<EntityDefinition_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	ExpressionSetView?: InputMaybe<ExpressionSetView_Filter>;
+	FeedItem?: InputMaybe<FeedItem_Filter>;
+	FieldPermissions?: InputMaybe<FieldPermissions_Filter>;
+	FlowInterview?: InputMaybe<FlowInterview_Filter>;
+	FlowOrchestration?: InputMaybe<FlowOrchestration_Filter>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationLog?: InputMaybe<FlowOrchestrationLog_Filter>;
+	FlowOrchestrationStageInstance?: InputMaybe<FlowOrchestrationStageInstance_Filter>;
+	FlowOrchestrationStepInstance?: InputMaybe<FlowOrchestrationStepInstance_Filter>;
+	FlowOrchestrationVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	FlowOrchestrationWorkItem?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	FlowRecord?: InputMaybe<FlowRecord_Filter>;
+	FlowRecordElement?: InputMaybe<FlowRecordElement_Filter>;
+	FlowRecordElementOccurrence?: InputMaybe<FlowRecordElementOccurrence_Filter>;
+	FlowRecordHistory?: InputMaybe<FlowRecordHistory_Filter>;
+	FlowRecordVersion?: InputMaybe<FlowRecordVersion_Filter>;
+	FlowRecordVersionOccurrence?: InputMaybe<FlowRecordVersionOccurrence_Filter>;
+	ForecastingCustomData?: InputMaybe<ForecastingCustomData_Filter>;
+	ForecastingFact?: InputMaybe<ForecastingFact_Filter>;
+	ForecastingOwnerAdjustment?: InputMaybe<ForecastingOwnerAdjustment_Filter>;
+	ForecastingQuota?: InputMaybe<ForecastingQuota_Filter>;
+	ForecastingType?: InputMaybe<ForecastingType_Filter>;
+	Group?: InputMaybe<Group_Filter>;
+	GroupMember?: InputMaybe<GroupMember_Filter>;
+	Holiday?: InputMaybe<Holiday_Filter>;
+	IPAddressRange?: InputMaybe<IpAddressRange_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	ImageHistory?: InputMaybe<ImageHistory_Filter>;
+	Individual?: InputMaybe<Individual_Filter>;
+	IndividualHistory?: InputMaybe<IndividualHistory_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	LeadHistory?: InputMaybe<LeadHistory_Filter>;
+	Lease__History?: InputMaybe<Lease__History_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationHistory?: InputMaybe<LocationHistory_Filter>;
+	LocationTrustMeasure?: InputMaybe<LocationTrustMeasure_Filter>;
+	Maintenance_Request__History?: InputMaybe<Maintenance_Request__History_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__History?: InputMaybe<Maintenance_Worker__History_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	ManagedContent?: InputMaybe<ManagedContent_Filter>;
+	ManagedContentPublishedUrl?: InputMaybe<ManagedContentPublishedUrl_Filter>;
+	ManagedContentVariant?: InputMaybe<ManagedContentVariant_Filter>;
+	Note?: InputMaybe<Note_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	ObjectPermissions?: InputMaybe<ObjectPermissions_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityContactRole?: InputMaybe<OpportunityContactRole_Filter>;
+	OpportunityFieldHistory?: InputMaybe<OpportunityFieldHistory_Filter>;
+	OpportunityHistory?: InputMaybe<OpportunityHistory_Filter>;
+	OpportunityLineItem?: InputMaybe<OpportunityLineItem_Filter>;
+	OpportunityPartner?: InputMaybe<OpportunityPartner_Filter>;
+	OpportunityRelatedDeleteLog?: InputMaybe<OpportunityRelatedDeleteLog_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderHistory?: InputMaybe<OrderHistory_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	OrderItemHistory?: InputMaybe<OrderItemHistory_Filter>;
+	OrgMetric?: InputMaybe<OrgMetric_Filter>;
+	OrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	Partner?: InputMaybe<Partner_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	PartyConsentHistory?: InputMaybe<PartyConsentHistory_Filter>;
+	Payment__History?: InputMaybe<Payment__History_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Period?: InputMaybe<Period_Filter>;
+	PermissionSet?: InputMaybe<PermissionSet_Filter>;
+	PermissionSetGroup?: InputMaybe<PermissionSetGroup_Filter>;
+	PermissionSetLicense?: InputMaybe<PermissionSetLicense_Filter>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2History?: InputMaybe<Pricebook2History_Filter>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	PricebookEntryHistory?: InputMaybe<PricebookEntryHistory_Filter>;
+	ProcessDefinition?: InputMaybe<ProcessDefinition_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	ProcessInstance?: InputMaybe<ProcessInstance_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2History?: InputMaybe<Product2History_Filter>;
+	Profile?: InputMaybe<Profile_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillEndorsementHistory?: InputMaybe<ProfileSkillEndorsementHistory_Filter>;
+	ProfileSkillHistory?: InputMaybe<ProfileSkillHistory_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	ProfileSkillUserHistory?: InputMaybe<ProfileSkillUserHistory_Filter>;
+	Property_Cost__History?: InputMaybe<Property_Cost__History_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__History?: InputMaybe<Property_Listing__History_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__History?: InputMaybe<Property_Management_Company__History_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__History?: InputMaybe<Property_Owner__History_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__History?: InputMaybe<Property_Sale__History_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__History?: InputMaybe<Property__History_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	QuickText?: InputMaybe<QuickText_Filter>;
+	QuickTextHistory?: InputMaybe<QuickTextHistory_Filter>;
+	Recommendation?: InputMaybe<Recommendation_Filter>;
+	RecordAction?: InputMaybe<RecordAction_Filter>;
+	RecordType?: InputMaybe<RecordType_Filter>;
+	Report?: InputMaybe<Report_Filter>;
+	ReportHierarchyObjectField?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	Scorecard?: InputMaybe<Scorecard_Filter>;
+	ScorecardAssociation?: InputMaybe<ScorecardAssociation_Filter>;
+	ScorecardMetric?: InputMaybe<ScorecardMetric_Filter>;
+	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SellerHistory?: InputMaybe<SellerHistory_Filter>;
+	SetupAssistantStep?: InputMaybe<SetupAssistantStep_Filter>;
+	SiteHistory?: InputMaybe<SiteHistory_Filter>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPersonaHistory?: InputMaybe<SocialPersonaHistory_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	SocialPostHistory?: InputMaybe<SocialPostHistory_Filter>;
+	SolutionHistory?: InputMaybe<SolutionHistory_Filter>;
+	StaticResource?: InputMaybe<StaticResource_Filter>;
+	StreamingChannel?: InputMaybe<StreamingChannel_Filter>;
+	TableauHostMapping?: InputMaybe<TableauHostMapping_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__History?: InputMaybe<Tenant__History_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	Topic?: InputMaybe<Topic_Filter>;
+	TopicAssignment?: InputMaybe<TopicAssignment_Filter>;
+	Translation?: InputMaybe<Translation_Filter>;
+	UnstructuredStorageSpace?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	User?: InputMaybe<User_Filter>;
+	UserAppMenuItem?: InputMaybe<UserAppMenuItem_Filter>;
+	UserDefinedLabel?: InputMaybe<UserDefinedLabel_Filter>;
+	UserDefinedLabelAssignment?: InputMaybe<UserDefinedLabelAssignment_Filter>;
+	UserHistory?: InputMaybe<UserHistory_Filter>;
+	UserLocalWebServerIdentity?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	UserRole?: InputMaybe<UserRole_Filter>;
+	UserSharedFeature?: InputMaybe<UserSharedFeature_Filter>;
+	WorkBadgeDefinitionHistory?: InputMaybe<WorkBadgeDefinitionHistory_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderHistory?: InputMaybe<WorkOrderHistory_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+	WorkOrderLineItemHistory?: InputMaybe<WorkOrderLineItemHistory_Filter>;
+};
+
+export type Kpi_Snapshot__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Kpi_Snapshot__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Previous_Month_Sales__c?: InputMaybe<CurrencyOperators>;
+	Sales_MoM_Change__c?: InputMaybe<PercentOperators>;
+	Snapshot_Date__c?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Total_Properties__c?: InputMaybe<DoubleOperators>;
+	Total_Sales_Amount__c?: InputMaybe<CurrencyOperators>;
+	Total_Sales_Count__c?: InputMaybe<DoubleOperators>;
+	Units_Available__c?: InputMaybe<DoubleOperators>;
+	Units_Occupied__c?: InputMaybe<DoubleOperators>;
+	and?: InputMaybe<Array<InputMaybe<Kpi_Snapshot__C_Filter>>>;
+	not?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Kpi_Snapshot__C_Filter>>>;
+};
+
+export type Kpi_Snapshot__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type LatitudeOperators = {
+	eq?: InputMaybe<Scalars["Latitude"]["input"]>;
+	gt?: InputMaybe<Scalars["Latitude"]["input"]>;
+	gte?: InputMaybe<Scalars["Latitude"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Latitude"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Latitude"]["input"]>;
+	lte?: InputMaybe<Scalars["Latitude"]["input"]>;
+	ne?: InputMaybe<Scalars["Latitude"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Latitude"]["input"]>>>;
+};
+
+export const LayoutComponentType = {
+	Canvas: "CANVAS",
+	CustomLink: "CUSTOM_LINK",
+	EmptySpace: "EMPTY_SPACE",
+	Field: "FIELD",
+	ReportChart: "REPORT_CHART",
+	VisualforcePage: "VISUALFORCE_PAGE",
+} as const;
+
+export type LayoutComponentType = (typeof LayoutComponentType)[keyof typeof LayoutComponentType];
+
+export const LayoutMode = {
+	Create: "CREATE",
+	Edit: "EDIT",
+	View: "VIEW",
+} as const;
+
+export type LayoutMode = (typeof LayoutMode)[keyof typeof LayoutMode];
+
+export const LayoutType = {
+	Compact: "COMPACT",
+	Full: "FULL",
+} as const;
+
+export type LayoutType = (typeof LayoutType)[keyof typeof LayoutType];
+
+export type LeadHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Lead?: InputMaybe<Lead_Filter>;
+	LeadId?: InputMaybe<IdOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<LeadHistory_Filter>>>;
+	not?: InputMaybe<LeadHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<LeadHistory_Filter>>>;
+};
+
+export type Lead_Filter = {
+	AnnualRevenue?: InputMaybe<CurrencyOperators>;
+	City?: InputMaybe<StringOperators>;
+	Company?: InputMaybe<StringOperators>;
+	ConvertedAccount?: InputMaybe<Account_Filter>;
+	ConvertedAccountId?: InputMaybe<IdOperators>;
+	ConvertedContact?: InputMaybe<Contact_Filter>;
+	ConvertedContactId?: InputMaybe<IdOperators>;
+	ConvertedDate?: InputMaybe<DateOperators>;
+	ConvertedOpportunity?: InputMaybe<Opportunity_Filter>;
+	ConvertedOpportunityId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	EmailBouncedDate?: InputMaybe<DateTimeOperators>;
+	EmailBouncedReason?: InputMaybe<StringOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Individual?: InputMaybe<Individual_Filter>;
+	IndividualId?: InputMaybe<IdOperators>;
+	Industry?: InputMaybe<PicklistOperators>;
+	IsConverted?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsUnreadByOwner?: InputMaybe<BooleanOperators>;
+	Jigsaw?: InputMaybe<StringOperators>;
+	JigsawContactId?: InputMaybe<StringOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	LeadSource?: InputMaybe<PicklistOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	MasterRecord?: InputMaybe<Lead_Filter>;
+	MasterRecordId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumberOfEmployees?: InputMaybe<IntegerOperators>;
+	Owner?: InputMaybe<Lead_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PhotoUrl?: InputMaybe<UrlOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	Rating?: InputMaybe<PicklistOperators>;
+	Salutation?: InputMaybe<PicklistOperators>;
+	State?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	Website?: InputMaybe<UrlOperators>;
+	and?: InputMaybe<Array<InputMaybe<Lead_Filter>>>;
+	not?: InputMaybe<Lead_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Lead_Filter>>>;
+};
+
+export type Lead_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Lease__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Lease__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Lease__History_Filter>>>;
+	not?: InputMaybe<Lease__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Lease__History_Filter>>>;
+};
+
+export type Lease__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	End_Date__c?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Lease_Status__c?: InputMaybe<PicklistOperators>;
+	Monthly_Rent__c?: InputMaybe<CurrencyOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	Security_Deposit__c?: InputMaybe<CurrencyOperators>;
+	Start_Date__c?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Tenant__c?: InputMaybe<IdOperators>;
+	Tenant__r?: InputMaybe<Tenant__C_Filter>;
+	and?: InputMaybe<Array<InputMaybe<Lease__C_Filter>>>;
+	not?: InputMaybe<Lease__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Lease__C_Filter>>>;
+};
+
+export type ListEmail_Filter = {
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignId?: InputMaybe<IdOperators>;
+	CcAddress?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FromAddress?: InputMaybe<LongTextAreaOperators>;
+	FromName?: InputMaybe<StringOperators>;
+	HasAttachment?: InputMaybe<BooleanOperators>;
+	HtmlBody?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsEmailArchiveRequired?: InputMaybe<BooleanOperators>;
+	IsSyntheticCcEnabled?: InputMaybe<BooleanOperators>;
+	IsTracked?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ListEmail_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	PardotAsset?: InputMaybe<StringOperators>;
+	PardotTenant?: InputMaybe<StringOperators>;
+	RelatedTo?: InputMaybe<ListEmail_RelatedTo_Filters>;
+	RelatedToId?: InputMaybe<IdOperators>;
+	ReplyToName?: InputMaybe<StringOperators>;
+	ScheduledDate?: InputMaybe<DateTimeOperators>;
+	SentVia?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Subject?: InputMaybe<LongTextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Template?: InputMaybe<EmailTemplate_Filter>;
+	TemplateId?: InputMaybe<IdOperators>;
+	TextBody?: InputMaybe<LongTextAreaOperators>;
+	TotalSent?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<ListEmail_Filter>>>;
+	not?: InputMaybe<ListEmail_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ListEmail_Filter>>>;
+};
+
+export type ListEmail_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ListEmail_RelatedTo_Filters = {
+	Case?: InputMaybe<Case_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type LocationHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationId?: InputMaybe<IdOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<LocationHistory_Filter>>>;
+	not?: InputMaybe<LocationHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<LocationHistory_Filter>>>;
+};
+
+export type LocationTrustMeasure_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	IconUrl?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsVisibleInPublic?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationExternalReference?: InputMaybe<StringOperators>;
+	LocationId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<LocationTrustMeasure_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<LocationTrustMeasure_Filter>>>;
+	not?: InputMaybe<LocationTrustMeasure_Filter>;
+	or?: InputMaybe<Array<InputMaybe<LocationTrustMeasure_Filter>>>;
+};
+
+export type LocationTrustMeasure_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Location_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	ExternalReference?: InputMaybe<StringOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsInventoryLocation?: InputMaybe<BooleanOperators>;
+	IsMobile?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LocationType?: InputMaybe<PicklistOperators>;
+	LogoId?: InputMaybe<IdOperators>;
+	Mobile?: InputMaybe<PhoneNumberOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Location_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	RootLocation?: InputMaybe<Location_Filter>;
+	RootLocationId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Location_Filter>>>;
+	not?: InputMaybe<Location_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Location_Filter>>>;
+};
+
+export type Location_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type LongOperators = {
+	eq?: InputMaybe<Scalars["Long"]["input"]>;
+	gt?: InputMaybe<Scalars["Long"]["input"]>;
+	gte?: InputMaybe<Scalars["Long"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Long"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Long"]["input"]>;
+	lte?: InputMaybe<Scalars["Long"]["input"]>;
+	ne?: InputMaybe<Scalars["Long"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Long"]["input"]>>>;
+};
+
+export type LongTextAreaOperators = {
+	eq?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	gt?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	gte?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["LongTextArea"]["input"]>>>;
+	like?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	lt?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	lte?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	ne?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["LongTextArea"]["input"]>>>;
+};
+
+export type LongitudeOperators = {
+	eq?: InputMaybe<Scalars["Longitude"]["input"]>;
+	gt?: InputMaybe<Scalars["Longitude"]["input"]>;
+	gte?: InputMaybe<Scalars["Longitude"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Longitude"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Longitude"]["input"]>;
+	lte?: InputMaybe<Scalars["Longitude"]["input"]>;
+	ne?: InputMaybe<Scalars["Longitude"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Longitude"]["input"]>>>;
+};
+
+export type Maintenance_Request__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Maintenance_Request__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Maintenance_Request__History_Filter>>>;
+	not?: InputMaybe<Maintenance_Request__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Maintenance_Request__History_Filter>>>;
+};
+
+export type Maintenance_Request__CUpdateInput = {
+	Id: Scalars["IdOrRef"]["input"];
+	Maintenance_Request__c: Maintenance_Request__CUpdateRepresentation;
+};
+
+export type Maintenance_Request__CUpdateRepresentation = {
+	Actual_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
+	Assigned_Worker__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Completed__c?: InputMaybe<Scalars["DateTime"]["input"]>;
+	Description__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
+	Est_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
+	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Priority__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+	Scheduled__c?: InputMaybe<Scalars["DateTime"]["input"]>;
+	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	Tenant_Home__c?: InputMaybe<Scalars["Boolean"]["input"]>;
+	Type__c?: InputMaybe<Scalars["Picklist"]["input"]>;
+	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
+};
+
+export type Maintenance_Request__C_Filter = {
+	Actual_Cost__c?: InputMaybe<CurrencyOperators>;
+	Assigned_Worker__c?: InputMaybe<IdOperators>;
+	Assigned_Worker__r?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Completed__c?: InputMaybe<DateTimeOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description__c?: InputMaybe<LongTextAreaOperators>;
+	Est_Cost__c?: InputMaybe<CurrencyOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Maintenance_Request__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Priority__c?: InputMaybe<PicklistOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	Scheduled__c?: InputMaybe<DateTimeOperators>;
+	Status__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Tenant_Home__c?: InputMaybe<BooleanOperators>;
+	Type__c?: InputMaybe<PicklistOperators>;
+	User__c?: InputMaybe<IdOperators>;
+	User__r?: InputMaybe<Tenant__C_Filter>;
+	and?: InputMaybe<Array<InputMaybe<Maintenance_Request__C_Filter>>>;
+	not?: InputMaybe<Maintenance_Request__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Maintenance_Request__C_Filter>>>;
+};
+
+export type Maintenance_Request__C_OrderBy = {
+	Actual_Cost__c?: InputMaybe<OrderByClause>;
+	Assigned_Worker__c?: InputMaybe<OrderByClause>;
+	Assigned_Worker__r?: InputMaybe<Maintenance_Worker__C_OrderBy>;
+	Completed__c?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Description__c?: InputMaybe<AggregateOrderByStringClause>;
+	Est_Cost__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Maintenance_Request__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Priority__c?: InputMaybe<OrderByClause>;
+	Property__c?: InputMaybe<OrderByClause>;
+	Property__r?: InputMaybe<Property__C_OrderBy>;
+	Scheduled__c?: InputMaybe<OrderByClause>;
+	Status__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Tenant_Home__c?: InputMaybe<OrderByClause>;
+	Type__c?: InputMaybe<OrderByClause>;
+	User__c?: InputMaybe<OrderByClause>;
+	User__r?: InputMaybe<Tenant__C_OrderBy>;
+};
+
+export type Maintenance_Request__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Maintenance_Request__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type Maintenance_Worker__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Maintenance_Worker__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Maintenance_Worker__History_Filter>>>;
+	not?: InputMaybe<Maintenance_Worker__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Maintenance_Worker__History_Filter>>>;
+};
+
+export type Maintenance_Worker__C_Filter = {
+	Certifications__c?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Employment_Type__c?: InputMaybe<PicklistOperators>;
+	Hourly_Rate__c?: InputMaybe<CurrencyOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive__c?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Location__c?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Maintenance_Worker__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone__c?: InputMaybe<PhoneNumberOperators>;
+	Rating__c?: InputMaybe<DoubleOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type__c?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Maintenance_Worker__C_Filter>>>;
+	not?: InputMaybe<Maintenance_Worker__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Maintenance_Worker__C_Filter>>>;
+};
+
+export type Maintenance_Worker__C_OrderBy = {
+	Certifications__c?: InputMaybe<AggregateOrderByStringClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Employment_Type__c?: InputMaybe<OrderByClause>;
+	Hourly_Rate__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsActive__c?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Location__c?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Maintenance_Worker__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Phone__c?: InputMaybe<OrderByClause>;
+	Rating__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Type__c?: InputMaybe<OrderByClause>;
+};
+
+export type Maintenance_Worker__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Maintenance_Worker__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type ManagedContentPublishedUrl_Filter = {
+	AssociatedCampaign?: InputMaybe<Campaign_Filter>;
+	AssociatedCampaignId?: InputMaybe<IdOperators>;
+	ContentKey?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	ManagedContent?: InputMaybe<ManagedContent_Filter>;
+	ManagedContentId?: InputMaybe<IdOperators>;
+	ManagedContentTypeId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	RedirectContent?: InputMaybe<ManagedContentPublishedUrl_Filter>;
+	RedirectContentId?: InputMaybe<IdOperators>;
+	RedirectUrl?: InputMaybe<LongTextAreaOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UrlAlias?: InputMaybe<StringOperators>;
+	UrlPreferenceIsDefault?: InputMaybe<BooleanOperators>;
+	and?: InputMaybe<Array<InputMaybe<ManagedContentPublishedUrl_Filter>>>;
+	not?: InputMaybe<ManagedContentPublishedUrl_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ManagedContentPublishedUrl_Filter>>>;
+};
+
+export type ManagedContentVariant_Filter = {
+	AltBodyMimeType?: InputMaybe<StringOperators>;
+	AltBodySize?: InputMaybe<IntegerOperators>;
+	ContentType?: InputMaybe<PicklistOperators>;
+	ContentTypeFullyQualifiedName?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	HasLocks?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	IsPublished?: InputMaybe<BooleanOperators>;
+	IsReady?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	ManagedContent?: InputMaybe<ManagedContent_Filter>;
+	ManagedContentId?: InputMaybe<IdOperators>;
+	ManagedContentKey?: InputMaybe<StringOperators>;
+	ManagedContentSpaceId?: InputMaybe<IdOperators>;
+	ManagedContentVariantStatus?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UrlName?: InputMaybe<StringOperators>;
+	VariantType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ManagedContentVariant_Filter>>>;
+	not?: InputMaybe<ManagedContentVariant_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ManagedContentVariant_Filter>>>;
+};
+
+export type ManagedContent_Filter = {
+	ApiName?: InputMaybe<StringOperators>;
+	AuthoredManagedContent?: InputMaybe<ManagedContent_Filter>;
+	AuthoredManagedContentId?: InputMaybe<IdOperators>;
+	AuthoredManagedContentSpaceId?: InputMaybe<IdOperators>;
+	BaseType?: InputMaybe<PicklistOperators>;
+	ContentKey?: InputMaybe<StringOperators>;
+	ContentType?: InputMaybe<PicklistOperators>;
+	ContentTypeFullyQualifiedName?: InputMaybe<StringOperators>;
+	ContentTypeInfoId?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ExternalId?: InputMaybe<StringOperators>;
+	FolderId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InternalPreferenceIsJsonStoreContent?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastPublishedVersionId?: InputMaybe<IdOperators>;
+	LastStagedVersionId?: InputMaybe<IdOperators>;
+	LatestVersionId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	PrimaryLanguage?: InputMaybe<PicklistOperators>;
+	SourceContext?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Template?: InputMaybe<ManagedContent_Filter>;
+	TemplateId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ManagedContent_Filter>>>;
+	not?: InputMaybe<ManagedContent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ManagedContent_Filter>>>;
+};
+
+export type MultiPicklistOperators = {
+	eq?: InputMaybe<Scalars["MultiPicklist"]["input"]>;
+	excludes?: InputMaybe<Array<InputMaybe<Scalars["MultiPicklist"]["input"]>>>;
+	includes?: InputMaybe<Array<InputMaybe<Scalars["MultiPicklist"]["input"]>>>;
+	ne?: InputMaybe<Scalars["MultiPicklist"]["input"]>;
+};
+
+export type Name_Filter = {
+	Alias?: InputMaybe<StringOperators>;
+	CommunityNickname?: InputMaybe<StringOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NameOrAlias?: InputMaybe<StringOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	Profile?: InputMaybe<Profile_Filter>;
+	ProfileId?: InputMaybe<IdOperators>;
+	RecordType?: InputMaybe<RecordType_Filter>;
+	RecordTypeId?: InputMaybe<IdOperators>;
+	Title?: InputMaybe<StringOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	UserRole?: InputMaybe<UserRole_Filter>;
+	UserRoleId?: InputMaybe<IdOperators>;
+	Username?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<Name_Filter>>>;
+	not?: InputMaybe<Name_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Name_Filter>>>;
+};
+
+export type Name_OrderBy = {
+	Alias?: InputMaybe<OrderByClause>;
+	CommunityNickname?: InputMaybe<OrderByClause>;
+	Email?: InputMaybe<OrderByClause>;
+	FirstName?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsActive?: InputMaybe<OrderByClause>;
+	LastName?: InputMaybe<OrderByClause>;
+	LastReferencedDate?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	NameOrAlias?: InputMaybe<OrderByClause>;
+	Phone?: InputMaybe<OrderByClause>;
+	Profile?: InputMaybe<Profile_OrderBy>;
+	ProfileId?: InputMaybe<OrderByClause>;
+	RecordType?: InputMaybe<RecordType_OrderBy>;
+	RecordTypeId?: InputMaybe<OrderByClause>;
+	Title?: InputMaybe<OrderByClause>;
+	Type?: InputMaybe<OrderByClause>;
+	UserRole?: InputMaybe<UserRole_OrderBy>;
+	UserRoleId?: InputMaybe<OrderByClause>;
+	Username?: InputMaybe<OrderByClause>;
+};
+
+export type NoFunctionAggregateOrderByClause = {
+	nulls?: InputMaybe<NullsOrder>;
+	order?: InputMaybe<ResultsOrder>;
+};
+
+export type Note_Filter = {
+	Body?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrivate?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Note_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<Note_Filter>>>;
+	not?: InputMaybe<Note_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Note_Filter>>>;
+};
+
+export type Note_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type Notification__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Is_Read__c?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Message__c?: InputMaybe<LongTextAreaOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Notification__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Priority__c?: InputMaybe<PicklistOperators>;
+	Related_Object_Type__c?: InputMaybe<StringOperators>;
+	Related_Record_Id__c?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Title__c?: InputMaybe<StringOperators>;
+	Type__c?: InputMaybe<PicklistOperators>;
+	User__c?: InputMaybe<IdOperators>;
+	User__r?: InputMaybe<User_Filter>;
+	and?: InputMaybe<Array<InputMaybe<Notification__C_Filter>>>;
+	not?: InputMaybe<Notification__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Notification__C_Filter>>>;
+};
+
+export type Notification__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export const NullOrder = {
+	First: "FIRST",
+	Last: "LAST",
+} as const;
+
+export type NullOrder = (typeof NullOrder)[keyof typeof NullOrder];
+
+export const NullsOrder = {
+	First: "FIRST",
+	Last: "LAST",
+} as const;
+
+export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder];
+
+export type ObjectPermissions_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Parent?: InputMaybe<PermissionSet_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	PermissionsCreate?: InputMaybe<BooleanOperators>;
+	PermissionsDelete?: InputMaybe<BooleanOperators>;
+	PermissionsEdit?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAllRecords?: InputMaybe<BooleanOperators>;
+	PermissionsRead?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllFields?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllRecords?: InputMaybe<BooleanOperators>;
+	SobjectType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ObjectPermissions_Filter>>>;
+	not?: InputMaybe<ObjectPermissions_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ObjectPermissions_Filter>>>;
+};
+
+export type OpportunityContactRole_Filter = {
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityContactRole_Filter>>>;
+	not?: InputMaybe<OpportunityContactRole_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityContactRole_Filter>>>;
+};
+
+export type OpportunityFieldHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityFieldHistory_Filter>>>;
+	not?: InputMaybe<OpportunityFieldHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityFieldHistory_Filter>>>;
+};
+
+export type OpportunityHistory_Filter = {
+	Amount?: InputMaybe<CurrencyOperators>;
+	CloseDate?: InputMaybe<DateOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ExpectedRevenue?: InputMaybe<CurrencyOperators>;
+	ForecastCategory?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	PrevAmount?: InputMaybe<CurrencyOperators>;
+	PrevCloseDate?: InputMaybe<DateOperators>;
+	Probability?: InputMaybe<PercentOperators>;
+	StageName?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityHistory_Filter>>>;
+	not?: InputMaybe<OpportunityHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityHistory_Filter>>>;
+};
+
+export type OpportunityLineItem_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	ListPrice?: InputMaybe<CurrencyOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	PricebookEntryId?: InputMaybe<IdOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	ProductCode?: InputMaybe<StringOperators>;
+	Quantity?: InputMaybe<DoubleOperators>;
+	ServiceDate?: InputMaybe<DateOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalPrice?: InputMaybe<CurrencyOperators>;
+	UnitPrice?: InputMaybe<CurrencyOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityLineItem_Filter>>>;
+	not?: InputMaybe<OpportunityLineItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityLineItem_Filter>>>;
+};
+
+export type OpportunityPartner_Filter = {
+	AccountTo?: InputMaybe<Account_Filter>;
+	AccountToId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	ReversePartnerId?: InputMaybe<IdOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityPartner_Filter>>>;
+	not?: InputMaybe<OpportunityPartner_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityPartner_Filter>>>;
+};
+
+export type OpportunityRelatedDeleteLog_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DeleteLog?: InputMaybe<StringOperators>;
+	FieldName?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<StringOperators>;
+	SobjectType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<OpportunityRelatedDeleteLog_Filter>>>;
+	not?: InputMaybe<OpportunityRelatedDeleteLog_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OpportunityRelatedDeleteLog_Filter>>>;
+};
+
+export type Opportunity_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	Amount?: InputMaybe<CurrencyOperators>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignId?: InputMaybe<IdOperators>;
+	CloseDate?: InputMaybe<DateOperators>;
+	ContactId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Fiscal?: InputMaybe<StringOperators>;
+	FiscalQuarter?: InputMaybe<IntegerOperators>;
+	FiscalYear?: InputMaybe<IntegerOperators>;
+	ForecastCategory?: InputMaybe<PicklistOperators>;
+	ForecastCategoryName?: InputMaybe<PicklistOperators>;
+	HasOpenActivity?: InputMaybe<BooleanOperators>;
+	HasOpportunityLineItem?: InputMaybe<BooleanOperators>;
+	HasOverdueTask?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsWon?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastAmountChangedHistory?: InputMaybe<OpportunityHistory_Filter>;
+	LastAmountChangedHistoryId?: InputMaybe<IdOperators>;
+	LastCloseDateChangedHistory?: InputMaybe<OpportunityHistory_Filter>;
+	LastCloseDateChangedHistoryId?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastStageChangeDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LeadSource?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NextStep?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<User_Filter>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2Id?: InputMaybe<IdOperators>;
+	Probability?: InputMaybe<PercentOperators>;
+	PushCount?: InputMaybe<IntegerOperators>;
+	StageName?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Opportunity_Filter>>>;
+	not?: InputMaybe<Opportunity_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Opportunity_Filter>>>;
+};
+
+export type OrderByClause = {
+	nulls?: InputMaybe<NullOrder>;
+	order?: InputMaybe<ResultOrder>;
+};
+
+export type OrderHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<OrderHistory_Filter>>>;
+	not?: InputMaybe<OrderHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OrderHistory_Filter>>>;
+};
+
+export type OrderItemHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	OrderItemId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<OrderItemHistory_Filter>>>;
+	not?: InputMaybe<OrderItemHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OrderItemHistory_Filter>>>;
+};
+
+export type OrderItem_Filter = {
+	AvailableQuantity?: InputMaybe<DoubleOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	EndDate?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	ListPrice?: InputMaybe<CurrencyOperators>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderId?: InputMaybe<IdOperators>;
+	OrderItemNumber?: InputMaybe<StringOperators>;
+	OriginalOrderItem?: InputMaybe<OrderItem_Filter>;
+	OriginalOrderItemId?: InputMaybe<IdOperators>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	PricebookEntryId?: InputMaybe<IdOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	Quantity?: InputMaybe<DoubleOperators>;
+	ServiceDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalPrice?: InputMaybe<CurrencyOperators>;
+	UnitPrice?: InputMaybe<CurrencyOperators>;
+	and?: InputMaybe<Array<InputMaybe<OrderItem_Filter>>>;
+	not?: InputMaybe<OrderItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OrderItem_Filter>>>;
+};
+
+export type Order_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	ActivatedBy?: InputMaybe<User_Filter>;
+	ActivatedById?: InputMaybe<IdOperators>;
+	ActivatedDate?: InputMaybe<DateTimeOperators>;
+	BillingCity?: InputMaybe<StringOperators>;
+	BillingCountry?: InputMaybe<StringOperators>;
+	BillingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	BillingLatitude?: InputMaybe<LatitudeOperators>;
+	BillingLongitude?: InputMaybe<LongitudeOperators>;
+	BillingPostalCode?: InputMaybe<StringOperators>;
+	BillingState?: InputMaybe<StringOperators>;
+	BillingStreet?: InputMaybe<TextAreaOperators>;
+	CompanyAuthorizedBy?: InputMaybe<User_Filter>;
+	CompanyAuthorizedById?: InputMaybe<IdOperators>;
+	Contract?: InputMaybe<Contract_Filter>;
+	ContractId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	CustomerAuthorizedBy?: InputMaybe<Contact_Filter>;
+	CustomerAuthorizedById?: InputMaybe<IdOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	EffectiveDate?: InputMaybe<DateOperators>;
+	EndDate?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsReductionOrder?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	OrderNumber?: InputMaybe<StringOperators>;
+	OriginalOrder?: InputMaybe<Order_Filter>;
+	OriginalOrderId?: InputMaybe<IdOperators>;
+	Owner?: InputMaybe<Order_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2Id?: InputMaybe<IdOperators>;
+	ShippingCity?: InputMaybe<StringOperators>;
+	ShippingCountry?: InputMaybe<StringOperators>;
+	ShippingGeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	ShippingLatitude?: InputMaybe<LatitudeOperators>;
+	ShippingLongitude?: InputMaybe<LongitudeOperators>;
+	ShippingPostalCode?: InputMaybe<StringOperators>;
+	ShippingState?: InputMaybe<StringOperators>;
+	ShippingStreet?: InputMaybe<TextAreaOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusCode?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalAmount?: InputMaybe<CurrencyOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Order_Filter>>>;
+	not?: InputMaybe<Order_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Order_Filter>>>;
+};
+
+export type Order_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type OrgMetricScanSummary_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ErrorMessage?: InputMaybe<PicklistOperators>;
+	FeatureLimit?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	ImplementationEffort?: InputMaybe<PicklistOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	ItemCount?: InputMaybe<IntegerOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OrgMetric?: InputMaybe<OrgMetric_Filter>;
+	OrgMetricId?: InputMaybe<IdOperators>;
+	PercentUsage?: InputMaybe<PercentOperators>;
+	ScanDate?: InputMaybe<DateTimeOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Unit?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<OrgMetricScanSummary_Filter>>>;
+	not?: InputMaybe<OrgMetricScanSummary_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OrgMetricScanSummary_Filter>>>;
+};
+
+export type OrgMetric_Filter = {
+	Category?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FeatureType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LatestOrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	LatestOrgMetricScanSummaryId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<OrgMetric_Filter>>>;
+	not?: InputMaybe<OrgMetric_Filter>;
+	or?: InputMaybe<Array<InputMaybe<OrgMetric_Filter>>>;
+};
+
+export type Organization_Filter = {
+	City?: InputMaybe<StringOperators>;
+	ComplianceBccEmail?: InputMaybe<EmailOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefaultAccountAccess?: InputMaybe<PicklistOperators>;
+	DefaultCalendarAccess?: InputMaybe<PicklistOperators>;
+	DefaultCampaignAccess?: InputMaybe<PicklistOperators>;
+	DefaultCaseAccess?: InputMaybe<PicklistOperators>;
+	DefaultContactAccess?: InputMaybe<PicklistOperators>;
+	DefaultLeadAccess?: InputMaybe<PicklistOperators>;
+	DefaultLocaleSidKey?: InputMaybe<PicklistOperators>;
+	DefaultOpportunityAccess?: InputMaybe<PicklistOperators>;
+	DefaultPricebookAccess?: InputMaybe<PicklistOperators>;
+	DelegatedAuthenticationServiceUrl?: InputMaybe<UrlOperators>;
+	Division?: InputMaybe<StringOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	FiscalYearStartMonth?: InputMaybe<IntegerOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InstanceName?: InputMaybe<StringOperators>;
+	IsReadOnly?: InputMaybe<BooleanOperators>;
+	IsSandbox?: InputMaybe<BooleanOperators>;
+	LanguageLocaleKey?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	MonthlyPageViewsEntitlement?: InputMaybe<IntegerOperators>;
+	MonthlyPageViewsUsed?: InputMaybe<IntegerOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	NumKnowledgeService?: InputMaybe<IntegerOperators>;
+	OrganizationType?: InputMaybe<PicklistOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	PreferencesAutoSelectIndividualOnMerge?: InputMaybe<BooleanOperators>;
+	PreferencesConsentManagementEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesDeleteMonitoringDataEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesEnhancedEmailEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesLightningLoginEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesManyWhoPreference?: InputMaybe<BooleanOperators>;
+	PreferencesOnlyLLPermUserAllowed?: InputMaybe<BooleanOperators>;
+	PreferencesPathAssistantsEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesRequireOpportunityProducts?: InputMaybe<BooleanOperators>;
+	PreferencesRetainLoginHints?: InputMaybe<BooleanOperators>;
+	PreferencesS1DesktopEnabled?: InputMaybe<BooleanOperators>;
+	PreferencesS1EncryptedStoragePref2?: InputMaybe<BooleanOperators>;
+	PreferencesS1OfflinePref?: InputMaybe<BooleanOperators>;
+	PreferencesShowTM2EnabledBanner?: InputMaybe<BooleanOperators>;
+	PreferencesSkipProvWizardWelcome?: InputMaybe<BooleanOperators>;
+	PreferencesSocialProfilesEnable?: InputMaybe<BooleanOperators>;
+	PreferencesTerritoryManagement2Enable?: InputMaybe<BooleanOperators>;
+	PreferencesUsePathCollapsedUserPref?: InputMaybe<BooleanOperators>;
+	PreferencesUserSwitching?: InputMaybe<BooleanOperators>;
+	PrimaryContact?: InputMaybe<StringOperators>;
+	ReceivesAdminInfoEmails?: InputMaybe<BooleanOperators>;
+	ReceivesInfoEmails?: InputMaybe<BooleanOperators>;
+	SignupCountryIsoCode?: InputMaybe<StringOperators>;
+	State?: InputMaybe<StringOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TimeZoneSidKey?: InputMaybe<PicklistOperators>;
+	TrialExpirationDate?: InputMaybe<DateTimeOperators>;
+	UiSkin?: InputMaybe<PicklistOperators>;
+	UsesStartDateAsFiscalYearName?: InputMaybe<BooleanOperators>;
+	WebToCaseDefaultOrigin?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<Organization_Filter>>>;
+	not?: InputMaybe<Organization_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Organization_Filter>>>;
+};
+
+export type Organization_OrderBy = {
+	City?: InputMaybe<OrderByClause>;
+	ComplianceBccEmail?: InputMaybe<OrderByClause>;
+	Country?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	DefaultAccountAccess?: InputMaybe<OrderByClause>;
+	DefaultCalendarAccess?: InputMaybe<OrderByClause>;
+	DefaultCampaignAccess?: InputMaybe<OrderByClause>;
+	DefaultCaseAccess?: InputMaybe<OrderByClause>;
+	DefaultContactAccess?: InputMaybe<OrderByClause>;
+	DefaultLeadAccess?: InputMaybe<OrderByClause>;
+	DefaultLocaleSidKey?: InputMaybe<OrderByClause>;
+	DefaultOpportunityAccess?: InputMaybe<OrderByClause>;
+	DefaultPricebookAccess?: InputMaybe<OrderByClause>;
+	DelegatedAuthenticationServiceUrl?: InputMaybe<OrderByClause>;
+	Division?: InputMaybe<OrderByClause>;
+	Fax?: InputMaybe<OrderByClause>;
+	FiscalYearStartMonth?: InputMaybe<OrderByClause>;
+	GeocodeAccuracy?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	InstanceName?: InputMaybe<OrderByClause>;
+	IsReadOnly?: InputMaybe<OrderByClause>;
+	IsSandbox?: InputMaybe<OrderByClause>;
+	LanguageLocaleKey?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Latitude?: InputMaybe<OrderByClause>;
+	Longitude?: InputMaybe<OrderByClause>;
+	MonthlyPageViewsEntitlement?: InputMaybe<OrderByClause>;
+	MonthlyPageViewsUsed?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	NamespacePrefix?: InputMaybe<OrderByClause>;
+	NumKnowledgeService?: InputMaybe<OrderByClause>;
+	OrganizationType?: InputMaybe<OrderByClause>;
+	Phone?: InputMaybe<OrderByClause>;
+	PostalCode?: InputMaybe<OrderByClause>;
+	PreferencesAutoSelectIndividualOnMerge?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesConsentManagementEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesDeleteMonitoringDataEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesEnhancedEmailEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesLightningLoginEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesManyWhoPreference?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesOnlyLLPermUserAllowed?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesPathAssistantsEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesRequireOpportunityProducts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesRetainLoginHints?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesS1DesktopEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesS1EncryptedStoragePref2?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesS1OfflinePref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesShowTM2EnabledBanner?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesSkipProvWizardWelcome?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesSocialProfilesEnable?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesTerritoryManagement2Enable?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesUsePathCollapsedUserPref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PreferencesUserSwitching?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PrimaryContact?: InputMaybe<OrderByClause>;
+	ReceivesAdminInfoEmails?: InputMaybe<OrderByClause>;
+	ReceivesInfoEmails?: InputMaybe<OrderByClause>;
+	SignupCountryIsoCode?: InputMaybe<OrderByClause>;
+	State?: InputMaybe<OrderByClause>;
+	Street?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	TimeZoneSidKey?: InputMaybe<OrderByClause>;
+	TrialExpirationDate?: InputMaybe<OrderByClause>;
+	UiSkin?: InputMaybe<OrderByClause>;
+	UsesStartDateAsFiscalYearName?: InputMaybe<OrderByClause>;
+	WebToCaseDefaultOrigin?: InputMaybe<OrderByClause>;
+};
+
+export type Partner_Filter = {
+	AccountFrom?: InputMaybe<Account_Filter>;
+	AccountFromId?: InputMaybe<IdOperators>;
+	AccountTo?: InputMaybe<Account_Filter>;
+	AccountToId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsPrimary?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	OpportunityId?: InputMaybe<IdOperators>;
+	ReversePartnerId?: InputMaybe<IdOperators>;
+	Role?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Partner_Filter>>>;
+	not?: InputMaybe<Partner_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Partner_Filter>>>;
+};
+
+export type PartyConsentHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	PartyConsentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<PartyConsentHistory_Filter>>>;
+	not?: InputMaybe<PartyConsentHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PartyConsentHistory_Filter>>>;
+};
+
+export type PartyConsent_Filter = {
+	Action?: InputMaybe<PicklistOperators>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	BusinessBrandId?: InputMaybe<IdOperators>;
+	CaptureContactPointType?: InputMaybe<PicklistOperators>;
+	CaptureDate?: InputMaybe<DateTimeOperators>;
+	CaptureSource?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DataUsePurposeId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<PartyConsent_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	PartyRole?: InputMaybe<PartyConsent_PartyRole_Filters>;
+	PartyRoleId?: InputMaybe<IdOperators>;
+	PrivacyConsentStatus?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<PartyConsent_Filter>>>;
+	not?: InputMaybe<PartyConsent_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PartyConsent_Filter>>>;
+};
+
+export type PartyConsent_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type PartyConsent_PartyRole_Filters = {
+	Customer?: InputMaybe<Customer_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+};
+
+export type Payment__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Payment__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Payment__History_Filter>>>;
+	not?: InputMaybe<Payment__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Payment__History_Filter>>>;
+};
+
+export type Payment__C_Filter = {
+	Amount__c?: InputMaybe<CurrencyOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Lease__c?: InputMaybe<IdOperators>;
+	Lease__r?: InputMaybe<Lease__C_Filter>;
+	Name?: InputMaybe<StringOperators>;
+	Notes__c?: InputMaybe<LongTextAreaOperators>;
+	Payment_Date__c?: InputMaybe<DateOperators>;
+	Payment_Method__c?: InputMaybe<PicklistOperators>;
+	Payment_Status__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Payment__C_Filter>>>;
+	not?: InputMaybe<Payment__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Payment__C_Filter>>>;
+};
+
+export type PercentOperators = {
+	eq?: InputMaybe<Scalars["Percent"]["input"]>;
+	gt?: InputMaybe<Scalars["Percent"]["input"]>;
+	gte?: InputMaybe<Scalars["Percent"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Percent"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Percent"]["input"]>;
+	lte?: InputMaybe<Scalars["Percent"]["input"]>;
+	ne?: InputMaybe<Scalars["Percent"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Percent"]["input"]>>>;
+};
+
+export type Period_Filter = {
+	EndDate?: InputMaybe<DateOperators>;
+	FiscalYearSettingsId?: InputMaybe<IdOperators>;
+	FullyQualifiedLabel?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsForecastPeriod?: InputMaybe<BooleanOperators>;
+	Number?: InputMaybe<IntegerOperators>;
+	PeriodLabel?: InputMaybe<PicklistOperators>;
+	QuarterLabel?: InputMaybe<PicklistOperators>;
+	StartDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Period_Filter>>>;
+	not?: InputMaybe<Period_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Period_Filter>>>;
+};
+
+export type PermissionSetGroup_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	HasActivationRequired?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<PermissionSetGroup_Filter>>>;
+	not?: InputMaybe<PermissionSetGroup_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PermissionSetGroup_Filter>>>;
+};
+
+export type PermissionSetLicense_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	ExpirationDate?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAvailableForIntegrations?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsSupplementLicense?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LicenseExpirationPolicy?: InputMaybe<PicklistOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	MaximumPermissionsAcceptInboundBundling?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessBankingRelationshipAssistance?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessBankingServiceAgent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessCMC?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessContentBuilder?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessDisputePrompts?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessOrchestrationObjects?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessPolicyAgent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessServiceEinstein?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessSfDrive?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessToComplaintAgent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessToComplaintMgmt?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessToDisputeManagement?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessToServiceProcess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccessWealthAdvisorAgent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAccountSwitcherUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsActivateContract?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsActivateOrder?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsActivateSystemModeFlows?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsActivitiesAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAddDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAdvancedCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAgentforceServiceAgentUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAllowEmailIC?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAllowLightningLogin?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAllowViewEditConvertedLeads?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsApexRestServices?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsApiEnabled?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsApiUserOnly?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAppFrameworkManageApp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAppFrameworkManageTemplate?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAppFrameworkViewApp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsApprovalAdmin?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsApprovalDesigner?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAssignPermissionSets?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAssignTopics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAttributionModelUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsAuthorApex?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsB2BMarketingAnalyticsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsBulkApiHardDelete?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsBypassMFAForUiLogins?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCMSECEAuthoringAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCampaignInfluence2?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanApproveFeedPost?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanApproveUninstalledApps?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanDoActAsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanEditPrompts?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanInsertFeedSystemFields?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanTranslateScrt2Conversation?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanUpdateEmailMessage?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanUseNewDashboardBuilder?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanVerifyComment?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCanWriteWithAiScrt2Conversation?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCdcReportingCreateReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCdcReportingManageFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCdcReportingViewReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChangeDashboardColors?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterComposeUiCodesnippet?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterEditOwnPost?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterEditOwnRecordPost?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterFileLink?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterInternalUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterInviteExternalUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsChatterOwnGroups?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsClientSecretRotation?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCloseConversations?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsConfigCustomRecs?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsConfigureDataspaceScope?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsConnectOrgToEnvironmentHub?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsConsentApiUpdate?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsContentAdministrator?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsContentHubUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsContentWorkspaces?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsConvertLeads?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateCustomizeDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateCustomizeFilters?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateCustomizeReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateDashboardFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateLtngTempFolder?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateLtngTempInPub?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreatePackaging?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateReportFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateReportInLightning?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateTopics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateWorkBadgeDefinition?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCreateWorkspaces?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCustomAppsOnFSMobile?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCustomMobileAppsAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCustomSidebarOnAllPages?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsCustomizeApplication?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDataExport?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDelegatedTwoFactor?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDeleteActivatedContract?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDeleteCrMemoAndInvoice?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDeleteSalesforceFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDeleteTopics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDigitalLendingAdminUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDigitalLendingEditReadOnly?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDigitalLendingUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDigitalLendingWorkbench?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDistributeFromPersWksp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDownloadMaliciousFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsDownloadPackageVersionZips?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditActivatedOrders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditBillingInfo?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditBrandTemplates?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditCaseComments?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditEvent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditHtmlTemplates?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditMyDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditMyReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditOppLineItemUnitPrice?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditPublicDocuments?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditPublicFilters?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditPublicTemplates?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditReadonlyFields?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditTask?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEditTopics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEmailAdministration?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEmailMass?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEmailSingle?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEmailTemplateManagement?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEnableBCTransactionPolling?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEnableCommunityAppLauncher?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEnableIPFSUpload?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEnableNotifications?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEngagementConfigUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsEnhancedSalesMobileExp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsExportReport?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsExternalClientAppAdmin?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsExternalClientAppDeveloper?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsExternalClientAppViewer?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsFSCArcGraphCommunityUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsFeedPinning?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsFlowUFLRequired?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsForceTwoFactor?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsFreezeUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsGiveRecognitionBadge?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsGovernNetworks?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsGrantOutboundBundling?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsHasUnlimitedNBAExecutions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsHeadlessCMSAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsHeadlessPublishNudges?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsHideReadByList?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIdentityConnect?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIdentityEnabled?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsImportCustomObjects?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsImportLeads?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsImportPersonal?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsInboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsInstallPackaging?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIntelligentDocumentProcessing?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIsSsoEnabled?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIsotopeAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIsotopeCToCUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsIsotopeLEX?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsKGERMultiArticlesUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLMEndMessagingSessionUserPerm?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLMOutboundMessagingUserPerm?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLightningConsoleAllowedForUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLightningExperienceUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsListEmailSend?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLobbyManagementUserAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsLtngPromoReserved01UserPerm?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMCPMetadataApi?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageAccessPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageAgentforceServiceAgent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageAnalyticSnapshots?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageApiNamedQueries?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageAuthProviders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageBusinessHourHolidays?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageC360AConnections?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCMS?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCallCenters?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCases?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCategories?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCdpMlModels?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCertificates?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCertificatesExpiration?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageChatterMessages?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageContentPermissions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageContentProperties?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageContentTaxonomy?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageContentTypes?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCustomDomains?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCustomPermissions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageCustomReportTypes?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageDashbdsInPubFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageDataCategories?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageDataIntegrations?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageDataspaceScope?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageDynamicDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageEmailClientConfig?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageExchangeConfig?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageExternalConnections?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageFilesAndAttachments?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageForecastingCustomData?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageHealthCheck?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageHerokuAppLink?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageHubConnections?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageIntegrationConnections?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageInteraction?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageInternalUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageIpAddresses?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageLeads?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageNetworks?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageOrchestrationRuns?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManagePasswordPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageProfilesPermissionsets?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManagePropositions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManagePvtRptsAndDashbds?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageQuotas?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageRecommendationStrategies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageReleaseUpdates?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageRemoteAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageReportsInPubFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageRoles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSessionPermissionSets?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSharedListViews?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSharing?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSocialPosting?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSolutions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSubscriptions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSurveys?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageSynonyms?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageTrustMeasures?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageTwoFactor?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageUnlistedGroups?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMassInlineEdit?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMeetingEngagementUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMergeTopics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyAllData?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyDataClassification?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModifyMetadata?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMonitorLoginHistory?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsNativeWebviewScrolling?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsNewReportBuilder?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsOutboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsOverrideForecasts?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPackaging2?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPackaging2Delete?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPasswordNeverExpires?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPersonalizationDecisioningUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPersonalizationIntelUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPersonalizationPlatform?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPersonalizedFinanceUserAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPreventClassicExperience?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPrismBackofficeUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPrismPlaygroundUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPrivacyDataAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPrmExtIntPrtnrAdminUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsPublishPackaging?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsQrCodeGeneratorMobilePublisherPlayground?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsQueryAllFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsQueryNonVetoedFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsQuipMetricsAccess?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsQuipUserEngagementMetrics?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsReassignOrchestrationWorkItems?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsRegrelloUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsRemoveDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsResetPasswords?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsRunFlow?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsRunReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSalesInsightsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSandboxTestingInCommunityApp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsScheduleJob?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsScheduleReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSegmentIntelligenceUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSelectFilesFromSalesforce?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSolutionImport?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsStageManagementDesignUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeDashboardRolesGrps?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeDashboardToOtherUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeReportRolesGrps?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeReportToOtherUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeReportsRunAsUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeToLightningDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsSubscribeToLightningReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTerritoryOperations?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTraceXdsQueries?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTransactionalEmailSend?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTransferAnyCase?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTransferAnyEntity?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTransferAnyLead?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsTwoFactorApi?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUpdateReportTypeReferences?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseAnyApiAuth?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseAssistantDialog?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseMySearch?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseQuerySuggestions?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseRestrictedTheme?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseServicePartReturn?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseSetupWithAgentforce?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseTeamReassignWizards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseTeamsForEmployee?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseTeamsForItSrvcs?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUseWebLink?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUserCanDeployStore?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsUserInteractionInsights?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAccessPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllActivities?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllCustomSettings?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllData?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllFieldsGlobal?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllForecasts?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllForeignKeyNames?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllProfiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewAllUsers?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewApiNamedQueries?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewContent?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewMyTeamsDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewOrchestrationsInAutomApp?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewPrivateStaticResources?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewPublicCapstoneFolders?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewPublicDashboards?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewPublicReports?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewRecommendations?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewRestrictionAndScopingRules?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewRoles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewSetup?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewTrustMeasures?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewUserPII?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsYourAccountCDAPublishEvents?: InputMaybe<BooleanOperators>;
+	MigratableLicenses?: InputMaybe<IntegerOperators>;
+	PermissionSetLicenseKey?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalLicenses?: InputMaybe<IntegerOperators>;
+	UsedLicenses?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<PermissionSetLicense_Filter>>>;
+	not?: InputMaybe<PermissionSetLicense_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PermissionSetLicense_Filter>>>;
+};
+
+export type PermissionSet_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	HasActivationRequired?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsCustom?: InputMaybe<BooleanOperators>;
+	IsOwnedByProfile?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	License?: InputMaybe<PermissionSet_License_Filters>;
+	LicenseId?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	PermissionSetGroup?: InputMaybe<PermissionSetGroup_Filter>;
+	PermissionSetGroupId?: InputMaybe<IdOperators>;
+	PermissionsAcceptInboundBundling?: InputMaybe<BooleanOperators>;
+	PermissionsAccessBankingRelationshipAssistance?: InputMaybe<BooleanOperators>;
+	PermissionsAccessBankingServiceAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessCMC?: InputMaybe<BooleanOperators>;
+	PermissionsAccessContentBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsAccessDisputePrompts?: InputMaybe<BooleanOperators>;
+	PermissionsAccessOrchestrationObjects?: InputMaybe<BooleanOperators>;
+	PermissionsAccessPolicyAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessServiceEinstein?: InputMaybe<BooleanOperators>;
+	PermissionsAccessSfDrive?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToComplaintAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToComplaintMgmt?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToDisputeManagement?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToServiceProcess?: InputMaybe<BooleanOperators>;
+	PermissionsAccessWealthAdvisorAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccountSwitcherUser?: InputMaybe<BooleanOperators>;
+	PermissionsActivateContract?: InputMaybe<BooleanOperators>;
+	PermissionsActivateOrder?: InputMaybe<BooleanOperators>;
+	PermissionsActivateSystemModeFlows?: InputMaybe<BooleanOperators>;
+	PermissionsActivitiesAccess?: InputMaybe<BooleanOperators>;
+	PermissionsAddDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	PermissionsAdvancedCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	PermissionsAgentforceServiceAgentUser?: InputMaybe<BooleanOperators>;
+	PermissionsAllowEmailIC?: InputMaybe<BooleanOperators>;
+	PermissionsAllowLightningLogin?: InputMaybe<BooleanOperators>;
+	PermissionsAllowViewEditConvertedLeads?: InputMaybe<BooleanOperators>;
+	PermissionsApexRestServices?: InputMaybe<BooleanOperators>;
+	PermissionsApiEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsApiUserOnly?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkManageApp?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkManageTemplate?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkViewApp?: InputMaybe<BooleanOperators>;
+	PermissionsApprovalAdmin?: InputMaybe<BooleanOperators>;
+	PermissionsApprovalDesigner?: InputMaybe<BooleanOperators>;
+	PermissionsAssignPermissionSets?: InputMaybe<BooleanOperators>;
+	PermissionsAssignTopics?: InputMaybe<BooleanOperators>;
+	PermissionsAttributionModelUser?: InputMaybe<BooleanOperators>;
+	PermissionsAuthorApex?: InputMaybe<BooleanOperators>;
+	PermissionsB2BMarketingAnalyticsUser?: InputMaybe<BooleanOperators>;
+	PermissionsBulkApiHardDelete?: InputMaybe<BooleanOperators>;
+	PermissionsBypassMFAForUiLogins?: InputMaybe<BooleanOperators>;
+	PermissionsCMSECEAuthoringAccess?: InputMaybe<BooleanOperators>;
+	PermissionsCampaignInfluence2?: InputMaybe<BooleanOperators>;
+	PermissionsCanApproveFeedPost?: InputMaybe<BooleanOperators>;
+	PermissionsCanApproveUninstalledApps?: InputMaybe<BooleanOperators>;
+	PermissionsCanDoActAsUser?: InputMaybe<BooleanOperators>;
+	PermissionsCanEditPrompts?: InputMaybe<BooleanOperators>;
+	PermissionsCanInsertFeedSystemFields?: InputMaybe<BooleanOperators>;
+	PermissionsCanTranslateScrt2Conversation?: InputMaybe<BooleanOperators>;
+	PermissionsCanUpdateEmailMessage?: InputMaybe<BooleanOperators>;
+	PermissionsCanUseNewDashboardBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsCanVerifyComment?: InputMaybe<BooleanOperators>;
+	PermissionsCanWriteWithAiScrt2Conversation?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingCreateReports?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingManageFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingViewReports?: InputMaybe<BooleanOperators>;
+	PermissionsChangeDashboardColors?: InputMaybe<BooleanOperators>;
+	PermissionsChatterComposeUiCodesnippet?: InputMaybe<BooleanOperators>;
+	PermissionsChatterEditOwnPost?: InputMaybe<BooleanOperators>;
+	PermissionsChatterEditOwnRecordPost?: InputMaybe<BooleanOperators>;
+	PermissionsChatterFileLink?: InputMaybe<BooleanOperators>;
+	PermissionsChatterInternalUser?: InputMaybe<BooleanOperators>;
+	PermissionsChatterInviteExternalUsers?: InputMaybe<BooleanOperators>;
+	PermissionsChatterOwnGroups?: InputMaybe<BooleanOperators>;
+	PermissionsClientSecretRotation?: InputMaybe<BooleanOperators>;
+	PermissionsCloseConversations?: InputMaybe<BooleanOperators>;
+	PermissionsConfigCustomRecs?: InputMaybe<BooleanOperators>;
+	PermissionsConfigureDataspaceScope?: InputMaybe<BooleanOperators>;
+	PermissionsConnectOrgToEnvironmentHub?: InputMaybe<BooleanOperators>;
+	PermissionsConsentApiUpdate?: InputMaybe<BooleanOperators>;
+	PermissionsContentAdministrator?: InputMaybe<BooleanOperators>;
+	PermissionsContentHubUser?: InputMaybe<BooleanOperators>;
+	PermissionsContentWorkspaces?: InputMaybe<BooleanOperators>;
+	PermissionsConvertLeads?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeFilters?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeReports?: InputMaybe<BooleanOperators>;
+	PermissionsCreateDashboardFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCreateLtngTempFolder?: InputMaybe<BooleanOperators>;
+	PermissionsCreateLtngTempInPub?: InputMaybe<BooleanOperators>;
+	PermissionsCreatePackaging?: InputMaybe<BooleanOperators>;
+	PermissionsCreateReportFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCreateReportInLightning?: InputMaybe<BooleanOperators>;
+	PermissionsCreateTopics?: InputMaybe<BooleanOperators>;
+	PermissionsCreateWorkBadgeDefinition?: InputMaybe<BooleanOperators>;
+	PermissionsCreateWorkspaces?: InputMaybe<BooleanOperators>;
+	PermissionsCustomAppsOnFSMobile?: InputMaybe<BooleanOperators>;
+	PermissionsCustomMobileAppsAccess?: InputMaybe<BooleanOperators>;
+	PermissionsCustomSidebarOnAllPages?: InputMaybe<BooleanOperators>;
+	PermissionsCustomizeApplication?: InputMaybe<BooleanOperators>;
+	PermissionsDataExport?: InputMaybe<BooleanOperators>;
+	PermissionsDelegatedTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteActivatedContract?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteCrMemoAndInvoice?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteSalesforceFiles?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteTopics?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingAdminUser?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingEditReadOnly?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingUser?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingWorkbench?: InputMaybe<BooleanOperators>;
+	PermissionsDistributeFromPersWksp?: InputMaybe<BooleanOperators>;
+	PermissionsDownloadMaliciousFiles?: InputMaybe<BooleanOperators>;
+	PermissionsDownloadPackageVersionZips?: InputMaybe<BooleanOperators>;
+	PermissionsEditActivatedOrders?: InputMaybe<BooleanOperators>;
+	PermissionsEditBillingInfo?: InputMaybe<BooleanOperators>;
+	PermissionsEditBrandTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditCaseComments?: InputMaybe<BooleanOperators>;
+	PermissionsEditEvent?: InputMaybe<BooleanOperators>;
+	PermissionsEditHtmlTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditMyDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsEditMyReports?: InputMaybe<BooleanOperators>;
+	PermissionsEditOppLineItemUnitPrice?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicDocuments?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicFilters?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditReadonlyFields?: InputMaybe<BooleanOperators>;
+	PermissionsEditTask?: InputMaybe<BooleanOperators>;
+	PermissionsEditTopics?: InputMaybe<BooleanOperators>;
+	PermissionsEmailAdministration?: InputMaybe<BooleanOperators>;
+	PermissionsEmailMass?: InputMaybe<BooleanOperators>;
+	PermissionsEmailSingle?: InputMaybe<BooleanOperators>;
+	PermissionsEmailTemplateManagement?: InputMaybe<BooleanOperators>;
+	PermissionsEnableBCTransactionPolling?: InputMaybe<BooleanOperators>;
+	PermissionsEnableCommunityAppLauncher?: InputMaybe<BooleanOperators>;
+	PermissionsEnableIPFSUpload?: InputMaybe<BooleanOperators>;
+	PermissionsEnableNotifications?: InputMaybe<BooleanOperators>;
+	PermissionsEngagementConfigUser?: InputMaybe<BooleanOperators>;
+	PermissionsEnhancedSalesMobileExp?: InputMaybe<BooleanOperators>;
+	PermissionsExportReport?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppAdmin?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppDeveloper?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppViewer?: InputMaybe<BooleanOperators>;
+	PermissionsFSCArcGraphCommunityUser?: InputMaybe<BooleanOperators>;
+	PermissionsFeedPinning?: InputMaybe<BooleanOperators>;
+	PermissionsFlowUFLRequired?: InputMaybe<BooleanOperators>;
+	PermissionsForceTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsFreezeUsers?: InputMaybe<BooleanOperators>;
+	PermissionsGiveRecognitionBadge?: InputMaybe<BooleanOperators>;
+	PermissionsGovernNetworks?: InputMaybe<BooleanOperators>;
+	PermissionsGrantOutboundBundling?: InputMaybe<BooleanOperators>;
+	PermissionsHasUnlimitedNBAExecutions?: InputMaybe<BooleanOperators>;
+	PermissionsHeadlessCMSAccess?: InputMaybe<BooleanOperators>;
+	PermissionsHeadlessPublishNudges?: InputMaybe<BooleanOperators>;
+	PermissionsHideReadByList?: InputMaybe<BooleanOperators>;
+	PermissionsIdentityConnect?: InputMaybe<BooleanOperators>;
+	PermissionsIdentityEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsImportCustomObjects?: InputMaybe<BooleanOperators>;
+	PermissionsImportLeads?: InputMaybe<BooleanOperators>;
+	PermissionsImportPersonal?: InputMaybe<BooleanOperators>;
+	PermissionsInboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	PermissionsInstallPackaging?: InputMaybe<BooleanOperators>;
+	PermissionsIntelligentDocumentProcessing?: InputMaybe<BooleanOperators>;
+	PermissionsIsSsoEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeAccess?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeCToCUser?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeLEX?: InputMaybe<BooleanOperators>;
+	PermissionsKGERMultiArticlesUser?: InputMaybe<BooleanOperators>;
+	PermissionsLMEndMessagingSessionUserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsLMOutboundMessagingUserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsLightningConsoleAllowedForUser?: InputMaybe<BooleanOperators>;
+	PermissionsLightningExperienceUser?: InputMaybe<BooleanOperators>;
+	PermissionsListEmailSend?: InputMaybe<BooleanOperators>;
+	PermissionsLobbyManagementUserAccess?: InputMaybe<BooleanOperators>;
+	PermissionsLtngPromoReserved01UserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsMCPMetadataApi?: InputMaybe<BooleanOperators>;
+	PermissionsManageAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageAgentforceServiceAgent?: InputMaybe<BooleanOperators>;
+	PermissionsManageAnalyticSnapshots?: InputMaybe<BooleanOperators>;
+	PermissionsManageApiNamedQueries?: InputMaybe<BooleanOperators>;
+	PermissionsManageAuthProviders?: InputMaybe<BooleanOperators>;
+	PermissionsManageBusinessHourHolidays?: InputMaybe<BooleanOperators>;
+	PermissionsManageC360AConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageCMS?: InputMaybe<BooleanOperators>;
+	PermissionsManageCallCenters?: InputMaybe<BooleanOperators>;
+	PermissionsManageCases?: InputMaybe<BooleanOperators>;
+	PermissionsManageCategories?: InputMaybe<BooleanOperators>;
+	PermissionsManageCdpMlModels?: InputMaybe<BooleanOperators>;
+	PermissionsManageCertificates?: InputMaybe<BooleanOperators>;
+	PermissionsManageCertificatesExpiration?: InputMaybe<BooleanOperators>;
+	PermissionsManageChatterMessages?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentPermissions?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentProperties?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentTypes?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomDomains?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomPermissions?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomReportTypes?: InputMaybe<BooleanOperators>;
+	PermissionsManageDashbdsInPubFolders?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataCategories?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataIntegrations?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataspaceScope?: InputMaybe<BooleanOperators>;
+	PermissionsManageDynamicDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsManageEmailClientConfig?: InputMaybe<BooleanOperators>;
+	PermissionsManageExchangeConfig?: InputMaybe<BooleanOperators>;
+	PermissionsManageExternalConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageFilesAndAttachments?: InputMaybe<BooleanOperators>;
+	PermissionsManageForecastingCustomData?: InputMaybe<BooleanOperators>;
+	PermissionsManageHealthCheck?: InputMaybe<BooleanOperators>;
+	PermissionsManageHerokuAppLink?: InputMaybe<BooleanOperators>;
+	PermissionsManageHubConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageIntegrationConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageInteraction?: InputMaybe<BooleanOperators>;
+	PermissionsManageInternalUsers?: InputMaybe<BooleanOperators>;
+	PermissionsManageIpAddresses?: InputMaybe<BooleanOperators>;
+	PermissionsManageLeads?: InputMaybe<BooleanOperators>;
+	PermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
+	PermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	PermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
+	PermissionsManageNetworks?: InputMaybe<BooleanOperators>;
+	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
+	PermissionsManageOrchestrationRuns?: InputMaybe<BooleanOperators>;
+	PermissionsManagePasswordPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageProfilesPermissionsets?: InputMaybe<BooleanOperators>;
+	PermissionsManagePropositions?: InputMaybe<BooleanOperators>;
+	PermissionsManagePvtRptsAndDashbds?: InputMaybe<BooleanOperators>;
+	PermissionsManageQuotas?: InputMaybe<BooleanOperators>;
+	PermissionsManageRecommendationStrategies?: InputMaybe<BooleanOperators>;
+	PermissionsManageReleaseUpdates?: InputMaybe<BooleanOperators>;
+	PermissionsManageRemoteAccess?: InputMaybe<BooleanOperators>;
+	PermissionsManageReportsInPubFolders?: InputMaybe<BooleanOperators>;
+	PermissionsManageRoles?: InputMaybe<BooleanOperators>;
+	PermissionsManageSessionPermissionSets?: InputMaybe<BooleanOperators>;
+	PermissionsManageSharedListViews?: InputMaybe<BooleanOperators>;
+	PermissionsManageSharing?: InputMaybe<BooleanOperators>;
+	PermissionsManageSocialPosting?: InputMaybe<BooleanOperators>;
+	PermissionsManageSolutions?: InputMaybe<BooleanOperators>;
+	PermissionsManageSubscriptions?: InputMaybe<BooleanOperators>;
+	PermissionsManageSurveys?: InputMaybe<BooleanOperators>;
+	PermissionsManageSynonyms?: InputMaybe<BooleanOperators>;
+	PermissionsManageTrustMeasures?: InputMaybe<BooleanOperators>;
+	PermissionsManageTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsManageUnlistedGroups?: InputMaybe<BooleanOperators>;
+	PermissionsManageUsers?: InputMaybe<BooleanOperators>;
+	PermissionsMassInlineEdit?: InputMaybe<BooleanOperators>;
+	PermissionsMeetingEngagementUser?: InputMaybe<BooleanOperators>;
+	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
+	PermissionsMergeTopics?: InputMaybe<BooleanOperators>;
+	PermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	PermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAllData?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyDataClassification?: InputMaybe<BooleanOperators>;
+	PermissionsModifyMetadata?: InputMaybe<BooleanOperators>;
+	PermissionsMonitorLoginHistory?: InputMaybe<BooleanOperators>;
+	PermissionsNativeWebviewScrolling?: InputMaybe<BooleanOperators>;
+	PermissionsNewReportBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsOutboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	PermissionsOverrideForecasts?: InputMaybe<BooleanOperators>;
+	PermissionsPackaging2?: InputMaybe<BooleanOperators>;
+	PermissionsPackaging2Delete?: InputMaybe<BooleanOperators>;
+	PermissionsPasswordNeverExpires?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationDecisioningUser?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationIntelUser?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationPlatform?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizedFinanceUserAccess?: InputMaybe<BooleanOperators>;
+	PermissionsPreventClassicExperience?: InputMaybe<BooleanOperators>;
+	PermissionsPrismBackofficeUser?: InputMaybe<BooleanOperators>;
+	PermissionsPrismPlaygroundUser?: InputMaybe<BooleanOperators>;
+	PermissionsPrivacyDataAccess?: InputMaybe<BooleanOperators>;
+	PermissionsPrmExtIntPrtnrAdminUser?: InputMaybe<BooleanOperators>;
+	PermissionsPublishPackaging?: InputMaybe<BooleanOperators>;
+	PermissionsQrCodeGeneratorMobilePublisherPlayground?: InputMaybe<BooleanOperators>;
+	PermissionsQueryAllFiles?: InputMaybe<BooleanOperators>;
+	PermissionsQueryNonVetoedFiles?: InputMaybe<BooleanOperators>;
+	PermissionsQuipMetricsAccess?: InputMaybe<BooleanOperators>;
+	PermissionsQuipUserEngagementMetrics?: InputMaybe<BooleanOperators>;
+	PermissionsReassignOrchestrationWorkItems?: InputMaybe<BooleanOperators>;
+	PermissionsRegrelloUser?: InputMaybe<BooleanOperators>;
+	PermissionsRemoveDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	PermissionsResetPasswords?: InputMaybe<BooleanOperators>;
+	PermissionsRunFlow?: InputMaybe<BooleanOperators>;
+	PermissionsRunReports?: InputMaybe<BooleanOperators>;
+	PermissionsSalesInsightsUser?: InputMaybe<BooleanOperators>;
+	PermissionsSandboxTestingInCommunityApp?: InputMaybe<BooleanOperators>;
+	PermissionsScheduleJob?: InputMaybe<BooleanOperators>;
+	PermissionsScheduleReports?: InputMaybe<BooleanOperators>;
+	PermissionsSegmentIntelligenceUser?: InputMaybe<BooleanOperators>;
+	PermissionsSelectFilesFromSalesforce?: InputMaybe<BooleanOperators>;
+	PermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
+	PermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
+	PermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
+	PermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	PermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
+	PermissionsSolutionImport?: InputMaybe<BooleanOperators>;
+	PermissionsStageManagementDesignUser?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeDashboardRolesGrps?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeDashboardToOtherUsers?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportRolesGrps?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportToOtherUsers?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportsRunAsUser?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeToLightningDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeToLightningReports?: InputMaybe<BooleanOperators>;
+	PermissionsTerritoryOperations?: InputMaybe<BooleanOperators>;
+	PermissionsTraceXdsQueries?: InputMaybe<BooleanOperators>;
+	PermissionsTransactionalEmailSend?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyCase?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyEntity?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyLead?: InputMaybe<BooleanOperators>;
+	PermissionsTwoFactorApi?: InputMaybe<BooleanOperators>;
+	PermissionsUpdateReportTypeReferences?: InputMaybe<BooleanOperators>;
+	PermissionsUseAnyApiAuth?: InputMaybe<BooleanOperators>;
+	PermissionsUseAssistantDialog?: InputMaybe<BooleanOperators>;
+	PermissionsUseMySearch?: InputMaybe<BooleanOperators>;
+	PermissionsUseQuerySuggestions?: InputMaybe<BooleanOperators>;
+	PermissionsUseRestrictedTheme?: InputMaybe<BooleanOperators>;
+	PermissionsUseServicePartReturn?: InputMaybe<BooleanOperators>;
+	PermissionsUseSetupWithAgentforce?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamReassignWizards?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamsForEmployee?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamsForItSrvcs?: InputMaybe<BooleanOperators>;
+	PermissionsUseWebLink?: InputMaybe<BooleanOperators>;
+	PermissionsUserCanDeployStore?: InputMaybe<BooleanOperators>;
+	PermissionsUserInteractionInsights?: InputMaybe<BooleanOperators>;
+	PermissionsViewAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllActivities?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllCustomSettings?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllData?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllFieldsGlobal?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllForecasts?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllForeignKeyNames?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllProfiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllUsers?: InputMaybe<BooleanOperators>;
+	PermissionsViewApiNamedQueries?: InputMaybe<BooleanOperators>;
+	PermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
+	PermissionsViewContent?: InputMaybe<BooleanOperators>;
+	PermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
+	PermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
+	PermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
+	PermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
+	PermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
+	PermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
+	PermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
+	PermissionsViewMyTeamsDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsViewOrchestrationsInAutomApp?: InputMaybe<BooleanOperators>;
+	PermissionsViewPrivateStaticResources?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicCapstoneFolders?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicReports?: InputMaybe<BooleanOperators>;
+	PermissionsViewRecommendations?: InputMaybe<BooleanOperators>;
+	PermissionsViewRestrictionAndScopingRules?: InputMaybe<BooleanOperators>;
+	PermissionsViewRoles?: InputMaybe<BooleanOperators>;
+	PermissionsViewSetup?: InputMaybe<BooleanOperators>;
+	PermissionsViewTrustMeasures?: InputMaybe<BooleanOperators>;
+	PermissionsViewUserPII?: InputMaybe<BooleanOperators>;
+	PermissionsYourAccountCDAPublishEvents?: InputMaybe<BooleanOperators>;
+	Profile?: InputMaybe<Profile_Filter>;
+	ProfileId?: InputMaybe<IdOperators>;
+	PsgCount?: InputMaybe<IntegerOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<PermissionSet_Filter>>>;
+	not?: InputMaybe<PermissionSet_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PermissionSet_Filter>>>;
+};
+
+export type PermissionSet_License_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	PermissionSetLicense?: InputMaybe<PermissionSetLicense_Filter>;
+};
+
+export type PhoneNumberOperators = {
+	eq?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	gt?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	gte?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["PhoneNumber"]["input"]>>>;
+	like?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	lt?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	lte?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	ne?: InputMaybe<Scalars["PhoneNumber"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["PhoneNumber"]["input"]>>>;
+};
+
+export type PicklistOperators = {
+	eq?: InputMaybe<Scalars["Picklist"]["input"]>;
+	gt?: InputMaybe<Scalars["Picklist"]["input"]>;
+	gte?: InputMaybe<Scalars["Picklist"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Picklist"]["input"]>>>;
+	like?: InputMaybe<Scalars["Picklist"]["input"]>;
+	lt?: InputMaybe<Scalars["Picklist"]["input"]>;
+	lte?: InputMaybe<Scalars["Picklist"]["input"]>;
+	ne?: InputMaybe<Scalars["Picklist"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Picklist"]["input"]>>>;
+};
+
+export type Pricebook2History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2Id?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Pricebook2History_Filter>>>;
+	not?: InputMaybe<Pricebook2History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Pricebook2History_Filter>>>;
+};
+
+export type Pricebook2_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsStandard?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Pricebook2_Filter>>>;
+	not?: InputMaybe<Pricebook2_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Pricebook2_Filter>>>;
+};
+
+export type PricebookEntryHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	PricebookEntryId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<PricebookEntryHistory_Filter>>>;
+	not?: InputMaybe<PricebookEntryHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PricebookEntryHistory_Filter>>>;
+};
+
+export type PricebookEntry_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2Id?: InputMaybe<IdOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	ProductCode?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UnitPrice?: InputMaybe<CurrencyOperators>;
+	UseStandardPrice?: InputMaybe<BooleanOperators>;
+	and?: InputMaybe<Array<InputMaybe<PricebookEntry_Filter>>>;
+	not?: InputMaybe<PricebookEntry_Filter>;
+	or?: InputMaybe<Array<InputMaybe<PricebookEntry_Filter>>>;
+};
+
+export type ProcessDefinition_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LockType?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	State?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TableEnumOrId?: InputMaybe<PicklistOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProcessDefinition_Filter>>>;
+	not?: InputMaybe<ProcessDefinition_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProcessDefinition_Filter>>>;
+};
+
+export type ProcessException_AttachedTo_Filters = {
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderItem?: InputMaybe<OrderItem_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+};
+
+export type ProcessException_Filter = {
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetId?: InputMaybe<IdOperators>;
+	AttachedTo?: InputMaybe<ProcessException_AttachedTo_Filters>;
+	AttachedToId?: InputMaybe<IdOperators>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseId?: InputMaybe<IdOperators>;
+	Category?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	ExternalReference?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Message?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ProcessException_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Priority?: InputMaybe<PicklistOperators>;
+	ProcessExceptionNumber?: InputMaybe<StringOperators>;
+	Severity?: InputMaybe<PicklistOperators>;
+	SeverityCategory?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusCategory?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProcessException_Filter>>>;
+	not?: InputMaybe<ProcessException_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProcessException_Filter>>>;
+};
+
+export type ProcessException_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type ProcessInstance_Filter = {
+	CompletedDate?: InputMaybe<DateTimeOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ElapsedTimeInDays?: InputMaybe<DoubleOperators>;
+	ElapsedTimeInHours?: InputMaybe<DoubleOperators>;
+	ElapsedTimeInMinutes?: InputMaybe<DoubleOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActor?: InputMaybe<User_Filter>;
+	LastActorId?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	ProcessDefinition?: InputMaybe<ProcessDefinition_Filter>;
+	ProcessDefinitionId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SubmittedBy?: InputMaybe<User_Filter>;
+	SubmittedById?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TargetObject?: InputMaybe<ProcessInstance_TargetObject_Filters>;
+	TargetObjectId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProcessInstance_Filter>>>;
+	not?: InputMaybe<ProcessInstance_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProcessInstance_Filter>>>;
+};
+
+export type ProcessInstance_TargetObject_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	AnalyticsUserAttrFuncTkn?: InputMaybe<AnalyticsUserAttrFuncTkn_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	AuthorizationForm?: InputMaybe<AuthorizationForm_Filter>;
+	AuthorizationFormConsent?: InputMaybe<AuthorizationFormConsent_Filter>;
+	AuthorizationFormDataUse?: InputMaybe<AuthorizationFormDataUse_Filter>;
+	AuthorizationFormText?: InputMaybe<AuthorizationFormText_Filter>;
+	BusinessBrand?: InputMaybe<BusinessBrand_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscription?: InputMaybe<CommSubscription_Filter>;
+	CommSubscriptionChannelType?: InputMaybe<CommSubscriptionChannelType_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactPointAddress?: InputMaybe<ContactPointAddress_Filter>;
+	ContactPointConsent?: InputMaybe<ContactPointConsent_Filter>;
+	ContactPointEmail?: InputMaybe<ContactPointEmail_Filter>;
+	ContactPointPhone?: InputMaybe<ContactPointPhone_Filter>;
+	ContactPointTypeConsent?: InputMaybe<ContactPointTypeConsent_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	Customer?: InputMaybe<Customer_Filter>;
+	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
+	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
+	DuplicateRecordSet?: InputMaybe<DuplicateRecordSet_Filter>;
+	EmailMessage?: InputMaybe<EmailMessage_Filter>;
+	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
+	FlowOrchestrationInstance?: InputMaybe<FlowOrchestrationInstance_Filter>;
+	FlowOrchestrationVersion?: InputMaybe<FlowOrchestrationVersion_Filter>;
+	FlowOrchestrationWorkItem?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationTrustMeasure?: InputMaybe<LocationTrustMeasure_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	OrgMetricScanSummary?: InputMaybe<OrgMetricScanSummary_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	ReportHierarchyObjectField?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	StreamingChannel?: InputMaybe<StreamingChannel_Filter>;
+	TableauHostMapping?: InputMaybe<TableauHostMapping_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	UnstructuredStorageSpace?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	UserLocalWebServerIdentity?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type Product2History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Product2History_Filter>>>;
+	not?: InputMaybe<Product2History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Product2History_Filter>>>;
+};
+
+export type Product2_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DisplayUrl?: InputMaybe<UrlOperators>;
+	ExternalDataSourceId?: InputMaybe<IdOperators>;
+	ExternalId?: InputMaybe<StringOperators>;
+	Family?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ProductCode?: InputMaybe<StringOperators>;
+	QuantityUnitOfMeasure?: InputMaybe<PicklistOperators>;
+	StockKeepingUnit?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Product2_Filter>>>;
+	not?: InputMaybe<Product2_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Product2_Filter>>>;
+};
+
+export type ProfileSkillEndorsementHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	ProfileSkillEndorsement?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	ProfileSkillEndorsementId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkillEndorsementHistory_Filter>>>;
+	not?: InputMaybe<ProfileSkillEndorsementHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkillEndorsementHistory_Filter>>>;
+};
+
+export type ProfileSkillEndorsement_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	ProfileSkillUserId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	User?: InputMaybe<User_Filter>;
+	UserId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkillEndorsement_Filter>>>;
+	not?: InputMaybe<ProfileSkillEndorsement_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkillEndorsement_Filter>>>;
+};
+
+export type ProfileSkillHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkillHistory_Filter>>>;
+	not?: InputMaybe<ProfileSkillHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkillHistory_Filter>>>;
+};
+
+export type ProfileSkillUserHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	ProfileSkillUser?: InputMaybe<ProfileSkillUser_Filter>;
+	ProfileSkillUserId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkillUserHistory_Filter>>>;
+	not?: InputMaybe<ProfileSkillUserHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkillUserHistory_Filter>>>;
+};
+
+export type ProfileSkillUser_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	EndorsementCount?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ProfileSkill?: InputMaybe<ProfileSkill_Filter>;
+	ProfileSkillId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	User?: InputMaybe<User_Filter>;
+	UserId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkillUser_Filter>>>;
+	not?: InputMaybe<ProfileSkillUser_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkillUser_Filter>>>;
+};
+
+export type ProfileSkill_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<ProfileSkill_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UserCount?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<ProfileSkill_Filter>>>;
+	not?: InputMaybe<ProfileSkill_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ProfileSkill_Filter>>>;
+};
+
+export type ProfileSkill_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Profile_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefaultApplicationId?: InputMaybe<IdOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsSsoEnabled?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	PermissionsAcceptInboundBundling?: InputMaybe<BooleanOperators>;
+	PermissionsAccessBankingRelationshipAssistance?: InputMaybe<BooleanOperators>;
+	PermissionsAccessBankingServiceAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessCMC?: InputMaybe<BooleanOperators>;
+	PermissionsAccessContentBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsAccessDisputePrompts?: InputMaybe<BooleanOperators>;
+	PermissionsAccessOrchestrationObjects?: InputMaybe<BooleanOperators>;
+	PermissionsAccessPolicyAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessServiceEinstein?: InputMaybe<BooleanOperators>;
+	PermissionsAccessSfDrive?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToComplaintAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToComplaintMgmt?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToDisputeManagement?: InputMaybe<BooleanOperators>;
+	PermissionsAccessToServiceProcess?: InputMaybe<BooleanOperators>;
+	PermissionsAccessWealthAdvisorAgent?: InputMaybe<BooleanOperators>;
+	PermissionsAccountSwitcherUser?: InputMaybe<BooleanOperators>;
+	PermissionsActivateContract?: InputMaybe<BooleanOperators>;
+	PermissionsActivateOrder?: InputMaybe<BooleanOperators>;
+	PermissionsActivateSystemModeFlows?: InputMaybe<BooleanOperators>;
+	PermissionsActivitiesAccess?: InputMaybe<BooleanOperators>;
+	PermissionsAddDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	PermissionsAdvancedCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	PermissionsAgentforceServiceAgentUser?: InputMaybe<BooleanOperators>;
+	PermissionsAllowEmailIC?: InputMaybe<BooleanOperators>;
+	PermissionsAllowLightningLogin?: InputMaybe<BooleanOperators>;
+	PermissionsAllowViewEditConvertedLeads?: InputMaybe<BooleanOperators>;
+	PermissionsApexRestServices?: InputMaybe<BooleanOperators>;
+	PermissionsApiEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsApiUserOnly?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkManageApp?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkManageTemplate?: InputMaybe<BooleanOperators>;
+	PermissionsAppFrameworkViewApp?: InputMaybe<BooleanOperators>;
+	PermissionsApprovalAdmin?: InputMaybe<BooleanOperators>;
+	PermissionsApprovalDesigner?: InputMaybe<BooleanOperators>;
+	PermissionsAssignPermissionSets?: InputMaybe<BooleanOperators>;
+	PermissionsAssignTopics?: InputMaybe<BooleanOperators>;
+	PermissionsAttributionModelUser?: InputMaybe<BooleanOperators>;
+	PermissionsAuthorApex?: InputMaybe<BooleanOperators>;
+	PermissionsB2BMarketingAnalyticsUser?: InputMaybe<BooleanOperators>;
+	PermissionsBulkApiHardDelete?: InputMaybe<BooleanOperators>;
+	PermissionsBypassMFAForUiLogins?: InputMaybe<BooleanOperators>;
+	PermissionsCMSECEAuthoringAccess?: InputMaybe<BooleanOperators>;
+	PermissionsCampaignInfluence2?: InputMaybe<BooleanOperators>;
+	PermissionsCanApproveFeedPost?: InputMaybe<BooleanOperators>;
+	PermissionsCanApproveUninstalledApps?: InputMaybe<BooleanOperators>;
+	PermissionsCanDoActAsUser?: InputMaybe<BooleanOperators>;
+	PermissionsCanEditPrompts?: InputMaybe<BooleanOperators>;
+	PermissionsCanInsertFeedSystemFields?: InputMaybe<BooleanOperators>;
+	PermissionsCanTranslateScrt2Conversation?: InputMaybe<BooleanOperators>;
+	PermissionsCanUpdateEmailMessage?: InputMaybe<BooleanOperators>;
+	PermissionsCanUseNewDashboardBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsCanVerifyComment?: InputMaybe<BooleanOperators>;
+	PermissionsCanWriteWithAiScrt2Conversation?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingCreateReports?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingManageFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCdcReportingViewReports?: InputMaybe<BooleanOperators>;
+	PermissionsChangeDashboardColors?: InputMaybe<BooleanOperators>;
+	PermissionsChatterComposeUiCodesnippet?: InputMaybe<BooleanOperators>;
+	PermissionsChatterEditOwnPost?: InputMaybe<BooleanOperators>;
+	PermissionsChatterEditOwnRecordPost?: InputMaybe<BooleanOperators>;
+	PermissionsChatterFileLink?: InputMaybe<BooleanOperators>;
+	PermissionsChatterInternalUser?: InputMaybe<BooleanOperators>;
+	PermissionsChatterInviteExternalUsers?: InputMaybe<BooleanOperators>;
+	PermissionsChatterOwnGroups?: InputMaybe<BooleanOperators>;
+	PermissionsClientSecretRotation?: InputMaybe<BooleanOperators>;
+	PermissionsCloseConversations?: InputMaybe<BooleanOperators>;
+	PermissionsConfigCustomRecs?: InputMaybe<BooleanOperators>;
+	PermissionsConfigureDataspaceScope?: InputMaybe<BooleanOperators>;
+	PermissionsConnectOrgToEnvironmentHub?: InputMaybe<BooleanOperators>;
+	PermissionsConsentApiUpdate?: InputMaybe<BooleanOperators>;
+	PermissionsContentAdministrator?: InputMaybe<BooleanOperators>;
+	PermissionsContentHubUser?: InputMaybe<BooleanOperators>;
+	PermissionsContentWorkspaces?: InputMaybe<BooleanOperators>;
+	PermissionsConvertLeads?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeFilters?: InputMaybe<BooleanOperators>;
+	PermissionsCreateCustomizeReports?: InputMaybe<BooleanOperators>;
+	PermissionsCreateDashboardFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCreateLtngTempFolder?: InputMaybe<BooleanOperators>;
+	PermissionsCreateLtngTempInPub?: InputMaybe<BooleanOperators>;
+	PermissionsCreateMultiforce?: InputMaybe<BooleanOperators>;
+	PermissionsCreateReportFolders?: InputMaybe<BooleanOperators>;
+	PermissionsCreateReportInLightning?: InputMaybe<BooleanOperators>;
+	PermissionsCreateTopics?: InputMaybe<BooleanOperators>;
+	PermissionsCreateWorkBadgeDefinition?: InputMaybe<BooleanOperators>;
+	PermissionsCreateWorkspaces?: InputMaybe<BooleanOperators>;
+	PermissionsCustomAppsOnFSMobile?: InputMaybe<BooleanOperators>;
+	PermissionsCustomMobileAppsAccess?: InputMaybe<BooleanOperators>;
+	PermissionsCustomSidebarOnAllPages?: InputMaybe<BooleanOperators>;
+	PermissionsCustomizeApplication?: InputMaybe<BooleanOperators>;
+	PermissionsDataExport?: InputMaybe<BooleanOperators>;
+	PermissionsDelegatedTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteActivatedContract?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteCrMemoAndInvoice?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteSalesforceFiles?: InputMaybe<BooleanOperators>;
+	PermissionsDeleteTopics?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingAdminUser?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingEditReadOnly?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingUser?: InputMaybe<BooleanOperators>;
+	PermissionsDigitalLendingWorkbench?: InputMaybe<BooleanOperators>;
+	PermissionsDistributeFromPersWksp?: InputMaybe<BooleanOperators>;
+	PermissionsDownloadMaliciousFiles?: InputMaybe<BooleanOperators>;
+	PermissionsDownloadPackageVersionZips?: InputMaybe<BooleanOperators>;
+	PermissionsEditActivatedOrders?: InputMaybe<BooleanOperators>;
+	PermissionsEditBillingInfo?: InputMaybe<BooleanOperators>;
+	PermissionsEditBrandTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditCaseComments?: InputMaybe<BooleanOperators>;
+	PermissionsEditEvent?: InputMaybe<BooleanOperators>;
+	PermissionsEditHtmlTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditMyDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsEditMyReports?: InputMaybe<BooleanOperators>;
+	PermissionsEditOppLineItemUnitPrice?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicDocuments?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicFilters?: InputMaybe<BooleanOperators>;
+	PermissionsEditPublicTemplates?: InputMaybe<BooleanOperators>;
+	PermissionsEditReadonlyFields?: InputMaybe<BooleanOperators>;
+	PermissionsEditTask?: InputMaybe<BooleanOperators>;
+	PermissionsEditTopics?: InputMaybe<BooleanOperators>;
+	PermissionsEmailAdministration?: InputMaybe<BooleanOperators>;
+	PermissionsEmailMass?: InputMaybe<BooleanOperators>;
+	PermissionsEmailSingle?: InputMaybe<BooleanOperators>;
+	PermissionsEmailTemplateManagement?: InputMaybe<BooleanOperators>;
+	PermissionsEnableBCTransactionPolling?: InputMaybe<BooleanOperators>;
+	PermissionsEnableCommunityAppLauncher?: InputMaybe<BooleanOperators>;
+	PermissionsEnableIPFSUpload?: InputMaybe<BooleanOperators>;
+	PermissionsEnableNotifications?: InputMaybe<BooleanOperators>;
+	PermissionsEngagementConfigUser?: InputMaybe<BooleanOperators>;
+	PermissionsEnhancedSalesMobileExp?: InputMaybe<BooleanOperators>;
+	PermissionsExportReport?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppAdmin?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppDeveloper?: InputMaybe<BooleanOperators>;
+	PermissionsExternalClientAppViewer?: InputMaybe<BooleanOperators>;
+	PermissionsFSCArcGraphCommunityUser?: InputMaybe<BooleanOperators>;
+	PermissionsFeedPinning?: InputMaybe<BooleanOperators>;
+	PermissionsFlowUFLRequired?: InputMaybe<BooleanOperators>;
+	PermissionsForceTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsFreezeUsers?: InputMaybe<BooleanOperators>;
+	PermissionsGiveRecognitionBadge?: InputMaybe<BooleanOperators>;
+	PermissionsGovernNetworks?: InputMaybe<BooleanOperators>;
+	PermissionsGrantOutboundBundling?: InputMaybe<BooleanOperators>;
+	PermissionsHasUnlimitedNBAExecutions?: InputMaybe<BooleanOperators>;
+	PermissionsHeadlessCMSAccess?: InputMaybe<BooleanOperators>;
+	PermissionsHeadlessPublishNudges?: InputMaybe<BooleanOperators>;
+	PermissionsHideReadByList?: InputMaybe<BooleanOperators>;
+	PermissionsIdentityConnect?: InputMaybe<BooleanOperators>;
+	PermissionsIdentityEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsImportCustomObjects?: InputMaybe<BooleanOperators>;
+	PermissionsImportLeads?: InputMaybe<BooleanOperators>;
+	PermissionsImportPersonal?: InputMaybe<BooleanOperators>;
+	PermissionsInboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	PermissionsInstallMultiforce?: InputMaybe<BooleanOperators>;
+	PermissionsIntelligentDocumentProcessing?: InputMaybe<BooleanOperators>;
+	PermissionsIsSsoEnabled?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeAccess?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeCToCUser?: InputMaybe<BooleanOperators>;
+	PermissionsIsotopeLEX?: InputMaybe<BooleanOperators>;
+	PermissionsKGERMultiArticlesUser?: InputMaybe<BooleanOperators>;
+	PermissionsLMEndMessagingSessionUserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsLMOutboundMessagingUserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsLightningConsoleAllowedForUser?: InputMaybe<BooleanOperators>;
+	PermissionsLightningExperienceUser?: InputMaybe<BooleanOperators>;
+	PermissionsListEmailSend?: InputMaybe<BooleanOperators>;
+	PermissionsLobbyManagementUserAccess?: InputMaybe<BooleanOperators>;
+	PermissionsLtngPromoReserved01UserPerm?: InputMaybe<BooleanOperators>;
+	PermissionsMCPMetadataApi?: InputMaybe<BooleanOperators>;
+	PermissionsManageAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageAgentforceServiceAgent?: InputMaybe<BooleanOperators>;
+	PermissionsManageAnalyticSnapshots?: InputMaybe<BooleanOperators>;
+	PermissionsManageApiNamedQueries?: InputMaybe<BooleanOperators>;
+	PermissionsManageAuthProviders?: InputMaybe<BooleanOperators>;
+	PermissionsManageBusinessHourHolidays?: InputMaybe<BooleanOperators>;
+	PermissionsManageC360AConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageCMS?: InputMaybe<BooleanOperators>;
+	PermissionsManageCallCenters?: InputMaybe<BooleanOperators>;
+	PermissionsManageCases?: InputMaybe<BooleanOperators>;
+	PermissionsManageCategories?: InputMaybe<BooleanOperators>;
+	PermissionsManageCdpMlModels?: InputMaybe<BooleanOperators>;
+	PermissionsManageCertificates?: InputMaybe<BooleanOperators>;
+	PermissionsManageCertificatesExpiration?: InputMaybe<BooleanOperators>;
+	PermissionsManageChatterMessages?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentPermissions?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentProperties?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsManageContentTypes?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomDomains?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomPermissions?: InputMaybe<BooleanOperators>;
+	PermissionsManageCustomReportTypes?: InputMaybe<BooleanOperators>;
+	PermissionsManageDashbdsInPubFolders?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataCategories?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataIntegrations?: InputMaybe<BooleanOperators>;
+	PermissionsManageDataspaceScope?: InputMaybe<BooleanOperators>;
+	PermissionsManageDynamicDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsManageEmailClientConfig?: InputMaybe<BooleanOperators>;
+	PermissionsManageExchangeConfig?: InputMaybe<BooleanOperators>;
+	PermissionsManageExternalConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageFilesAndAttachments?: InputMaybe<BooleanOperators>;
+	PermissionsManageForecastingCustomData?: InputMaybe<BooleanOperators>;
+	PermissionsManageHealthCheck?: InputMaybe<BooleanOperators>;
+	PermissionsManageHerokuAppLink?: InputMaybe<BooleanOperators>;
+	PermissionsManageHubConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageIntegrationConnections?: InputMaybe<BooleanOperators>;
+	PermissionsManageInteraction?: InputMaybe<BooleanOperators>;
+	PermissionsManageInternalUsers?: InputMaybe<BooleanOperators>;
+	PermissionsManageIpAddresses?: InputMaybe<BooleanOperators>;
+	PermissionsManageLeads?: InputMaybe<BooleanOperators>;
+	PermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
+	PermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	PermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
+	PermissionsManageNetworks?: InputMaybe<BooleanOperators>;
+	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
+	PermissionsManageOrchestrationRuns?: InputMaybe<BooleanOperators>;
+	PermissionsManagePasswordPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsManageProfilesPermissionsets?: InputMaybe<BooleanOperators>;
+	PermissionsManagePropositions?: InputMaybe<BooleanOperators>;
+	PermissionsManagePvtRptsAndDashbds?: InputMaybe<BooleanOperators>;
+	PermissionsManageQuotas?: InputMaybe<BooleanOperators>;
+	PermissionsManageRecommendationStrategies?: InputMaybe<BooleanOperators>;
+	PermissionsManageReleaseUpdates?: InputMaybe<BooleanOperators>;
+	PermissionsManageRemoteAccess?: InputMaybe<BooleanOperators>;
+	PermissionsManageReportsInPubFolders?: InputMaybe<BooleanOperators>;
+	PermissionsManageRoles?: InputMaybe<BooleanOperators>;
+	PermissionsManageSessionPermissionSets?: InputMaybe<BooleanOperators>;
+	PermissionsManageSharedListViews?: InputMaybe<BooleanOperators>;
+	PermissionsManageSharing?: InputMaybe<BooleanOperators>;
+	PermissionsManageSocialPosting?: InputMaybe<BooleanOperators>;
+	PermissionsManageSolutions?: InputMaybe<BooleanOperators>;
+	PermissionsManageSubscriptions?: InputMaybe<BooleanOperators>;
+	PermissionsManageSurveys?: InputMaybe<BooleanOperators>;
+	PermissionsManageSynonyms?: InputMaybe<BooleanOperators>;
+	PermissionsManageTrustMeasures?: InputMaybe<BooleanOperators>;
+	PermissionsManageTwoFactor?: InputMaybe<BooleanOperators>;
+	PermissionsManageUnlistedGroups?: InputMaybe<BooleanOperators>;
+	PermissionsManageUsers?: InputMaybe<BooleanOperators>;
+	PermissionsMassInlineEdit?: InputMaybe<BooleanOperators>;
+	PermissionsMeetingEngagementUser?: InputMaybe<BooleanOperators>;
+	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
+	PermissionsMergeTopics?: InputMaybe<BooleanOperators>;
+	PermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	PermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAllData?: InputMaybe<BooleanOperators>;
+	PermissionsModifyAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsModifyDataClassification?: InputMaybe<BooleanOperators>;
+	PermissionsModifyMetadata?: InputMaybe<BooleanOperators>;
+	PermissionsMonitorLoginHistory?: InputMaybe<BooleanOperators>;
+	PermissionsNativeWebviewScrolling?: InputMaybe<BooleanOperators>;
+	PermissionsNewReportBuilder?: InputMaybe<BooleanOperators>;
+	PermissionsOutboundMigrationToolsUser?: InputMaybe<BooleanOperators>;
+	PermissionsOverrideForecasts?: InputMaybe<BooleanOperators>;
+	PermissionsPackaging2?: InputMaybe<BooleanOperators>;
+	PermissionsPackaging2Delete?: InputMaybe<BooleanOperators>;
+	PermissionsPasswordNeverExpires?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationDecisioningUser?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationIntelUser?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizationPlatform?: InputMaybe<BooleanOperators>;
+	PermissionsPersonalizedFinanceUserAccess?: InputMaybe<BooleanOperators>;
+	PermissionsPreventClassicExperience?: InputMaybe<BooleanOperators>;
+	PermissionsPrismBackofficeUser?: InputMaybe<BooleanOperators>;
+	PermissionsPrismPlaygroundUser?: InputMaybe<BooleanOperators>;
+	PermissionsPrivacyDataAccess?: InputMaybe<BooleanOperators>;
+	PermissionsPrmExtIntPrtnrAdminUser?: InputMaybe<BooleanOperators>;
+	PermissionsPublishMultiforce?: InputMaybe<BooleanOperators>;
+	PermissionsQrCodeGeneratorMobilePublisherPlayground?: InputMaybe<BooleanOperators>;
+	PermissionsQueryAllFiles?: InputMaybe<BooleanOperators>;
+	PermissionsQueryNonVetoedFiles?: InputMaybe<BooleanOperators>;
+	PermissionsQuipMetricsAccess?: InputMaybe<BooleanOperators>;
+	PermissionsQuipUserEngagementMetrics?: InputMaybe<BooleanOperators>;
+	PermissionsReassignOrchestrationWorkItems?: InputMaybe<BooleanOperators>;
+	PermissionsRegrelloUser?: InputMaybe<BooleanOperators>;
+	PermissionsRemoveDirectMessageMembers?: InputMaybe<BooleanOperators>;
+	PermissionsResetPasswords?: InputMaybe<BooleanOperators>;
+	PermissionsRunFlow?: InputMaybe<BooleanOperators>;
+	PermissionsRunReports?: InputMaybe<BooleanOperators>;
+	PermissionsSalesInsightsUser?: InputMaybe<BooleanOperators>;
+	PermissionsSandboxTestingInCommunityApp?: InputMaybe<BooleanOperators>;
+	PermissionsScheduleJob?: InputMaybe<BooleanOperators>;
+	PermissionsScheduleReports?: InputMaybe<BooleanOperators>;
+	PermissionsSegmentIntelligenceUser?: InputMaybe<BooleanOperators>;
+	PermissionsSelectFilesFromSalesforce?: InputMaybe<BooleanOperators>;
+	PermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
+	PermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
+	PermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
+	PermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
+	PermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
+	PermissionsSolutionImport?: InputMaybe<BooleanOperators>;
+	PermissionsStageManagementDesignUser?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeDashboardRolesGrps?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeDashboardToOtherUsers?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportRolesGrps?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportToOtherUsers?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeReportsRunAsUser?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeToLightningDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsSubscribeToLightningReports?: InputMaybe<BooleanOperators>;
+	PermissionsTerritoryOperations?: InputMaybe<BooleanOperators>;
+	PermissionsTraceXdsQueries?: InputMaybe<BooleanOperators>;
+	PermissionsTransactionalEmailSend?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyCase?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyEntity?: InputMaybe<BooleanOperators>;
+	PermissionsTransferAnyLead?: InputMaybe<BooleanOperators>;
+	PermissionsTwoFactorApi?: InputMaybe<BooleanOperators>;
+	PermissionsUpdateReportTypeReferences?: InputMaybe<BooleanOperators>;
+	PermissionsUseAnyApiAuth?: InputMaybe<BooleanOperators>;
+	PermissionsUseAssistantDialog?: InputMaybe<BooleanOperators>;
+	PermissionsUseMySearch?: InputMaybe<BooleanOperators>;
+	PermissionsUseQuerySuggestions?: InputMaybe<BooleanOperators>;
+	PermissionsUseRestrictedTheme?: InputMaybe<BooleanOperators>;
+	PermissionsUseServicePartReturn?: InputMaybe<BooleanOperators>;
+	PermissionsUseSetupWithAgentforce?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamReassignWizards?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamsForEmployee?: InputMaybe<BooleanOperators>;
+	PermissionsUseTeamsForItSrvcs?: InputMaybe<BooleanOperators>;
+	PermissionsUseWebLink?: InputMaybe<BooleanOperators>;
+	PermissionsUserCanDeployStore?: InputMaybe<BooleanOperators>;
+	PermissionsUserInteractionInsights?: InputMaybe<BooleanOperators>;
+	PermissionsViewAccessPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllActivities?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllCustomSettings?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllData?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllFieldsGlobal?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllForecasts?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllForeignKeyNames?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllPolicyCenterPolicies?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllProfiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewAllUsers?: InputMaybe<BooleanOperators>;
+	PermissionsViewApiNamedQueries?: InputMaybe<BooleanOperators>;
+	PermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
+	PermissionsViewContent?: InputMaybe<BooleanOperators>;
+	PermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
+	PermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
+	PermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
+	PermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
+	PermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
+	PermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
+	PermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
+	PermissionsViewMyTeamsDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsViewOrchestrationsInAutomApp?: InputMaybe<BooleanOperators>;
+	PermissionsViewPrivateStaticResources?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicCapstoneFolders?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicDashboards?: InputMaybe<BooleanOperators>;
+	PermissionsViewPublicReports?: InputMaybe<BooleanOperators>;
+	PermissionsViewRecommendations?: InputMaybe<BooleanOperators>;
+	PermissionsViewRestrictionAndScopingRules?: InputMaybe<BooleanOperators>;
+	PermissionsViewRoles?: InputMaybe<BooleanOperators>;
+	PermissionsViewSetup?: InputMaybe<BooleanOperators>;
+	PermissionsViewTrustMeasures?: InputMaybe<BooleanOperators>;
+	PermissionsViewUserPII?: InputMaybe<BooleanOperators>;
+	PermissionsYourAccountCDAPublishEvents?: InputMaybe<BooleanOperators>;
+	SharingType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	UserLicenseId?: InputMaybe<IdOperators>;
+	UserType?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Profile_Filter>>>;
+	not?: InputMaybe<Profile_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Profile_Filter>>>;
+};
+
+export type Profile_OrderBy = {
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	DefaultApplicationId?: InputMaybe<OrderByClause>;
+	Description?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsSsoEnabled?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	LastReferencedDate?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	PermissionsAcceptInboundBundling?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessBankingRelationshipAssistance?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessBankingServiceAgent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessCMC?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessContentBuilder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessDisputePrompts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessOrchestrationObjects?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessPolicyAgent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessServiceEinstein?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessSfDrive?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessToComplaintAgent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessToComplaintMgmt?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessToDisputeManagement?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessToServiceProcess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccessWealthAdvisorAgent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAccountSwitcherUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsActivateContract?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsActivateOrder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsActivateSystemModeFlows?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsActivitiesAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAddDirectMessageMembers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAdvancedCsvDataImportUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAgentforceServiceAgentUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAllowEmailIC?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAllowLightningLogin?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAllowViewEditConvertedLeads?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsApexRestServices?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsApiEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsApiUserOnly?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAppFrameworkManageApp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAppFrameworkManageTemplate?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAppFrameworkViewApp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsApprovalAdmin?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsApprovalDesigner?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAssignPermissionSets?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAssignTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAttributionModelUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsAuthorApex?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsB2BMarketingAnalyticsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsBulkApiHardDelete?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsBypassMFAForUiLogins?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCMSECEAuthoringAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCampaignInfluence2?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanApproveFeedPost?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanApproveUninstalledApps?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanDoActAsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanEditPrompts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanInsertFeedSystemFields?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanTranslateScrt2Conversation?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanUpdateEmailMessage?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanUseNewDashboardBuilder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanVerifyComment?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCanWriteWithAiScrt2Conversation?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCdcReportingCreateReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCdcReportingManageFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCdcReportingViewReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChangeDashboardColors?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterComposeUiCodesnippet?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterEditOwnPost?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterEditOwnRecordPost?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterFileLink?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterInternalUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterInviteExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsChatterOwnGroups?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsClientSecretRotation?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCloseConversations?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsConfigCustomRecs?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsConfigureDataspaceScope?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsConnectOrgToEnvironmentHub?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsConsentApiUpdate?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsContentAdministrator?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsContentHubUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsContentWorkspaces?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsConvertLeads?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateCustomizeDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateCustomizeFilters?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateCustomizeReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateDashboardFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateLtngTempFolder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateLtngTempInPub?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateMultiforce?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateReportFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateReportInLightning?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateWorkBadgeDefinition?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCreateWorkspaces?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCustomAppsOnFSMobile?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCustomMobileAppsAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCustomSidebarOnAllPages?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsCustomizeApplication?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDataExport?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDelegatedTwoFactor?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDeleteActivatedContract?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDeleteCrMemoAndInvoice?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDeleteSalesforceFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDeleteTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDigitalLendingAdminUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDigitalLendingEditReadOnly?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDigitalLendingUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDigitalLendingWorkbench?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDistributeFromPersWksp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDownloadMaliciousFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsDownloadPackageVersionZips?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditActivatedOrders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditBillingInfo?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditBrandTemplates?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditCaseComments?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditEvent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditHtmlTemplates?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditMyDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditMyReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditOppLineItemUnitPrice?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditPublicDocuments?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditPublicFilters?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditPublicTemplates?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditReadonlyFields?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditTask?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEditTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEmailAdministration?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEmailMass?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEmailSingle?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEmailTemplateManagement?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEnableBCTransactionPolling?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEnableCommunityAppLauncher?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEnableIPFSUpload?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEnableNotifications?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEngagementConfigUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsEnhancedSalesMobileExp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsExportReport?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsExternalClientAppAdmin?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsExternalClientAppDeveloper?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsExternalClientAppViewer?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsFSCArcGraphCommunityUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsFeedPinning?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsFlowUFLRequired?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsForceTwoFactor?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsFreezeUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsGiveRecognitionBadge?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsGovernNetworks?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsGrantOutboundBundling?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsHasUnlimitedNBAExecutions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsHeadlessCMSAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsHeadlessPublishNudges?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsHideReadByList?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIdentityConnect?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIdentityEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsImportCustomObjects?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsImportLeads?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsImportPersonal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsInboundMigrationToolsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsInstallMultiforce?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIntelligentDocumentProcessing?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIsSsoEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIsotopeAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIsotopeCToCUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsIsotopeLEX?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsKGERMultiArticlesUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLMEndMessagingSessionUserPerm?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLMOutboundMessagingUserPerm?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLightningConsoleAllowedForUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLightningExperienceUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsListEmailSend?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLobbyManagementUserAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsLtngPromoReserved01UserPerm?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMCPMetadataApi?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageAccessPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageAgentforceServiceAgent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageAnalyticSnapshots?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageApiNamedQueries?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageAuthProviders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageBusinessHourHolidays?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageC360AConnections?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCMS?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCallCenters?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCases?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCategories?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCdpMlModels?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCertificates?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCertificatesExpiration?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageChatterMessages?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageContentPermissions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageContentProperties?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageContentTaxonomy?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageContentTypes?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCustomDomains?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCustomPermissions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageCustomReportTypes?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageDashbdsInPubFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageDataCategories?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageDataIntegrations?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageDataspaceScope?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageDynamicDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageEmailClientConfig?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageExchangeConfig?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageExternalConnections?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageFilesAndAttachments?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageForecastingCustomData?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageHealthCheck?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageHerokuAppLink?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageHubConnections?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageIntegrationConnections?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageInteraction?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageInternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageIpAddresses?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageLeads?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageLoginAccessPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageMaliciousFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageMobile?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageNamedCredentials?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageNetworks?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageOrchestrationRuns?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManagePasswordPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageProfilesPermissionsets?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManagePropositions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManagePvtRptsAndDashbds?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageQuotas?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageRecommendationStrategies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageReleaseUpdates?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageRemoteAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageReportsInPubFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageRoles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSessionPermissionSets?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSharedListViews?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSharing?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSocialPosting?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSolutions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSubscriptions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSurveys?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageSynonyms?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageTrustMeasures?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageTwoFactor?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageUnlistedGroups?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMassInlineEdit?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMeetingEngagementUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMergeTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMetadataStudioUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModerateChatter?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModerateNetworkUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyAccessAllowPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyAccessDenyPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyAllData?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyAllPolicyCenterPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyDataClassification?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModifyMetadata?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMonitorLoginHistory?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsNativeWebviewScrolling?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsNewReportBuilder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsOutboundMigrationToolsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsOverrideForecasts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPackaging2?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPackaging2Delete?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPasswordNeverExpires?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPersonalizationDecisioningUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPersonalizationIntelUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPersonalizationPlatform?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPersonalizedFinanceUserAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPreventClassicExperience?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPrismBackofficeUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPrismPlaygroundUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPrivacyDataAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPrmExtIntPrtnrAdminUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsPublishMultiforce?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsQrCodeGeneratorMobilePublisherPlayground?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsQueryAllFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsQueryNonVetoedFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsQuipMetricsAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsQuipUserEngagementMetrics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsReassignOrchestrationWorkItems?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsRegrelloUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsRemoveDirectMessageMembers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsResetPasswords?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsRunFlow?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsRunReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSalesInsightsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSandboxTestingInCommunityApp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsScheduleJob?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsScheduleReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSegmentIntelligenceUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSelectFilesFromSalesforce?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSendAnnouncementEmails?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSendCustomNotifications?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSendSitRequests?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSimpleCsvDataImportUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSkipIdentityConfirmation?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSolutionImport?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsStageManagementDesignUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeDashboardRolesGrps?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeDashboardToOtherUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeReportRolesGrps?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeReportToOtherUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeReportsRunAsUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeToLightningDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsSubscribeToLightningReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTerritoryOperations?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTraceXdsQueries?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTransactionalEmailSend?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTransferAnyCase?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTransferAnyEntity?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTransferAnyLead?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsTwoFactorApi?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUpdateReportTypeReferences?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseAnyApiAuth?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseAssistantDialog?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseMySearch?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseQuerySuggestions?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseRestrictedTheme?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseServicePartReturn?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseSetupWithAgentforce?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseTeamReassignWizards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseTeamsForEmployee?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseTeamsForItSrvcs?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUseWebLink?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUserCanDeployStore?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsUserInteractionInsights?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAccessPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllActivities?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllCustomSettings?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllData?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllFieldsGlobal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllForecasts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllForeignKeyNames?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllPolicyCenterPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllProfiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewAllUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewApiNamedQueries?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewClientSecret?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewContent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewContentTaxonomy?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewDataAssessment?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewDataCategories?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewDeveloperName?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewEncryptedData?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewEventLogFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewHealthCheck?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewHelpLink?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewLicenseUtilization?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewMyTeamsDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewOrchestrationsInAutomApp?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewPrivateStaticResources?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewPublicCapstoneFolders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewPublicDashboards?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewPublicReports?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewRecommendations?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewRestrictionAndScopingRules?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewRoles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewSetup?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewTrustMeasures?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewUserPII?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsYourAccountCDAPublishEvents?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	SharingType?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Type?: InputMaybe<OrderByClause>;
+	UserLicenseId?: InputMaybe<OrderByClause>;
+	UserType?: InputMaybe<OrderByClause>;
+};
+
+export type Property_Cost__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property_Cost__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Cost__History_Filter>>>;
+	not?: InputMaybe<Property_Cost__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Cost__History_Filter>>>;
+};
+
+export type Property_Cost__C_Filter = {
+	Cost_Amount__c?: InputMaybe<CurrencyOperators>;
+	Cost_Category__c?: InputMaybe<PicklistOperators>;
+	Cost_Date__c?: InputMaybe<DateOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description__c?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Vendor__c?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Cost__C_Filter>>>;
+	not?: InputMaybe<Property_Cost__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Cost__C_Filter>>>;
+};
+
+export type Property_Feature__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description__c?: InputMaybe<LongTextAreaOperators>;
+	Display_on_Listing__c?: InputMaybe<BooleanOperators>;
+	Feature_Category__c?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Feature__C_Filter>>>;
+	not?: InputMaybe<Property_Feature__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Feature__C_Filter>>>;
+};
+
+export type Property_Image__C_Filter = {
+	Alt_Text__c?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Display_Order__c?: InputMaybe<DoubleOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Image_Type__c?: InputMaybe<PicklistOperators>;
+	Image_URL__c?: InputMaybe<UrlOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Image__C_Filter>>>;
+	not?: InputMaybe<Property_Image__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Image__C_Filter>>>;
+};
+
+export type Property_Listing__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property_Listing__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Listing__History_Filter>>>;
+	not?: InputMaybe<Property_Listing__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Listing__History_Filter>>>;
+};
+
+export type Property_Listing__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Display_Order__c?: InputMaybe<DoubleOperators>;
+	Featured__c?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Listing_Price__c?: InputMaybe<CurrencyOperators>;
+	Listing_Status__c?: InputMaybe<PicklistOperators>;
+	Marketing_Description__c?: InputMaybe<LongTextAreaOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	Short_Description__c?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Listing__C_Filter>>>;
+	not?: InputMaybe<Property_Listing__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Listing__C_Filter>>>;
+};
+
+export type Property_Listing__C_OrderBy = {
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Display_Order__c?: InputMaybe<OrderByClause>;
+	Featured__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Listing_Price__c?: InputMaybe<OrderByClause>;
+	Listing_Status__c?: InputMaybe<OrderByClause>;
+	Marketing_Description__c?: InputMaybe<AggregateOrderByStringClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Property__c?: InputMaybe<OrderByClause>;
+	Property__r?: InputMaybe<Property__C_OrderBy>;
+	Short_Description__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+};
+
+export type Property_Management_Company__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property_Management_Company__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Management_Company__History_Filter>>>;
+	not?: InputMaybe<Property_Management_Company__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Management_Company__History_Filter>>>;
+};
+
+export type Property_Management_Company__C_Filter = {
+	Active__c?: InputMaybe<BooleanOperators>;
+	Company_Code__c?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Email__c?: InputMaybe<EmailOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Property_Management_Company__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone__c?: InputMaybe<PhoneNumberOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Management_Company__C_Filter>>>;
+	not?: InputMaybe<Property_Management_Company__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Management_Company__C_Filter>>>;
+};
+
+export type Property_Management_Company__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Property_Owner__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property_Owner__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Owner__History_Filter>>>;
+	not?: InputMaybe<Property_Owner__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Owner__History_Filter>>>;
+};
+
+export type Property_Owner__C_Filter = {
+	Address__c?: InputMaybe<TextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Email__c?: InputMaybe<EmailOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Property_Owner__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Phone__c?: InputMaybe<PhoneNumberOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Owner__C_Filter>>>;
+	not?: InputMaybe<Property_Owner__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Owner__C_Filter>>>;
+};
+
+export type Property_Owner__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Property_Sale__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property_Sale__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Sale__History_Filter>>>;
+	not?: InputMaybe<Property_Sale__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Sale__History_Filter>>>;
+};
+
+export type Property_Sale__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	Sale_Amount__c?: InputMaybe<CurrencyOperators>;
+	Sale_Date__c?: InputMaybe<DateTimeOperators>;
+	Sale_Status__c?: InputMaybe<PicklistOperators>;
+	Sale_Type__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property_Sale__C_Filter>>>;
+	not?: InputMaybe<Property_Sale__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property_Sale__C_Filter>>>;
+};
+
+export type Property__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Property__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property__History_Filter>>>;
+	not?: InputMaybe<Property__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property__History_Filter>>>;
+};
+
+export type Property__C_Filter = {
+	Address__c?: InputMaybe<StringOperators>;
+	Agent__c?: InputMaybe<IdOperators>;
+	Agent__r?: InputMaybe<Agent__C_Filter>;
+	Available_Date__c?: InputMaybe<DateOperators>;
+	Bathrooms__c?: InputMaybe<DoubleOperators>;
+	Bedrooms__c?: InputMaybe<DoubleOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Deposit__c?: InputMaybe<CurrencyOperators>;
+	Description__c?: InputMaybe<LongTextAreaOperators>;
+	Features__c?: InputMaybe<MultiPicklistOperators>;
+	Hero_Image__c?: InputMaybe<UrlOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Lease_Term__c?: InputMaybe<DoubleOperators>;
+	Monthly_Rent__c?: InputMaybe<CurrencyOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Property__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parking__c?: InputMaybe<DoubleOperators>;
+	Pet_Friendly__c?: InputMaybe<BooleanOperators>;
+	Sq_Ft__c?: InputMaybe<DoubleOperators>;
+	Status__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Tour_URL__c?: InputMaybe<UrlOperators>;
+	Type__c?: InputMaybe<PicklistOperators>;
+	Utilities__c?: InputMaybe<MultiPicklistOperators>;
+	Year_Built__c?: InputMaybe<DoubleOperators>;
+	and?: InputMaybe<Array<InputMaybe<Property__C_Filter>>>;
+	not?: InputMaybe<Property__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Property__C_Filter>>>;
+};
+
+export type Property__C_OrderBy = {
+	Address__c?: InputMaybe<OrderByClause>;
+	Agent__c?: InputMaybe<OrderByClause>;
+	Agent__r?: InputMaybe<Agent__C_OrderBy>;
+	Available_Date__c?: InputMaybe<OrderByClause>;
+	Bathrooms__c?: InputMaybe<OrderByClause>;
+	Bedrooms__c?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Deposit__c?: InputMaybe<OrderByClause>;
+	Description__c?: InputMaybe<AggregateOrderByStringClause>;
+	Hero_Image__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Lease_Term__c?: InputMaybe<OrderByClause>;
+	Monthly_Rent__c?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Property__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Parking__c?: InputMaybe<OrderByClause>;
+	Pet_Friendly__c?: InputMaybe<OrderByClause>;
+	Sq_Ft__c?: InputMaybe<OrderByClause>;
+	Status__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	Tour_URL__c?: InputMaybe<OrderByClause>;
+	Type__c?: InputMaybe<OrderByClause>;
+	Year_Built__c?: InputMaybe<OrderByClause>;
+};
+
+export type Property__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Property__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type QuickTextHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	QuickText?: InputMaybe<QuickText_Filter>;
+	QuickTextId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<QuickTextHistory_Filter>>>;
+	not?: InputMaybe<QuickTextHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<QuickTextHistory_Filter>>>;
+};
+
+export type QuickText_Filter = {
+	Category?: InputMaybe<PicklistOperators>;
+	Channel?: InputMaybe<MultiPicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FolderId?: InputMaybe<IdOperators>;
+	FolderName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsInsertable?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Message?: InputMaybe<LongTextAreaOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<QuickText_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SourceType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<QuickText_Filter>>>;
+	not?: InputMaybe<QuickText_Filter>;
+	or?: InputMaybe<Array<InputMaybe<QuickText_Filter>>>;
+};
+
+export type QuickText_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Recommendation_Filter = {
+	AcceptanceLabel?: InputMaybe<StringOperators>;
+	ActionReference?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	ExternalId?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	ImageId?: InputMaybe<IdOperators>;
+	IsActionActive?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	RecommendationKey?: InputMaybe<StringOperators>;
+	RejectionLabel?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Recommendation_Filter>>>;
+	not?: InputMaybe<Recommendation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Recommendation_Filter>>>;
+};
+
+export type RecordAction_Filter = {
+	ActionDefinition?: InputMaybe<PicklistOperators>;
+	ActionType?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	FlowDefinition?: InputMaybe<PicklistOperators>;
+	FlowInterview?: InputMaybe<FlowInterview_Filter>;
+	FlowInterviewId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsMandatory?: InputMaybe<BooleanOperators>;
+	IsUiRemoveHidden?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Order?: InputMaybe<IntegerOperators>;
+	Pinned?: InputMaybe<PicklistOperators>;
+	Record?: InputMaybe<RecordAction_Record_Filters>;
+	RecordId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<RecordAction_Filter>>>;
+	not?: InputMaybe<RecordAction_Filter>;
+	or?: InputMaybe<Array<InputMaybe<RecordAction_Filter>>>;
+};
+
+export type RecordAction_Record_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	AssociatedLocation?: InputMaybe<AssociatedLocation_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	CampaignMember?: InputMaybe<CampaignMember_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	EnhancedLetterhead?: InputMaybe<EnhancedLetterhead_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Scorecard?: InputMaybe<Scorecard_Filter>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	User?: InputMaybe<User_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type RecordType_Filter = {
+	BusinessProcessId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	SobjectType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<RecordType_Filter>>>;
+	not?: InputMaybe<RecordType_Filter>;
+	or?: InputMaybe<Array<InputMaybe<RecordType_Filter>>>;
+};
+
+export type RecordType_OrderBy = {
+	BusinessProcessId?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	Description?: InputMaybe<OrderByClause>;
+	DeveloperName?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsActive?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	NamespacePrefix?: InputMaybe<OrderByClause>;
+	SobjectType?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+};
+
+export type ReportHierarchyObjectField_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	HierarchyApiName?: InputMaybe<StringOperators>;
+	HierarchyField?: InputMaybe<StringOperators>;
+	HierarchyType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Object?: InputMaybe<StringOperators>;
+	ObjectType?: InputMaybe<PicklistOperators>;
+	Report?: InputMaybe<Report_Filter>;
+	ReportId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ReportHierarchyObjectField_Filter>>>;
+	not?: InputMaybe<ReportHierarchyObjectField_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ReportHierarchyObjectField_Filter>>>;
+};
+
+export type Report_Filter = {
+	BlockReportId?: InputMaybe<IdOperators>;
+	BooleanFilter?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Currency?: InputMaybe<StringOperators>;
+	Description?: InputMaybe<StringOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	Division?: InputMaybe<StringOperators>;
+	Drill?: InputMaybe<StringOperators>;
+	DrillRoleId?: InputMaybe<IdOperators>;
+	DrillUserId?: InputMaybe<IdOperators>;
+	FolderName?: InputMaybe<StringOperators>;
+	Format?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	JoinType?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastRunDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	NumSubscriptions?: InputMaybe<IntegerOperators>;
+	OptionsFlagCurrentSnapshotDate?: InputMaybe<BooleanOperators>;
+	OptionsFlagHasStackedSummaries?: InputMaybe<BooleanOperators>;
+	OptionsFlagIsSmartTotalDisabled?: InputMaybe<BooleanOperators>;
+	OptionsFlagShowCommonRowsOnly?: InputMaybe<BooleanOperators>;
+	OptionsFlagShowGrandTotal?: InputMaybe<BooleanOperators>;
+	OptionsFlagShowSubtotals?: InputMaybe<BooleanOperators>;
+	OptionsFlagSideBySide?: InputMaybe<BooleanOperators>;
+	Owner?: InputMaybe<Report_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ReportTypeEnumOrId?: InputMaybe<PicklistOperators>;
+	Scope?: InputMaybe<StringOperators>;
+	ShowDetails?: InputMaybe<BooleanOperators>;
+	SortAsc?: InputMaybe<BooleanOperators>;
+	SortCol?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TopRows?: InputMaybe<IntegerOperators>;
+	Version?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<Report_Filter>>>;
+	not?: InputMaybe<Report_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Report_Filter>>>;
+};
+
+export type Report_Owner_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
 export const ResultOrder = {
 	Asc: "ASC",
 	Desc: "DESC",
 } as const;
+
 export type ResultOrder = (typeof ResultOrder)[keyof typeof ResultOrder];
 
-/** orderBy for Property_Listing__c (e.g. { Listing_Price__c: { order: ResultOrder.Asc } }). */
-export type PropertyListingsOrderBy = {
-	Listing_Price__c?: { order: ResultOrder };
-	Property__r?: { Bedrooms__c?: { order: ResultOrder } };
+export const ResultsOrder = {
+	Asc: "ASC",
+	Desc: "DESC",
+} as const;
+
+export type ResultsOrder = (typeof ResultsOrder)[keyof typeof ResultsOrder];
+
+export type ScorecardAssociation_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Scorecard?: InputMaybe<Scorecard_Filter>;
+	ScorecardId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TargetEntity?: InputMaybe<Account_Filter>;
+	TargetEntityId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<ScorecardAssociation_Filter>>>;
+	not?: InputMaybe<ScorecardAssociation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ScorecardAssociation_Filter>>>;
 };
 
-/** Where clause: condition, or { and: conditions[] }, or { or: conditions[] }. */
-export interface PropertyListingsQueryVariables {
-	where?:
-		| PropertyListingsWhereCondition
-		| { and: Array<PropertyListingsWhereCondition | { or: PropertyListingsWhereCondition[] }> }
-		| { or: PropertyListingsWhereCondition[] };
-	first: number;
-	after?: string | null;
-	orderBy?: PropertyListingsOrderBy | null;
-}
+export type ScorecardMetric_Filter = {
+	Category?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Report?: InputMaybe<Report_Filter>;
+	ReportId?: InputMaybe<IdOperators>;
+	Scorecard?: InputMaybe<Scorecard_Filter>;
+	ScorecardId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<ScorecardMetric_Filter>>>;
+	not?: InputMaybe<ScorecardMetric_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ScorecardMetric_Filter>>>;
+};
 
-export interface PropertyListingsQuery {
-	uiapi?: {
-		query?: {
+export type Scorecard_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Scorecard_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TargetEntity?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<Scorecard_Filter>>>;
+	not?: InputMaybe<Scorecard_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Scorecard_Filter>>>;
+};
+
+export type Scorecard_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type SecurityHealthCheckAlertRecipient_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsAdminNotifyEnabled?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NotificationType?: InputMaybe<StringOperators>;
+	RecipientEmails?: InputMaybe<LongTextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<SecurityHealthCheckAlertRecipient_Filter>>>;
+	not?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SecurityHealthCheckAlertRecipient_Filter>>>;
+};
+
+export type SecurityHealthCheckResult_Filter = {
+	BaselineApiName?: InputMaybe<StringOperators>;
+	BaselineName?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	ProcessedTime?: InputMaybe<DateTimeOperators>;
+	ResultDetails?: InputMaybe<LongTextAreaOperators>;
+	Score?: InputMaybe<DoubleOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<SecurityHealthCheckResult_Filter>>>;
+	not?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SecurityHealthCheckResult_Filter>>>;
+};
+
+export type SellerHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Seller?: InputMaybe<Seller_Filter>;
+	SellerId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SellerHistory_Filter>>>;
+	not?: InputMaybe<SellerHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SellerHistory_Filter>>>;
+};
+
+export type Seller_Filter = {
+	ActiveFromDate?: InputMaybe<DateOperators>;
+	ActiveToDate?: InputMaybe<DateOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Seller_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Party?: InputMaybe<Individual_Filter>;
+	PartyId?: InputMaybe<IdOperators>;
+	SalesAmount?: InputMaybe<IntegerOperators>;
+	SellerTier?: InputMaybe<PicklistOperators>;
+	SellerType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Seller_Filter>>>;
+	not?: InputMaybe<Seller_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Seller_Filter>>>;
+};
+
+export type Seller_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type SetupAssistantStep_Filter = {
+	AssistantType?: InputMaybe<PicklistOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsComplete?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<SetupAssistantStep_Filter>>>;
+	not?: InputMaybe<SetupAssistantStep_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SetupAssistantStep_Filter>>>;
+};
+
+export type SiteHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	SiteId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SiteHistory_Filter>>>;
+	not?: InputMaybe<SiteHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SiteHistory_Filter>>>;
+};
+
+export type SocialPersonaHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	SocialPersona?: InputMaybe<SocialPersona_Filter>;
+	SocialPersonaId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SocialPersonaHistory_Filter>>>;
+	not?: InputMaybe<SocialPersonaHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SocialPersonaHistory_Filter>>>;
+};
+
+export type SocialPersona_Filter = {
+	AreWeFollowing?: InputMaybe<BooleanOperators>;
+	AuthorLabels?: InputMaybe<StringOperators>;
+	AvatarUrl?: InputMaybe<StringOperators>;
+	Bio?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	ExternalId?: InputMaybe<StringOperators>;
+	ExternalPictureURL?: InputMaybe<UrlOperators>;
+	Followers?: InputMaybe<IntegerOperators>;
+	Following?: InputMaybe<IntegerOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InfluencerScore?: InputMaybe<IntegerOperators>;
+	IsBlacklisted?: InputMaybe<BooleanOperators>;
+	IsDefault?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsFollowingUs?: InputMaybe<BooleanOperators>;
+	IsVerified?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	ListedCount?: InputMaybe<IntegerOperators>;
+	MediaProvider?: InputMaybe<StringOperators>;
+	MediaType?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumberOfFriends?: InputMaybe<IntegerOperators>;
+	NumberOfTweets?: InputMaybe<IntegerOperators>;
+	Parent?: InputMaybe<SocialPersona_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	ProfileType?: InputMaybe<PicklistOperators>;
+	ProfileUrl?: InputMaybe<UrlOperators>;
+	Provider?: InputMaybe<PicklistOperators>;
+	R6SourceId?: InputMaybe<StringOperators>;
+	RealName?: InputMaybe<StringOperators>;
+	SourceApp?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TopicType?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<SocialPersona_Filter>>>;
+	not?: InputMaybe<SocialPersona_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SocialPersona_Filter>>>;
+};
+
+export type SocialPersona_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+};
+
+export type SocialPostHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	SocialPost?: InputMaybe<SocialPost_Filter>;
+	SocialPostId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SocialPostHistory_Filter>>>;
+	not?: InputMaybe<SocialPostHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SocialPostHistory_Filter>>>;
+};
+
+export type SocialPost_Filter = {
+	AnalyzerScore?: InputMaybe<DoubleOperators>;
+	AssignedTo?: InputMaybe<StringOperators>;
+	AttachmentType?: InputMaybe<PicklistOperators>;
+	AttachmentUrl?: InputMaybe<UrlOperators>;
+	Classification?: InputMaybe<PicklistOperators>;
+	CommentCount?: InputMaybe<IntegerOperators>;
+	Content?: InputMaybe<LongTextAreaOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DeletedBy?: InputMaybe<User_Filter>;
+	DeletedById?: InputMaybe<IdOperators>;
+	EngagementLevel?: InputMaybe<PicklistOperators>;
+	ExternalPostId?: InputMaybe<StringOperators>;
+	Handle?: InputMaybe<StringOperators>;
+	HarvestDate?: InputMaybe<DateTimeOperators>;
+	Headline?: InputMaybe<StringOperators>;
+	HiddenBy?: InputMaybe<User_Filter>;
+	HiddenById?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InboundLinkCount?: InputMaybe<IntegerOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsOutbound?: InputMaybe<BooleanOperators>;
+	KeywordGroupName?: InputMaybe<StringOperators>;
+	Language?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	LikedBy?: InputMaybe<StringOperators>;
+	LikesAndVotes?: InputMaybe<IntegerOperators>;
+	MediaProvider?: InputMaybe<StringOperators>;
+	MediaType?: InputMaybe<StringOperators>;
+	MessageType?: InputMaybe<PicklistOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Notes?: InputMaybe<LongTextAreaOperators>;
+	OutboundSocialAccountId?: InputMaybe<IdOperators>;
+	Owner?: InputMaybe<SocialPost_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Case_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	Persona?: InputMaybe<SocialPersona_Filter>;
+	PersonaId?: InputMaybe<IdOperators>;
+	PostPriority?: InputMaybe<StringOperators>;
+	PostTags?: InputMaybe<LongTextAreaOperators>;
+	PostUrl?: InputMaybe<UrlOperators>;
+	Posted?: InputMaybe<DateTimeOperators>;
+	Provider?: InputMaybe<PicklistOperators>;
+	R6PostId?: InputMaybe<StringOperators>;
+	R6SourceId?: InputMaybe<StringOperators>;
+	R6TopicId?: InputMaybe<StringOperators>;
+	Recipient?: InputMaybe<StringOperators>;
+	RecipientType?: InputMaybe<StringOperators>;
+	ReplyTo?: InputMaybe<SocialPost_Filter>;
+	ReplyToId?: InputMaybe<IdOperators>;
+	ResponseContextExternalId?: InputMaybe<StringOperators>;
+	ReviewScale?: InputMaybe<DoubleOperators>;
+	ReviewScore?: InputMaybe<DoubleOperators>;
+	ReviewedStatus?: InputMaybe<PicklistOperators>;
+	Sentiment?: InputMaybe<PicklistOperators>;
+	Shares?: InputMaybe<IntegerOperators>;
+	SourceTags?: InputMaybe<LongTextAreaOperators>;
+	SpamRating?: InputMaybe<PicklistOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusMessage?: InputMaybe<TextAreaOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	ThreadSize?: InputMaybe<IntegerOperators>;
+	TopicProfileName?: InputMaybe<StringOperators>;
+	TopicType?: InputMaybe<PicklistOperators>;
+	TruncatedContent?: InputMaybe<StringOperators>;
+	UniqueCommentors?: InputMaybe<IntegerOperators>;
+	ViewCount?: InputMaybe<IntegerOperators>;
+	Who?: InputMaybe<SocialPost_Who_Filters>;
+	WhoId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SocialPost_Filter>>>;
+	not?: InputMaybe<SocialPost_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SocialPost_Filter>>>;
+};
+
+export type SocialPost_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type SocialPost_Who_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type SolutionHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	SolutionId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<SolutionHistory_Filter>>>;
+	not?: InputMaybe<SolutionHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SolutionHistory_Filter>>>;
+};
+
+export type StaticResource_Filter = {
+	BodyLength?: InputMaybe<IntegerOperators>;
+	CacheControl?: InputMaybe<PicklistOperators>;
+	ContentType?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<TextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NamespacePrefix?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<StaticResource_Filter>>>;
+	not?: InputMaybe<StaticResource_Filter>;
+	or?: InputMaybe<Array<InputMaybe<StaticResource_Filter>>>;
+};
+
+export type StreamingChannel_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsDynamic?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<StreamingChannel_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<StreamingChannel_Filter>>>;
+	not?: InputMaybe<StreamingChannel_Filter>;
+	or?: InputMaybe<Array<InputMaybe<StreamingChannel_Filter>>>;
+};
+
+export type StreamingChannel_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type StringOperators = {
+	eq?: InputMaybe<Scalars["String"]["input"]>;
+	gt?: InputMaybe<Scalars["String"]["input"]>;
+	gte?: InputMaybe<Scalars["String"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
+	like?: InputMaybe<Scalars["String"]["input"]>;
+	lt?: InputMaybe<Scalars["String"]["input"]>;
+	lte?: InputMaybe<Scalars["String"]["input"]>;
+	ne?: InputMaybe<Scalars["String"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
+};
+
+export const TabOrder = {
+	LeftRight: "LEFT_RIGHT",
+	TopDown: "TOP_DOWN",
+} as const;
+
+export type TabOrder = (typeof TabOrder)[keyof typeof TabOrder];
+
+export type TableauHostMapping_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	HostType?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<TableauHostMapping_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SiteLuid?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UrlMatch?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<TableauHostMapping_Filter>>>;
+	not?: InputMaybe<TableauHostMapping_Filter>;
+	or?: InputMaybe<Array<InputMaybe<TableauHostMapping_Filter>>>;
+};
+
+export type TableauHostMapping_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Task_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	ActivityDate?: InputMaybe<DateOperators>;
+	ActivityOriginType?: InputMaybe<PicklistOperators>;
+	CallDisposition?: InputMaybe<StringOperators>;
+	CallDurationInSeconds?: InputMaybe<IntegerOperators>;
+	CallObject?: InputMaybe<StringOperators>;
+	CallType?: InputMaybe<PicklistOperators>;
+	CompletedDateTime?: InputMaybe<DateTimeOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsArchived?: InputMaybe<BooleanOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsHighPriority?: InputMaybe<BooleanOperators>;
+	IsRecurrence?: InputMaybe<BooleanOperators>;
+	IsReminderSet?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Owner?: InputMaybe<Task_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Priority?: InputMaybe<PicklistOperators>;
+	RecurrenceActivityId?: InputMaybe<IdOperators>;
+	RecurrenceDayOfMonth?: InputMaybe<IntegerOperators>;
+	RecurrenceDayOfWeekMask?: InputMaybe<IntegerOperators>;
+	RecurrenceEndDateOnly?: InputMaybe<DateOperators>;
+	RecurrenceInstance?: InputMaybe<PicklistOperators>;
+	RecurrenceInterval?: InputMaybe<IntegerOperators>;
+	RecurrenceMonthOfYear?: InputMaybe<PicklistOperators>;
+	RecurrenceRegeneratedType?: InputMaybe<PicklistOperators>;
+	RecurrenceStartDateOnly?: InputMaybe<DateOperators>;
+	RecurrenceTimeZoneSidKey?: InputMaybe<PicklistOperators>;
+	RecurrenceType?: InputMaybe<PicklistOperators>;
+	ReminderDateTime?: InputMaybe<DateTimeOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	Subject?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TaskSubtype?: InputMaybe<PicklistOperators>;
+	What?: InputMaybe<Task_What_Filters>;
+	WhatId?: InputMaybe<IdOperators>;
+	Who?: InputMaybe<Task_Who_Filters>;
+	WhoId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Task_Filter>>>;
+	not?: InputMaybe<Task_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Task_Filter>>>;
+};
+
+export type Task_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Task_What_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	ApprovalSubmission?: InputMaybe<ApprovalSubmission_Filter>;
+	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
+	ApprovalWorkItem?: InputMaybe<ApprovalWorkItem_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetRelationship?: InputMaybe<AssetRelationship_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
+	ContactRequest?: InputMaybe<ContactRequest_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
+	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
+	Image?: InputMaybe<Image_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	ListEmail?: InputMaybe<ListEmail_Filter>;
+	Location?: InputMaybe<Location_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	PartyConsent?: InputMaybe<PartyConsent_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	ProcessException?: InputMaybe<ProcessException_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type Task_Who_Filters = {
+	Contact?: InputMaybe<Contact_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+};
+
+export type Tenant__History_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<Tenant__C_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Tenant__History_Filter>>>;
+	not?: InputMaybe<Tenant__History_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Tenant__History_Filter>>>;
+};
+
+export type Tenant__C_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	End_Date__c?: InputMaybe<DateOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastActivityDate?: InputMaybe<DateOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<Tenant__C_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Property__c?: InputMaybe<IdOperators>;
+	Property__r?: InputMaybe<Property__C_Filter>;
+	Start_Date__c?: InputMaybe<DateOperators>;
+	Status__c?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	User_Status__c?: InputMaybe<PicklistOperators>;
+	User__c?: InputMaybe<IdOperators>;
+	User__r?: InputMaybe<User_Filter>;
+	and?: InputMaybe<Array<InputMaybe<Tenant__C_Filter>>>;
+	not?: InputMaybe<Tenant__C_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Tenant__C_Filter>>>;
+};
+
+export type Tenant__C_OrderBy = {
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	End_Date__c?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	IsDeleted?: InputMaybe<OrderByClause>;
+	LastActivityDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	Owner?: InputMaybe<Tenant__C_Owner_OrderBys>;
+	OwnerId?: InputMaybe<OrderByClause>;
+	Property__c?: InputMaybe<OrderByClause>;
+	Property__r?: InputMaybe<Property__C_OrderBy>;
+	Start_Date__c?: InputMaybe<OrderByClause>;
+	Status__c?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	User_Status__c?: InputMaybe<OrderByClause>;
+	User__c?: InputMaybe<OrderByClause>;
+	User__r?: InputMaybe<User_OrderBy>;
+};
+
+export type Tenant__C_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type Tenant__C_Owner_OrderBys = {
+	Group?: InputMaybe<Group_OrderBy>;
+	Name?: InputMaybe<Name_OrderBy>;
+	User?: InputMaybe<User_OrderBy>;
+};
+
+export type TextAreaOperators = {
+	eq?: InputMaybe<Scalars["TextArea"]["input"]>;
+	gt?: InputMaybe<Scalars["TextArea"]["input"]>;
+	gte?: InputMaybe<Scalars["TextArea"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["TextArea"]["input"]>>>;
+	like?: InputMaybe<Scalars["TextArea"]["input"]>;
+	lt?: InputMaybe<Scalars["TextArea"]["input"]>;
+	lte?: InputMaybe<Scalars["TextArea"]["input"]>;
+	ne?: InputMaybe<Scalars["TextArea"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["TextArea"]["input"]>>>;
+};
+
+export type TimeOperators = {
+	eq?: InputMaybe<Scalars["Time"]["input"]>;
+	gt?: InputMaybe<Scalars["Time"]["input"]>;
+	gte?: InputMaybe<Scalars["Time"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Time"]["input"]>>>;
+	lt?: InputMaybe<Scalars["Time"]["input"]>;
+	lte?: InputMaybe<Scalars["Time"]["input"]>;
+	ne?: InputMaybe<Scalars["Time"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Time"]["input"]>>>;
+};
+
+export type TopicAssignment_Entity_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Asset?: InputMaybe<Asset_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContentDocument?: InputMaybe<ContentDocument_Filter>;
+	Contract?: InputMaybe<Contract_Filter>;
+	Event?: InputMaybe<Event_Filter>;
+	FeedItem?: InputMaybe<FeedItem_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Order?: InputMaybe<Order_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+};
+
+export type TopicAssignment_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Entity?: InputMaybe<TopicAssignment_Entity_Filters>;
+	EntityId?: InputMaybe<IdOperators>;
+	EntityKeyPrefix?: InputMaybe<StringOperators>;
+	EntityType?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Topic?: InputMaybe<Topic_Filter>;
+	TopicId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<TopicAssignment_Filter>>>;
+	not?: InputMaybe<TopicAssignment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<TopicAssignment_Filter>>>;
+};
+
+export type Topic_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	ManagedTopicType?: InputMaybe<StringOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TalkingAbout?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<Topic_Filter>>>;
+	not?: InputMaybe<Topic_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Topic_Filter>>>;
+};
+
+export type Translation_Filter = {
+	CanManage?: InputMaybe<BooleanOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<Translation_Filter>>>;
+	not?: InputMaybe<Translation_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Translation_Filter>>>;
+};
+
+export type UrlOperators = {
+	eq?: InputMaybe<Scalars["Url"]["input"]>;
+	gt?: InputMaybe<Scalars["Url"]["input"]>;
+	gte?: InputMaybe<Scalars["Url"]["input"]>;
+	in?: InputMaybe<Array<InputMaybe<Scalars["Url"]["input"]>>>;
+	like?: InputMaybe<Scalars["Url"]["input"]>;
+	lt?: InputMaybe<Scalars["Url"]["input"]>;
+	lte?: InputMaybe<Scalars["Url"]["input"]>;
+	ne?: InputMaybe<Scalars["Url"]["input"]>;
+	nin?: InputMaybe<Array<InputMaybe<Scalars["Url"]["input"]>>>;
+};
+
+export const UiBehavior = {
+	Edit: "EDIT",
+	Readonly: "READONLY",
+	Required: "REQUIRED",
+} as const;
+
+export type UiBehavior = (typeof UiBehavior)[keyof typeof UiBehavior];
+
+export type UnstructuredStorageSpace_Filter = {
+	ApplicationName?: InputMaybe<StringOperators>;
+	Attribute1?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DerivedFolderLocation?: InputMaybe<StringOperators>;
+	ExpirationPolicyType?: InputMaybe<PicklistOperators>;
+	Folder?: InputMaybe<UnstructuredStorageSpace_Folder_Filters>;
+	FolderId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<UnstructuredStorageSpace_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SpaceName?: InputMaybe<StringOperators>;
+	SpaceType?: InputMaybe<PicklistOperators>;
+	StorageLocation?: InputMaybe<StringOperators>;
+	StorageReference?: InputMaybe<StringOperators>;
+	StorageTierType?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<UnstructuredStorageSpace_Filter>>>;
+	not?: InputMaybe<UnstructuredStorageSpace_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UnstructuredStorageSpace_Filter>>>;
+};
+
+export type UnstructuredStorageSpace_Folder_Filters = {
+	Name?: InputMaybe<Name_Filter>;
+	Organization?: InputMaybe<Organization_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type UnstructuredStorageSpace_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type UserAppMenuItem_Filter = {
+	AppMenuItemId?: InputMaybe<StringOperators>;
+	ApplicationId?: InputMaybe<IdOperators>;
+	Description?: InputMaybe<StringOperators>;
+	FormFactors?: InputMaybe<StringOperators>;
+	IconUrl?: InputMaybe<UrlOperators>;
+	Id?: InputMaybe<IdOperators>;
+	InfoUrl?: InputMaybe<UrlOperators>;
+	IsUsingAdminAuthorization?: InputMaybe<BooleanOperators>;
+	IsVisible?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LogoUrl?: InputMaybe<UrlOperators>;
+	MobileStartUrl?: InputMaybe<UrlOperators>;
+	Name?: InputMaybe<StringOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	StartUrl?: InputMaybe<UrlOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	UiType?: InputMaybe<PicklistOperators>;
+	UserSortOrder?: InputMaybe<IntegerOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserAppMenuItem_Filter>>>;
+	not?: InputMaybe<UserAppMenuItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserAppMenuItem_Filter>>>;
+};
+
+export type UserDefinedLabelAssignment_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	EntityType?: InputMaybe<StringOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Item?: InputMaybe<UserDefinedLabelAssignment_Item_Filters>;
+	ItemId?: InputMaybe<IdOperators>;
+	Label?: InputMaybe<UserDefinedLabel_Filter>;
+	LabelId?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Owner?: InputMaybe<UserDefinedLabelAssignment_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SortOrder?: InputMaybe<IntegerOperators>;
+	SubjectOrName?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserDefinedLabelAssignment_Filter>>>;
+	not?: InputMaybe<UserDefinedLabelAssignment_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserDefinedLabelAssignment_Filter>>>;
+};
+
+export type UserDefinedLabelAssignment_Item_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Campaign?: InputMaybe<Campaign_Filter>;
+	Case?: InputMaybe<Case_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	EmailTemplate?: InputMaybe<EmailTemplate_Filter>;
+	FlowOrchestrationWorkItem?: InputMaybe<FlowOrchestrationWorkItem_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lead?: InputMaybe<Lead_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Opportunity?: InputMaybe<Opportunity_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Task?: InputMaybe<Task_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+};
+
+export type UserDefinedLabelAssignment_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type UserDefinedLabel_Filter = {
+	Color?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<UserDefinedLabel_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalAssignments?: InputMaybe<IntegerOperators>;
+	Type?: InputMaybe<PicklistOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserDefinedLabel_Filter>>>;
+	not?: InputMaybe<UserDefinedLabel_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserDefinedLabel_Filter>>>;
+};
+
+export type UserDefinedLabel_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type UserHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	User?: InputMaybe<User_Filter>;
+	UserId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserHistory_Filter>>>;
+	not?: InputMaybe<UserHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserHistory_Filter>>>;
+};
+
+export type UserLocalWebServerIdentity_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LocalWebServerIdentityToken?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<UserLocalWebServerIdentity_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserLocalWebServerIdentity_Filter>>>;
+	not?: InputMaybe<UserLocalWebServerIdentity_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserLocalWebServerIdentity_Filter>>>;
+};
+
+export type UserLocalWebServerIdentity_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type UserRole_Filter = {
+	CaseAccessForAccountOwner?: InputMaybe<PicklistOperators>;
+	ContactAccessForAccountOwner?: InputMaybe<PicklistOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	ForecastUserId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MayForecastManagerShare?: InputMaybe<BooleanOperators>;
+	Name?: InputMaybe<StringOperators>;
+	OpportunityAccessForAccountOwner?: InputMaybe<PicklistOperators>;
+	ParentRole?: InputMaybe<UserRole_Filter>;
+	ParentRoleId?: InputMaybe<IdOperators>;
+	PortalAccountId?: InputMaybe<IdOperators>;
+	PortalAccountOwnerId?: InputMaybe<IdOperators>;
+	PortalType?: InputMaybe<PicklistOperators>;
+	RollupDescription?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserRole_Filter>>>;
+	not?: InputMaybe<UserRole_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserRole_Filter>>>;
+};
+
+export type UserRole_OrderBy = {
+	CaseAccessForAccountOwner?: InputMaybe<OrderByClause>;
+	ContactAccessForAccountOwner?: InputMaybe<OrderByClause>;
+	DeveloperName?: InputMaybe<OrderByClause>;
+	ForecastUserId?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	MayForecastManagerShare?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	OpportunityAccessForAccountOwner?: InputMaybe<OrderByClause>;
+	ParentRole?: InputMaybe<UserRole_OrderBy>;
+	ParentRoleId?: InputMaybe<OrderByClause>;
+	PortalAccountId?: InputMaybe<OrderByClause>;
+	PortalAccountOwnerId?: InputMaybe<OrderByClause>;
+	PortalType?: InputMaybe<OrderByClause>;
+	RollupDescription?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+};
+
+export type UserSharedFeature_Filter = {
+	FeatureName?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	User?: InputMaybe<User_Filter>;
+	UserId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<UserSharedFeature_Filter>>>;
+	not?: InputMaybe<UserSharedFeature_Filter>;
+	or?: InputMaybe<Array<InputMaybe<UserSharedFeature_Filter>>>;
+};
+
+export type User_Filter = {
+	AboutMe?: InputMaybe<LongTextAreaOperators>;
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	Alias?: InputMaybe<StringOperators>;
+	BadgeText?: InputMaybe<StringOperators>;
+	BannerPhotoId?: InputMaybe<IdOperators>;
+	BannerPhotoUrl?: InputMaybe<UrlOperators>;
+	CallCenterId?: InputMaybe<IdOperators>;
+	City?: InputMaybe<StringOperators>;
+	CommunityNickname?: InputMaybe<StringOperators>;
+	CompanyName?: InputMaybe<StringOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DefaultGroupNotificationFrequency?: InputMaybe<PicklistOperators>;
+	DelegatedApproverId?: InputMaybe<IdOperators>;
+	Department?: InputMaybe<StringOperators>;
+	DigestFrequency?: InputMaybe<PicklistOperators>;
+	Division?: InputMaybe<StringOperators>;
+	Email?: InputMaybe<EmailOperators>;
+	EmailEncodingKey?: InputMaybe<PicklistOperators>;
+	EmailPreferencesAutoBcc?: InputMaybe<BooleanOperators>;
+	EmailPreferencesAutoBccStayInTouch?: InputMaybe<BooleanOperators>;
+	EmailPreferencesStayInTouchReminder?: InputMaybe<BooleanOperators>;
+	EmployeeNumber?: InputMaybe<StringOperators>;
+	EndDay?: InputMaybe<PicklistOperators>;
+	Extension?: InputMaybe<PhoneNumberOperators>;
+	Fax?: InputMaybe<PhoneNumberOperators>;
+	FederationIdentifier?: InputMaybe<StringOperators>;
+	FirstName?: InputMaybe<StringOperators>;
+	ForecastEnabled?: InputMaybe<BooleanOperators>;
+	FullPhotoUrl?: InputMaybe<UrlOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	HasUserVerifiedEmail?: InputMaybe<BooleanOperators>;
+	HasUserVerifiedPhone?: InputMaybe<BooleanOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Individual?: InputMaybe<Individual_Filter>;
+	IndividualId?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsExtIndicatorVisible?: InputMaybe<BooleanOperators>;
+	IsProfilePhotoActive?: InputMaybe<BooleanOperators>;
+	LanguageLocaleKey?: InputMaybe<PicklistOperators>;
+	LastLoginDate?: InputMaybe<DateTimeOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastName?: InputMaybe<StringOperators>;
+	LastPasswordChangeDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	LocaleSidKey?: InputMaybe<PicklistOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	Manager?: InputMaybe<User_Filter>;
+	ManagerId?: InputMaybe<IdOperators>;
+	MediumBannerPhotoUrl?: InputMaybe<UrlOperators>;
+	MediumPhotoUrl?: InputMaybe<UrlOperators>;
+	MobilePhone?: InputMaybe<PhoneNumberOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NumberOfFailedLogins?: InputMaybe<IntegerOperators>;
+	OfflinePdaTrialExpirationDate?: InputMaybe<DateTimeOperators>;
+	OfflineTrialExpirationDate?: InputMaybe<DateTimeOperators>;
+	OutOfOfficeMessage?: InputMaybe<StringOperators>;
+	PasswordExpirationDate?: InputMaybe<DateTimeOperators>;
+	Phone?: InputMaybe<PhoneNumberOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	Profile?: InputMaybe<Profile_Filter>;
+	ProfileId?: InputMaybe<IdOperators>;
+	ProfilePhotoId?: InputMaybe<IdOperators>;
+	ReceivesAdminInfoEmails?: InputMaybe<BooleanOperators>;
+	ReceivesInfoEmails?: InputMaybe<BooleanOperators>;
+	SenderEmail?: InputMaybe<EmailOperators>;
+	SenderName?: InputMaybe<StringOperators>;
+	Signature?: InputMaybe<LongTextAreaOperators>;
+	SmallBannerPhotoUrl?: InputMaybe<UrlOperators>;
+	SmallPhotoUrl?: InputMaybe<UrlOperators>;
+	StartDay?: InputMaybe<PicklistOperators>;
+	State?: InputMaybe<StringOperators>;
+	StayInTouchNote?: InputMaybe<StringOperators>;
+	StayInTouchSignature?: InputMaybe<LongTextAreaOperators>;
+	StayInTouchSubject?: InputMaybe<StringOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	SuAccessExpirationDate?: InputMaybe<DateOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TimeZoneSidKey?: InputMaybe<PicklistOperators>;
+	Title?: InputMaybe<StringOperators>;
+	UserPermissionsAvantgoUser?: InputMaybe<BooleanOperators>;
+	UserPermissionsCallCenterAutoLogin?: InputMaybe<BooleanOperators>;
+	UserPermissionsInteractionUser?: InputMaybe<BooleanOperators>;
+	UserPermissionsMarketingUser?: InputMaybe<BooleanOperators>;
+	UserPermissionsOfflineUser?: InputMaybe<BooleanOperators>;
+	UserPermissionsSFContentUser?: InputMaybe<BooleanOperators>;
+	UserPreferencesActionLauncherEinsteinGptConsent?: InputMaybe<BooleanOperators>;
+	UserPreferencesActivityRemindersPopup?: InputMaybe<BooleanOperators>;
+	UserPreferencesApexPagesDeveloperMode?: InputMaybe<BooleanOperators>;
+	UserPreferencesAssistiveActionsEnabledInActionLauncher?: InputMaybe<BooleanOperators>;
+	UserPreferencesCacheDiagnostics?: InputMaybe<BooleanOperators>;
+	UserPreferencesContentEmailAsAndWhen?: InputMaybe<BooleanOperators>;
+	UserPreferencesContentNoEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesCreateLEXAppsWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesDedupeStorageMigrationComplete?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisCommentAfterLikeEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisMentionsCommentEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisProfPostCommentEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableAllFeedsEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableBookmarkEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableChangeCommentEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableEndorsementEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableFileShareNotificationsForApi?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableFollowersEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableLaterCommentEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableLikeEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableMentionsPostEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableMessageEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableProfilePostEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDisableSharePostEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesDismissPersonalSpaceLegalMessage?: InputMaybe<BooleanOperators>;
+	UserPreferencesDismissRecordChannelsSuggestedObjects?: InputMaybe<BooleanOperators>;
+	UserPreferencesDismissReuseUpdateReminderModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesEnableAutoSubForFeeds?: InputMaybe<BooleanOperators>;
+	UserPreferencesEnableLwrLexPilot?: InputMaybe<BooleanOperators>;
+	UserPreferencesEventRemindersCheckboxDefault?: InputMaybe<BooleanOperators>;
+	UserPreferencesExcludeMailAppAttachments?: InputMaybe<BooleanOperators>;
+	UserPreferencesFavoritesShowTopFavorites?: InputMaybe<BooleanOperators>;
+	UserPreferencesFavoritesWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesFirstTimeInLightning?: InputMaybe<BooleanOperators>;
+	UserPreferencesGlobalNavBarWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesGlobalNavGridMenuWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesHasCelebrationBadge?: InputMaybe<BooleanOperators>;
+	UserPreferencesHasSentWarningEmail?: InputMaybe<BooleanOperators>;
+	UserPreferencesHasSentWarningEmail238?: InputMaybe<BooleanOperators>;
+	UserPreferencesHasSentWarningEmail240?: InputMaybe<BooleanOperators>;
+	UserPreferencesHeavyPagePromptEnabled?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideBiggerPhotoCallout?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideBrowseProductRedirectConfirmation?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideCSNDesktopTask?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideCSNGetChatterMobileTask?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideChatterOnboardingSplash?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideEndUserOnboardingAssistantModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideEventCalendar?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideFLSNotification?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideLearningPathModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideLightningMigrationModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideMailAppEAPUserGuidance?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideMailAppWelcomeMat?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideManagedEcaMobilePubModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideOnlineSalesAppTabVisibilityRequirementsModal?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideOnlineSalesAppWelcomeMat?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideS1BrowserUI?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideSecondChatterOnboardingSplash?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideSfxWelcomeMat?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideTaskListViewsPopover?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideTrialsCelebration?: InputMaybe<BooleanOperators>;
+	UserPreferencesHideTrialsWelcomeMat?: InputMaybe<BooleanOperators>;
+	UserPreferencesLightningExperiencePreferred?: InputMaybe<BooleanOperators>;
+	UserPreferencesLiveAgentMiawSetupDeflection?: InputMaybe<BooleanOperators>;
+	UserPreferencesLtngPromoReserved10UserPref?: InputMaybe<BooleanOperators>;
+	UserPreferencesLtngPromoReserved16UserPref?: InputMaybe<BooleanOperators>;
+	UserPreferencesLtngPromoReserved19UserPref?: InputMaybe<BooleanOperators>;
+	UserPreferencesNativeEmailClient?: InputMaybe<BooleanOperators>;
+	UserPreferencesNewLightningReportRunPageEnabled?: InputMaybe<BooleanOperators>;
+	UserPreferencesPathAssistantCollapsed?: InputMaybe<BooleanOperators>;
+	UserPreferencesPreviewCustomTheme?: InputMaybe<BooleanOperators>;
+	UserPreferencesPreviewLightning?: InputMaybe<BooleanOperators>;
+	UserPreferencesReadReceiptLastToggleValue?: InputMaybe<BooleanOperators>;
+	UserPreferencesReceiveNoNotificationsAsApprover?: InputMaybe<BooleanOperators>;
+	UserPreferencesReceiveNotificationsAsDelegatedApprover?: InputMaybe<BooleanOperators>;
+	UserPreferencesRecordHomeReservedWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesRecordHomeSectionCollapseWTShown?: InputMaybe<BooleanOperators>;
+	UserPreferencesReminderSoundOff?: InputMaybe<BooleanOperators>;
+	UserPreferencesReverseOpenActivitiesView?: InputMaybe<BooleanOperators>;
+	UserPreferencesSRHOverrideActivities?: InputMaybe<BooleanOperators>;
+	UserPreferencesSalesEssentialsSetupAssistantCompleted?: InputMaybe<BooleanOperators>;
+	UserPreferencesSetupAssistantUserPref1?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowCityToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowCityToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowCountryToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowCountryToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowEmailToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowEmailToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowFaxToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowFaxToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowForecastingChangeSignals?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowForecastingRoundedAmounts?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowManagerToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowManagerToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowMobilePhoneToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowMobilePhoneToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowPostalCodeToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowPostalCodeToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowProfilePicToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowStateToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowStateToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowStreetAddressToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowStreetAddressToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowTitleToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowTitleToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowWorkPhoneToExternalUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesShowWorkPhoneToGuestUsers?: InputMaybe<BooleanOperators>;
+	UserPreferencesSortFeedByComment?: InputMaybe<BooleanOperators>;
+	UserPreferencesSuppressEventSFXReminders?: InputMaybe<BooleanOperators>;
+	UserPreferencesSuppressTaskSFXReminders?: InputMaybe<BooleanOperators>;
+	UserPreferencesTaskRemindersCheckboxDefault?: InputMaybe<BooleanOperators>;
+	UserPreferencesTodayGettingStarted?: InputMaybe<BooleanOperators>;
+	UserPreferencesTrailheadBadgeCreated?: InputMaybe<BooleanOperators>;
+	UserPreferencesUserDebugModePref?: InputMaybe<BooleanOperators>;
+	UserPreferencesUserHasCollapsedGoogleEmbedded?: InputMaybe<BooleanOperators>;
+	UserPreferencesUserHasLaunchedSidePanel?: InputMaybe<BooleanOperators>;
+	UserPreferencesUserHasOptedInToSidePanel?: InputMaybe<BooleanOperators>;
+	UserPreferencesUserHasRemovedGoogleEmbedded?: InputMaybe<BooleanOperators>;
+	UserRole?: InputMaybe<UserRole_Filter>;
+	UserRoleId?: InputMaybe<IdOperators>;
+	UserType?: InputMaybe<PicklistOperators>;
+	Username?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<User_Filter>>>;
+	not?: InputMaybe<User_Filter>;
+	or?: InputMaybe<Array<InputMaybe<User_Filter>>>;
+};
+
+export type User_OrderBy = {
+	AboutMe?: InputMaybe<OrderByClause>;
+	Account?: InputMaybe<Account_OrderBy>;
+	AccountId?: InputMaybe<OrderByClause>;
+	Alias?: InputMaybe<OrderByClause>;
+	BadgeText?: InputMaybe<OrderByClause>;
+	BannerPhotoId?: InputMaybe<OrderByClause>;
+	BannerPhotoUrl?: InputMaybe<OrderByClause>;
+	CallCenterId?: InputMaybe<OrderByClause>;
+	City?: InputMaybe<OrderByClause>;
+	CommunityNickname?: InputMaybe<OrderByClause>;
+	CompanyName?: InputMaybe<OrderByClause>;
+	Contact?: InputMaybe<Contact_OrderBy>;
+	ContactId?: InputMaybe<OrderByClause>;
+	Country?: InputMaybe<OrderByClause>;
+	CreatedBy?: InputMaybe<User_OrderBy>;
+	CreatedById?: InputMaybe<OrderByClause>;
+	CreatedDate?: InputMaybe<OrderByClause>;
+	DefaultGroupNotificationFrequency?: InputMaybe<OrderByClause>;
+	DelegatedApproverId?: InputMaybe<OrderByClause>;
+	Department?: InputMaybe<OrderByClause>;
+	DigestFrequency?: InputMaybe<OrderByClause>;
+	Division?: InputMaybe<OrderByClause>;
+	Email?: InputMaybe<OrderByClause>;
+	EmailEncodingKey?: InputMaybe<OrderByClause>;
+	EmailPreferencesAutoBcc?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	EmailPreferencesAutoBccStayInTouch?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	EmailPreferencesStayInTouchReminder?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	EmployeeNumber?: InputMaybe<OrderByClause>;
+	EndDay?: InputMaybe<OrderByClause>;
+	Extension?: InputMaybe<OrderByClause>;
+	Fax?: InputMaybe<OrderByClause>;
+	FederationIdentifier?: InputMaybe<OrderByClause>;
+	FirstName?: InputMaybe<OrderByClause>;
+	ForecastEnabled?: InputMaybe<OrderByClause>;
+	FullPhotoUrl?: InputMaybe<OrderByClause>;
+	GeocodeAccuracy?: InputMaybe<OrderByClause>;
+	HasUserVerifiedEmail?: InputMaybe<OrderByClause>;
+	HasUserVerifiedPhone?: InputMaybe<OrderByClause>;
+	Id?: InputMaybe<OrderByClause>;
+	Individual?: InputMaybe<Individual_OrderBy>;
+	IndividualId?: InputMaybe<OrderByClause>;
+	IsActive?: InputMaybe<OrderByClause>;
+	IsExtIndicatorVisible?: InputMaybe<OrderByClause>;
+	IsProfilePhotoActive?: InputMaybe<OrderByClause>;
+	LanguageLocaleKey?: InputMaybe<OrderByClause>;
+	LastLoginDate?: InputMaybe<OrderByClause>;
+	LastModifiedBy?: InputMaybe<User_OrderBy>;
+	LastModifiedById?: InputMaybe<OrderByClause>;
+	LastModifiedDate?: InputMaybe<OrderByClause>;
+	LastName?: InputMaybe<OrderByClause>;
+	LastPasswordChangeDate?: InputMaybe<OrderByClause>;
+	LastReferencedDate?: InputMaybe<OrderByClause>;
+	LastViewedDate?: InputMaybe<OrderByClause>;
+	Latitude?: InputMaybe<OrderByClause>;
+	LocaleSidKey?: InputMaybe<OrderByClause>;
+	Longitude?: InputMaybe<OrderByClause>;
+	Manager?: InputMaybe<User_OrderBy>;
+	ManagerId?: InputMaybe<OrderByClause>;
+	MediumBannerPhotoUrl?: InputMaybe<OrderByClause>;
+	MediumPhotoUrl?: InputMaybe<OrderByClause>;
+	MobilePhone?: InputMaybe<OrderByClause>;
+	Name?: InputMaybe<OrderByClause>;
+	NumberOfFailedLogins?: InputMaybe<OrderByClause>;
+	OfflinePdaTrialExpirationDate?: InputMaybe<OrderByClause>;
+	OfflineTrialExpirationDate?: InputMaybe<OrderByClause>;
+	OutOfOfficeMessage?: InputMaybe<OrderByClause>;
+	PasswordExpirationDate?: InputMaybe<OrderByClause>;
+	Phone?: InputMaybe<OrderByClause>;
+	PostalCode?: InputMaybe<OrderByClause>;
+	Profile?: InputMaybe<Profile_OrderBy>;
+	ProfileId?: InputMaybe<OrderByClause>;
+	ProfilePhotoId?: InputMaybe<OrderByClause>;
+	ReceivesAdminInfoEmails?: InputMaybe<OrderByClause>;
+	ReceivesInfoEmails?: InputMaybe<OrderByClause>;
+	SenderEmail?: InputMaybe<OrderByClause>;
+	SenderName?: InputMaybe<OrderByClause>;
+	Signature?: InputMaybe<OrderByClause>;
+	SmallBannerPhotoUrl?: InputMaybe<OrderByClause>;
+	SmallPhotoUrl?: InputMaybe<OrderByClause>;
+	StartDay?: InputMaybe<OrderByClause>;
+	State?: InputMaybe<OrderByClause>;
+	StayInTouchNote?: InputMaybe<OrderByClause>;
+	StayInTouchSignature?: InputMaybe<OrderByClause>;
+	StayInTouchSubject?: InputMaybe<OrderByClause>;
+	Street?: InputMaybe<OrderByClause>;
+	SuAccessExpirationDate?: InputMaybe<OrderByClause>;
+	SystemModstamp?: InputMaybe<OrderByClause>;
+	TimeZoneSidKey?: InputMaybe<OrderByClause>;
+	Title?: InputMaybe<OrderByClause>;
+	UserPermissionsAvantgoUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPermissionsCallCenterAutoLogin?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPermissionsInteractionUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPermissionsMarketingUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPermissionsOfflineUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPermissionsSFContentUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesActionLauncherEinsteinGptConsent?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesActivityRemindersPopup?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesApexPagesDeveloperMode?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesAssistiveActionsEnabledInActionLauncher?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesCacheDiagnostics?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesContentEmailAsAndWhen?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesContentNoEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesCreateLEXAppsWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDedupeStorageMigrationComplete?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisCommentAfterLikeEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisMentionsCommentEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisProfPostCommentEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableAllFeedsEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableBookmarkEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableChangeCommentEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableEndorsementEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableFileShareNotificationsForApi?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableFollowersEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableLaterCommentEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableLikeEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableMentionsPostEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableMessageEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableProfilePostEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDisableSharePostEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDismissPersonalSpaceLegalMessage?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDismissRecordChannelsSuggestedObjects?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesDismissReuseUpdateReminderModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesEnableAutoSubForFeeds?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesEnableLwrLexPilot?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesEventRemindersCheckboxDefault?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesExcludeMailAppAttachments?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesFavoritesShowTopFavorites?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesFavoritesWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesFirstTimeInLightning?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesGlobalNavBarWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesGlobalNavGridMenuWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHasCelebrationBadge?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHasSentWarningEmail?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHasSentWarningEmail238?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHasSentWarningEmail240?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHeavyPagePromptEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideBiggerPhotoCallout?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideBrowseProductRedirectConfirmation?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideCSNDesktopTask?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideCSNGetChatterMobileTask?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideChatterOnboardingSplash?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideEndUserOnboardingAssistantModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideEventCalendar?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideFLSNotification?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideLearningPathModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideLightningMigrationModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideMailAppEAPUserGuidance?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideMailAppWelcomeMat?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideManagedEcaMobilePubModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideOnlineSalesAppTabVisibilityRequirementsModal?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideOnlineSalesAppWelcomeMat?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideS1BrowserUI?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideSecondChatterOnboardingSplash?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideSfxWelcomeMat?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideTaskListViewsPopover?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideTrialsCelebration?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesHideTrialsWelcomeMat?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesLightningExperiencePreferred?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesLiveAgentMiawSetupDeflection?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesLtngPromoReserved10UserPref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesLtngPromoReserved16UserPref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesLtngPromoReserved19UserPref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesNativeEmailClient?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesNewLightningReportRunPageEnabled?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesPathAssistantCollapsed?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesPreviewCustomTheme?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesPreviewLightning?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesReadReceiptLastToggleValue?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesReceiveNoNotificationsAsApprover?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesReceiveNotificationsAsDelegatedApprover?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesRecordHomeReservedWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesRecordHomeSectionCollapseWTShown?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesReminderSoundOff?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesReverseOpenActivitiesView?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSRHOverrideActivities?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSalesEssentialsSetupAssistantCompleted?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSetupAssistantUserPref1?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowCityToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowCityToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowCountryToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowCountryToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowEmailToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowEmailToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowFaxToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowFaxToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowForecastingChangeSignals?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowForecastingRoundedAmounts?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowManagerToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowManagerToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowMobilePhoneToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowMobilePhoneToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowPostalCodeToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowPostalCodeToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowProfilePicToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowStateToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowStateToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowStreetAddressToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowStreetAddressToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowTitleToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowTitleToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowWorkPhoneToExternalUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesShowWorkPhoneToGuestUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSortFeedByComment?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSuppressEventSFXReminders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesSuppressTaskSFXReminders?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesTaskRemindersCheckboxDefault?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesTodayGettingStarted?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesTrailheadBadgeCreated?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesUserDebugModePref?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesUserHasCollapsedGoogleEmbedded?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesUserHasLaunchedSidePanel?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesUserHasOptedInToSidePanel?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserPreferencesUserHasRemovedGoogleEmbedded?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	UserRole?: InputMaybe<UserRole_OrderBy>;
+	UserRoleId?: InputMaybe<OrderByClause>;
+	UserType?: InputMaybe<OrderByClause>;
+	Username?: InputMaybe<OrderByClause>;
+};
+
+export type WorkBadgeDefinitionHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	WorkBadgeDefinitionId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<WorkBadgeDefinitionHistory_Filter>>>;
+	not?: InputMaybe<WorkBadgeDefinitionHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<WorkBadgeDefinitionHistory_Filter>>>;
+};
+
+export type WorkOrderHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<WorkOrderHistory_Filter>>>;
+	not?: InputMaybe<WorkOrderHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<WorkOrderHistory_Filter>>>;
+};
+
+export type WorkOrderLineItemHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	WorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+	WorkOrderLineItemId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<WorkOrderLineItemHistory_Filter>>>;
+	not?: InputMaybe<WorkOrderLineItemHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<WorkOrderLineItemHistory_Filter>>>;
+};
+
+export type WorkOrderLineItem_Filter = {
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetId?: InputMaybe<IdOperators>;
+	City?: InputMaybe<StringOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Discount?: InputMaybe<PercentOperators>;
+	Duration?: InputMaybe<DoubleOperators>;
+	DurationInMinutes?: InputMaybe<DoubleOperators>;
+	DurationType?: InputMaybe<PicklistOperators>;
+	EndDate?: InputMaybe<DateTimeOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	LineItemNumber?: InputMaybe<StringOperators>;
+	ListPrice?: InputMaybe<CurrencyOperators>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationId?: InputMaybe<IdOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	Order?: InputMaybe<Order_Filter>;
+	OrderId?: InputMaybe<IdOperators>;
+	ParentWorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+	ParentWorkOrderLineItemId?: InputMaybe<IdOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	PricebookEntry?: InputMaybe<PricebookEntry_Filter>;
+	PricebookEntryId?: InputMaybe<IdOperators>;
+	Priority?: InputMaybe<PicklistOperators>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Product2Id?: InputMaybe<IdOperators>;
+	Quantity?: InputMaybe<DoubleOperators>;
+	RootWorkOrderLineItem?: InputMaybe<WorkOrderLineItem_Filter>;
+	RootWorkOrderLineItemId?: InputMaybe<IdOperators>;
+	ServiceAppointmentCount?: InputMaybe<IntegerOperators>;
+	StartDate?: InputMaybe<DateTimeOperators>;
+	State?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusCategory?: InputMaybe<PicklistOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	Subject?: InputMaybe<StringOperators>;
+	Subtotal?: InputMaybe<CurrencyOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TotalPrice?: InputMaybe<CurrencyOperators>;
+	UnitPrice?: InputMaybe<CurrencyOperators>;
+	WorkOrder?: InputMaybe<WorkOrder_Filter>;
+	WorkOrderId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<WorkOrderLineItem_Filter>>>;
+	not?: InputMaybe<WorkOrderLineItem_Filter>;
+	or?: InputMaybe<Array<InputMaybe<WorkOrderLineItem_Filter>>>;
+};
+
+export type WorkOrder_Filter = {
+	Account?: InputMaybe<Account_Filter>;
+	AccountId?: InputMaybe<IdOperators>;
+	Asset?: InputMaybe<Asset_Filter>;
+	AssetId?: InputMaybe<IdOperators>;
+	BusinessHours?: InputMaybe<BusinessHours_Filter>;
+	BusinessHoursId?: InputMaybe<IdOperators>;
+	Case?: InputMaybe<Case_Filter>;
+	CaseId?: InputMaybe<IdOperators>;
+	City?: InputMaybe<StringOperators>;
+	Contact?: InputMaybe<Contact_Filter>;
+	ContactId?: InputMaybe<IdOperators>;
+	Country?: InputMaybe<StringOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Discount?: InputMaybe<PercentOperators>;
+	Duration?: InputMaybe<DoubleOperators>;
+	DurationInMinutes?: InputMaybe<DoubleOperators>;
+	DurationType?: InputMaybe<PicklistOperators>;
+	EndDate?: InputMaybe<DateTimeOperators>;
+	GeocodeAccuracy?: InputMaybe<PicklistOperators>;
+	GrandTotal?: InputMaybe<CurrencyOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsClosed?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	Latitude?: InputMaybe<LatitudeOperators>;
+	LineItemCount?: InputMaybe<IntegerOperators>;
+	Location?: InputMaybe<Location_Filter>;
+	LocationId?: InputMaybe<IdOperators>;
+	Longitude?: InputMaybe<LongitudeOperators>;
+	Owner?: InputMaybe<WorkOrder_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	ParentWorkOrder?: InputMaybe<WorkOrder_Filter>;
+	ParentWorkOrderId?: InputMaybe<IdOperators>;
+	PostalCode?: InputMaybe<StringOperators>;
+	Pricebook2?: InputMaybe<Pricebook2_Filter>;
+	Pricebook2Id?: InputMaybe<IdOperators>;
+	Priority?: InputMaybe<PicklistOperators>;
+	RootWorkOrder?: InputMaybe<WorkOrder_Filter>;
+	RootWorkOrderId?: InputMaybe<IdOperators>;
+	ServiceAppointmentCount?: InputMaybe<IntegerOperators>;
+	StartDate?: InputMaybe<DateTimeOperators>;
+	State?: InputMaybe<StringOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	StatusCategory?: InputMaybe<PicklistOperators>;
+	Street?: InputMaybe<TextAreaOperators>;
+	Subject?: InputMaybe<StringOperators>;
+	Subtotal?: InputMaybe<CurrencyOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Tax?: InputMaybe<CurrencyOperators>;
+	TotalPrice?: InputMaybe<CurrencyOperators>;
+	WorkOrderNumber?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<WorkOrder_Filter>>>;
+	not?: InputMaybe<WorkOrder_Filter>;
+	or?: InputMaybe<Array<InputMaybe<WorkOrder_Filter>>>;
+};
+
+export type WorkOrder_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
+export type GetApplicationsQueryVariables = Exact<{ [key: string]: never }>;
+
+export type GetApplicationsQuery = {
+	uiapi: {
+		query: {
+			Application__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null } | null;
+						User__r?: {
+							FirstName?: { value?: string | null } | null;
+							LastName?: { value?: string | null } | null;
+						} | null;
+						Property__r?: {
+							Name?: { value?: string | null } | null;
+							Address__c?: { value?: string | null } | null;
+						} | null;
+						Start_Date__c?: { value?: string | null } | null;
+						Status__c?: { value?: string | null } | null;
+						Employment__c?: { value?: string | null } | null;
+						References__c?: { value?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type UpdateApplicationStatusMutationVariables = Exact<{
+	input: Application__CUpdateInput;
+}>;
+
+export type UpdateApplicationStatusMutation = {
+	uiapi: {
+		Application__cUpdate?: {
+			success?: boolean | null;
+			Record?: { Id: string; Status__c?: { value?: string | null } | null } | null;
+		} | null;
+	};
+};
+
+export type GetMaintenanceRequestsQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+}>;
+
+export type GetMaintenanceRequestsQuery = {
+	uiapi: {
+		query: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null } | null;
+						Property__r?: { Address__c?: { value?: string | null } | null } | null;
+						User__r?: { Name?: { value?: string | null } | null } | null;
+						Type__c?: { value?: string | null } | null;
+						Priority__c?: { value?: string | null } | null;
+						Status__c?: { value?: string | null } | null;
+						Description__c?: { value?: string | null } | null;
+						Scheduled__c?: { value?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type GetAllMaintenanceRequestsQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+}>;
+
+export type GetAllMaintenanceRequestsQuery = {
+	uiapi: {
+		query: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null } | null;
+						Description__c?: { value?: string | null } | null;
+						Type__c?: { value?: string | null } | null;
+						Priority__c?: { value?: string | null } | null;
+						Status__c?: { value?: string | null } | null;
+						Scheduled__c?: { value?: string | null } | null;
+						Property__r?: {
+							Address__c?: { value?: string | null } | null;
+							Name?: { value?: string | null } | null;
+						} | null;
+						User__r?: { Name?: { value?: string | null } | null } | null;
+						Assigned_Worker__r?: {
+							Name?: { value?: string | null } | null;
+							Employment_Type__c?: { value?: string | null } | null;
+						} | null;
+						ContentDocumentLinks?: {
+							edges?: Array<{
+								node?: {
+									ContentDocument?: {
+										LatestPublishedVersionId?: { value?: string | null } | null;
+									} | null;
+								} | null;
+							} | null> | null;
+						} | null;
+					} | null;
+				} | null> | null;
+				pageInfo: { hasNextPage: boolean; endCursor?: string | null };
+			} | null;
+		};
+	};
+};
+
+export type UpdateMaintenanceStatusMutationVariables = Exact<{
+	input: Maintenance_Request__CUpdateInput;
+}>;
+
+export type UpdateMaintenanceStatusMutation = {
+	uiapi: {
+		Maintenance_Request__cUpdate?: {
+			success?: boolean | null;
+			Record?: { Id: string; Status__c?: { value?: string | null } | null } | null;
+		} | null;
+	};
+};
+
+export type MaintenanceRequestsQueryVariables = Exact<{
+	first: Scalars["Int"]["input"];
+	after?: InputMaybe<Scalars["String"]["input"]>;
+}>;
+
+export type MaintenanceRequestsQuery = {
+	uiapi: {
+		query: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					cursor: string;
+					node?: {
+						Id: string;
+						ApiName: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
+						Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Priority__c?: { value?: string | null; displayValue?: string | null } | null;
+						Status__c?: { value?: string | null; displayValue?: string | null } | null;
+						Scheduled__c?: { value?: string | null; displayValue?: string | null } | null;
+						User__r?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+						Property__r?: {
+							Address__c?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+					} | null;
+				} | null> | null;
+				pageInfo: { hasNextPage: boolean; endCursor?: string | null };
+			} | null;
+		};
+	};
+};
+
+export type ListingByIdQueryVariables = Exact<{
+	listingId: Scalars["ID"]["input"];
+}>;
+
+export type ListingByIdQuery = {
+	uiapi: {
+		query: {
 			Property_Listing__c?: {
 				edges?: Array<{
 					node?: {
 						Id: string;
-						ApiName?: string | null;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Listing_Price__c?: {
-							value?: number | null;
-							displayValue?: string | null;
-						} | null;
-						Listing_Status__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
+						Listing_Price__c?: { value?: number | null; displayValue?: string | null } | null;
+						Listing_Status__c?: { value?: string | null; displayValue?: string | null } | null;
+						Property__c?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type PropertyByIdQueryVariables = Exact<{
+	propertyId: Scalars["ID"]["input"];
+}>;
+
+export type PropertyByIdQuery = {
+	uiapi: {
+		query: {
+			Property__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Address__c?: { value?: string | null; displayValue?: string | null } | null;
+						Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Monthly_Rent__c?: { value?: number | null; displayValue?: string | null } | null;
+						Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
+						Bathrooms__c?: { value?: number | null; displayValue?: string | null } | null;
+						Sq_Ft__c?: { value?: number | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type PropertyImagesQueryVariables = Exact<{
+	propertyId: Scalars["ID"]["input"];
+}>;
+
+export type PropertyImagesQuery = {
+	uiapi: {
+		query: {
+			Property_Image__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Image_URL__c?: { value?: string | null; displayValue?: string | null } | null;
+						Image_Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Display_Order__c?: { value?: number | null; displayValue?: string | null } | null;
+						Alt_Text__c?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type PropertyCostsQueryVariables = Exact<{
+	propertyId: Scalars["ID"]["input"];
+}>;
+
+export type PropertyCostsQuery = {
+	uiapi: {
+		query: {
+			Property_Cost__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Cost_Category__c?: { value?: string | null; displayValue?: string | null } | null;
+						Cost_Amount__c?: { value?: number | null; displayValue?: string | null } | null;
+						Cost_Date__c?: { value?: string | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
+						Vendor__c?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type PropertyFeaturesQueryVariables = Exact<{
+	propertyId: Scalars["ID"]["input"];
+}>;
+
+export type PropertyFeaturesQuery = {
+	uiapi: {
+		query: {
+			Property_Feature__c?: {
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Feature_Category__c?: { value?: string | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type PropertyListingsQueryVariables = Exact<{
+	where?: InputMaybe<Property_Listing__C_Filter>;
+	first: Scalars["Int"]["input"];
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	orderBy?: InputMaybe<Property_Listing__C_OrderBy>;
+}>;
+
+export type PropertyListingsQuery = {
+	uiapi: {
+		query: {
+			Property_Listing__c?: {
+				totalCount: number;
+				edges?: Array<{
+					cursor: string;
+					node?: {
+						Id: string;
+						ApiName: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Listing_Price__c?: { value?: number | null; displayValue?: string | null } | null;
+						Listing_Status__c?: { value?: string | null; displayValue?: string | null } | null;
 						Property__c?: { value?: string | null; displayValue?: string | null } | null;
 						Property__r?: {
 							Name?: { value?: string | null; displayValue?: string | null } | null;
@@ -100,200 +11686,458 @@ export interface PropertyListingsQuery {
 							Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
 						} | null;
 					} | null;
-					cursor?: string | null;
-				}> | null;
-				pageInfo?: {
-					hasNextPage?: boolean | null;
-					hasPreviousPage?: boolean | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
 					startCursor?: string | null;
 					endCursor?: string | null;
-				} | null;
-				totalCount?: number | null;
+				};
 			} | null;
-		} | null;
-	} | null;
-}
+		};
+	};
+};
 
-// ---- ListingById ----
-export interface ListingByIdQueryVariables {
-	listingId: string;
-}
+export type DistinctAccountIndustriesQueryVariables = Exact<{ [key: string]: never }>;
 
-export interface ListingByIdQuery {
-	uiapi?: {
-		query?: {
-			Property_Listing__c?: {
+export type DistinctAccountIndustriesQuery = {
+	uiapi: {
+		aggregate: {
+			Account?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Industry?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctAccountTypesQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctAccountTypesQuery = {
+	uiapi: {
+		aggregate: {
+			Account?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Type?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type GetAccountDetailQueryVariables = Exact<{
+	id: Scalars["ID"]["input"];
+}>;
+
+export type GetAccountDetailQuery = {
+	uiapi: {
+		query: {
+			Account?: {
 				edges?: Array<{
 					node?: {
 						Id: string;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Listing_Price__c?: {
-							value?: unknown;
-							displayValue?: string | null;
+						Owner?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
 						} | null;
-						Listing_Status__c?: {
-							value?: string | null;
-							displayValue?: string | null;
+						Phone?: { value?: string | null; displayValue?: string | null } | null;
+						Fax?: { value?: string | null; displayValue?: string | null } | null;
+						Parent?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
 						} | null;
-						Property__c?: { value?: string | null; displayValue?: string | null } | null;
+						Website?: { value?: string | null; displayValue?: string | null } | null;
+						Type?: { value?: string | null; displayValue?: string | null } | null;
+						NumberOfEmployees?: { value?: number | null; displayValue?: string | null } | null;
+						Industry?: { value?: string | null; displayValue?: string | null } | null;
+						AnnualRevenue?: { value?: number | null; displayValue?: string | null } | null;
+						Description?: { value?: string | null; displayValue?: string | null } | null;
+						BillingStreet?: { value?: string | null; displayValue?: string | null } | null;
+						BillingCity?: { value?: string | null; displayValue?: string | null } | null;
+						BillingState?: { value?: string | null; displayValue?: string | null } | null;
+						BillingPostalCode?: { value?: string | null; displayValue?: string | null } | null;
+						BillingCountry?: { value?: string | null; displayValue?: string | null } | null;
+						ShippingStreet?: { value?: string | null; displayValue?: string | null } | null;
+						ShippingCity?: { value?: string | null; displayValue?: string | null } | null;
+						ShippingState?: { value?: string | null; displayValue?: string | null } | null;
+						ShippingPostalCode?: { value?: string | null; displayValue?: string | null } | null;
+						ShippingCountry?: { value?: string | null; displayValue?: string | null } | null;
+						CreatedBy?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
+						LastModifiedBy?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+						LastModifiedDate?: { value?: string | null; displayValue?: string | null } | null;
 					} | null;
-				}> | null;
+				} | null> | null;
 			} | null;
-		} | null;
-	} | null;
-}
+		};
+	};
+};
 
-// ---- PropertyById ----
-export interface PropertyByIdQueryVariables {
-	propertyId: string;
-}
+export type SearchAccountsQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	where?: InputMaybe<Account_Filter>;
+	orderBy?: InputMaybe<Account_OrderBy>;
+}>;
 
-export interface PropertyByIdQuery {
-	uiapi?: {
-		query?: {
+export type SearchAccountsQuery = {
+	uiapi: {
+		query: {
+			Account?: {
+				totalCount: number;
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Industry?: { value?: string | null; displayValue?: string | null } | null;
+						Type?: { value?: string | null; displayValue?: string | null } | null;
+						Phone?: { value?: string | null; displayValue?: string | null } | null;
+						Owner?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+						AnnualRevenue?: { value?: number | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
+					endCursor?: string | null;
+					startCursor?: string | null;
+				};
+			} | null;
+		};
+	};
+};
+
+export type DistinctApplicationStatusQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctApplicationStatusQuery = {
+	uiapi: {
+		aggregate: {
+			Application__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Status__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctMaintenanceRequestPriorityQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctMaintenanceRequestPriorityQuery = {
+	uiapi: {
+		aggregate: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Priority__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctMaintenanceRequestStatusQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctMaintenanceRequestStatusQuery = {
+	uiapi: {
+		aggregate: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Status__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctMaintenanceRequestTypeQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctMaintenanceRequestTypeQuery = {
+	uiapi: {
+		aggregate: {
+			Maintenance_Request__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Type__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctMaintenanceWorkerEmploymentTypeQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctMaintenanceWorkerEmploymentTypeQuery = {
+	uiapi: {
+		aggregate: {
+			Maintenance_Worker__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Employment_Type__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctPropertyStatusQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctPropertyStatusQuery = {
+	uiapi: {
+		aggregate: {
 			Property__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Status__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type DistinctPropertyTypeQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DistinctPropertyTypeQuery = {
+	uiapi: {
+		aggregate: {
+			Property__c?: {
+				edges?: Array<{
+					node?: {
+						aggregate?: {
+							Type__c?: {
+								value?: string | null;
+								displayValue?: string | null;
+								label?: string | null;
+							} | null;
+						} | null;
+					} | null;
+				} | null> | null;
+			} | null;
+		};
+	};
+};
+
+export type SearchApplicationsQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	where?: InputMaybe<Application__C_Filter>;
+	orderBy?: InputMaybe<Application__C_OrderBy>;
+}>;
+
+export type SearchApplicationsQuery = {
+	uiapi: {
+		query: {
+			Application__c?: {
+				totalCount: number;
 				edges?: Array<{
 					node?: {
 						Id: string;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Address__c?: {
-							value?: string | null;
-							displayValue?: string | null;
+						Status__c?: { value?: string | null; displayValue?: string | null } | null;
+						Start_Date__c?: { value?: string | null; displayValue?: string | null } | null;
+						Employment__c?: { value?: string | null; displayValue?: string | null } | null;
+						References__c?: { value?: string | null; displayValue?: string | null } | null;
+						Property__r?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+							Address__c?: { value?: string | null; displayValue?: string | null } | null;
 						} | null;
+						User__r?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
+						} | null;
+						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
+					} | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
+					endCursor?: string | null;
+					startCursor?: string | null;
+				};
+			} | null;
+		};
+	};
+};
+
+export type SearchMaintenanceRequestsQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	where?: InputMaybe<Maintenance_Request__C_Filter>;
+	orderBy?: InputMaybe<Maintenance_Request__C_OrderBy>;
+}>;
+
+export type SearchMaintenanceRequestsQuery = {
+	uiapi: {
+		query: {
+			Maintenance_Request__c?: {
+				totalCount: number;
+				edges?: Array<{
+					node?: {
+						Id: string;
+						Name?: { value?: string | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
 						Type__c?: { value?: string | null; displayValue?: string | null } | null;
-						Monthly_Rent__c?: {
-							value?: unknown;
-							displayValue?: string | null;
+						Priority__c?: { value?: string | null; displayValue?: string | null } | null;
+						Status__c?: { value?: string | null; displayValue?: string | null } | null;
+						Scheduled__c?: { value?: string | null; displayValue?: string | null } | null;
+						Property__r?: {
+							Address__c?: { value?: string | null; displayValue?: string | null } | null;
+							Name?: { value?: string | null; displayValue?: string | null } | null;
 						} | null;
-						Bedrooms__c?: { value?: unknown; displayValue?: string | null } | null;
-						Bathrooms__c?: { value?: unknown; displayValue?: string | null } | null;
-						Sq_Ft__c?: { value?: unknown; displayValue?: string | null } | null;
-						Description__c?: {
-							value?: string | null;
-							displayValue?: string | null;
+						User__r?: {
+							Name?: { value?: string | null; displayValue?: string | null } | null;
 						} | null;
 					} | null;
-				}> | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
+					endCursor?: string | null;
+					startCursor?: string | null;
+				};
 			} | null;
-		} | null;
-	} | null;
-}
+		};
+	};
+};
 
-// ---- PropertyImages ----
-export interface PropertyImagesQueryVariables {
-	propertyId: string;
-}
+export type SearchMaintenanceWorkersQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	where?: InputMaybe<Maintenance_Worker__C_Filter>;
+	orderBy?: InputMaybe<Maintenance_Worker__C_OrderBy>;
+}>;
 
-export interface PropertyImagesQuery {
-	uiapi?: {
-		query?: {
-			Property_Image__c?: {
+export type SearchMaintenanceWorkersQuery = {
+	uiapi: {
+		query: {
+			Maintenance_Worker__c?: {
+				totalCount: number;
 				edges?: Array<{
 					node?: {
 						Id: string;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Image_URL__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Image_Type__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Display_Order__c?: {
-							value?: unknown;
-							displayValue?: string | null;
-						} | null;
-						Alt_Text__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
+						Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Employment_Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Phone__c?: { value?: string | null; displayValue?: string | null } | null;
+						Location__c?: { value?: string | null; displayValue?: string | null } | null;
+						IsActive__c?: { value?: boolean | null; displayValue?: string | null } | null;
+						Rating__c?: { value?: number | null; displayValue?: string | null } | null;
+						Hourly_Rate__c?: { value?: number | null; displayValue?: string | null } | null;
+						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
 					} | null;
-				}> | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
+					endCursor?: string | null;
+					startCursor?: string | null;
+				};
 			} | null;
-		} | null;
-	} | null;
-}
+		};
+	};
+};
 
-// ---- PropertyCosts ----
-export interface PropertyCostsQueryVariables {
-	propertyId: string;
-}
+export type SearchPropertiesQueryVariables = Exact<{
+	first?: InputMaybe<Scalars["Int"]["input"]>;
+	after?: InputMaybe<Scalars["String"]["input"]>;
+	where?: InputMaybe<Property__C_Filter>;
+	orderBy?: InputMaybe<Property__C_OrderBy>;
+}>;
 
-export interface PropertyCostsQuery {
-	uiapi?: {
-		query?: {
-			Property_Cost__c?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Cost_Category__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Cost_Amount__c?: {
-							value?: unknown;
-							displayValue?: string | null;
-						} | null;
-						Cost_Date__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Description__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Vendor__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-					} | null;
-				}> | null;
-			} | null;
-		} | null;
-	} | null;
-}
-
-// ---- PropertyFeatures ----
-export interface PropertyFeaturesQueryVariables {
-	propertyId: string;
-}
-
-export interface PropertyFeaturesQuery {
-	uiapi?: {
-		query?: {
-			Property_Feature__c?: {
+export type SearchPropertiesQuery = {
+	uiapi: {
+		query: {
+			Property__c?: {
+				totalCount: number;
 				edges?: Array<{
 					node?: {
 						Id: string;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Feature_Category__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
-						Description__c?: {
-							value?: string | null;
-							displayValue?: string | null;
-						} | null;
+						Address__c?: { value?: string | null; displayValue?: string | null } | null;
+						Status__c?: { value?: string | null; displayValue?: string | null } | null;
+						Type__c?: { value?: string | null; displayValue?: string | null } | null;
+						Monthly_Rent__c?: { value?: number | null; displayValue?: string | null } | null;
+						Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
+						Bathrooms__c?: { value?: number | null; displayValue?: string | null } | null;
+						Description__c?: { value?: string | null; displayValue?: string | null } | null;
+						Hero_Image__c?: { value?: string | null; displayValue?: string | null } | null;
+						Sq_Ft__c?: { value?: number | null; displayValue?: string | null } | null;
+						Year_Built__c?: { value?: number | null; displayValue?: string | null } | null;
+						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
 					} | null;
-				}> | null;
+				} | null> | null;
+				pageInfo: {
+					hasNextPage: boolean;
+					hasPreviousPage: boolean;
+					endCursor?: string | null;
+					startCursor?: string | null;
+				};
 			} | null;
-		} | null;
-	} | null;
-}
-
-// ---- GetUserInfo ----
-export interface GetUserInfoQuery {
-	uiapi?: {
-		query?: {
-			User?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null } | null;
-					} | null;
-				}> | null;
-			} | null;
-		} | null;
-	} | null;
-}
+		};
+	};
+};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts
index bf63f07..be4c26e 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts
@@ -2,21 +2,24 @@
  * Thin GraphQL client: createDataSDK + data.graphql with centralized error handling.
  * Use with gql-tagged queries and generated operation types for type-safe calls.
  */
-import { createDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from '@salesforce/sdk-data';
 
-export async function executeGraphQL<TData, TVariables = Record<string, unknown>>(
-	query: string | { kind: string; definitions: unknown[] },
-	variables?: TVariables,
+export async function executeGraphQL<TData, TVariables>(
+  query: string,
+  variables?: TVariables
 ): Promise<TData> {
-	const data = await createDataSDK();
-	// SDK types graphql() first param as string; at runtime it may accept gql DocumentNode too
-	const response = await data.graphql?.<TData>(
-		query as unknown as string,
-		variables as Record<string, unknown>,
-	);
-	if (response?.errors?.length) {
-		const msg = response.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${msg}`);
-	}
-	return (response?.data ?? {}) as TData;
+  const data = await createDataSDK();
+  // SDK types graphql() first param as string; at runtime it may accept gql DocumentNode too
+  const response = await data.graphql?.<TData, TVariables>(query, variables);
+
+  if (!response) {
+    throw new Error('GraphQL response is undefined');
+  }
+
+  if (response?.errors?.length) {
+    const msg = response.errors.map(e => e.message).join('; ');
+    throw new Error(`GraphQL Error: ${msg}`);
+  }
+
+  return response.data;
 }
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequestApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequests/maintenanceRequestApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequestApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequests/maintenanceRequestApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyDetailGraphQL.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyDetailGraphQL.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyDetailGraphQL.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyDetailGraphQL.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyListingGraphQL.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts
similarity index 99%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyListingGraphQL.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts
index 9dd5192..a6a38eb 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyListingGraphQL.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts
@@ -13,7 +13,7 @@ import type {
 	SearchResultRecord,
 	SearchResultRecordData,
 	FieldValue,
-} from "@/features/global-search/types/search/searchResults.js";
+} from "@/types/searchResults.js";
 
 const OBJECT_API_NAME = "Property_Listing__c";
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx
index c544914..3da4d09 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx
@@ -1,13 +1,15 @@
 import { useState } from "react";
 import { Outlet } from "react-router";
-import { TopBar } from "@/components/TopBar";
-import { NavMenu } from "@/components/NavMenu";
+import { TopBar } from "@/components/layout/TopBar";
+import { NavMenu } from "@/components/layout/VerticalNav";
+import { Toaster } from "@/components/ui/sonner";
 
 export default function AppLayout() {
 	const [isNavOpen, setIsNavOpen] = useState(false);
 
 	return (
 		<div className="flex flex-col">
+			<Toaster />
 			<TopBar onMenuClick={() => setIsNavOpen(true)} />
 
 			<div className="flex flex-1 overflow-hidden">
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceDetailsModal.tsx
deleted file mode 100644
index 3ce0c65..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceDetailsModal.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Modal showing maintenance request details. Read-only (no status update in B2X).
- * Layout matches B2E MaintenanceDetailsModal.
- */
-import { useEffect } from "react";
-import { X } from "lucide-react";
-import { StatusBadge } from "@/components/StatusBadge";
-import type { MaintenanceRequestSummary } from "@/api/maintenanceRequestApi";
-
-export interface MaintenanceDetailsModalProps {
-	request: MaintenanceRequestSummary;
-	onClose: () => void;
-}
-
-function formatDate(value: string | null): string {
-	if (!value?.trim()) return "—";
-	try {
-		const d = new Date(value);
-		return d.toLocaleDateString("en-US", {
-			month: "short",
-			day: "numeric",
-			year: "numeric",
-			hour: "numeric",
-			minute: "2-digit",
-			hour12: true,
-		});
-	} catch {
-		return value;
-	}
-}
-
-export default function MaintenanceDetailsModal({
-	request,
-	onClose,
-}: MaintenanceDetailsModalProps) {
-	useEffect(() => {
-		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape") onClose();
-		};
-		document.addEventListener("keydown", handleEscape);
-		return () => document.removeEventListener("keydown", handleEscape);
-	}, [onClose]);
-
-	const description = request.description?.trim() || request.title?.trim() || "—";
-
-	return (
-		<div className="fixed inset-0 z-50 flex items-center justify-center">
-			{/* Backdrop */}
-			<div className="fixed inset-0 bg-black/50" onClick={onClose} aria-hidden />
-
-			{/* Modal */}
-			<div
-				className="relative z-10 w-full max-w-2xl mx-4 max-h-[90vh] overflow-y-auto rounded-2xl bg-card shadow-xl border border-border"
-				role="dialog"
-				aria-modal="true"
-				aria-labelledby="maintenance-details-title"
-			>
-				{/* Header */}
-				<div className="flex items-center justify-between border-b border-border p-6">
-					<h2 id="maintenance-details-title" className="text-xl font-semibold text-foreground">
-						Maintenance Request Details
-					</h2>
-					<button
-						type="button"
-						onClick={onClose}
-						className="rounded-lg p-1 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
-						aria-label="Close"
-					>
-						<X className="size-6" />
-					</button>
-				</div>
-
-				{/* Content */}
-				<div className="space-y-6 p-6">
-					<div>
-						<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-							Description
-						</h3>
-						<p className="text-base text-foreground">{description}</p>
-					</div>
-
-					<div className="grid grid-cols-2 gap-4">
-						<div>
-							<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-								Issue Type
-							</h3>
-							<p className="text-base text-foreground">{request.type ?? "—"}</p>
-						</div>
-						<div>
-							<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-								Priority
-							</h3>
-							<p className="text-base text-foreground">{request.priority ?? "—"}</p>
-						</div>
-					</div>
-
-					<div>
-						<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-							Property
-						</h3>
-						<p className="text-base text-foreground">{request.propertyAddress?.trim() || "—"}</p>
-					</div>
-
-					<div>
-						<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-							Tenant
-						</h3>
-						<p className="text-base text-foreground">{request.tenantName?.trim() || "—"}</p>
-					</div>
-
-					<div>
-						<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-							Scheduled Date
-						</h3>
-						<p className="text-base text-foreground">{formatDate(request.dateRequested)}</p>
-					</div>
-
-					<div>
-						<h3 className="mb-2 text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-							Status
-						</h3>
-						<StatusBadge status={request.status ?? "—"} />
-					</div>
-				</div>
-			</div>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/WeatherWidget.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/dashboard/WeatherWidget.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/WeatherWidget.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/dashboard/WeatherWidget.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/TopBar.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/TopBar.tsx
similarity index 96%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/TopBar.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/TopBar.tsx
index 10c9485..47a293f 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/TopBar.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/TopBar.tsx
@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { ChevronDown, Menu, UserPen, LogOut, User, Loader2 } from "lucide-react";
 import { Link } from "react-router";
-import { useAuth } from "../features/authentication/context/AuthContext";
-import { ROUTES } from "../features/authentication/authenticationConfig";
+import { useAuth } from "@/features/authentication/context/AuthContext";
+import { ROUTES } from "@/features/authentication/authenticationConfig";
 import zenLogo from "@/assets/icons/zen-logo.svg";
 
 export interface TopBarProps {
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/NavMenu.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/VerticalNav.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/NavMenu.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/VerticalNav.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestIcon.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestIcon.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestList.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestList.tsx
similarity index 80%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestList.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestList.tsx
index 3b6f984..97ded26 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestList.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestList.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
-import type { MaintenanceRequestSummary } from "@/api/maintenanceRequestApi";
-import MaintenanceRequestListItem from "@/components/MaintenanceRequestListItem";
-import MaintenanceDetailsModal from "@/components/MaintenanceDetailsModal";
+import type { MaintenanceRequestSummary } from "@/api/maintenanceRequests/maintenanceRequestApi";
+import MaintenanceRequestListItem from "@/components/maintenanceRequests/MaintenanceRequestListItem";
+import MaintenanceSummaryDetailsModal from "@/components/maintenanceRequests/MaintenanceSummaryDetailsModal";
 import { SkeletonListRows } from "@/components/SkeletonPrimitives";
 
 interface MaintenanceRequestListProps {
@@ -22,7 +22,7 @@ export default function MaintenanceRequestList({
 	return (
 		<>
 			{selectedRequest && (
-				<MaintenanceDetailsModal
+				<MaintenanceSummaryDetailsModal
 					request={selectedRequest}
 					onClose={() => setSelectedRequest(null)}
 				/>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestListItem.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
similarity index 91%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestListItem.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
index 5389b9a..e785975 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/MaintenanceRequestListItem.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
@@ -2,9 +2,9 @@
  * Single maintenance request row: icon (teal) | Type & address + title | tenant (gray circle) [| status].
  */
 import { useCallback } from "react";
-import type { MaintenanceRequestSummary } from "@/api/maintenanceRequestApi";
-import { MaintenanceRequestIcon } from "@/components/MaintenanceRequestIcon";
-import { StatusBadge } from "@/components/StatusBadge";
+import type { MaintenanceRequestSummary } from "@/api/maintenanceRequests/maintenanceRequestApi";
+import { MaintenanceRequestIcon } from "@/components/maintenanceRequests/MaintenanceRequestIcon";
+import { StatusBadge } from "@/components/maintenanceRequests/StatusBadge";
 
 export interface MaintenanceRequestListItemProps {
 	request: MaintenanceRequestSummary;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
new file mode 100644
index 0000000..9a60bf2
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
@@ -0,0 +1,87 @@
+/**
+ * Read-only maintenance details for B2C Maintenance page (summary rows from maintenanceRequestApi).
+ */
+import { useEffect } from "react";
+import { X } from "lucide-react";
+import { StatusBadge } from "@/components/maintenanceRequests/StatusBadge";
+import type { MaintenanceRequestSummary } from "@/api/maintenanceRequests/maintenanceRequestApi";
+
+export interface MaintenanceSummaryDetailsModalProps {
+	request: MaintenanceRequestSummary;
+	onClose: () => void;
+}
+
+function formatDate(value: string | null): string {
+	if (!value?.trim()) return "—";
+	try {
+		const d = new Date(value);
+		return d.toLocaleDateString("en-US", {
+			month: "short",
+			day: "numeric",
+			year: "numeric",
+			hour: "numeric",
+			minute: "2-digit",
+			hour12: true,
+		});
+	} catch {
+		return value;
+	}
+}
+
+export default function MaintenanceSummaryDetailsModal({
+	request,
+	onClose,
+}: MaintenanceSummaryDetailsModalProps) {
+	useEffect(() => {
+		const handleEscape = (e: KeyboardEvent) => {
+			if (e.key === "Escape") onClose();
+		};
+		document.addEventListener("keydown", handleEscape);
+		return () => document.removeEventListener("keydown", handleEscape);
+	}, [onClose]);
+
+	return (
+		<div className="fixed inset-0 z-50 flex items-center justify-center p-4">
+			<div className="fixed inset-0 bg-black/50" onClick={onClose} aria-hidden />
+			<div
+				role="dialog"
+				aria-modal
+				className="relative max-h-[90vh] w-full max-w-lg overflow-y-auto rounded-lg bg-white shadow-xl"
+			>
+				<div className="flex items-center justify-between border-b p-4">
+					<h2 className="text-lg font-semibold">{request.title ?? request.name ?? "Request"}</h2>
+					<button type="button" onClick={onClose} className="text-gray-500 hover:text-gray-800">
+						<X className="h-5 w-5" />
+					</button>
+				</div>
+				<div className="space-y-3 p-4 text-sm">
+					{request.description && <p className="text-gray-700">{request.description}</p>}
+					<div className="flex flex-wrap gap-2">
+						{request.type && (
+							<span className="rounded bg-gray-100 px-2 py-0.5">{request.type}</span>
+						)}
+						{request.priority && (
+							<span className="rounded bg-gray-100 px-2 py-0.5">{request.priority}</span>
+						)}
+						{request.status && <StatusBadge status={request.status} />}
+					</div>
+					{request.propertyAddress && (
+						<p>
+							<span className="font-medium">Property:</span> {request.propertyAddress}
+						</p>
+					)}
+					{request.tenantName && (
+						<p>
+							<span className="font-medium">Tenant:</span> {request.tenantName}
+						</p>
+					)}
+					{request.dateRequested && (
+						<p>
+							<span className="font-medium">Requested:</span> {formatDate(request.dateRequested)}
+						</p>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/StatusBadge.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/StatusBadge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/StatusBadge.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/StatusBadge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertyListingCard.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingCard.tsx
similarity index 98%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertyListingCard.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingCard.tsx
index b54f1be..262f4b8 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertyListingCard.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingCard.tsx
@@ -6,7 +6,7 @@ import { useNavigate } from "react-router";
 import { useCallback, type MouseEvent } from "react";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
-import type { SearchResultRecordData } from "@/features/global-search/types/search/searchResults.js";
+import type { SearchResultRecordData } from "@/types/searchResults.js";
 
 function fieldDisplay(
 	fields: Record<string, { value?: unknown; displayValue?: string | null }> | undefined,
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchPagination.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingSearchPagination.tsx
similarity index 65%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchPagination.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingSearchPagination.tsx
index 0cf4f8b..75693ef 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchPagination.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingSearchPagination.tsx
@@ -1,39 +1,35 @@
 /**
- * SearchPagination Component
- *
- * Displays pagination controls for search results.
- * Previous/Next are disabled using hasPreviousPage/hasNextPage from the API so no request is made when there is no page.
- *
- * @remarks
- * - Layout: page size selector on the left, prev/page/next controls on the right (corners).
- * - Previous disabled when !hasPreviousPage (cursor stack enables prev when pageIndex > 0).
- * - Next disabled when !hasNextPage or nextPageToken is null.
+ * Pagination controls for Property_Listing__c consumer search (token-based).
+ * Replaces feature-react-global-search SearchPagination without pulling in that feature.
  */
-import { Button } from "../../../../components/ui/button";
+import { Button } from "@/components/ui/button";
 import {
 	Select,
 	SelectContent,
 	SelectItem,
 	SelectTrigger,
 	SelectValue,
-} from "../../../../components/ui/select";
-import { Label } from "../../../../components/ui/label";
-import { PAGE_SIZE_OPTIONS, getValidPageSize, isValidPageSize } from "../../utils/paginationUtils";
+} from "@/components/ui/select";
+import { Label } from "@/components/ui/label";
+import {
+	PAGE_SIZE_OPTIONS,
+	getValidPageSize,
+	isValidPageSize,
+} from "@/utils/propertyListingPaginationUtils";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 
-interface SearchPaginationProps {
+interface PropertyListingSearchPaginationProps {
 	currentPageToken: string;
 	nextPageToken: string | null;
 	previousPageToken: string | null;
 	hasNextPage?: boolean;
 	hasPreviousPage?: boolean;
 	pageSize: number;
-	/** direction: 'prev' | 'next' | 'first'. When 'first' (e.g. page size change), parent typically resets pagination; token may be '' for prev when going to page 0. */
 	onPageChange: (newPageToken: string, direction?: "next" | "prev" | "first") => void;
 	onPageSizeChange: (newPageSize: number) => void;
 }
 
-export default function SearchPagination({
+export default function PropertyListingSearchPagination({
 	currentPageToken,
 	nextPageToken,
 	previousPageToken,
@@ -42,7 +38,7 @@ export default function SearchPagination({
 	pageSize,
 	onPageChange,
 	onPageSizeChange,
-}: SearchPaginationProps) {
+}: PropertyListingSearchPaginationProps) {
 	const validPageSize = getValidPageSize(pageSize);
 
 	const currentPageTokenNum = parseInt(currentPageToken, 10) || 0;
@@ -73,23 +69,19 @@ export default function SearchPagination({
 
 	return (
 		<nav
-			className="w-full flex flex-row flex-wrap items-center justify-between gap-4 py-2"
+			className="flex w-full flex-row flex-wrap items-center justify-between gap-4 py-2"
 			aria-label="Search results pagination"
 		>
 			<div
-				className="flex items-center gap-2 shrink-0"
+				className="flex shrink-0 items-center gap-2"
 				role="group"
 				aria-label="Page size selector"
 			>
-				<Label htmlFor="page-size-select" className="text-sm font-normal whitespace-nowrap">
+				<Label htmlFor="page-size-select" className="whitespace-nowrap text-sm font-normal">
 					Results per page:
 				</Label>
 				<Select value={validPageSize.toString()} onValueChange={handlePageSizeChange}>
-					<SelectTrigger
-						id="page-size-select"
-						className="w-[70px]"
-						aria-label="Select number of results per page"
-					>
+					<SelectTrigger id="page-size-select" className="w-[70px]" aria-label="Results per page">
 						<SelectValue />
 					</SelectTrigger>
 					<SelectContent>
@@ -102,7 +94,7 @@ export default function SearchPagination({
 				</Select>
 			</div>
 
-			<div className="flex items-center gap-1 shrink-0" role="group" aria-label="Page navigation">
+			<div className="flex shrink-0 items-center gap-1" role="group" aria-label="Page navigation">
 				<Button
 					type="button"
 					variant="outline"
@@ -119,9 +111,9 @@ export default function SearchPagination({
 					Previous
 				</Button>
 				<span
-					className="min-w-[4rem] text-center text-sm text-muted-foreground px-2"
-					aria-label={`Page ${currentPage}, current page`}
+					className="min-w-[4rem] px-2 text-center text-sm text-muted-foreground"
 					aria-current="page"
+					aria-label={`Page ${currentPage}, current page`}
 				>
 					Page {currentPage}
 				</span>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertyMap.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyMap.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertyMap.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyMap.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertySearchFilters.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertySearchFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/PropertySearchFilters.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertySearchFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts
new file mode 100644
index 0000000..0da672d
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts
@@ -0,0 +1,4 @@
+/**
+ * Defaults for consumer property listing search (map + list), independent of object-search admin pages.
+ */
+export const DEFAULT_PAGE_SIZE = 20;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectDetailService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectDetailService.ts
deleted file mode 100644
index c5c2279..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectDetailService.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Record detail service: layout (REST), object metadata (GraphQL), single record (GraphQL).
- *
- * getRecordDetail orchestrates layout + objectInfoBatch + getRecordByIdGraphQL for the detail page.
- * Layout is still REST (uiApiClient); record and object info are GraphQL-backed.
- *
- * @module api/objectDetailService
- */
-
-import { uiApiClient } from "@salesforce/webapp-experimental/api";
-import type { LayoutResponse } from "../types/recordDetail/recordDetail";
-import { LayoutResponseSchema } from "../types/recordDetail/recordDetail";
-import { fetchAndValidate, safeEncodePath } from "../utils/apiUtils";
-import { objectInfoService } from "./objectInfoService";
-import type { ObjectInfoResult } from "../types/objectInfo/objectInfo";
-import { getRecordByIdGraphQL, type GraphQLRecordNode } from "./recordListGraphQLService";
-import type { Column } from "../types/search/searchResults";
-import { calculateFieldsToFetch } from "../utils/recordUtils";
-
-/** Fallback when record type is unknown. Prefer recordTypeId from the record (e.g. from search or record response) when available. */
-const DEFAULT_RECORD_TYPE_ID = "012000000000000AAA";
-
-/**
- * Returns field API names to request for a record from the given layout and object metadata.
- * Used to derive GraphQL columns from layout (detail view). Delegates to recordUtils.calculateFieldsToFetch.
- *
- * @param objectMetadata - Object info (fields, relationshipName, etc.).
- * @param layout - Layout response (sections, layoutItems, layoutComponents).
- * @returns Array of field API names (e.g. ["Name", "OwnerId", "Owner", "CreatedDate"]).
- */
-export function extractFieldsFromLayout(
-	objectMetadata: ObjectInfoResult,
-	layout: LayoutResponse,
-): string[] {
-	const [optionalFields] = calculateFieldsToFetch(objectMetadata, layout, false);
-	return optionalFields;
-}
-
-export async function getLayout(
-	objectApiName: string,
-	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-): Promise<LayoutResponse> {
-	const params = new URLSearchParams({
-		layoutType: "Full",
-		mode: "View",
-		recordTypeId,
-	});
-	return fetchAndValidate(
-		() => uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`),
-		{
-			schema: LayoutResponseSchema,
-			errorContext: `layout for ${objectApiName}`,
-		},
-	);
-}
-
-export interface RecordDetailResult {
-	layout: LayoutResponse;
-	record: GraphQLRecordNode;
-	objectMetadata: ObjectInfoResult;
-}
-
-/**
- * Converts layout-derived optionalFields (field API names) to Column[] for GraphQL node selection.
- * Uses unqualified names (no entity prefix) so the GraphQL query matches UI API shape.
- * Other Column fields (label, searchable, sortable) are only required by the type; GraphQL selection uses fieldApiName only.
- */
-function optionalFieldsToColumns(optionalFields: string[]): Column[] {
-	return optionalFields.map((fieldApiName) => ({
-		fieldApiName,
-		label: "",
-		searchable: false,
-		sortable: false,
-	}));
-}
-
-export async function getRecordDetail(
-	objectApiName: string,
-	recordId: string,
-	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-): Promise<RecordDetailResult> {
-	const layout = await getLayout(objectApiName, recordTypeId);
-	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName);
-	const firstResult = objectMetadata?.results?.[0]?.result;
-	if (!firstResult) {
-		throw new Error(`Object metadata not found for ${objectApiName}`);
-	}
-	// Layout-driven optionalFields (fields shown on the detail layout), not list columns
-	const [optionalFields] = calculateFieldsToFetch(firstResult, layout, false);
-	const columns = optionalFieldsToColumns(optionalFields);
-	const record = await getRecordByIdGraphQL(objectApiName, recordId, columns);
-	if (!record) {
-		throw new Error(`Record not found: ${recordId}`);
-	}
-	return { layout, record, objectMetadata: firstResult };
-}
-
-export const objectDetailService = {
-	extractFieldsFromLayout,
-	getLayout,
-	getRecordDetail,
-};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoGraphQLService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoGraphQLService.ts
deleted file mode 100644
index d320f35..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoGraphQLService.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Object metadata GraphQL service (uiapi.objectInfos).
- *
- * Single endpoint for object describe and picklist values. Used by objectInfoService
- * to implement getObjectInfoBatch and getPicklistValues. Not used directly by UI.
- *
- * @module api/objectInfoGraphQLService
- */
-
-import { createDataSDK, gql } from "@salesforce/sdk-data";
-import type {
-	GetObjectInfosQuery,
-	GetObjectInfosQueryVariables,
-	GetPicklistValuesQuery,
-	GetPicklistValuesQueryVariables,
-	ObjectInfoInput,
-} from "../types/schema";
-
-/**
- * Builds objectInfos query (metadata only). Uses apiNames only — do not pass objectInfoInputs.
- */
-const OBJECT_INFOS_QUERY = gql`
-	query GetObjectInfos($apiNames: [String!]!) {
-		uiapi {
-			objectInfos(apiNames: $apiNames) {
-				ApiName
-				label
-				labelPlural
-				nameFields
-				defaultRecordTypeId
-				keyPrefix
-				layoutable
-				queryable
-				searchable
-				updateable
-				deletable
-				createable
-				custom
-				mruEnabled
-				feedEnabled
-				fields {
-					ApiName
-					label
-					dataType
-					relationshipName
-					reference
-					compound
-					compoundFieldName
-					compoundComponentName
-					controllingFields
-					controllerName
-					referenceToInfos {
-						ApiName
-						nameFields
-					}
-				}
-				recordTypeInfos {
-					recordTypeId
-					name
-					master
-					available
-					defaultRecordTypeMapping
-				}
-				themeInfo {
-					color
-					iconUrl
-				}
-				childRelationships {
-					relationshipName
-					fieldName
-					childObjectApiName
-				}
-				dependentFields {
-					controllingField
-				}
-			}
-		}
-	}
-`;
-
-/**
- * Builds objectInfos query with picklist values (API v65.0+).
- * Schema requires objectInfos to be called with either apiNames or objectInfoInputs, not both.
- * This query uses objectInfoInputs only.
- * Optimized to only fetch fields used by extractPicklistValuesFromGraphQLObjectInfo.
- */
-const PICKLIST_VALUES_QUERY = gql`
-	query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
-		uiapi {
-			objectInfos(objectInfoInputs: $objectInfoInputs) {
-				ApiName
-				fields {
-					ApiName
-					... on PicklistField {
-						picklistValuesByRecordTypeIDs {
-							recordTypeID
-							defaultValue {
-								value
-							}
-							picklistValues {
-								label
-								value
-								validFor
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-`;
-
-export async function queryForObjectInfos(apiNames: string[]): Promise<GetObjectInfosQuery> {
-	return runQuery<GetObjectInfosQuery, GetObjectInfosQueryVariables>(OBJECT_INFOS_QUERY, {
-		apiNames,
-	});
-}
-
-export async function queryForPicklistValues(
-	objectInfoInputs: ObjectInfoInput[],
-): Promise<GetPicklistValuesQuery> {
-	return runQuery<GetPicklistValuesQuery, GetPicklistValuesQueryVariables>(PICKLIST_VALUES_QUERY, {
-		objectInfoInputs,
-	});
-}
-
-async function runQuery<Q, V>(query: string, variables: V): Promise<Q> {
-	const data = await createDataSDK();
-	const response = await data.graphql?.<Q, V>(query, variables);
-
-	if (response?.errors?.length) {
-		const errorMessages = response.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
-	return response?.data ?? ({} as Q);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoService.ts
deleted file mode 100644
index a438540..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/objectInfoService.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { uiApiClient } from "@salesforce/webapp-experimental/api";
-import type { Filter } from "../types/filters/filters";
-import { FilterArraySchema } from "../types/filters/filters";
-import type { PicklistValue } from "../types/filters/picklist";
-import type { ObjectInfoBatchResponse } from "../types/objectInfo/objectInfo";
-import { fetchAndValidate, safeEncodePath } from "../utils/apiUtils";
-import { queryForObjectInfos, queryForPicklistValues } from "./objectInfoGraphQLService";
-import {
-	graphQLObjectInfosToBatchResponse,
-	extractPicklistValuesFromGraphQLObjectInfo,
-} from "../utils/graphQLObjectInfoAdapter";
-
-/**
- * Object info and search service.
- *
- * - getObjectInfoBatch / getPicklistValues: GraphQL (objectInfoGraphQLService).
- * - getObjectListFilters: REST (search-info).
- * Hooks use this service; components do not call it directly.
- *
- * @module api/objectInfoService
- */
-
-/** Cache key: sorted, comma-joined object API names. */
-function getObjectInfoBatchCacheKey(objectApiNames: string): string {
-	const names = objectApiNames
-		.split(",")
-		.map((s) => s.trim())
-		.filter(Boolean);
-	return [...names].sort().join(",");
-}
-
-const objectInfoBatchCache = new Map<string, ObjectInfoBatchResponse>();
-const objectInfoBatchInFlight = new Map<string, Promise<ObjectInfoBatchResponse>>();
-
-export async function getObjectInfoBatch(objectApiNames: string): Promise<ObjectInfoBatchResponse> {
-	const names = objectApiNames
-		.split(",")
-		.map((s) => s.trim())
-		.filter(Boolean);
-	if (names.length === 0) {
-		return { results: [] };
-	}
-	const key = getObjectInfoBatchCacheKey(objectApiNames);
-	const cached = objectInfoBatchCache.get(key);
-	if (cached) return Promise.resolve(cached);
-	const inFlight = objectInfoBatchInFlight.get(key);
-	if (inFlight) return inFlight;
-	const promise = (async () => {
-		try {
-			const response = await queryForObjectInfos(names);
-			const nodes = response?.uiapi?.objectInfos ?? [];
-			const result = graphQLObjectInfosToBatchResponse(nodes, names);
-			objectInfoBatchCache.set(key, result);
-			return result;
-		} finally {
-			objectInfoBatchInFlight.delete(key);
-		}
-	})();
-	objectInfoBatchInFlight.set(key, promise);
-	return promise;
-}
-
-export async function getObjectListFilters(objectApiName: string): Promise<Filter[]> {
-	return fetchAndValidate(
-		() => uiApiClient.get(`/search-info/${safeEncodePath(objectApiName)}/filters`),
-		{
-			schema: FilterArraySchema,
-			errorContext: `filters for ${objectApiName}`,
-			extractData: (data: unknown) => {
-				if (!data) return [];
-				return Array.isArray(data) ? data : (data as { filters?: unknown }).filters || [];
-			},
-		},
-	);
-}
-
-export async function getPicklistValues(
-	objectApiName: string,
-	fieldName: string,
-	recordTypeId: string = "012000000000000AAA",
-): Promise<PicklistValue[]> {
-	const response = await queryForPicklistValues([
-		{ apiName: objectApiName, fieldNames: [fieldName] },
-	]);
-	const nodes = response?.uiapi?.objectInfos ?? [];
-	const node = nodes[0];
-	if (!node) return [];
-	return extractPicklistValuesFromGraphQLObjectInfo(node, fieldName, recordTypeId);
-}
-
-export const objectInfoService = {
-	getObjectInfoBatch,
-	getObjectListFilters,
-	getPicklistValues,
-};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/recordListGraphQLService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/recordListGraphQLService.ts
deleted file mode 100644
index 8cf8084..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/api/recordListGraphQLService.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- * Record GraphQL Service
- *
- * Single service for querying Salesforce object records via GraphQL UI API (uiapi.query).
- * Handles both list (paginated, filter, sort, search) and single-record-by-id using one query shape.
- *
- * @module api/recordListGraphQLService
- */
-
-import { createDataSDK } from "@salesforce/sdk-data";
-import type { Column } from "../types/search/searchResults";
-import type { FilterCriteria } from "../types/filters/filters";
-
-const DEFAULT_PAGE_SIZE = 50;
-
-/** Tree of selection: leaf is "value", branch is nested fields. Keys starting with __on_ are inline fragments (e.g. __on_User). */
-interface SelectionTree {
-	[key: string]: "value" | SelectionTree;
-}
-
-/**
- * Polymorphic relationship fields and the concrete GraphQL types they can resolve to.
- * Only relationship names listed here use inline fragments; others use direct selection
- * (e.g. Parent -> Parent { Name { value } } because "Parent" is not a schema type).
- * We use a single fragment per field to avoid schema validation errors (e.g. User and Group
- * cannot both be spread in the same selection in some contexts).
- */
-const POLYMORPHIC_RELATIONSHIP_TYPES: Record<string, string[]> = {
-	Owner: ["User"],
-	CreatedBy: ["User"],
-	LastModifiedBy: ["User"],
-};
-
-/**
- * Builds a selection tree from columns (fieldApiName). Simple fields (e.g. Name, OwnerId) become
- * top-level leaves. Relationship fields that are in POLYMORPHIC_RELATIONSHIP_TYPES use a single
- * inline fragment on the first concrete type (e.g. ... on User). All other relationship fields
- * (e.g. Parent, Account) use direct selection (e.g. Parent { Name { value } }) because the
- * relationship name is not necessarily a GraphQL type name (e.g. Parent resolves to Account).
- */
-function buildSelectionTree(columns: Column[]): SelectionTree {
-	const allFieldNames = new Set(columns.map((c) => (c.fieldApiName ?? "").trim()).filter(Boolean));
-	const tree: SelectionTree = { Id: "value" };
-	for (const col of columns) {
-		const name = (col.fieldApiName ?? "").trim();
-		if (!name) continue;
-		const parts = name.split(".");
-		if (parts.length === 1) {
-			const fieldName = parts[0];
-			const hasCorrespondingId = allFieldNames.has(`${fieldName}Id`);
-			if (hasCorrespondingId) {
-				const knownTypes = POLYMORPHIC_RELATIONSHIP_TYPES[fieldName];
-				if (knownTypes?.length) {
-					// Use a single inline fragment to avoid "User can never be Group" validation errors
-					const typeName = knownTypes[0];
-					tree[fieldName] = { [`__on_${typeName}`]: { Name: "value" } };
-				} else {
-					// Relationship name (e.g. Parent) is not a GraphQL type; use direct selection
-					tree[fieldName] = { Name: "value" };
-				}
-			} else {
-				tree[fieldName] = "value";
-			}
-		} else {
-			let current = tree;
-			for (let i = 0; i < parts.length; i++) {
-				const part = parts[i];
-				const isLeaf = i === parts.length - 1;
-				if (isLeaf) {
-					current[part] = "value";
-				} else {
-					const existing = current[part];
-					if (existing === "value") continue;
-					if (!existing) {
-						current[part] = {};
-					}
-					current = current[part] as SelectionTree;
-				}
-			}
-		}
-	}
-	return tree;
-}
-
-/**
- * Serializes a selection tree to GraphQL selection set string.
- * Keys starting with __on_ are emitted as inline fragments (... on TypeName { ... }).
- * Id is scalar (no subselection); other leaves use { value }.
- */
-function serializeSelectionTree(tree: SelectionTree, indent: string): string {
-	const fragmentKeys = Object.keys(tree).filter((k) => k.startsWith("__on_"));
-	const normalKeys = Object.keys(tree).filter((k) => !k.startsWith("__on_"));
-	normalKeys.sort((a, b) => {
-		if (a === "Id") return -1;
-		if (b === "Id") return 1;
-		return a.localeCompare(b);
-	});
-	fragmentKeys.sort();
-	const lines: string[] = [];
-	const childIndent = `${indent}  `;
-	for (const key of normalKeys) {
-		const val = tree[key];
-		if (val === "value") {
-			if (key === "Id") {
-				lines.push(`${indent}Id`);
-			} else {
-				lines.push(`${indent}${key} @optional { value }`);
-			}
-		} else {
-			lines.push(`${indent}${key} @optional {`);
-			lines.push(serializeSelectionTree(val, childIndent));
-			lines.push(`${indent}}`);
-		}
-	}
-	for (const key of fragmentKeys) {
-		const typeName = key.slice(5);
-		const val = tree[key];
-		if (val && typeof val === "object") {
-			lines.push(`${indent}... on ${typeName} {`);
-			lines.push(serializeSelectionTree(val, childIndent));
-			lines.push(`${indent}}`);
-		}
-	}
-	return lines.join("\n");
-}
-
-function buildNodeSelection(columns: Column[]): string {
-	const tree = buildSelectionTree(columns);
-	return serializeSelectionTree(tree, "            ");
-}
-
-/**
- * Builds GraphQL where clause from filter criteria and optional search text.
- * Search text is applied as Name like %query%. Multiple conditions are combined with and.
- *
- * @param criteria - Field filters (fieldPath, operator, values).
- * @param searchQuery - Optional; adds Name like %searchQuery% when provided.
- */
-export function buildWhereFromCriteria(
-	criteria: FilterCriteria[],
-	searchQuery?: string,
-): Record<string, unknown> | null {
-	const conditions: Record<string, unknown>[] = [];
-
-	if (searchQuery && searchQuery.trim()) {
-		const term = `%${searchQuery.trim()}%`;
-		conditions.push({ Name: { like: term } });
-	}
-
-	for (const c of criteria) {
-		if (!c.fieldPath || !c.operator || !c.values?.length) continue;
-		const op = c.operator;
-		const parts = c.fieldPath.split(".");
-		const fieldClause = op === "in" ? { in: c.values } : { [op]: c.values[0] };
-		if (parts.length === 1) {
-			conditions.push({ [parts[0]]: fieldClause });
-		} else {
-			let nested: Record<string, unknown> = { [parts[parts.length - 1]]: fieldClause };
-			for (let i = parts.length - 2; i >= 0; i--) {
-				nested = { [parts[i]]: nested };
-			}
-			conditions.push(nested);
-		}
-	}
-
-	if (conditions.length === 0) return null;
-	if (conditions.length === 1) return conditions[0] as Record<string, unknown>;
-	return { and: conditions };
-}
-
-/**
- * Parses sortBy string (e.g. "Name", "Name ASC", "AnnualRevenue DESC") into GraphQL orderBy shape.
- * Default direction is ASC.
- */
-export function buildOrderByFromSort(
-	sortBy: string,
-): Record<string, { order: "ASC" | "DESC" }> | null {
-	const trimmed = (sortBy ?? "").trim();
-	if (!trimmed || trimmed.toLowerCase() === "relevance") return null;
-	const parts = trimmed.split(/\s+/);
-	const field = parts[0];
-	const dir = parts[1]?.toUpperCase() === "DESC" ? "DESC" : "ASC";
-	return { [field]: { order: dir } };
-}
-
-/** Variables for the GetRecords GraphQL operation. */
-export interface RecordListGraphQLVariables {
-	first?: number;
-	after?: string | null;
-	where?: Record<string, unknown> | null;
-	orderBy?: Record<string, unknown> | null;
-}
-
-export interface RecordListGraphQLOptions {
-	objectApiName: string;
-	columns: Column[];
-	/** When set, fetches a single record by Id (first=1, where Id eq); used for detail view. */
-	recordId?: string | null;
-	first?: number;
-	after?: string | null;
-	filters?: FilterCriteria[];
-	orderBy?: Record<string, unknown> | null;
-	searchQuery?: string;
-}
-
-/**
- * Builds the GraphQL query string for uiapi.query.{objectApiName}.
- * Used for both list (pagination, where, orderBy) and single record (where Id eq, first 1).
- *
- * @param objectApiName - API name of the object (e.g. Account, Contact).
- * @param columns - Field selection (becomes node selection via buildNodeSelection).
- * @param options - Optional where and orderBy; when recordId is used, where is set to Id eq.
- */
-export function buildGetRecordsQuery(
-	objectApiName: string,
-	columns: Column[],
-	options?: { where?: Record<string, unknown> | null; orderBy?: Record<string, unknown> | null },
-): string {
-	const nodeSelection = buildNodeSelection(columns);
-	const hasWhere = options?.where != null && Object.keys(options.where).length > 0;
-	const hasOrderBy = options?.orderBy != null && Object.keys(options.orderBy).length > 0;
-
-	const filterType = `${objectApiName}_Filter`;
-	const orderByType = `${objectApiName}_OrderBy`;
-
-	const varDecls = [
-		"$first: Int",
-		"$after: String",
-		...(hasWhere ? [`$where: ${filterType}`] : []),
-		...(hasOrderBy ? [`$orderBy: ${orderByType}`] : []),
-	];
-	const opArgs = [
-		"first: $first",
-		"after: $after",
-		...(hasWhere ? ["where: $where"] : []),
-		...(hasOrderBy ? ["orderBy: $orderBy"] : []),
-	];
-
-	return `query GetRecords(${varDecls.join(", ")}) {
-  uiapi {
-    query {
-      ${objectApiName}(${opArgs.join(", ")}) {
-        edges {
-          node {
-            ${nodeSelection}
-          }
-        }
-        pageInfo {
-          hasNextPage
-          hasPreviousPage
-          endCursor
-          startCursor
-        },
-		totalCount,
-		pageResultCount
-      }
-    }
-  }
-}`;
-}
-
-export interface RecordListGraphQLResult {
-	uiapi?: {
-		query?: {
-			[key: string]: {
-				edges?: Array<{ node?: Record<string, unknown> }>;
-				pageInfo?: {
-					hasNextPage?: boolean;
-					hasPreviousPage?: boolean;
-					endCursor?: string | null;
-					startCursor?: string | null;
-				};
-			};
-		};
-	};
-}
-
-/** GraphQL node shape for a single record (Id + field selections with value/nested). */
-export type GraphQLRecordNode = Record<string, unknown>;
-
-/**
- * Fetches records for the given object via GraphQL (single query for both list and single record).
- *
- * - List: pass first, after, filters, orderBy, searchQuery.
- * - Single record: pass recordId; first is set to 1 and where includes Id eq.
- *
- * @param options.objectApiName - API name of the object (e.g. Account, Contact).
- * @param options.columns - Field selection (from filters-derived columns or layout-derived optionalFields).
- * @param options.recordId - If set, fetches one record by Id (first=1, where Id eq).
- * @param options.first - Page size (default 50; ignored when recordId is set).
- * @param options.after - Cursor for next page.
- * @param options.filters - Filter criteria (mapped to where).
- * @param options.orderBy - GraphQL orderBy; use buildOrderByFromSort(sortBy) when needed.
- * @param options.searchQuery - Text search (Name like %query% in where).
- * @returns Connection result (edges, pageInfo); for recordId callers use edges[0].node.
- */
-export async function getRecordsGraphQL(
-	options: RecordListGraphQLOptions,
-): Promise<RecordListGraphQLResult> {
-	const {
-		objectApiName,
-		columns,
-		recordId,
-		first = DEFAULT_PAGE_SIZE,
-		after = null,
-		filters = [],
-		orderBy = null,
-		searchQuery,
-	} = options;
-
-	const listWhere = buildWhereFromCriteria(filters, searchQuery);
-	const where =
-		recordId != null && recordId !== ""
-			? listWhere != null && Object.keys(listWhere).length > 0
-				? { and: [{ Id: { eq: recordId } }, listWhere] }
-				: { Id: { eq: recordId } }
-			: listWhere;
-	const effectiveFirst = recordId != null && recordId !== "" ? 1 : first;
-	const hasWhere = where != null && Object.keys(where).length > 0;
-	const hasOrderBy = orderBy != null && Object.keys(orderBy).length > 0;
-
-	const query = buildGetRecordsQuery(objectApiName, columns, { where, orderBy });
-	const variables: Record<string, unknown> = {
-		first: effectiveFirst,
-		after: after ?? null,
-		...(hasWhere && where ? { where } : {}),
-		...(hasOrderBy && orderBy ? { orderBy } : {}),
-	};
-
-	const data = await createDataSDK();
-	const response = await data.graphql?.<RecordListGraphQLResult>(query, variables);
-
-	if (response?.errors?.length) {
-		const errorMessages = response.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
-	return response?.data ?? ({} as RecordListGraphQLResult);
-}
-
-/**
- * Fetches a single record by Id. Uses the same GraphQL query as list (getRecordsGraphQL with recordId + first 1).
- *
- * @param objectApiName - API name of the object.
- * @param recordId - Record Id.
- * @param columns - Field selection (e.g. layout-derived optionalFields as Column[]).
- * @returns The record node or null if not found.
- */
-export async function getRecordByIdGraphQL(
-	objectApiName: string,
-	recordId: string,
-	columns: Column[],
-): Promise<GraphQLRecordNode | null> {
-	const result = await getRecordsGraphQL({
-		objectApiName,
-		columns,
-		recordId,
-		first: 1,
-	});
-	const edges =
-		result?.uiapi?.query?.[objectApiName]?.edges ??
-		([] as Array<{ node?: Record<string, unknown> }>);
-	return (edges[0]?.node ?? null) as GraphQLRecordNode | null;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailFields.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailFields.tsx
deleted file mode 100644
index abbc0bf..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailFields.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Alternative detail rendering: columns + record → label/value list.
- *
- * Use when you have list columns + record (e.g. from filters-derived columns + searchResults)
- * and do not need the Layout API. The primary detail view (DetailPage) uses DetailForm
- * via UiApiDetailForm (layout + GraphQL record).
- *
- * @param record - Record data to display
- * @param columns - Column definitions (e.g. derived from getObjectListFilters)
- */
-import type { Column, SearchResultRecordData } from "../../types/search/searchResults";
-import { getNestedFieldValue } from "../../utils/fieldUtils";
-
-interface DetailFieldsProps {
-	record: SearchResultRecordData;
-	columns: Column[];
-}
-
-function hasVisibleValue(value: string | number | boolean | null | undefined): boolean {
-	return value !== null && value !== undefined && value !== "";
-}
-
-export default function DetailFields({ record, columns }: DetailFieldsProps) {
-	const rows = columns.filter(
-		(col) =>
-			col?.fieldApiName && hasVisibleValue(getNestedFieldValue(record.fields, col.fieldApiName)),
-	);
-
-	if (columns.length > 0 && rows.length === 0) {
-		return (
-			<div role="status" className="text-sm text-muted-foreground py-4">
-				No field values to display
-			</div>
-		);
-	}
-
-	return (
-		<dl className="space-y-4" role="list">
-			{rows.map((column) => {
-				const fieldApiName = column.fieldApiName as string;
-				const displayValue = getNestedFieldValue(record.fields, fieldApiName);
-				return (
-					<div key={fieldApiName} className="border-b pb-4 last:border-0" role="listitem">
-						<div className="flex flex-col sm:flex-row sm:items-start gap-2">
-							<dt className="font-semibold text-sm text-muted-foreground min-w-[150px]">
-								{column.label || fieldApiName}:
-							</dt>
-							<dd className="text-sm text-foreground flex-1">{displayValue}</dd>
-						</div>
-					</div>
-				);
-			})}
-		</dl>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailForm.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailForm.tsx
deleted file mode 100644
index c8fb3c6..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailForm.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { useState, useCallback, useMemo, useId } from "react";
-import type { LayoutResponse } from "../../types/recordDetail/recordDetail";
-import type { GraphQLRecordNode } from "../../api/recordListGraphQLService";
-import {
-	getDisplayValueForLayoutItemFromNode,
-	getDisplayValueForDetailFieldFromNode,
-} from "../../utils/graphQLNodeFieldUtils";
-import type { ObjectInfoMetadata } from "../../utils/formDataTransformUtils";
-import {
-	getTransformedSections,
-	type LayoutTransformContext,
-	type ObjectInfo,
-	type PicklistOption,
-	type TransformedLayoutItem,
-} from "../../utils/layoutTransformUtils";
-import { FieldValueDisplay } from "./formatted/FieldValueDisplay";
-import { Section } from "./Section";
-import { SectionRow } from "./SectionRow";
-
-export interface DetailFormProps {
-	layout: LayoutResponse;
-	record: GraphQLRecordNode;
-	metadata?: ObjectInfoMetadata | null;
-	objectInfo?: ObjectInfo | null;
-	lookupRecords?: Record<string, PicklistOption[] | null> | null;
-	showSectionHeaders?: boolean;
-	collapsibleSections?: boolean;
-}
-
-function FieldCell({
-	item,
-	record,
-	metadata,
-}: {
-	item: TransformedLayoutItem;
-	record: GraphQLRecordNode;
-	metadata?: ObjectInfoMetadata | null;
-}) {
-	const labelId = useId();
-	const valueId = useId();
-	if (!item.isField || item.apiName == null) return null;
-	const label = item.label ?? item.apiName;
-	const hasComponents = item.layoutComponentApiNames && item.layoutComponentApiNames.length > 0;
-	const layoutResult = hasComponents
-		? getDisplayValueForLayoutItemFromNode(
-				record,
-				item.layoutComponentApiNames as string[],
-				metadata,
-			)
-		: null;
-	const value = hasComponents
-		? (layoutResult?.value ?? null)
-		: getDisplayValueForDetailFieldFromNode(record, item.apiName, metadata);
-	const dataType =
-		(hasComponents ? layoutResult?.dataType : undefined) ?? item.dataType ?? undefined;
-	return (
-		<div
-			className="flex flex-col gap-1"
-			role="group"
-			aria-labelledby={labelId}
-			aria-describedby={valueId}
-		>
-			<dt id={labelId} className="text-sm font-medium text-muted-foreground">
-				{label}
-			</dt>
-			<dd id={valueId} className="text-sm text-foreground">
-				<FieldValueDisplay value={value} dataType={dataType} />
-			</dd>
-		</div>
-	);
-}
-
-/**
- * Read-only detail form: layout API + record (+ optional object info) drive sections, rows, and
- * field values. Uses layoutComponents to club multi-component items (address, Created By, etc.).
- */
-export function DetailForm({
-	layout,
-	record,
-	metadata = null,
-	objectInfo = null,
-	lookupRecords = null,
-	showSectionHeaders = true,
-	collapsibleSections = true,
-}: DetailFormProps) {
-	const [collapsedSections, setCollapsedSections] = useState<Record<string, boolean>>({});
-
-	const recordId = (record.Id as string) ?? "";
-
-	const layoutObjectInfo = objectInfo ?? metadata;
-
-	const transformContext: LayoutTransformContext = useMemo(
-		() => ({
-			recordId,
-			objectInfo: layoutObjectInfo,
-			lookupRecords,
-			getSectionCollapsedState: (sectionId: string) => Boolean(collapsedSections[sectionId]),
-		}),
-		[recordId, layoutObjectInfo, lookupRecords, collapsedSections],
-	);
-
-	const computedSections = useMemo(
-		() => getTransformedSections(layout.sections, transformContext),
-		[layout.sections, transformContext],
-	);
-
-	const handleSectionToggle = useCallback((sectionId: string, collapsed: boolean) => {
-		setCollapsedSections((prev) => ({ ...prev, [sectionId]: collapsed }));
-	}, []);
-
-	return (
-		<div
-			className="space-y-6"
-			role="region"
-			aria-label="Record details"
-			aria-roledescription="Detail form"
-		>
-			{computedSections.map((section) => (
-				<Section
-					key={section.key}
-					sectionId={section.id}
-					titleLabel={section.heading}
-					showHeader={showSectionHeaders && section.useHeading}
-					collapsible={collapsibleSections && section.collapsible}
-					collapsed={section.collapsed}
-					onToggle={handleSectionToggle}
-				>
-					<div className="space-y-4">
-						{section.layoutRows.map((row) => (
-							<SectionRow key={row.key}>
-								{row.layoutItems.map((item) => {
-									const cellKey = `${section.key}-${row.key}-${item.apiName ?? item.key}`;
-									return item.isField ? (
-										<FieldCell key={cellKey} item={item} record={record} metadata={metadata} />
-									) : (
-										<div key={cellKey} className="min-h-[2.5rem]" aria-hidden="true" />
-									);
-								})}
-							</SectionRow>
-						))}
-					</div>
-				</Section>
-			))}
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailHeader.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailHeader.tsx
deleted file mode 100644
index 19e0f69..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailHeader.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Back button and title for the record detail page.
- *
- * @param title - Record title (e.g. record name) shown next to the back control.
- * @param onBack - Called when the user activates the back control.
- */
-import { Button } from "../../../../components/ui/button";
-import { ArrowLeft } from "lucide-react";
-
-interface DetailHeaderProps {
-	title: string;
-	onBack: () => void;
-}
-
-export default function DetailHeader({ title, onBack }: DetailHeaderProps) {
-	return (
-		<div className="mb-6 flex flex-col gap-2 sm:flex-row sm:items-center sm:gap-4">
-			<Button
-				variant="ghost"
-				onClick={onBack}
-				className="w-fit"
-				aria-label="Go back to search results"
-			>
-				<ArrowLeft className="h-4 w-4 mr-2" aria-hidden="true" />
-				Back
-			</Button>
-			{title ? (
-				<h1 className="text-xl font-semibold text-foreground truncate" id="detail-page-title">
-					{title}
-				</h1>
-			) : null}
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailLayoutSections.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailLayoutSections.tsx
deleted file mode 100644
index d01ba6f..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/DetailLayoutSections.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Alternative detail rendering: layout sections → rows → items → label/value grid.
- *
- * Use when you have raw Layout API response + record and do not need the full
- * layoutTransformUtils + formDataTransformUtils pipeline. The primary detail view
- * (DetailPage) uses DetailForm via UiApiDetailForm; use this component for other
- * entry points that already have layout + record in hand.
- */
-import type { LayoutResponse } from "../../types/recordDetail/recordDetail";
-import type { SearchResultRecordData } from "../../types/search/searchResults";
-import { getNestedFieldValue } from "../../utils/fieldUtils";
-
-interface DetailLayoutSectionsProps {
-	layout: LayoutResponse;
-	record: SearchResultRecordData;
-}
-
-interface FieldEntry {
-	key: string;
-	label: string;
-	value: string | number | boolean | null;
-}
-
-function getSectionFieldEntries(
-	section: LayoutResponse["sections"][number],
-	record: SearchResultRecordData,
-): FieldEntry[] {
-	const entries: FieldEntry[] = [];
-	section.layoutRows.forEach((row, rowIdx) => {
-		row.layoutItems.forEach((item, itemIdx) => {
-			item.layoutComponents.forEach((comp, compIdx) => {
-				if (comp.componentType !== "Field" || !comp.apiName) return;
-				const value = getNestedFieldValue(record.fields, comp.apiName);
-				const label = comp.label ?? item.label;
-				entries.push({
-					key: `${section.id}-${rowIdx}-${itemIdx}-${comp.apiName ?? compIdx}`,
-					label: label || comp.apiName,
-					value: value ?? null,
-				});
-			});
-		});
-	});
-	return entries;
-}
-
-export default function DetailLayoutSections({ layout, record }: DetailLayoutSectionsProps) {
-	return (
-		<div className="space-y-8" role="region" aria-label="Record details">
-			{layout.sections.map((section) => {
-				const entries = getSectionFieldEntries(section, record);
-				if (entries.length === 0) return null;
-
-				return (
-					<section
-						key={section.id}
-						className="space-y-4"
-						aria-labelledby={section.useHeading ? `section-${section.id}` : undefined}
-					>
-						{section.useHeading && section.heading ? (
-							<h3
-								id={`section-${section.id}`}
-								className="text-base font-semibold text-foreground border-b pb-2"
-							>
-								{section.heading}
-							</h3>
-						) : null}
-						<dl className="grid grid-cols-1 sm:grid-cols-2 gap-x-8 gap-y-4">
-							{entries.map(({ key, label, value }) => (
-								<div key={key} className="flex flex-col gap-1">
-									<dt className="text-sm font-medium text-muted-foreground">{label}</dt>
-									<dd className="text-sm text-foreground">{value || "—"}</dd>
-								</div>
-							))}
-						</dl>
-					</section>
-				);
-			})}
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/Section.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/Section.tsx
deleted file mode 100644
index 61004b2..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/Section.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { useState, useCallback, useEffect, useRef } from "react";
-import { ChevronDown, ChevronRight } from "lucide-react";
-import type { ReactNode } from "react";
-
-export interface SectionProps {
-	sectionId: string;
-	titleLabel: string;
-	showHeader: boolean;
-	collapsible: boolean;
-	/** When provided, section is controlled (parent owns state). When undefined, section is uncontrolled (internal state). */
-	collapsed?: boolean;
-	onToggle?: (sectionId: string, collapsed: boolean) => void;
-	children: ReactNode;
-}
-
-/**
- * Section block with optional heading and collapsible content. Controlled when
- * `collapsed` is passed; uncontrolled otherwise. Accessible: aria-expanded, aria-controls, keyboard (Enter/Space).
- */
-export function Section({
-	sectionId,
-	titleLabel,
-	showHeader,
-	collapsible,
-	collapsed: controlledCollapsed,
-	onToggle,
-	children,
-}: SectionProps) {
-	const [internalCollapsed, setInternalCollapsed] = useState(false);
-	const isControlled = controlledCollapsed !== undefined;
-	const collapsed = isControlled ? controlledCollapsed : internalCollapsed;
-
-	const warnedUncontrolledRef = useRef(false);
-	useEffect(() => {
-		if (
-			process.env.NODE_ENV === "development" &&
-			onToggle != null &&
-			!isControlled &&
-			!warnedUncontrolledRef.current
-		) {
-			warnedUncontrolledRef.current = true;
-			console.warn(
-				"[Section] onToggle is passed but collapsed is undefined; section is uncontrolled. Pass collapsed to control from parent.",
-			);
-		}
-	}, [onToggle, isControlled]);
-
-	const contentId = `section-content-${sectionId}`;
-	const headerId = `section-header-${sectionId}`;
-
-	const handleToggle = useCallback(() => {
-		const next = !collapsed;
-		if (!isControlled) setInternalCollapsed(next);
-		onToggle?.(sectionId, next);
-	}, [collapsed, isControlled, onToggle, sectionId]);
-
-	const handleKeyDown = useCallback(
-		(e: React.KeyboardEvent) => {
-			if (!collapsible) return;
-			if (e.key === "Enter" || e.key === " ") {
-				e.preventDefault();
-				handleToggle();
-			}
-		},
-		[collapsible, handleToggle],
-	);
-
-	return (
-		<section
-			className="border-b border-border last:border-b-0 pb-6 last:pb-0"
-			aria-labelledby={showHeader ? headerId : undefined}
-		>
-			{showHeader && titleLabel && (
-				<h3 id={headerId} className="text-base font-semibold text-foreground mb-4">
-					{collapsible ? (
-						<button
-							type="button"
-							className="flex items-center gap-2 w-full text-left hover:opacity-80 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 rounded"
-							onClick={handleToggle}
-							onKeyDown={handleKeyDown}
-							aria-expanded={!collapsed}
-							aria-controls={contentId}
-							aria-label={`${titleLabel}, ${collapsed ? "expand" : "collapse"} section`}
-							aria-roledescription="Section toggle"
-						>
-							{collapsed ? (
-								<ChevronRight className="h-4 w-4 shrink-0" aria-hidden />
-							) : (
-								<ChevronDown className="h-4 w-4 shrink-0" aria-hidden />
-							)}
-							<span>{titleLabel}</span>
-						</button>
-					) : (
-						<span className="block">{titleLabel}</span>
-					)}
-				</h3>
-			)}
-			<div
-				id={contentId}
-				className={showHeader && collapsible ? "mt-2" : ""}
-				aria-hidden={collapsible ? collapsed : undefined}
-				hidden={collapsible && collapsed}
-			>
-				{children}
-			</div>
-		</section>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/SectionRow.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/SectionRow.tsx
deleted file mode 100644
index 85affb9..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/SectionRow.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { ReactNode } from "react";
-
-export interface SectionRowProps {
-	children: ReactNode;
-}
-
-/**
- * One row of the detail form: definition list (dl) with two-column grid. Each child
- * is a layout item (field cell or placeholder) from the layout API row.
- */
-export function SectionRow({ children }: SectionRowProps) {
-	return (
-		<dl
-			className="grid grid-cols-1 sm:grid-cols-2 gap-x-8 gap-y-4 sm:gap-y-2"
-			aria-label="Row of fields"
-		>
-			{children}
-		</dl>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/UiApiDetailForm.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/UiApiDetailForm.tsx
deleted file mode 100644
index b9d6336..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/UiApiDetailForm.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { useEffect, useMemo } from "react";
-import type { LayoutResponse } from "../../types/recordDetail/recordDetail";
-import { useRecordDetailLayout } from "../../hooks/useRecordDetailLayout";
-import { toRecordDisplayNameMetadata } from "../../utils/fieldUtils";
-import { DetailForm } from "./DetailForm";
-import type { ObjectInfoResult } from "../../types/objectInfo/objectInfo";
-import type { ObjectInfoMetadata } from "../../utils/formDataTransformUtils";
-import type { ObjectInfo } from "../../utils/layoutTransformUtils";
-import type { GraphQLRecordNode } from "../../api/recordListGraphQLService";
-import { getGraphQLRecordDisplayName } from "../../utils/graphQLNodeFieldUtils";
-
-export interface UiApiDetailFormProps {
-	objectApiName: string;
-	recordId: string;
-	recordTypeId?: string | null;
-	/** When provided, skips fetching and uses this layout (controlled mode). */
-	layout?: LayoutResponse | null;
-	/** When provided with layout, skips fetching and uses this record (controlled mode). */
-	record?: GraphQLRecordNode | null;
-	/** When provided, skips fetching and uses this object metadata (controlled mode). */
-	objectMetadata?: ObjectInfoResult | null;
-	/** When true, shows a loading spinner until layout and record are ready. */
-	loadsWithSpinner?: boolean;
-	/** Reserved for future edit mode; no-op in read-only. */
-	hideFooter?: boolean;
-	/** Callback when layout and record are ready (e.g. for parent to show record title). */
-	onRecordDataUpdate?: (payload: { recordName: string; record: unknown }) => void;
-}
-
-/**
- * Entry component for the record detail view. When layout/record are not provided,
- * fetches them via useRecordDetailLayout. Shows optional loading spinner and renders
- * a read-only DetailForm when ready. Mirrors LWC uiApiDetailForm (read-only).
- *
- * Passes objectInfo (mapped from object metadata) to DetailForm for layout transform.
- * lookupRecords (picklist/lookup options) are not fetched in this flow; DetailForm
- * accepts them when provided (e.g. from a future picklist API). Omit for read-only
- * display without API-driven picklist labels.
- */
-export function UiApiDetailForm({
-	objectApiName,
-	recordId,
-	recordTypeId = null,
-	layout: layoutProp,
-	record: recordProp,
-	objectMetadata: objectMetadataProp,
-	loadsWithSpinner = false,
-	onRecordDataUpdate,
-}: UiApiDetailFormProps) {
-	// Memoize so hook dependency doesn't change every render (avoids duplicate fetches)
-	const initialData = useMemo(
-		() =>
-			layoutProp && recordProp && objectMetadataProp
-				? {
-						layout: layoutProp,
-						record: recordProp,
-						objectMetadata: objectMetadataProp,
-					}
-				: null,
-		[layoutProp, recordProp, objectMetadataProp],
-	);
-
-	const fetched = useRecordDetailLayout({
-		objectApiName,
-		recordId,
-		recordTypeId,
-		initialData,
-	});
-
-	const layout = layoutProp ?? fetched.layout;
-	const record = recordProp ?? fetched.record;
-	const metadata = objectMetadataProp ?? fetched.objectMetadata;
-	const loading = layoutProp == null || recordProp == null ? fetched.loading : false;
-	const error = layoutProp == null || recordProp == null ? fetched.error : null;
-
-	const objectInfo: ObjectInfo | null = useMemo(() => {
-		if (!metadata?.fields) return null;
-		const apiName = metadata.ApiName;
-		return {
-			apiName,
-			fields: Object.fromEntries(
-				Object.entries(metadata.fields).map(([name, f]) => [
-					name,
-					{
-						compoundFieldName: f.compoundFieldName ?? undefined,
-						dataType: f.dataType ?? "",
-					},
-				]),
-			),
-		};
-	}, [metadata]);
-
-	const isReadyToRender = Boolean(layout && record && layout.sections?.length);
-
-	const showSpinner = !isReadyToRender && loadsWithSpinner && loading;
-
-	useEffect(() => {
-		if (!record || !onRecordDataUpdate || !isReadyToRender) return;
-		onRecordDataUpdate({
-			recordName: getGraphQLRecordDisplayName(record, toRecordDisplayNameMetadata(metadata)),
-			record,
-		});
-	}, [record, metadata, onRecordDataUpdate, isReadyToRender]);
-
-	if (showSpinner) {
-		return (
-			<div
-				className="min-h-[80px] flex items-center justify-center"
-				role="status"
-				aria-live="polite"
-				aria-label="Loading record details"
-			>
-				<span className="sr-only">Loading record details</span>
-				<div
-					className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent"
-					aria-hidden
-				/>
-			</div>
-		);
-	}
-
-	if (error || !layout || !record) {
-		return null;
-	}
-
-	if (!isReadyToRender) {
-		return null;
-	}
-
-	return (
-		<DetailForm
-			layout={layout}
-			record={record}
-			metadata={metadata as ObjectInfoMetadata}
-			objectInfo={objectInfo}
-			showSectionHeaders
-			collapsibleSections
-		/>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FieldValueDisplay.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FieldValueDisplay.tsx
deleted file mode 100644
index 4892a3e..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FieldValueDisplay.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Picks formatter by dataType (Address, Phone, Url, Email) or plain text. Empty values show "—" with a11y label.
- */
-import { FormattedAddress } from "./FormattedAddress";
-import { FormattedEmail } from "./FormattedEmail";
-import { FormattedPhone } from "./FormattedPhone";
-import { FormattedText } from "./FormattedText";
-import { FormattedUrl } from "./FormattedUrl";
-
-/** Salesforce UI API dataType values that have dedicated formatters. */
-const DATA_TYPES = {
-	Address: "Address",
-	Email: "Email",
-	Phone: "Phone",
-	Url: "Url",
-} as const;
-
-/** Normalize dataType to canonical casing so "PHONE" / "phone" match Phone, etc. */
-function normalizeDataType(dataType: string | undefined): string | undefined {
-	if (dataType == null || dataType === "") return dataType;
-	const lower = dataType.toLowerCase();
-	const canonical: Record<string, string> = {
-		phone: DATA_TYPES.Phone,
-		email: DATA_TYPES.Email,
-		url: DATA_TYPES.Url,
-		address: DATA_TYPES.Address,
-	};
-	return canonical[lower] ?? dataType;
-}
-
-export interface FieldValueDisplayProps {
-	/** Resolved display value (string, number, boolean, or null). */
-	value: string | number | boolean | null | undefined;
-	/** Field dataType from object info (e.g. Phone, Email, Url, Address). */
-	dataType?: string;
-	className?: string;
-}
-
-const DEFAULT_CLASS = "text-sm text-foreground";
-const LINK_CLASS =
-	"text-sm text-foreground text-primary underline underline-offset-2 hover:opacity-80";
-
-export function FieldValueDisplay({
-	value,
-	dataType,
-	className = DEFAULT_CLASS,
-}: FieldValueDisplayProps) {
-	const str = value || null;
-
-	if (str === null) {
-		return (
-			<span className={className} aria-label="No value">
-				—
-			</span>
-		);
-	}
-
-	const linkClassName = className === DEFAULT_CLASS ? LINK_CLASS : className;
-	const normalizedType = normalizeDataType(dataType);
-
-	switch (normalizedType) {
-		case DATA_TYPES.Address:
-			return <FormattedAddress value={str as string} className={linkClassName} />;
-		case DATA_TYPES.Phone:
-			return <FormattedPhone value={str as string} className={linkClassName} />;
-		case DATA_TYPES.Url:
-			return <FormattedUrl value={str as string} className={linkClassName} />;
-		case DATA_TYPES.Email:
-			return <FormattedEmail value={str as string} className={linkClassName} />;
-		default:
-			return <FormattedText value={value} className={className} />;
-	}
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedAddress.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedAddress.tsx
deleted file mode 100644
index 376724b..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedAddress.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/** Address as link to Google Maps search. External link: target _blank, rel noopener noreferrer. */
-
-const GOOGLE_MAPS_SEARCH_BASE = "https://www.google.com/maps/search/?api=1&query=";
-
-export interface FormattedAddressProps {
-	/** Full address string (e.g. "10 Main Rd.\nNew York, NY 31349\nUSA"). */
-	value: string;
-	className?: string;
-}
-
-export function FormattedAddress({ value, className }: FormattedAddressProps) {
-	if (!value || !value.trim()) return null;
-	const url = GOOGLE_MAPS_SEARCH_BASE + encodeURIComponent(value.trim());
-	return (
-		<a
-			href={url}
-			target="_blank"
-			rel="noopener noreferrer"
-			className={className}
-			aria-label="Open address in Google Maps"
-		>
-			{value.split("\n").map((line, i) => (
-				<span key={i} className="block">
-					{line}
-				</span>
-			))}
-		</a>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedEmail.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedEmail.tsx
deleted file mode 100644
index 1e464e1..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedEmail.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-/** Email as mailto: link. */
-
-export interface FormattedEmailProps {
-	value: string;
-	className?: string;
-}
-
-export function FormattedEmail({ value, className }: FormattedEmailProps) {
-	const str = (value || "").trim();
-	if (!str) return null;
-	const href = `mailto:${encodeURIComponent(str)}`;
-	return (
-		<a href={href} className={className} aria-label={`Email ${str}`}>
-			{str}
-		</a>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedPhone.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedPhone.tsx
deleted file mode 100644
index 8cf729e..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedPhone.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/** Phone value as tel: link for dialer/VoIP. */
-
-export interface FormattedPhoneProps {
-	value: string;
-	className?: string;
-}
-
-/** Normalizes value for tel: (digits and + only). */
-function telHref(value: string): string {
-	const cleaned = value.replace(/[^\d+]/g, "");
-	return cleaned ? `tel:${cleaned}` : "#";
-}
-
-export function FormattedPhone({ value, className }: FormattedPhoneProps) {
-	if (!value) return null;
-	const trimmed = (value || "").trim();
-	const href = telHref(trimmed);
-	if (href === "#") return <span className={className}>{trimmed}</span>;
-	return (
-		<a href={href} className={className} aria-label={`Call ${trimmed}`}>
-			{trimmed}
-		</a>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedText.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedText.tsx
deleted file mode 100644
index 3aa9a35..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedText.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/** Plain-text field value when dataType has no dedicated formatter. */
-
-export interface FormattedTextProps {
-	value: string | number | boolean | null | undefined;
-	className?: string;
-}
-
-export function FormattedText({ value, className }: FormattedTextProps) {
-	if (!value) return null;
-	return <span className={className}>{value as string}</span>;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedUrl.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedUrl.tsx
deleted file mode 100644
index 27b4388..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/detail/formatted/FormattedUrl.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/** URL as external link (new tab, noopener noreferrer). Falls back to plain text if not http(s). */
-
-import { isAllowedLinkUrl } from "../../../utils/linkUtils";
-
-export interface FormattedUrlProps {
-	value: string;
-	className?: string;
-	/** Optional display text; defaults to the URL. */
-	displayText?: string;
-}
-
-export function FormattedUrl({ value, className, displayText }: FormattedUrlProps) {
-	const str = (value || "").trim();
-	if (!str) return null;
-	const href = str.startsWith("http://") || str.startsWith("https://") ? str : `https://${str}`;
-	if (!isAllowedLinkUrl(href)) return <span className={className}>{str}</span>;
-	const label = displayText ?? str;
-	return (
-		<a
-			href={href}
-			target="_blank"
-			rel="noopener noreferrer"
-			className={className}
-			aria-label={`Open link in new tab: ${label}`}
-		>
-			{label}
-		</a>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterField.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterField.tsx
deleted file mode 100644
index 5b440a8..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterField.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * FilterField Component
- *
- * Wrapper component that renders the appropriate filter input type based on filter affordance.
- * Routes to FilterInput for text fields or FilterSelect for picklist fields.
- *
- * @param filter - Filter definition containing field path, label, and affordance
- * @param value - Current filter value
- * @param picklistValues - Array of picklist options (for select fields)
- * @param onChange - Callback when filter value changes
- *
- * @remarks
- * - Automatically determines input type from filter.affordance
- * - Returns null if filter is invalid
- * - Defaults to text input if affordance is not 'select'
- *
- * @example
- * ```tsx
- * <FilterField
- *   filter={filter}
- *   value={filterValue}
- *   picklistValues={picklistOptions}
- *   onChange={(value) => setFilterValue(value)}
- * />
- * ```
- */
-import FilterInput from "./FilterInput";
-import FilterSelect from "./FilterSelect";
-import type { Filter } from "../../types/filters/filters";
-import type { PicklistValue } from "../../types/filters/picklist";
-
-interface FilterFieldProps {
-	filter: Filter;
-	value: string;
-	picklistValues: PicklistValue[];
-	onChange: (value: string) => void;
-}
-
-export default function FilterField({ filter, value, picklistValues, onChange }: FilterFieldProps) {
-	// Guard against invalid filter objects
-	if (!filter || !filter.targetFieldPath) {
-		return null;
-	}
-
-	const affordance = filter.affordance?.toLowerCase() || "";
-
-	if (affordance === "select") {
-		const options = picklistValues || [];
-		return <FilterSelect filter={filter} value={value} options={options} onChange={onChange} />;
-	}
-
-	// Default to text input
-	return <FilterInput filter={filter} value={value} onChange={onChange} />;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterInput.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterInput.tsx
deleted file mode 100644
index 2e44ce6..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterInput.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * FilterInput Component
- *
- * Renders a text input field for filter values.
- * Used for filters that don't have a picklist (affordance !== 'select').
- *
- * @param filter - Filter definition containing field path, label, and attributes
- * @param value - Current filter input value
- * @param onChange - Callback when input value changes
- *
- * @remarks
- * - Displays filter label or field path as the label
- * - Shows placeholder text from filter attributes or generates default
- * - Displays help message if available
- *
- * @example
- * ```tsx
- * <FilterInput
- *   filter={textFilter}
- *   value={filterValue}
- *   onChange={(value) => setFilterValue(value)}
- * />
- * ```
- */
-import { Input } from "../../../../components/ui/input";
-import { Field, FieldLabel, FieldDescription } from "../../../../components/ui/field";
-import type { Filter } from "../../types/filters/filters";
-
-interface FilterInputProps {
-	filter: Filter;
-	value: string;
-	onChange: (value: string) => void;
-}
-
-export default function FilterInput({ filter, value, onChange }: FilterInputProps) {
-	return (
-		<Field>
-			<FieldLabel htmlFor={filter.targetFieldPath}>
-				{filter.label || filter.targetFieldPath}
-			</FieldLabel>
-			<Input
-				id={filter.targetFieldPath}
-				type="text"
-				value={value}
-				onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e.target.value)}
-				placeholder={
-					filter.attributes?.placeholder ||
-					`Enter ${(filter.label || filter.targetFieldPath).toLowerCase()}`
-				}
-				aria-label={filter.label || filter.targetFieldPath}
-			/>
-			{filter.helpMessage && <FieldDescription>{filter.helpMessage}</FieldDescription>}
-		</Field>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterSelect.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterSelect.tsx
deleted file mode 100644
index eb544c6..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FilterSelect.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * FilterSelect Component
- *
- * Renders a dropdown select field for filter values with picklist options.
- * Used for filters with affordance === 'select'.
- *
- * @param filter - Filter definition containing field path, label, and attributes
- * @param value - Currently selected filter value
- * @param options - Array of picklist values to display as options
- * @param onChange - Callback when selection changes
- *
- * @remarks
- * - Filters out invalid options (null/undefined values)
- * - Displays option label if available, otherwise uses value
- * - Shows placeholder from filter attributes or default "Select..."
- *
- * @example
- * ```tsx
- * <FilterSelect
- *   filter={selectFilter}
- *   value={selectedValue}
- *   options={picklistOptions}
- *   onChange={(value) => setSelectedValue(value)}
- * />
- * ```
- */
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "../../../../components/ui/select";
-import { Field, FieldLabel, FieldDescription } from "../../../../components/ui/field";
-import type { Filter } from "../../types/filters/filters";
-import type { PicklistValue } from "../../types/filters/picklist";
-
-interface FilterSelectProps {
-	filter: Filter;
-	value: string;
-	options: PicklistValue[];
-	onChange: (value: string) => void;
-}
-
-export default function FilterSelect({ filter, value, options, onChange }: FilterSelectProps) {
-	return (
-		<Field>
-			<FieldLabel htmlFor={filter.targetFieldPath}>
-				{filter.label || filter.targetFieldPath}
-			</FieldLabel>
-			<Select value={value} onValueChange={onChange}>
-				<SelectTrigger
-					id={filter.targetFieldPath}
-					aria-label={filter.label || filter.targetFieldPath}
-				>
-					<SelectValue placeholder={filter.attributes?.placeholder || "Select..."} />
-				</SelectTrigger>
-				<SelectContent>
-					{options.map((option) => {
-						if (!option || !option.value) return null;
-						return (
-							<SelectItem key={option.value} value={option.value}>
-								{option.label || option.value}
-							</SelectItem>
-						);
-					})}
-				</SelectContent>
-			</Select>
-			{filter.helpMessage && <FieldDescription>{filter.helpMessage}</FieldDescription>}
-		</Field>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FiltersPanel.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FiltersPanel.tsx
deleted file mode 100644
index 370260c..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/filters/FiltersPanel.tsx
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * FiltersPanel Component
- *
- * Displays a panel of filter inputs for refining search results.
- * Supports both text inputs and select dropdowns based on filter affordance.
- *
- * @param filters - Array of filter definitions to display
- * @param picklistValues - Record of picklist values keyed by field path
- * @param loading - Whether filters are currently loading
- * @param onApplyFilters - Callback when filters are applied, receives filter values object
- *
- * @remarks
- * - Automatically initializes filter values from defaultValues
- * - Shows loading skeleton while filters are being fetched
- * - Supports "Apply Filters" and "Reset" actions
- * - Uses TanStack Form for form state management (similar to Login page)
- * - Uses FiltersForm wrapper for consistent UX/UI (similar to AuthForm pattern)
- *
- * @example
- * ```tsx
- * <FiltersPanel
- *   filters={filters}
- *   picklistValues={picklistValues}
- *   loading={false}
- *   onApplyFilters={(values) => applyFilters(values)}
- * />
- * ```
- */
-import { useState, useMemo, useCallback, useEffect, useRef } from "react";
-import {
-	Card,
-	CardContent,
-	CardHeader,
-	CardTitle,
-} from "../../../../components/ui/card";
-import { Skeleton } from "../../../../components/ui/skeleton";
-import { FiltersForm } from "../forms/filters-form";
-import { Field, FieldLabel, FieldDescription } from "../../../../components/ui/field";
-import { useAppForm, validateRangeValues } from "../../hooks/form";
-import type { Filter, FilterCriteria } from "../../types/filters/filters";
-import type { PicklistValue } from "../../types/filters/picklist";
-import { parseFilterValue } from "../../utils/filterUtils";
-import { sanitizeFilterValue } from "../../utils/sanitizationUtils";
-import { getFormValueByPath } from "../../utils/formUtils";
-
-interface FiltersPanelProps {
-	filters: Filter[];
-	picklistValues: Record<string, PicklistValue[]>;
-	loading: boolean;
-	objectApiName: string;
-	onApplyFilters: (filterCriteria: FilterCriteria[]) => void;
-}
-
-export default function FiltersPanel({
-	filters,
-	picklistValues,
-	loading,
-	objectApiName,
-	onApplyFilters,
-}: FiltersPanelProps) {
-	const [submitError, setSubmitError] = useState<string | null>(null);
-	const [submitSuccess, setSubmitSuccess] = useState<string | null>(null);
-
-	const defaultValues = useMemo(() => {
-		if (!filters || !Array.isArray(filters)) {
-			return {};
-		}
-
-		const values: Record<string, string> = {};
-		filters.forEach((filter) => {
-			if (filter && filter.targetFieldPath) {
-				const affordance = filter.affordance?.toLowerCase() || "";
-
-				if (affordance === "range") {
-					const minFieldName = `${filter.targetFieldPath}_min`;
-					const maxFieldName = `${filter.targetFieldPath}_max`;
-
-					if (filter.defaultValues && filter.defaultValues.length >= 2) {
-						values[minFieldName] = filter.defaultValues[0] || "";
-						values[maxFieldName] = filter.defaultValues[1] || "";
-					} else {
-						values[minFieldName] = "";
-						values[maxFieldName] = "";
-					}
-				} else {
-					if (filter.defaultValues && filter.defaultValues.length > 0) {
-						values[filter.targetFieldPath] = filter.defaultValues[0];
-					} else {
-						values[filter.targetFieldPath] = "";
-					}
-				}
-			}
-		});
-		return values;
-	}, [filters]);
-
-	const form = useAppForm({
-		defaultValues,
-		onSubmit: async ({ value }) => {
-			setSubmitError(null);
-			setSubmitSuccess(null);
-			try {
-				const filterCriteria: FilterCriteria[] = [];
-
-				for (const filter of filters) {
-					if (!filter || !filter.targetFieldPath) {
-						continue;
-					}
-
-					const affordance = filter.affordance?.toLowerCase() || "";
-
-					if (affordance === "range") {
-						const minFieldName = `${filter.targetFieldPath}_min`;
-						const maxFieldName = `${filter.targetFieldPath}_max`;
-						const minValueRaw = value[minFieldName] || "";
-						const maxValueRaw = value[maxFieldName] || "";
-
-						const minValue = sanitizeFilterValue(minValueRaw);
-						const maxValue = sanitizeFilterValue(maxValueRaw);
-
-						if (minValue && maxValue) {
-							const rangeError = validateRangeValues(minValue, maxValue);
-							if (rangeError) {
-								setSubmitError(rangeError);
-								return;
-							}
-						}
-
-						if (minValue) {
-							const parsedMin = parseFilterValue(minValue);
-							if (parsedMin !== "") {
-								filterCriteria.push({
-									objectApiName,
-									fieldPath: filter.targetFieldPath,
-									operator: "gte",
-									values: [parsedMin],
-								});
-							}
-						}
-
-						if (maxValue) {
-							const parsedMax = parseFilterValue(maxValue);
-							if (parsedMax !== "") {
-								filterCriteria.push({
-									objectApiName,
-									fieldPath: filter.targetFieldPath,
-									operator: "lte",
-									values: [parsedMax],
-								});
-							}
-						}
-					} else {
-						const fieldValueRaw =
-							getFormValueByPath(value as Record<string, unknown>, filter.targetFieldPath) || "";
-						const fieldValue = sanitizeFilterValue(fieldValueRaw);
-
-						if (fieldValue) {
-							if (affordance === "select") {
-								filterCriteria.push({
-									objectApiName,
-									fieldPath: filter.targetFieldPath,
-									operator: "eq",
-									values: [fieldValue],
-								});
-							} else {
-								const likeValue = `%${fieldValue}%`;
-								filterCriteria.push({
-									objectApiName,
-									fieldPath: filter.targetFieldPath,
-									operator: "like",
-									values: [likeValue],
-								});
-							}
-						}
-					}
-				}
-
-				if (filterCriteria.length === 0) {
-					setSubmitSuccess("No filters applied. Showing all results.");
-				} else {
-					setSubmitSuccess("Filters applied successfully");
-				}
-
-				onApplyFilters(filterCriteria);
-			} catch (err) {
-				const errorMessage = err instanceof Error ? err.message : "Failed to apply filters";
-				setSubmitError(errorMessage);
-			}
-		},
-		onSubmitInvalid: () => {},
-	});
-
-	const previousDefaultValuesRef = useRef<Record<string, string>>({});
-	const previousLoadingRef = useRef<boolean>(true);
-
-	useEffect(() => {
-		const loadingJustCompleted = previousLoadingRef.current && !loading;
-		const defaultValuesChanged =
-			JSON.stringify(previousDefaultValuesRef.current) !== JSON.stringify(defaultValues);
-
-		if (loadingJustCompleted && defaultValues && Object.keys(defaultValues).length > 0) {
-			form.reset(defaultValues);
-			previousDefaultValuesRef.current = defaultValues;
-		} else if (defaultValuesChanged && !loading && Object.keys(defaultValues).length > 0) {
-			form.reset(defaultValues);
-			previousDefaultValuesRef.current = defaultValues;
-		}
-
-		previousLoadingRef.current = loading;
-	}, [loading, defaultValues, form]);
-
-	const handleSuccessDismiss = useCallback(() => {
-		setSubmitSuccess(null);
-	}, []);
-
-	const handleReset = useCallback(() => {
-		if (!filters || !Array.isArray(filters)) {
-			form.reset();
-			onApplyFilters([]);
-			setSubmitError(null);
-			setSubmitSuccess(null);
-			return;
-		}
-
-		const resetValues: Record<string, string> = {};
-		filters.forEach((filter) => {
-			if (filter && filter.targetFieldPath) {
-				const affordance = filter.affordance?.toLowerCase() || "";
-
-				if (affordance === "range") {
-					resetValues[`${filter.targetFieldPath}_min`] = "";
-					resetValues[`${filter.targetFieldPath}_max`] = "";
-				} else {
-					resetValues[filter.targetFieldPath] = "";
-				}
-			}
-		});
-		form.reset(resetValues);
-		onApplyFilters([]);
-		setSubmitError(null);
-		setSubmitSuccess(null);
-	}, [filters, onApplyFilters, form]);
-
-	if (loading) {
-		return (
-			<Card className="w-full" role="region" aria-label="Filters panel">
-				<CardHeader>
-					<CardTitle>Filters</CardTitle>
-				</CardHeader>
-				<CardContent
-					className="space-y-4"
-					role="status"
-					aria-live="polite"
-					aria-label="Loading filters"
-				>
-					<span className="sr-only">Loading filters</span>
-					{[1, 2, 3].map((i) => (
-						<div key={i} className="space-y-2" aria-hidden="true">
-							<Skeleton className="h-4 w-24" />
-							<Skeleton className="h-9 w-full" />
-						</div>
-					))}
-				</CardContent>
-			</Card>
-		);
-	}
-
-	if (!filters || !Array.isArray(filters) || filters.length === 0) {
-		return (
-			<Card className="w-full" role="region" aria-label="Filters panel">
-				<CardHeader>
-					<CardTitle>Filters</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<p className="text-sm text-muted-foreground">No filters available</p>
-				</CardContent>
-			</Card>
-		);
-	}
-
-	return (
-		<form.AppForm>
-			<FiltersForm
-				title="Filters"
-				description="Refine your search results by applying filters"
-				error={submitError}
-				success={submitSuccess}
-				onSuccessDismiss={handleSuccessDismiss}
-				submit={{
-					text: "Apply Filters",
-					loadingText: "Applying filters…",
-				}}
-				reset={{
-					text: "Reset",
-					onReset: handleReset,
-				}}
-			>
-				{filters.map((filter) => {
-					if (!filter || !filter.targetFieldPath) {
-						return null;
-					}
-
-					const fieldPicklistValues = picklistValues[filter.targetFieldPath] || [];
-					const affordance = filter.affordance?.toLowerCase() || "";
-
-					if (affordance === "range") {
-						const minFieldName = `${filter.targetFieldPath}_min`;
-						const maxFieldName = `${filter.targetFieldPath}_max`;
-						const inputType = "text";
-						const placeholder =
-							filter.attributes?.placeholder === "null"
-								? undefined
-								: filter.attributes?.placeholder;
-
-						return (
-							<Field key={filter.targetFieldPath}>
-								<FieldLabel>{filter.label || filter.targetFieldPath}</FieldLabel>
-								{filter.helpMessage && <FieldDescription>{filter.helpMessage}</FieldDescription>}
-								<div
-									className="grid grid-cols-2 gap-3"
-									role="group"
-									aria-label={`${filter.label || filter.targetFieldPath} range filter`}
-								>
-									<form.AppField name={minFieldName}>
-										{(field) => (
-											<field.FilterRangeMinField
-												placeholder={placeholder || "Min"}
-												type={inputType}
-												aria-label={`${filter.label || filter.targetFieldPath} - Minimum`}
-											/>
-										)}
-									</form.AppField>
-									<form.AppField name={maxFieldName}>
-										{(field) => (
-											<field.FilterRangeMaxField
-												placeholder={placeholder || "Max"}
-												type={inputType}
-												aria-label={`${filter.label || filter.targetFieldPath} - Maximum`}
-											/>
-										)}
-									</form.AppField>
-								</div>
-							</Field>
-						);
-					}
-
-					if (affordance === "select") {
-						return (
-							<form.AppField key={filter.targetFieldPath} name={filter.targetFieldPath}>
-								{(field) => (
-									<field.FilterSelectField
-										label={filter.label || filter.targetFieldPath}
-										description={filter.helpMessage || undefined}
-										placeholder={filter.attributes?.placeholder || "Select..."}
-										options={fieldPicklistValues}
-									/>
-								)}
-							</form.AppField>
-						);
-					}
-
-					return (
-						<form.AppField key={filter.targetFieldPath} name={filter.targetFieldPath}>
-							{(field) => (
-								<field.FilterTextField
-									label={filter.label || filter.targetFieldPath}
-									description={filter.helpMessage || undefined}
-									placeholder={
-										filter.attributes?.placeholder ||
-										`Enter ${(filter.label || filter.targetFieldPath).toLowerCase()}`
-									}
-								/>
-							)}
-						</form.AppField>
-					);
-				})}
-			</FiltersForm>
-		</form.AppForm>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/filters-form.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/filters-form.tsx
deleted file mode 100644
index 2f87bb6..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/filters-form.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { FieldGroup } from "../../../../components/ui/field";
-import { StatusAlert } from "../../../../components/alerts/status-alert";
-import { CardLayout } from "../../../../components/layouts/card-layout";
-import { SubmitButton } from "./submit-button";
-import { Button } from "../../../../components/ui/button";
-import { useFormContext } from "../../hooks/form";
-import { useId, useEffect, useRef } from "react";
-
-const SUCCESS_AUTO_DISMISS_DELAY = 3000;
-
-interface FiltersFormProps extends Omit<React.ComponentProps<"form">, "onSubmit"> {
-	title: string;
-	description?: string;
-	error?: React.ReactNode;
-	success?: React.ReactNode;
-	submit: {
-		text: string;
-		loadingText?: string;
-	};
-	reset?: {
-		text: string;
-		onReset: () => void;
-	};
-	onSuccessDismiss?: () => void;
-}
-
-/**
- * Wrapper component that provides consistent layout and error/success alert positioning
- * for all filter forms.
- */
-export function FiltersForm({
-	id: providedId,
-	title,
-	description,
-	error,
-	success,
-	children,
-	submit,
-	reset,
-	onSuccessDismiss,
-	...props
-}: FiltersFormProps) {
-	const form = useFormContext();
-	const generatedId = useId();
-	const id = providedId ?? generatedId;
-
-	const isSubmittingSelector = (state: { isSubmitting: boolean }) => state.isSubmitting;
-	const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-	useEffect(() => {
-		if (timeoutRef.current) {
-			clearTimeout(timeoutRef.current);
-			timeoutRef.current = null;
-		}
-
-		if (success && onSuccessDismiss) {
-			timeoutRef.current = setTimeout(() => {
-				onSuccessDismiss();
-				timeoutRef.current = null;
-			}, SUCCESS_AUTO_DISMISS_DELAY);
-		}
-
-		return () => {
-			if (timeoutRef.current) {
-				clearTimeout(timeoutRef.current);
-				timeoutRef.current = null;
-			}
-		};
-	}, [success, onSuccessDismiss]);
-
-	return (
-		<CardLayout title={title} description={description}>
-			<div className="space-y-6">
-				{error && <StatusAlert variant="error">{error}</StatusAlert>}
-				{success && <StatusAlert variant="success">{success}</StatusAlert>}
-
-				<form
-					id={id}
-					onSubmit={(e) => {
-						e.preventDefault();
-						e.stopPropagation();
-						form.handleSubmit();
-					}}
-					{...props}
-				>
-					<FieldGroup>{children}</FieldGroup>
-					<div className="flex flex-col sm:flex-row gap-2 pt-4">
-						<SubmitButton
-							form={id}
-							label={submit.text}
-							loadingLabel={submit.loadingText}
-							className="flex-1"
-						/>
-						{reset && (
-							<form.Subscribe selector={isSubmittingSelector}>
-								{(isSubmitting: boolean) => (
-									<Button
-										type="button"
-										variant="outline"
-										onClick={reset.onReset}
-										className="flex-1"
-										disabled={isSubmitting}
-									>
-										{reset.text}
-									</Button>
-								)}
-							</form.Subscribe>
-						)}
-					</div>
-				</form>
-			</div>
-		</CardLayout>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/submit-button.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/submit-button.tsx
deleted file mode 100644
index aae4906..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/forms/submit-button.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Button } from "../../../../components/ui/button";
-import { Spinner } from "../../../../components/ui/spinner";
-import { cn } from "../../../../lib/utils";
-import { useFormContext } from "../../hooks/form";
-
-interface SubmitButtonProps extends Omit<React.ComponentProps<typeof Button>, "type" | "disabled"> {
-	/** Button text when not submitting */
-	label: string;
-	/** Button text while submitting */
-	loadingLabel?: string;
-	/** Form id to associate with (for buttons outside form element) */
-	form?: string;
-}
-
-const isSubmittingSelector = (state: { isSubmitting: boolean }) => state.isSubmitting;
-
-/**
- * Submit button that subscribes to form submission state.
- * Disables interaction during submission and provides visual feedback.
- */
-export function SubmitButton({
-	label,
-	loadingLabel = "Applying…",
-	className,
-	form: formId,
-	...props
-}: SubmitButtonProps) {
-	const form = useFormContext();
-	return (
-		<form.Subscribe selector={isSubmittingSelector}>
-			{(isSubmitting: boolean) => (
-				<Button
-					type="submit"
-					form={formId}
-					className={cn("w-full", className)}
-					disabled={isSubmitting}
-					aria-label={isSubmitting ? loadingLabel : label}
-					aria-busy={isSubmitting}
-					{...props}
-				>
-					{isSubmitting && <Spinner className="mr-2" aria-hidden="true" />}
-					<span aria-live="polite">{isSubmitting ? loadingLabel : label}</span>
-				</Button>
-			)}
-		</form.Subscribe>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/GlobalSearchInput.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/GlobalSearchInput.tsx
deleted file mode 100644
index 894adeb..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/GlobalSearchInput.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * GlobalSearchInput Component
- *
- * Search input with two actions: Search (navigate to results for query) and
- * Browse All (navigate to same results UI with all records for the object).
- */
-import { useState, useCallback, useMemo, useId } from "react";
-import type { KeyboardEvent, ChangeEvent } from "react";
-import { useNavigate } from "react-router";
-import { Card, CardContent } from "../../../../components/ui/card";
-import { Input } from "../../../../components/ui/input";
-import { Button } from "../../../../components/ui/button";
-import { Search } from "lucide-react";
-import { OBJECT_API_NAMES } from "../../constants";
-import { useObjectInfoBatch } from "../../hooks/useObjectInfoBatch";
-
-const BROWSE_SEGMENT = "browse__all";
-
-const FALLBACK_LABEL_PLURAL = "records";
-
-export function GlobalSearchInput() {
-	const [searchQuery, setSearchQuery] = useState("");
-	const navigate = useNavigate();
-	const inputId = useId();
-	const searchButtonId = useId();
-	const browseButtonId = useId();
-	const inputDescriptionId = `${inputId}-description`;
-	const { objectInfos } = useObjectInfoBatch([...OBJECT_API_NAMES]);
-	const labelPlural = (objectInfos[0]?.labelPlural as string | undefined) ?? FALLBACK_LABEL_PLURAL;
-
-	const handleInputChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
-		setSearchQuery(e.target.value);
-	}, []);
-
-	const handleSearch = useCallback(() => {
-		const trimmed = searchQuery.trim();
-		if (trimmed) {
-			navigate(`/global-search/${encodeURIComponent(trimmed)}`);
-		}
-	}, [searchQuery, navigate]);
-
-	const handleBrowseAll = useCallback(() => {
-		navigate(`/global-search/${BROWSE_SEGMENT}`);
-	}, [navigate]);
-
-	const handleKeyDown = useCallback(
-		(e: KeyboardEvent<HTMLInputElement>) => {
-			if (e.key === "Enter") {
-				e.preventDefault();
-				handleSearch();
-			}
-		},
-		[handleSearch],
-	);
-
-	const isSearchDisabled = useMemo(() => !searchQuery.trim(), [searchQuery]);
-
-	return (
-		<div className="w-full max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
-			<Card className="w-full">
-				<CardContent className="pt-6">
-					<div className="flex flex-col sm:flex-row gap-3">
-						<div className="flex-1 relative">
-							<Search
-								className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-gray-600"
-								aria-hidden="true"
-							/>
-							<Input
-								id={inputId}
-								type="search"
-								placeholder={`Search for ${labelPlural}`}
-								value={searchQuery}
-								onChange={handleInputChange}
-								onKeyDown={handleKeyDown}
-								className="pl-10"
-								aria-label={`Search for ${labelPlural}`}
-								aria-describedby={inputDescriptionId}
-							/>
-							<p id={inputDescriptionId} className="sr-only">
-								Enter your search query and press Enter or click Search. Or click Browse All to see
-								all {labelPlural}.
-							</p>
-						</div>
-
-						<div className="flex flex-col sm:flex-row gap-2 sm:gap-3">
-							<Button
-								id={searchButtonId}
-								onClick={handleSearch}
-								disabled={isSearchDisabled}
-								className="w-full sm:w-auto"
-								aria-label="Search"
-								aria-describedby={inputDescriptionId}
-								variant="default"
-							>
-								<Search className="h-4 w-4 mr-2" aria-hidden="true" />
-								Search
-							</Button>
-							<Button
-								id={browseButtonId}
-								variant="outline"
-								onClick={handleBrowseAll}
-								className="w-full sm:w-auto"
-								aria-label={`Browse all ${labelPlural}`}
-								aria-describedby={inputDescriptionId}
-							>
-								Browse All {labelPlural}
-							</Button>
-						</div>
-					</div>
-				</CardContent>
-			</Card>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/ResultCardFields.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/ResultCardFields.tsx
deleted file mode 100644
index d27068e..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/ResultCardFields.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * ResultCardFields Component
- *
- * Displays secondary fields (up to 3) for a search result card.
- * Excludes the primary field and handles nested field values.
- *
- * @param record - The search result record data
- * @param columns - Array of column definitions
- * @param excludeFieldApiName - Field API name to exclude (usually the primary field)
- *
- * @remarks
- * - Displays up to 3 secondary fields
- * - Handles nested field paths (e.g., "Owner.Alias")
- * - Skips fields with null/undefined/empty values
- * - Responsive layout (vertical on mobile, horizontal on desktop)
- *
- * @example
- * ```tsx
- * <ResultCardFields
- *   record={searchResult}
- *   columns={columns}
- *   excludeFieldApiName="Name"
- * />
- * ```
- */
-import type { Column, SearchResultRecordData } from "../../types/search/searchResults";
-import { getNestedFieldValue } from "../../utils/fieldUtils";
-
-interface ResultCardFieldsProps {
-	record: SearchResultRecordData;
-	columns: Column[];
-	excludeFieldApiName?: string;
-}
-
-export default function ResultCardFields({
-	record,
-	columns,
-	excludeFieldApiName,
-}: ResultCardFieldsProps) {
-	const secondaryFields = columns.filter(
-		(col) => col && col.fieldApiName && col.fieldApiName !== excludeFieldApiName,
-	);
-
-	return (
-		<dl className="space-y-2" aria-label="Additional record information">
-			{secondaryFields.map((column) => {
-				if (!column || !column.fieldApiName) {
-					return null;
-				}
-
-				const displayValue = getNestedFieldValue(record.fields, column.fieldApiName);
-
-				if (displayValue === null || displayValue === undefined || displayValue === "") {
-					return null;
-				}
-
-				return (
-					<div
-						key={column.fieldApiName}
-						className="flex flex-col sm:flex-row sm:items-center gap-1 sm:gap-2"
-					>
-						<dt className="text-sm font-medium text-muted-foreground min-w-[100px]">
-							{column.label || column.fieldApiName}:
-						</dt>
-						<dd className="text-sm text-foreground">{displayValue}</dd>
-					</div>
-				);
-			})}
-		</dl>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchHeader.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchHeader.tsx
deleted file mode 100644
index 90ee379..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchHeader.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * SearchHeader Component
- *
- * Displays the header for search results or browse-all (same UI).
- * labelPlural comes from object metadata (e.g. useObjectInfoBatch) so it is not hard-coded.
- */
-interface SearchHeaderProps {
-	query?: string;
-	isBrowseAll?: boolean;
-	/** Plural label for the primary object (e.g. "Accounts"). From object metadata. */
-	labelPlural?: string;
-}
-
-export default function SearchHeader({
-	query,
-	isBrowseAll,
-	labelPlural = "records",
-}: SearchHeaderProps) {
-	return (
-		<header className="mb-6" aria-label="Search results header">
-			<h1 className="text-3xl font-bold mb-2">
-				{isBrowseAll ? `Browse All ${labelPlural}` : "Search Results"}
-			</h1>
-			{!isBrowseAll && query && (
-				<p className="text-lg" aria-live="polite">
-					Results for: <span className="font-semibold">"{query}"</span>
-				</p>
-			)}
-		</header>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultCard.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultCard.tsx
deleted file mode 100644
index 4505fb5..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultCard.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * SearchResultCard Component
- *
- * Displays a single search result as a card with primary and secondary fields.
- * Clicking the card navigates to the detail page for that record.
- *
- * @param record - The search result record data to display
- * @param columns - Array of column definitions for field display
- * @param objectApiName - API name of the object (path param in detail URL: /object/:objectApiName/:recordId)
- *
- * @remarks
- * - Automatically identifies the primary field (usually "Name")
- * - Displays up to 3 secondary fields
- * - Supports keyboard navigation (Enter/Space to navigate)
- * - Handles nested field values (e.g., "Owner.Alias")
- *
- * @example
- * ```tsx
- * <SearchResultCard
- *   record={searchResult}
- *   columns={columns}
- *   objectApiName="Account"
- * />
- * ```
- */
-import React from "react";
-import { useNavigate } from "react-router";
-import { useMemo, useCallback } from "react";
-import {
-	Card,
-	CardContent,
-	CardHeader,
-	CardTitle,
-} from "../../../../components/ui/card";
-import type { Column, SearchResultRecordData } from "../../types/search/searchResults";
-import { getNestedFieldValue } from "../../utils/fieldUtils";
-import ResultCardFields from "./ResultCardFields";
-import { OBJECT_API_NAMES } from "../../constants";
-
-interface SearchResultCardProps {
-	record: SearchResultRecordData;
-	columns: Column[];
-	objectApiName?: string;
-}
-
-export default function SearchResultCard({
-	record,
-	columns,
-	objectApiName,
-}: SearchResultCardProps) {
-	const navigate = useNavigate();
-
-	const validColumns = useMemo(
-		() => (columns && Array.isArray(columns) && columns.length > 0 ? columns : []),
-		[columns],
-	);
-	const validRecord =
-		record?.id && record?.fields && typeof record.fields === "object" ? record : null;
-
-	const detailPath = useMemo(
-		() =>
-			validRecord
-				? `/object/${objectApiName?.trim() || OBJECT_API_NAMES[0]}/${validRecord.id}`
-				: "",
-		[validRecord, objectApiName],
-	);
-
-	const handleClick = useCallback(() => {
-		if (validRecord?.id) navigate(detailPath);
-	}, [validRecord?.id, detailPath, navigate]);
-
-	const handleKeyDown = useCallback(
-		(e: React.KeyboardEvent) => {
-			if (e.key === "Enter" || e.key === " ") {
-				e.preventDefault();
-				handleClick();
-			}
-		},
-		[handleClick],
-	);
-
-	const primaryField = useMemo(() => {
-		return (
-			validColumns.find(
-				(col) =>
-					col &&
-					col.fieldApiName &&
-					(col.fieldApiName.toLowerCase() === "name" ||
-						col.fieldApiName.toLowerCase().includes("name")),
-			) ||
-			validColumns[0] ||
-			null
-		);
-	}, [validColumns]);
-
-	const primaryValue = useMemo(() => {
-		return primaryField && primaryField.fieldApiName && validRecord?.fields
-			? getNestedFieldValue(validRecord.fields, primaryField.fieldApiName) || "Untitled"
-			: "Untitled";
-	}, [primaryField, validRecord]);
-
-	const secondaryColumns = useMemo(() => {
-		return validColumns.filter(
-			(col) => col && col.fieldApiName && col.fieldApiName !== primaryField?.fieldApiName,
-		);
-	}, [validColumns, primaryField]);
-
-	if (!validRecord) return null;
-	if (validColumns.length === 0) return null;
-
-	return (
-		<Card
-			className="cursor-pointer hover:shadow-md transition-shadow focus-within:ring-2 focus-within:ring-blue-500 focus-within:ring-offset-2"
-			onClick={handleClick}
-			onKeyDown={handleKeyDown}
-			role="button"
-			tabIndex={0}
-			aria-label={`View details for ${primaryValue}`}
-			aria-describedby={`result-${validRecord.id}-description`}
-		>
-			<CardHeader>
-				<CardTitle className="text-lg" id={`result-${validRecord.id}-title`}>
-					{primaryValue}
-				</CardTitle>
-			</CardHeader>
-			<CardContent>
-				<div id={`result-${validRecord.id}-description`} className="sr-only">
-					Search result: {primaryValue}
-				</div>
-				<ResultCardFields
-					record={validRecord}
-					columns={secondaryColumns}
-					excludeFieldApiName={primaryField?.fieldApiName}
-				/>
-			</CardContent>
-		</Card>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultsPanel.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultsPanel.tsx
deleted file mode 100644
index 17e0e5a..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/search/SearchResultsPanel.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * SearchResultsPanel Component
- *
- * Displays the search results panel with loading, error, and empty states.
- * Renders a list of SearchResultCard components and pagination controls.
- *
- * @param columns - Array of column definitions for displaying result data
- * @param results - Array of search result records to display
- * @param columnsLoading - Whether column metadata is currently loading
- * @param resultsLoading - Whether search results are currently loading
- * @param columnsError - Error message if column fetch failed
- * @param resultsError - Error message if results fetch failed
- * @param currentPageToken - Current pagination token
- * @param pageSize - Number of results per page
- * @param onPageChange - Callback when pagination changes; second arg optional: "next" | "prev" | "first" (cursor-stack pagination)
- * @param onPageSizeChange - Callback when page size changes
- *
- * @example
- * ```tsx
- * <SearchResultsPanel
- *   columns={columns}
- *   results={results}
- *   columnsLoading={false}
- *   resultsLoading={false}
- *   columnsError={null}
- *   resultsError={null}
- *   currentPageToken="0"
- *   pageSize={25}
- *   onPageChange={(token, direction) => handlePageChange(token, direction)}
- *   onPageSizeChange={(size) => setPageSize(size)}
- * />
- * ```
- */
-import { useMemo } from "react";
-import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
-import { Skeleton } from "../../../../components/ui/skeleton";
-import { AlertCircle } from "lucide-react";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "../../../../components/ui/select";
-import { Label } from "../../../../components/ui/label";
-import SearchResultCard from "./SearchResultCard";
-import SearchPagination from "./SearchPagination";
-import type { Column, SearchResultRecord } from "../../types/search/searchResults";
-import { getSafeKey } from "../../utils/recordUtils";
-
-interface SearchResultsPanelProps {
-	/** API name of the object being searched (e.g. for detail page navigation). */
-	objectApiName?: string;
-	columns: Column[];
-	results: SearchResultRecord[];
-	columnsLoading: boolean;
-	resultsLoading: boolean;
-	columnsError: string | null;
-	resultsError: string | null;
-	currentPageToken: string;
-	nextPageToken: string | null;
-	previousPageToken: string | null;
-	hasNextPage?: boolean;
-	hasPreviousPage?: boolean;
-	pageSize: number;
-	sortBy: string;
-	onPageChange: (newPageToken: string, direction?: "next" | "prev" | "first") => void;
-	onPageSizeChange: (newPageSize: number) => void;
-	onSortByChange: (newSortBy: string) => void;
-}
-
-export default function SearchResultsPanel({
-	objectApiName,
-	columns,
-	results,
-	columnsLoading,
-	resultsLoading,
-	columnsError,
-	resultsError,
-	currentPageToken,
-	nextPageToken,
-	previousPageToken,
-	hasNextPage = false,
-	hasPreviousPage = false,
-	pageSize,
-	sortBy,
-	onPageChange,
-	onPageSizeChange,
-	onSortByChange,
-}: SearchResultsPanelProps) {
-	const sortableColumns = useMemo(() => columns.filter(({ sortable }) => sortable), [columns]);
-
-	const validResults = useMemo(
-		() => results.filter((record) => record && record.record && record.record.id),
-		[results],
-	);
-	if (columnsError || resultsError) {
-		return (
-			<Alert variant="destructive" role="alert">
-				<AlertCircle className="h-4 w-4" aria-hidden="true" />
-				<AlertTitle>Error</AlertTitle>
-				<AlertDescription>
-					{columnsError || resultsError || "Failed to load search results"}
-				</AlertDescription>
-			</Alert>
-		);
-	}
-
-	if (resultsLoading || columnsLoading) {
-		return (
-			<div
-				className="space-y-4"
-				role="status"
-				aria-live="polite"
-				aria-label="Loading search results"
-			>
-				<span className="sr-only">Loading search results</span>
-				{[1, 2, 3].map((i) => (
-					<div key={i} className="border rounded-lg p-6" aria-hidden="true">
-						<Skeleton className="h-6 w-3/4 mb-4" />
-						<Skeleton className="h-4 w-full mb-2" />
-						<Skeleton className="h-4 w-2/3" />
-					</div>
-				))}
-			</div>
-		);
-	}
-
-	if (results.length === 0) {
-		return (
-			<div className="text-center py-12" role="status" aria-live="polite">
-				<p className="text-lg mb-2">No results found</p>
-				<p className="text-sm">Try adjusting your search query or filters</p>
-			</div>
-		);
-	}
-
-	return (
-		<>
-			{sortableColumns.length > 0 && (
-				<div
-					className="mb-6 flex items-center gap-2 justify-end"
-					role="group"
-					aria-label="Sort options"
-				>
-					<Label htmlFor="sort-by-select" className="text-sm font-normal whitespace-nowrap">
-						Sort by:
-					</Label>
-					<Select value={sortBy || ""} onValueChange={onSortByChange}>
-						<SelectTrigger
-							id="sort-by-select"
-							className="w-[200px]"
-							aria-label="Sort search results by field"
-						>
-							<SelectValue placeholder="Select field..." />
-						</SelectTrigger>
-						<SelectContent>
-							<SelectItem value="relevance">Relevance</SelectItem>
-							{sortableColumns.map((column) => (
-								<SelectItem key={column.fieldApiName} value={column.fieldApiName}>
-									{column.label}
-								</SelectItem>
-							))}
-						</SelectContent>
-					</Select>
-				</div>
-			)}
-
-			<div className="space-y-4 mb-6" role="list" aria-label="Search results list">
-				{validResults.map((record, index) => {
-					const recordId = record.record.id;
-					const safeKey = getSafeKey(recordId, index);
-					return (
-						<div key={safeKey} role="listitem">
-							<SearchResultCard
-								record={record.record}
-								columns={columns}
-								objectApiName={objectApiName}
-							/>
-						</div>
-					);
-				})}
-			</div>
-
-			<SearchPagination
-				currentPageToken={currentPageToken}
-				nextPageToken={nextPageToken}
-				previousPageToken={previousPageToken}
-				hasNextPage={hasNextPage}
-				hasPreviousPage={hasPreviousPage}
-				pageSize={pageSize}
-				onPageChange={onPageChange}
-				onPageSizeChange={onPageSizeChange}
-			/>
-		</>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/shared/LoadingFallback.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/shared/LoadingFallback.tsx
deleted file mode 100644
index 61572e7..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/components/shared/LoadingFallback.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * LoadingFallback Component
- *
- * Loading fallback component for Suspense boundaries.
- * Displays a centered spinner while lazy-loaded components are being fetched.
- *
- * @remarks
- * - Used with React Suspense for code splitting
- * - Simple centered spinner design
- * - Responsive and accessible
- *
- * @example
- * ```tsx
- * <Suspense fallback={<LoadingFallback />}>
- *   <LazyComponent />
- * </Suspense>
- * ```
- */
-import { cva, type VariantProps } from "class-variance-authority";
-import { Spinner } from "../../../../components/ui/spinner";
-
-/**
- * Spinner size variants based on content width.
- */
-const spinnerVariants = cva("", {
-	variants: {
-		contentMaxWidth: {
-			sm: "size-6",
-			md: "size-8",
-			lg: "size-10",
-		},
-	},
-	defaultVariants: {
-		contentMaxWidth: "sm",
-	},
-});
-
-interface LoadingFallbackProps extends VariantProps<typeof spinnerVariants> {
-	/**
-	 * Maximum width of the content container. Also scales the spinner size.
-	 * @default "sm"
-	 */
-	contentMaxWidth?: "sm" | "md" | "lg";
-	/**
-	 * Accessible label for screen readers.
-	 * @default "Loading…"
-	 */
-	loadingText?: string;
-}
-
-export default function LoadingFallback({
-	contentMaxWidth = "sm",
-	loadingText = "Loading…",
-}: LoadingFallbackProps) {
-	return (
-		<div className="flex justify-center" role="status" aria-live="polite">
-			<Spinner className={spinnerVariants({ contentMaxWidth })} aria-hidden="true" />
-			<span className="sr-only">{loadingText}</span>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/constants.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/constants.ts
deleted file mode 100644
index 82eefda..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/constants.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Application-wide Constants
- *
- * Defines constants used throughout the global search feature.
- */
-
-/**
- * Object API names to search across in the global search feature.
- * Currently supports single object search.
- *
- * @remarks
- * - Array of Salesforce object API names
- * - First element is used as the primary search object
- * - Can be extended to support multiple objects in the future
- *
- * @example
- * ```tsx
- * const objectApiName = OBJECT_API_NAMES[0]; // 'Account'
- * ```
- */
-export const OBJECT_API_NAMES = ["Account"] as const;
-
-/** Fallback title when record display name cannot be resolved (e.g. before load or no name field). */
-export const DEFAULT_DETAIL_PAGE_TITLE = "Untitled";
-
-/**
- * Default page size for search results pagination.
- * This should match one of the values in PAGE_SIZE_OPTIONS from paginationUtils.
- *
- * @remarks
- * - Default value is 20 (second option in PAGE_SIZE_OPTIONS)
- * - Can be changed by user via pagination controls
- *
- * @example
- * ```tsx
- * const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
- * ```
- */
-export const DEFAULT_PAGE_SIZE = 20;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterInput.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterInput.tsx
deleted file mode 100644
index 6487b58..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterInput.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * FilterInput Component
- *
- * Renders a text input field for filter values.
- * Used for filters that don't have a picklist (affordance !== 'select').
- *
- * @param filter - Filter definition containing field path, label, and attributes
- * @param value - Current filter input value
- * @param onChange - Callback when input value changes
- *
- * @remarks
- * - Displays filter label or field path as the label
- * - Shows placeholder text from filter attributes or generates default
- * - Displays help message if available
- *
- * @example
- * ```tsx
- * <FilterInput
- *   filter={textFilter}
- *   value={filterValue}
- *   onChange={(value) => setFilterValue(value)}
- * />
- * ```
- */
-import { Input } from "../../../components/ui/input";
-import { Field, FieldLabel, FieldDescription } from "../../../components/ui/field";
-import type { Filter } from "../types/filters/filters";
-
-interface FilterInputProps {
-	filter: Filter;
-	value: string;
-	onChange: (value: string) => void;
-}
-
-export default function FilterInput({ filter, value, onChange }: FilterInputProps) {
-	return (
-		<Field>
-			<FieldLabel htmlFor={filter.targetFieldPath}>
-				{filter.label || filter.targetFieldPath}
-			</FieldLabel>
-			<Input
-				id={filter.targetFieldPath}
-				type="text"
-				value={value}
-				onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e.target.value)}
-				placeholder={
-					filter.attributes?.placeholder ||
-					`Enter ${(filter.label || filter.targetFieldPath).toLowerCase()}`
-				}
-				aria-label={filter.label || filter.targetFieldPath}
-			/>
-			{filter.helpMessage && <FieldDescription>{filter.helpMessage}</FieldDescription>}
-		</Field>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterSelect.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterSelect.tsx
deleted file mode 100644
index e7d2e26..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/filters/FilterSelect.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * FilterSelect Component
- *
- * Renders a dropdown select field for filter values with picklist options.
- * Used for filters with affordance === 'select'.
- *
- * @param filter - Filter definition containing field path, label, and attributes
- * @param value - Currently selected filter value
- * @param options - Array of picklist values to display as options
- * @param onChange - Callback when selection changes
- *
- * @remarks
- * - Filters out invalid options (null/undefined values)
- * - Displays option label if available, otherwise uses value
- * - Shows placeholder from filter attributes or default "Select..."
- *
- * @example
- * ```tsx
- * <FilterSelect
- *   filter={selectFilter}
- *   value={selectedValue}
- *   options={picklistOptions}
- *   onChange={(value) => setSelectedValue(value)}
- * />
- * ```
- */
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "../../../components/ui/select";
-import { Field, FieldLabel, FieldDescription } from "../../../components/ui/field";
-import type { Filter } from "../types/filters/filters";
-import type { PicklistValue } from "../types/filters/picklist";
-
-interface FilterSelectProps {
-	filter: Filter;
-	value: string;
-	options: PicklistValue[];
-	onChange: (value: string) => void;
-}
-
-export default function FilterSelect({ filter, value, options, onChange }: FilterSelectProps) {
-	return (
-		<Field>
-			<FieldLabel htmlFor={filter.targetFieldPath}>
-				{filter.label || filter.targetFieldPath}
-			</FieldLabel>
-			<Select value={value} onValueChange={onChange}>
-				<SelectTrigger
-					id={filter.targetFieldPath}
-					aria-label={filter.label || filter.targetFieldPath}
-				>
-					<SelectValue placeholder={filter.attributes?.placeholder || "Select..."} />
-				</SelectTrigger>
-				<SelectContent>
-					{options.map((option) => {
-						if (!option || !option.value) return null;
-						return (
-							<SelectItem key={option.value} value={option.value}>
-								{option.label || option.value}
-							</SelectItem>
-						);
-					})}
-				</SelectContent>
-			</Select>
-			{filter.helpMessage && <FieldDescription>{filter.helpMessage}</FieldDescription>}
-		</Field>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/form.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/form.tsx
deleted file mode 100644
index 0b7f9dd..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/form.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-import React, { useId } from "react";
-import { createFormHookContexts, createFormHook } from "@tanstack/react-form";
-import {
-	Field,
-	FieldDescription,
-	FieldError,
-	FieldLabel,
-} from "../../../components/ui/field";
-import { Input } from "../../../components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "../../../components/ui/select";
-import { cn } from "../../../lib/utils";
-import type { PicklistValue } from "../types/filters/picklist";
-import { getUniqueErrors } from "../utils/formUtils";
-
-export type { FormError } from "../utils/formUtils";
-export { validateRangeValues } from "../utils/formUtils";
-
-export const { fieldContext, formContext, useFieldContext, useFormContext } =
-	createFormHookContexts();
-
-interface FilterTextFieldProps extends Omit<
-	React.ComponentProps<typeof Input>,
-	"name" | "value" | "onBlur" | "onChange" | "aria-invalid"
-> {
-	label: string;
-	description?: React.ReactNode;
-	placeholder?: string;
-}
-
-function FilterTextField({
-	label,
-	id: providedId,
-	description,
-	placeholder,
-	type = "text",
-	...props
-}: FilterTextFieldProps) {
-	const field = useFieldContext<string>();
-	const generatedId = useId();
-	const id = providedId ?? generatedId;
-	const descriptionId = `${id}-description`;
-	const errorId = `${id}-error`;
-	const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
-
-	const uniqueErrors = getUniqueErrors(field.state.meta.errors);
-
-	return (
-		<Field data-invalid={isInvalid}>
-			<FieldLabel htmlFor={id}>{label}</FieldLabel>
-			{description && <FieldDescription id={descriptionId}>{description}</FieldDescription>}
-			<Input
-				id={id}
-				name={field.name as string}
-				type={type}
-				value={field.state.value ?? ""}
-				onBlur={field.handleBlur}
-				onChange={(e: React.ChangeEvent<HTMLInputElement>) => field.handleChange(e.target.value)}
-				placeholder={placeholder}
-				aria-invalid={isInvalid}
-				aria-describedby={cn(description && descriptionId, isInvalid && errorId)}
-				{...props}
-			/>
-			{isInvalid && uniqueErrors.length > 0 && <FieldError errors={uniqueErrors} />}
-		</Field>
-	);
-}
-
-interface FilterSelectFieldProps {
-	label: string;
-	id?: string;
-	description?: React.ReactNode;
-	placeholder?: string;
-	options: PicklistValue[];
-}
-
-function FilterSelectField({
-	label,
-	id: providedId,
-	description,
-	placeholder = "Select...",
-	options,
-}: FilterSelectFieldProps) {
-	const field = useFieldContext<string>();
-	const generatedId = useId();
-	const id = providedId ?? generatedId;
-	const descriptionId = `${id}-description`;
-	const errorId = `${id}-error`;
-	const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
-
-	const uniqueErrors = getUniqueErrors(field.state.meta.errors);
-
-	return (
-		<Field data-invalid={isInvalid}>
-			<FieldLabel htmlFor={id}>{label}</FieldLabel>
-			{description && <FieldDescription id={descriptionId}>{description}</FieldDescription>}
-			<Select value={field.state.value ?? ""} onValueChange={(value) => field.handleChange(value)}>
-				<SelectTrigger
-					id={id}
-					aria-invalid={isInvalid}
-					aria-describedby={cn(description && descriptionId, isInvalid && errorId)}
-				>
-					<SelectValue placeholder={placeholder} />
-				</SelectTrigger>
-				<SelectContent>
-					{options.map((option) => {
-						if (!option || !option.value) return null;
-						return (
-							<SelectItem key={option.value} value={option.value}>
-								{option.label || option.value}
-							</SelectItem>
-						);
-					})}
-				</SelectContent>
-			</Select>
-			{isInvalid && uniqueErrors.length > 0 && <FieldError errors={uniqueErrors} />}
-		</Field>
-	);
-}
-
-interface FilterRangeFieldProps extends Omit<
-	React.ComponentProps<typeof Input>,
-	"name" | "value" | "onBlur" | "onChange" | "aria-invalid"
-> {
-	label?: string;
-	description?: React.ReactNode;
-	placeholder?: string;
-}
-
-function FilterRangeFieldBase({
-	label,
-	id: providedId,
-	description,
-	placeholder,
-	type = "text",
-	...props
-}: FilterRangeFieldProps) {
-	const field = useFieldContext<string>();
-	const generatedId = useId();
-	const id = providedId ?? generatedId;
-	const descriptionId = `${id}-description`;
-	const errorId = `${id}-error`;
-	const isInvalid = field.state.meta.isTouched && field.state.meta.errors.length > 0;
-
-	const uniqueErrors = getUniqueErrors(field.state.meta.errors);
-
-	return (
-		<div>
-			{label && <FieldLabel htmlFor={id}>{label}</FieldLabel>}
-			{description && <FieldDescription id={descriptionId}>{description}</FieldDescription>}
-			<Input
-				id={id}
-				name={field.name as string}
-				type={type}
-				value={field.state.value ?? ""}
-				onBlur={field.handleBlur}
-				onChange={(e: React.ChangeEvent<HTMLInputElement>) => field.handleChange(e.target.value)}
-				placeholder={placeholder}
-				aria-invalid={isInvalid}
-				aria-describedby={cn(description && descriptionId, isInvalid && errorId)}
-				{...props}
-			/>
-			{isInvalid && uniqueErrors.length > 0 && <FieldError errors={uniqueErrors} />}
-		</div>
-	);
-}
-
-interface FilterRangeMinFieldProps extends Omit<
-	React.ComponentProps<typeof Input>,
-	"name" | "value" | "onBlur" | "onChange" | "aria-invalid"
-> {
-	label?: string;
-	description?: React.ReactNode;
-	placeholder?: string;
-}
-
-interface FilterRangeMaxFieldProps extends Omit<
-	React.ComponentProps<typeof Input>,
-	"name" | "value" | "onBlur" | "onChange" | "aria-invalid"
-> {
-	label?: string;
-	description?: React.ReactNode;
-	placeholder?: string;
-}
-
-function FilterRangeMinField({ placeholder = "Min", ...props }: FilterRangeMinFieldProps) {
-	return <FilterRangeFieldBase placeholder={placeholder} {...props} />;
-}
-
-function FilterRangeMaxField({ placeholder = "Max", ...props }: FilterRangeMaxFieldProps) {
-	return <FilterRangeFieldBase placeholder={placeholder} {...props} />;
-}
-
-export const { useAppForm } = createFormHook({
-	fieldContext,
-	formContext,
-	fieldComponents: {
-		FilterTextField,
-		FilterSelectField,
-		FilterRangeMinField,
-		FilterRangeMaxField,
-	},
-	formComponents: {},
-});
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectInfoBatch.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectInfoBatch.ts
deleted file mode 100644
index 990a2d6..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectInfoBatch.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * useObjectInfoBatch
- *
- * Fetches object metadata (label, labelPlural, fields, etc.) for the given object API names.
- * Uses the shared cache in objectInfoService so List, Home, and Detail views reuse one request.
- */
-
-import { useState, useEffect, useRef } from "react";
-import { objectInfoService } from "../api/objectInfoService";
-import type { ObjectInfoResult } from "../types/objectInfo/objectInfo";
-
-export interface UseObjectInfoBatchResult {
-	/** Object metadata in the same order as the requested objectApiNames. */
-	objectInfos: ObjectInfoResult[];
-	loading: boolean;
-	error: string | null;
-}
-
-/**
- * Fetches batch object info for the given object API names. Results are cached;
- * multiple callers (List, Home, Detail) share the same request.
- *
- * @param objectApiNames - Array of object API names (e.g. OBJECT_API_NAMES)
- * @returns objectInfos (same order as input), loading, error
- */
-export function useObjectInfoBatch(objectApiNames: string[]): UseObjectInfoBatchResult {
-	const [state, setState] = useState<UseObjectInfoBatchResult>({
-		objectInfos: [],
-		loading: objectApiNames.length > 0,
-		error: null,
-	});
-	const isCancelled = useRef(false);
-	// Derive a stable primitive from the array so the effect dependency doesn't
-	// change on every render. A new array reference (even with identical contents)
-	// would otherwise trigger the effect on every render, causing an infinite loop.
-	const namesKey = objectApiNames.filter(Boolean).join(",");
-
-	useEffect(() => {
-		isCancelled.current = false;
-		// Re-derive the array inside the effect from the stable key rather than
-		// closing over objectApiNames directly, which would require it in the dep
-		// array and reintroduce the infinite loop.
-		const names = namesKey ? namesKey.split(",") : [];
-		if (names.length === 0) {
-			queueMicrotask(() => setState({ objectInfos: [], loading: false, error: null }));
-			return;
-		}
-		queueMicrotask(() => setState((s) => ({ ...s, loading: true, error: null })));
-		objectInfoService
-			.getObjectInfoBatch(namesKey)
-			.then((res) => {
-				if (isCancelled.current) return;
-				const objectInfos = names
-					.map((apiName) => res.results?.find((r) => r.result?.ApiName === apiName)?.result)
-					.filter((r) => r != null) as ObjectInfoResult[];
-				setState({ objectInfos, loading: false, error: null });
-			})
-			.catch((err) => {
-				if (isCancelled.current) return;
-				setState({
-					objectInfos: [],
-					loading: false,
-					error: err instanceof Error ? err.message : (err as string),
-				});
-			});
-		return () => {
-			isCancelled.current = true;
-		};
-	}, [namesKey]);
-
-	return state;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectSearchData.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectSearchData.ts
deleted file mode 100644
index 833d16f..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useObjectSearchData.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Object Search Data Hooks
- *
- * - useObjectListMetadata: single source for list-view metadata (filters → columns + picklists). Use in list pages to avoid duplicate state and API calls.
- * - useObjectColumns / useObjectFilters: thin wrappers over useObjectListMetadata for backward compatibility.
- * - getSharedFilters: module-level deduplication for getObjectListFilters across hook instances.
- */
-
-import { useState, useEffect } from "react";
-import { objectInfoService } from "../api/objectInfoService";
-import type { Column } from "../types/search/searchResults";
-import type { Filter } from "../types/filters/filters";
-import type { PicklistValue } from "../types/filters/picklist";
-
-// --- Shared filters cache (deduplicates getObjectListFilters across useObjectColumns + useObjectFilters) ---
-const sharedFiltersCache = new Map<string, Filter[]>();
-const sharedFiltersInFlight = new Map<string, Promise<Filter[]>>();
-
-function getSharedFilters(objectApiName: string): Promise<Filter[]> {
-	const cached = sharedFiltersCache.get(objectApiName);
-	if (cached) return Promise.resolve(cached);
-	const inFlight = sharedFiltersInFlight.get(objectApiName);
-	if (inFlight) return inFlight;
-	const promise = objectInfoService
-		.getObjectListFilters(objectApiName)
-		.then((filters) => {
-			sharedFiltersCache.set(objectApiName, filters);
-			sharedFiltersInFlight.delete(objectApiName);
-			return filters;
-		})
-		.catch((err) => {
-			sharedFiltersInFlight.delete(objectApiName);
-			throw err;
-		});
-	sharedFiltersInFlight.set(objectApiName, promise);
-	return promise;
-}
-
-// --- Shared Types ---
-export interface FiltersData {
-	filters: Filter[];
-	picklistValues: Record<string, PicklistValue[]>;
-	loading: boolean;
-	error: string | null;
-}
-
-/**
- * Derives column definitions from filter definitions for list/result UI.
- */
-function filtersToColumns(filters: Filter[]): Column[] {
-	return filters.map((f) => ({
-		fieldApiName: f.targetFieldPath,
-		label: f.label,
-		searchable: true,
-		sortable: true,
-	}));
-}
-
-export interface ObjectListMetadata {
-	columns: Column[];
-	filters: Filter[];
-	picklistValues: Record<string, PicklistValue[]>;
-	loading: boolean;
-	error: string | null;
-}
-
-/**
- * Single hook for list-view metadata: filters (shared API), derived columns, and picklist values.
- * Use this in list/search pages to avoid duplicate useObjectColumns + useObjectFilters and duplicate state.
- */
-export function useObjectListMetadata(objectApiName: string | null): ObjectListMetadata {
-	const [state, setState] = useState<{
-		columns: Column[];
-		filters: Filter[];
-		picklistValues: Record<string, PicklistValue[]>;
-		loading: boolean;
-		error: string | null;
-	}>({
-		columns: [],
-		filters: [],
-		picklistValues: {},
-		loading: true,
-		error: null,
-	});
-
-	useEffect(() => {
-		if (!objectApiName) {
-			queueMicrotask(() => setState((s) => ({ ...s, loading: false, error: "Invalid object" })));
-			return;
-		}
-
-		let isCancelled = false;
-
-		const run = async () => {
-			queueMicrotask(() => setState((s) => ({ ...s, loading: true, error: null })));
-			try {
-				const filters = await getSharedFilters(objectApiName!);
-				if (isCancelled) return;
-
-				const selectFilters = filters.filter((f) => f.affordance?.toLowerCase() === "select");
-				const picklistPromises = selectFilters.map((f) =>
-					objectInfoService
-						.getPicklistValues(objectApiName!, f.targetFieldPath)
-						.then((values) => ({ fieldPath: f.targetFieldPath, values }))
-						.catch(() => ({ fieldPath: f.targetFieldPath, values: [] as PicklistValue[] })),
-				);
-				const picklistResults = await Promise.all(picklistPromises);
-				if (isCancelled) return;
-
-				const picklistValues: Record<string, PicklistValue[]> = {};
-				picklistResults.forEach(({ fieldPath, values }) => {
-					picklistValues[fieldPath] = values;
-				});
-
-				setState({
-					columns: filtersToColumns(filters),
-					filters,
-					picklistValues,
-					loading: false,
-					error: null,
-				});
-			} catch {
-				if (isCancelled) return;
-				setState((s) => ({
-					...s,
-					columns: [],
-					filters: [],
-					picklistValues: {},
-					loading: false,
-					error: "Failed to load list metadata",
-				}));
-			}
-		};
-
-		run();
-		return () => {
-			isCancelled = true;
-		};
-	}, [objectApiName]);
-
-	return state;
-}
-
-/**
- * Hook: useObjectColumns
- * Thin wrapper over useObjectListMetadata for backward compatibility.
- */
-export function useObjectColumns(objectApiName: string | null) {
-	const { columns, loading, error } = useObjectListMetadata(objectApiName);
-	return {
-		columns: objectApiName ? columns : [],
-		columnsLoading: loading,
-		columnsError: error,
-	};
-}
-
-/**
- * Hook: useObjectFilters
- * Thin wrapper over useObjectListMetadata for backward compatibility.
- */
-export function useObjectFilters(objectApiName: string | null) {
-	const { filters, picklistValues, loading, error } = useObjectListMetadata(objectApiName);
-	const filtersData: Record<string, FiltersData> = objectApiName
-		? {
-				[objectApiName]: {
-					filters,
-					picklistValues,
-					loading,
-					error,
-				},
-			}
-		: {};
-	return { filtersData };
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordDetailLayout.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordDetailLayout.ts
deleted file mode 100644
index 71abd3a..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordDetailLayout.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { useState, useEffect, useRef } from "react";
-import { objectDetailService } from "../api/objectDetailService";
-import type { LayoutResponse } from "../types/recordDetail/recordDetail";
-import type { ObjectInfoResult } from "../types/objectInfo/objectInfo";
-import type { GraphQLRecordNode } from "../api/recordListGraphQLService";
-
-export interface UseRecordDetailLayoutReturn {
-	layout: LayoutResponse | null;
-	record: GraphQLRecordNode | null;
-	objectMetadata: ObjectInfoResult | null;
-	loading: boolean;
-	error: string | null;
-}
-
-export interface UseRecordDetailLayoutParams {
-	objectApiName: string | null;
-	recordId: string | null;
-	recordTypeId?: string | null;
-	initialData?: {
-		layout: LayoutResponse;
-		record: GraphQLRecordNode;
-		objectMetadata: ObjectInfoResult;
-	} | null;
-}
-
-const MAX_CACHE_SIZE = 50;
-const CACHE_TTL_MS = 5 * 60 * 1000;
-
-type CacheEntry = {
-	layout: LayoutResponse;
-	record: GraphQLRecordNode;
-	objectMetadata: ObjectInfoResult;
-	cachedAt: number;
-};
-
-export function useRecordDetailLayout({
-	objectApiName,
-	recordId,
-	recordTypeId = null,
-	initialData = null,
-}: UseRecordDetailLayoutParams): UseRecordDetailLayoutReturn {
-	const [layout, setLayout] = useState<LayoutResponse | null>(initialData?.layout ?? null);
-	const [record, setRecord] = useState<GraphQLRecordNode | null>(initialData?.record ?? null);
-	const [objectMetadata, setObjectMetadata] = useState<ObjectInfoResult | null>(
-		initialData?.objectMetadata ?? null,
-	);
-	const [loading, setLoading] = useState(!initialData);
-	const [error, setError] = useState<string | null>(null);
-
-	const cacheKey =
-		objectApiName && recordId ? `${objectApiName}:${recordId}:${recordTypeId ?? "default"}` : null;
-	const cacheRef = useRef<Map<string, CacheEntry>>(new Map());
-
-	useEffect(() => {
-		if (!objectApiName || !recordId) {
-			setError("Invalid object or record ID");
-			setLoading(false);
-			return;
-		}
-
-		if (
-			initialData?.layout != null &&
-			initialData?.record != null &&
-			initialData?.objectMetadata != null
-		) {
-			return;
-		}
-
-		const cached = cacheRef.current.get(cacheKey!);
-		const now = Date.now();
-		if (cached && now - cached.cachedAt < CACHE_TTL_MS) {
-			setLayout(cached.layout);
-			setRecord(cached.record);
-			setObjectMetadata(cached.objectMetadata);
-			setLoading(false);
-			setError(null);
-			return;
-		}
-
-		let isCancelled = false;
-
-		const fetchDetail = async () => {
-			setLoading(true);
-			setError(null);
-
-			try {
-				const {
-					layout: layoutData,
-					record: recordData,
-					objectMetadata: objectMetadataData,
-				} = await objectDetailService.getRecordDetail(
-					objectApiName,
-					recordId,
-					recordTypeId ?? undefined,
-				);
-
-				if (isCancelled) return;
-
-				const cache = cacheRef.current;
-				if (cache.size >= MAX_CACHE_SIZE) {
-					const firstKey = cache.keys().next().value;
-					if (firstKey != null) cache.delete(firstKey);
-				}
-				cache.set(cacheKey!, {
-					layout: layoutData,
-					record: recordData,
-					objectMetadata: objectMetadataData,
-					cachedAt: Date.now(),
-				});
-				setLayout(layoutData);
-				setRecord(recordData);
-				setObjectMetadata(objectMetadataData);
-			} catch {
-				if (isCancelled) return;
-				setError("Failed to load record details");
-			} finally {
-				if (!isCancelled) {
-					setLoading(false);
-				}
-			}
-		};
-
-		fetchDetail();
-
-		return () => {
-			isCancelled = true;
-		};
-	}, [objectApiName, recordId, recordTypeId, cacheKey, initialData]);
-
-	return {
-		layout,
-		record,
-		objectMetadata,
-		loading,
-		error,
-	};
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordListGraphQL.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordListGraphQL.ts
deleted file mode 100644
index 39ebf85..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/hooks/useRecordListGraphQL.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Record list hook: GraphQL records with filter, sort, pagination, search.
- * Use for list/search views; detail view uses useRecordDetailLayout instead.
- *
- * @module hooks/useRecordListGraphQL
- */
-
-import { useState, useEffect, useCallback } from "react";
-import { useObjectColumns } from "./useObjectSearchData";
-import {
-	getRecordsGraphQL,
-	buildOrderByFromSort,
-	type RecordListGraphQLResult,
-} from "../api/recordListGraphQLService";
-import type { Column } from "../types/search/searchResults";
-import type { FilterCriteria } from "../types/filters/filters";
-
-const EMPTY_FILTERS: FilterCriteria[] = [];
-
-export interface UseRecordListGraphQLOptions {
-	objectApiName: string;
-	first?: number;
-	after?: string | null;
-	filters?: FilterCriteria[];
-	sortBy?: string;
-	searchQuery?: string;
-	/** When provided, skips useObjectColumns (use from parent e.g. useObjectListMetadata). */
-	columns?: Column[];
-	columnsLoading?: boolean;
-	columnsError?: string | null;
-}
-
-export interface UseRecordListGraphQLReturn {
-	data: RecordListGraphQLResult | null;
-	edges: Array<{ node?: Record<string, unknown> }>;
-	pageInfo: {
-		hasNextPage?: boolean;
-		hasPreviousPage?: boolean;
-		endCursor?: string | null;
-		startCursor?: string | null;
-	} | null;
-	loading: boolean;
-	error: string | null;
-	columnsLoading: boolean;
-	columnsError: string | null;
-	refetch: () => void;
-}
-
-/**
- * Fetches records via GraphQL for the given object with filter, sort, pagination, and search.
- */
-export function useRecordListGraphQL(
-	options: UseRecordListGraphQLOptions,
-): UseRecordListGraphQLReturn {
-	const {
-		objectApiName,
-		first = 50,
-		after = null,
-		filters = EMPTY_FILTERS,
-		sortBy = "",
-		searchQuery = "",
-		columns: columnsProp,
-		columnsLoading: columnsLoadingProp,
-		columnsError: columnsErrorProp,
-	} = options;
-
-	const fromParent = columnsProp !== undefined;
-	const fromHook = useObjectColumns(fromParent ? null : objectApiName);
-
-	const columns = fromParent ? columnsProp : fromHook.columns;
-	const columnsLoading = fromParent ? (columnsLoadingProp ?? false) : fromHook.columnsLoading;
-	const columnsError = fromParent ? (columnsErrorProp ?? null) : fromHook.columnsError;
-
-	const [data, setData] = useState<RecordListGraphQLResult | null>(null);
-	const [loading, setLoading] = useState(false);
-	const [error, setError] = useState<string | null>(null);
-
-	const fetchRecords = useCallback(() => {
-		if (columnsLoading || columnsError || columns.length === 0) return;
-
-		setLoading(true);
-		setError(null);
-		const orderBy = buildOrderByFromSort(sortBy);
-
-		getRecordsGraphQL({
-			objectApiName,
-			columns,
-			first,
-			after,
-			filters,
-			orderBy,
-			searchQuery: searchQuery.trim() || undefined,
-		})
-			.then((result) => {
-				setData(result);
-			})
-			.catch((err) => {
-				setError(err instanceof Error ? err.message : "Failed to load records");
-			})
-			.finally(() => {
-				setLoading(false);
-			});
-	}, [
-		objectApiName,
-		columns,
-		columnsLoading,
-		columnsError,
-		first,
-		after,
-		filters,
-		sortBy,
-		searchQuery,
-	]);
-
-	useEffect(() => {
-		if (!objectApiName || columnsLoading || columnsError) return;
-		if (columns.length === 0 && !columnsLoading) return;
-		queueMicrotask(() => fetchRecords());
-	}, [objectApiName, columns, columnsLoading, columnsError, fetchRecords]);
-
-	const objectData = data?.uiapi?.query?.[objectApiName];
-	const edges = objectData?.edges ?? [];
-	const pageInfo = objectData?.pageInfo ?? null;
-
-	return {
-		data,
-		edges,
-		pageInfo,
-		loading: columnsLoading || loading,
-		error: columnsError || error,
-		columnsLoading,
-		columnsError,
-		refetch: fetchRecords,
-	};
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/DetailPage.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/DetailPage.tsx
deleted file mode 100644
index 2ae6f6f..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/DetailPage.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { useMemo } from "react";
-import { useParams, useNavigate } from "react-router";
-import { Card, CardContent, CardHeader, CardTitle } from "../../../components/ui/card";
-import { Skeleton } from "../../../components/ui/skeleton";
-import { Alert, AlertDescription, AlertTitle } from "../../../components/ui/alert";
-import { AlertCircle } from "lucide-react";
-import DetailHeader from "../components/detail/DetailHeader";
-import { UiApiDetailForm } from "../components/detail/UiApiDetailForm";
-import { OBJECT_API_NAMES, DEFAULT_DETAIL_PAGE_TITLE } from "../constants";
-import { toRecordDisplayNameMetadata } from "../utils/fieldUtils";
-import { useRecordDetailLayout } from "../hooks/useRecordDetailLayout";
-import { getGraphQLRecordDisplayName } from "../utils/graphQLNodeFieldUtils";
-
-export default function DetailPage() {
-	const { objectApiName: objectApiNameParam, recordId } = useParams<{
-		objectApiName: string;
-		recordId: string;
-	}>();
-	const navigate = useNavigate();
-	const objectApiName = objectApiNameParam ?? OBJECT_API_NAMES[0];
-
-	const { layout, record, objectMetadata, loading, error } = useRecordDetailLayout({
-		objectApiName,
-		recordId: recordId ?? null,
-	});
-
-	const recordTitle = useMemo(
-		() =>
-			record
-				? getGraphQLRecordDisplayName(record, toRecordDisplayNameMetadata(objectMetadata))
-				: DEFAULT_DETAIL_PAGE_TITLE,
-		[record, objectMetadata],
-	);
-
-	const handleBack = () => navigate(-1);
-
-	if (loading) {
-		return (
-			<div
-				className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-12"
-				role="status"
-				aria-live="polite"
-				aria-label="Loading record details"
-			>
-				<span className="sr-only">Loading record details</span>
-				<Skeleton className="h-10 w-32 mb-6" aria-hidden="true" />
-				<Card aria-hidden="true">
-					<CardHeader>
-						<Skeleton className="h-8 w-3/4" />
-					</CardHeader>
-					<CardContent className="space-y-4">
-						{[1, 2, 3, 4].map((i) => (
-							<div key={i} className="space-y-2">
-								<Skeleton className="h-4 w-24" />
-								<Skeleton className="h-4 w-full" />
-							</div>
-						))}
-					</CardContent>
-				</Card>
-			</div>
-		);
-	}
-
-	if (error) {
-		return (
-			<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-				<DetailHeader title="" onBack={handleBack} />
-				<Alert variant="destructive" role="alert">
-					<AlertCircle className="h-4 w-4" aria-hidden="true" />
-					<AlertTitle>Error</AlertTitle>
-					<AlertDescription>{error}</AlertDescription>
-				</Alert>
-			</div>
-		);
-	}
-
-	if (!layout || !record) {
-		return (
-			<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-				<DetailHeader title="" onBack={handleBack} />
-				<Alert role="alert">
-					<AlertCircle className="h-4 w-4" aria-hidden="true" />
-					<AlertTitle>Not Found</AlertTitle>
-					<AlertDescription>Record not found</AlertDescription>
-				</Alert>
-			</div>
-		);
-	}
-
-	return (
-		<main className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-12" aria-label="Record details">
-			<DetailHeader title={recordTitle} onBack={handleBack} />
-			<Card>
-				<CardHeader>
-					<CardTitle className="text-2xl">{recordTitle}</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<UiApiDetailForm
-						objectApiName={objectApiName}
-						recordId={recordId!}
-						layout={layout}
-						record={record}
-						objectMetadata={objectMetadata}
-					/>
-				</CardContent>
-			</Card>
-		</main>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/GlobalSearch.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/GlobalSearch.tsx
deleted file mode 100644
index 3031ce7..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/pages/GlobalSearch.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * GlobalSearch Page Component
- *
- * Main page component for displaying global search results.
- * Uses GraphQL API (useRecordListGraphQL) for list data; results are adapted to the
- * same record shape as before so SearchResultCard and filters/sort/pagination work unchanged.
- *
- * @remarks
- * - Supports single object search (no tabs)
- * - Displays filters panel on the left and results on the right
- * - Pagination uses a cursor stack: we only query forward (first + after) and store endCursor per page;
- *   Previous re-queries using the stored cursor for the previous page so both Next and Previous work.
- */
-import { useMemo, useState, useCallback, useEffect, useRef } from "react";
-import { useParams } from "react-router";
-import { OBJECT_API_NAMES, DEFAULT_PAGE_SIZE } from "../constants";
-import { useObjectListMetadata } from "../hooks/useObjectSearchData";
-import { useObjectInfoBatch } from "../hooks/useObjectInfoBatch";
-import { useRecordListGraphQL } from "../hooks/useRecordListGraphQL";
-import FiltersPanel from "../components/filters/FiltersPanel";
-import SearchHeader from "../components/search/SearchHeader";
-import SearchResultsPanel from "../components/search/SearchResultsPanel";
-import { Card, CardContent, CardHeader, CardTitle } from "../../../components/ui/card";
-import { Skeleton } from "../../../components/ui/skeleton";
-import type { FilterCriteria } from "../types/filters/filters";
-import type { SearchResultRecord } from "../types/search/searchResults";
-import { graphQLNodeToSearchResultRecordData } from "../utils/graphQLRecordAdapter";
-
-const EMPTY_HIGHLIGHT = { fields: {}, snippet: null };
-const EMPTY_SEARCH_INFO = { isPromoted: false, isSpellCorrected: false };
-
-export default function GlobalSearch() {
-	const { query } = useParams<{ query: string }>();
-
-	const objectApiName = OBJECT_API_NAMES[0];
-
-	const [searchPageSize, setSearchPageSize] = useState(DEFAULT_PAGE_SIZE);
-	const [afterCursor, setAfterCursor] = useState<string | null>(null);
-	const [pageIndex, setPageIndex] = useState(0);
-	/** Cursor stack: cursorStack[i] is the `after` value that returns page i. cursorStack[0] = null (first page). */
-	const [cursorStack, setCursorStack] = useState<(string | null)[]>([null]);
-	const [appliedFilters, setAppliedFilters] = useState<FilterCriteria[]>([]);
-	const [sortBy, setSortBy] = useState("Name");
-
-	const decodedQuery = useMemo(() => {
-		if (!query) return "";
-		try {
-			return decodeURIComponent(query);
-		} catch {
-			return query;
-		}
-	}, [query]);
-
-	const isBrowseAll = decodedQuery === "browse__all";
-	const searchQuery = isBrowseAll ? "" : decodedQuery.trim();
-
-	// Reset pagination when the URL search query changes so we don't use an old cursor with a new result set
-	useEffect(() => {
-		queueMicrotask(() => {
-			setAfterCursor(null);
-			setPageIndex(0);
-			setCursorStack([null]);
-		});
-	}, [query]);
-
-	const listMeta = useObjectListMetadata(objectApiName);
-	const { objectInfos } = useObjectInfoBatch([...OBJECT_API_NAMES]);
-	const labelPlural = (objectInfos[0]?.labelPlural as string | undefined) ?? "records";
-	const {
-		edges,
-		pageInfo,
-		loading: resultsLoading,
-		error: resultsError,
-	} = useRecordListGraphQL({
-		objectApiName,
-		first: searchPageSize,
-		after: afterCursor,
-		filters: appliedFilters,
-		sortBy: sortBy === "relevance" ? "Name" : sortBy,
-		searchQuery: searchQuery || undefined,
-		columns: listMeta.columns,
-		columnsLoading: listMeta.loading,
-		columnsError: listMeta.error,
-	});
-
-	// Store endCursor for the next page so we can re-query when user clicks Next; also enables Previous via stack.
-	// Only update when not loading so a stale response cannot write a cursor into the wrong stack index (e.g. after rapid Next clicks).
-	useEffect(() => {
-		if (resultsLoading) return;
-		const cursor = pageInfo?.endCursor ?? null;
-		if (cursor == null) return;
-		queueMicrotask(() => {
-			setCursorStack((prev) => {
-				const next = [...prev];
-				next[pageIndex + 1] = cursor;
-				return next;
-			});
-		});
-	}, [resultsLoading, pageInfo?.endCursor, pageIndex]);
-
-	const results: SearchResultRecord[] = useMemo(
-		() =>
-			(edges ?? []).map((edge) => ({
-				record: graphQLNodeToSearchResultRecordData(
-					edge?.node as Record<string, unknown>,
-					objectApiName,
-				),
-				highlightInfo: EMPTY_HIGHLIGHT,
-				searchInfo: EMPTY_SEARCH_INFO,
-			})),
-		[edges, objectApiName],
-	);
-
-	const nextPageToken = pageInfo?.endCursor ?? null;
-	/** Entry cursor for the previous page; used when user clicks Previous to re-query with after=cursorStack[pageIndex-1]. */
-	const previousPageToken = pageIndex > 0 ? (cursorStack[pageIndex - 1] ?? null) : null;
-	const hasNextPage = pageInfo?.hasNextPage === true;
-	const hasPreviousPage = pageIndex > 0;
-	const currentPageToken = pageIndex.toString();
-
-	const cursorStackRef = useRef(cursorStack);
-	const pageIndexRef = useRef(pageIndex);
-	useEffect(() => {
-		cursorStackRef.current = cursorStack;
-		pageIndexRef.current = pageIndex;
-	}, [cursorStack, pageIndex]);
-
-	const canRenderFilters =
-		!listMeta.loading && listMeta.filters !== undefined && listMeta.picklistValues !== undefined;
-
-	const handleApplyFilters = useCallback((filterCriteria: FilterCriteria[]) => {
-		setAppliedFilters(filterCriteria);
-		setAfterCursor(null);
-		setPageIndex(0);
-		setCursorStack([null]);
-	}, []);
-
-	const handlePageChange = useCallback(
-		(newPageToken: string, direction?: "next" | "prev" | "first") => {
-			if (direction === "first" || newPageToken === "0") {
-				setAfterCursor(null);
-				setPageIndex(0);
-			} else if (direction === "prev") {
-				const idx = pageIndexRef.current;
-				const stack = cursorStackRef.current;
-				const prevCursor = idx > 0 ? (stack[idx - 1] ?? null) : null;
-				setAfterCursor(prevCursor);
-				setPageIndex((prev) => Math.max(0, prev - 1));
-			} else {
-				setAfterCursor(newPageToken);
-				setPageIndex((prev) => prev + 1);
-			}
-			window.scrollTo({ top: 0, behavior: "smooth" });
-		},
-		[],
-	);
-
-	const handlePageSizeChange = useCallback((newPageSize: number) => {
-		setSearchPageSize(newPageSize);
-		setAfterCursor(null);
-		setPageIndex(0);
-		setCursorStack([null]);
-		window.scrollTo({ top: 0, behavior: "smooth" });
-	}, []);
-
-	const handleSortByChange = useCallback((newSortBy: string) => {
-		setSortBy(newSortBy);
-		setAfterCursor(null);
-		setPageIndex(0);
-		setCursorStack([null]);
-		window.scrollTo({ top: 0, behavior: "smooth" });
-	}, []);
-
-	return (
-		<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
-			<SearchHeader query={decodedQuery} isBrowseAll={isBrowseAll} labelPlural={labelPlural} />
-
-			<div className="grid grid-cols-1 lg:grid-cols-4 gap-6">
-				<aside className="lg:col-span-1" aria-label="Filters panel">
-					{canRenderFilters ? (
-						<FiltersPanel
-							filters={listMeta.filters}
-							picklistValues={listMeta.picklistValues}
-							loading={listMeta.loading}
-							objectApiName={objectApiName}
-							onApplyFilters={handleApplyFilters}
-						/>
-					) : (
-						<Card className="w-full" role="region" aria-label="Filters panel">
-							<CardHeader>
-								<CardTitle>Filters</CardTitle>
-							</CardHeader>
-							<CardContent
-								className="space-y-4"
-								role="status"
-								aria-live="polite"
-								aria-label="Loading filters"
-							>
-								<span className="sr-only">Loading filters</span>
-								{[1, 2, 3].map((i) => (
-									<div key={i} className="space-y-2" aria-hidden="true">
-										<Skeleton className="h-4 w-24" />
-										<Skeleton className="h-9 w-full" />
-									</div>
-								))}
-							</CardContent>
-						</Card>
-					)}
-				</aside>
-
-				<section className="lg:col-span-3" aria-label="Search results">
-					<SearchResultsPanel
-						objectApiName={objectApiName}
-						columns={listMeta.columns}
-						results={results}
-						columnsLoading={listMeta.loading}
-						resultsLoading={resultsLoading}
-						columnsError={listMeta.error}
-						resultsError={resultsError}
-						currentPageToken={currentPageToken}
-						nextPageToken={nextPageToken}
-						previousPageToken={previousPageToken}
-						hasNextPage={hasNextPage}
-						hasPreviousPage={hasPreviousPage}
-						pageSize={searchPageSize}
-						sortBy={sortBy}
-						onPageChange={handlePageChange}
-						onPageSizeChange={handlePageSizeChange}
-						onSortByChange={handleSortByChange}
-					/>
-				</section>
-			</div>
-		</main>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/filters.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/filters.ts
deleted file mode 100644
index 76176f4..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/filters.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { z } from "zod";
-
-/**
- * Type definitions for filter structures
- * All types are derived from Zod schemas using z.infer for type safety
- */
-
-/**
- * Allowed filter operators for Salesforce search queries
- */
-export const FILTER_OPERATORS = [
-	"eq", // Equals
-	"ne", // Not equals
-	"like", // Pattern matching (contains)
-	"in", // In list (multiple values)
-	"gt", // Greater than
-	"gte", // Greater than or equal
-	"lt", // Less than
-	"lte", // Less than or equal
-] as const;
-
-/**
- * Filter operator type
- */
-export type FilterOperator = (typeof FILTER_OPERATORS)[number];
-
-/**
- * Salesforce field path validation regex
- * Validates field paths like:
- * - Simple fields: "Name", "FieldName__c"
- * - Relationship fields: "Account__r.Name", "Owner__r.FieldName__c"
- * - Nested relationships: "Account__r.Owner__r.Name"
- *
- * Pattern explanation:
- * - ^[A-Za-z][A-Za-z0-9_]* - Starts with letter, followed by letters/numbers/underscores
- * - (__[cr])? - Optional relationship suffix (__r or __c)
- * - (\.[A-Za-z][A-Za-z0-9_]*(__[cr])?)* - Optional relationship traversal (dot notation)
- */
-const SALESFORCE_FIELD_PATH_REGEX =
-	/^[A-Za-z][A-Za-z0-9_]*(__[cr])?(\.[A-Za-z][A-Za-z0-9_]*(__[cr])?)*$/;
-
-/**
- * Validates Salesforce field path format
- * @param fieldPath - The field path to validate
- * @returns true if valid, false otherwise
- */
-function isValidSalesforceFieldPath(fieldPath: string): boolean {
-	if (!fieldPath || fieldPath.trim().length === 0) {
-		return false;
-	}
-	return SALESFORCE_FIELD_PATH_REGEX.test(fieldPath);
-}
-
-// Zod Schema for Filter Attributes
-const FilterAttributesSchema = z.object({
-	affordance: z.string().optional(),
-	placeholder: z.string().optional(),
-});
-
-/**
- * Filter attributes containing input-specific properties
- */
-export type FilterAttributes = z.infer<typeof FilterAttributesSchema>;
-
-// Zod Schema for Filter
-const FilterSchema = z.object({
-	affordance: z.string(),
-	attributes: FilterAttributesSchema.optional(),
-	defaultValues: z.array(z.string()).optional(),
-	helpMessage: z.string().nullable().optional(),
-	label: z.string(),
-	targetFieldPath: z.string().refine((value) => isValidSalesforceFieldPath(value), {
-		message:
-			"Invalid Salesforce field path format. Field paths must start with a letter and can contain letters, numbers, underscores, and relationship notation (__r or __c). Use dot notation for relationships (e.g., 'Account__r.Name').",
-	}),
-	type: z.string(),
-});
-
-/**
- * Single filter definition from getObjectListFilters API
- */
-export type Filter = z.infer<typeof FilterSchema>;
-
-// Export schema for validation
-export const FilterArraySchema = z.array(FilterSchema);
-
-// Zod Schema for Filter Criteria with operator and field path validation
-const FilterCriteriaSchema = z.object({
-	objectApiName: z.string().min(1, "Object API name is required"),
-	fieldPath: z
-		.string()
-		.min(1, "Field path is required")
-		.refine((value) => isValidSalesforceFieldPath(value), {
-			message:
-				"Invalid Salesforce field path format. Field paths must start with a letter and can contain letters, numbers, underscores, and relationship notation (__r or __c). Use dot notation for relationships (e.g., 'Account__r.Name').",
-		}),
-	operator: z.enum(FILTER_OPERATORS, {
-		message: `Operator must be one of: ${FILTER_OPERATORS.join(", ")}`,
-	}),
-	values: z.array(z.union([z.string(), z.number()])).min(1, "At least one value is required"),
-});
-
-/**
- * Filter criteria structure for filtering search results
- */
-export type FilterCriteria = z.infer<typeof FilterCriteriaSchema>;
-
-// Export schema for validation
-export const FilterCriteriaArraySchema = z.array(FilterCriteriaSchema);
-
-// Zod Schema for Filters Response (used for type inference via z.infer)
-export const FiltersResponseSchema = z.record(z.string(), z.unknown()).and(
-	z.object({
-		filters: FilterArraySchema.optional(),
-	}),
-);
-
-/**
- * Filters response structure
- */
-export type FiltersResponse = z.infer<typeof FiltersResponseSchema>;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/picklist.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/picklist.ts
deleted file mode 100644
index 61e5a3b..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/filters/picklist.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { PicklistValue as GraphQLPicklistValue } from "../objectInfo/objectInfo";
-
-export type PicklistValue = GraphQLPicklistValue & {
-	value: NonNullable<GraphQLPicklistValue["value"]>;
-	label: NonNullable<GraphQLPicklistValue["label"]>;
-};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/objectInfo/objectInfo.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/objectInfo/objectInfo.ts
deleted file mode 100644
index 250c32c..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/objectInfo/objectInfo.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import type { GetObjectInfosQuery, GetPicklistValuesQuery } from "../schema";
-
-// Generic utility types for extracting array item types
-type ArrayItem<T> = T extends (infer Item)[] ? Item : never;
-type NonNullableArrayItem<T> = NonNullable<ArrayItem<NonNullable<T>>>;
-
-// ObjectInfos extraction
-export type GetObjectInfosQueryObjectInfos = NonNullable<
-	GetObjectInfosQuery["uiapi"]["objectInfos"]
->;
-export type GetObjectInfosQueryObjectInfo = NonNullableArrayItem<GetObjectInfosQueryObjectInfos>;
-export type GetObjectInfosQueryField = NonNullableArrayItem<
-	GetObjectInfosQueryObjectInfo["fields"]
->;
-
-// ObjectInfoResult types
-export type ObjectInfoResult = Omit<GetObjectInfosQueryObjectInfo, "fields"> & {
-	fields: Record<string, GetObjectInfosQueryField>;
-};
-export type ObjectInfoBatchResponse = {
-	results: { result: ObjectInfoResult; statusCode: number }[];
-};
-
-// Picklist values extraction
-export type GetPicklistValuesQueryObjectInfos = GetPicklistValuesQuery["uiapi"]["objectInfos"];
-export type GetPicklistValuesQueryObjectInfo =
-	NonNullableArrayItem<GetPicklistValuesQueryObjectInfos>;
-export type GetPicklistValuesQueryField = NonNullableArrayItem<
-	GetPicklistValuesQueryObjectInfo["fields"]
->;
-
-// Extract picklist-specific field type (the one with picklistValuesByRecordTypeIDs)
-type GetPicklistValuesQueryPicklistField = Extract<
-	GetPicklistValuesQueryField,
-	{ picklistValuesByRecordTypeIDs?: unknown }
->;
-
-// Extract types from picklistValuesByRecordTypeIDs
-type PicklistValuesByRecordTypeIDs =
-	GetPicklistValuesQueryPicklistField["picklistValuesByRecordTypeIDs"];
-type PicklistValuesByRecordTypeID = NonNullable<
-	NonNullable<PicklistValuesByRecordTypeIDs> extends (infer Item)[] ? Item : null
->;
-
-// Extract individual picklist value type
-type PicklistValues = NonNullable<PicklistValuesByRecordTypeID>["picklistValues"];
-export type PicklistValue = NonNullable<
-	NonNullable<PicklistValues> extends (infer Item)[] ? Item : null
->;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/recordDetail/recordDetail.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/recordDetail/recordDetail.ts
deleted file mode 100644
index ff7e646..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/recordDetail/recordDetail.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { z } from "zod";
-
-/**
- * Type definitions and Zod schemas for Record Detail APIs:
- * - Layout API (layout/{objectApiName}?layoutType=Full&mode=View&recordTypeId=...)
- * - Record API (records/{recordId}?optionalFields=...)
- */
-
-const LayoutComponentSchema = z.object({
-	apiName: z.string().nullable(),
-	behavior: z.string().optional(),
-	componentType: z.enum(["Field", "CustomLink", "EmptySpace"]),
-	customLinkUrl: z.string().optional(),
-	label: z.string().optional(),
-});
-
-export type LayoutComponent = z.infer<typeof LayoutComponentSchema>;
-
-const LayoutItemSchema = z.object({
-	editableForNew: z.boolean(),
-	editableForUpdate: z.boolean(),
-	label: z.string(),
-	layoutComponents: z.array(LayoutComponentSchema),
-	lookupIdApiName: z.string().nullable(),
-	required: z.boolean(),
-	sortable: z.boolean(),
-	uiBehavior: z.string().nullable(),
-});
-
-export type LayoutItem = z.infer<typeof LayoutItemSchema>;
-
-const LayoutRowSchema = z.object({
-	layoutItems: z.array(LayoutItemSchema),
-});
-
-const LayoutSectionSchema = z.object({
-	collapsible: z.boolean(),
-	columns: z.number(),
-	heading: z.string(),
-	id: z.string(),
-	layoutRows: z.array(LayoutRowSchema),
-	rows: z.number(),
-	tabOrder: z.string(),
-	useHeading: z.boolean(),
-});
-
-export type LayoutSection = z.infer<typeof LayoutSectionSchema>;
-
-export const LayoutResponseSchema = z.object({
-	eTag: z.string(),
-	id: z.string(),
-	layoutType: z.string(),
-	mode: z.string(),
-	objectApiName: z.string(),
-	recordTypeId: z.string(),
-	saveOptions: z.array(z.unknown()).optional(),
-	sections: z.array(LayoutSectionSchema),
-});
-
-export type LayoutResponse = z.infer<typeof LayoutResponseSchema>;
-export type LayoutRow = z.infer<typeof LayoutRowSchema>;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/schema.d.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/schema.d.ts
deleted file mode 100644
index 962189f..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/schema.d.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-export type Maybe<T> = T | null;
-export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
-export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = {
-	[_ in K]?: never;
-};
-export type Incremental<T> =
-	| T
-	| { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
-/** All built-in and custom scalars, mapped to their actual values */
-export type Scalars = {
-	ID: { input: string; output: string };
-	String: { input: string; output: string };
-	Boolean: { input: boolean; output: boolean };
-	Int: { input: number; output: number };
-	Float: { input: number; output: number };
-	Base64: { input: string; output: string };
-	/** An arbitrary precision signed decimal */
-	BigDecimal: { input: number | string; output: number };
-	/** An arbitrary precision signed integer */
-	BigInteger: { input: number; output: number };
-	/** An 8-bit signed integer */
-	Byte: { input: number; output: number };
-	/** A UTF-16 code unit; a character on Unicode's BMP */
-	Char: { input: number; output: number };
-	Currency: { input: number | string; output: number };
-	Date: { input: string; output: string };
-	DateTime: { input: string; output: string };
-	Double: { input: number | string; output: number };
-	Email: { input: string; output: string };
-	EncryptedString: { input: string; output: string };
-	/** Can be set to an ID or a Reference to the result of another mutation operation. */
-	IdOrRef: { input: string; output: string };
-	JSON: { input: string; output: string };
-	Latitude: { input: number | string; output: number };
-	/** A 64-bit signed integer */
-	Long: { input: number; output: number };
-	LongTextArea: { input: string; output: string };
-	Longitude: { input: number | string; output: number };
-	MultiPicklist: { input: string; output: string };
-	Percent: { input: number | string; output: number };
-	PhoneNumber: { input: string; output: string };
-	Picklist: { input: string; output: string };
-	RichTextArea: { input: string; output: string };
-	/** A 16-bit signed integer */
-	Short: { input: number; output: number };
-	TextArea: { input: string; output: string };
-	Time: { input: string; output: string };
-	Url: { input: string; output: string };
-};
-
-export enum DataType {
-	Address = "ADDRESS",
-	Anytype = "ANYTYPE",
-	Base64 = "BASE64",
-	Boolean = "BOOLEAN",
-	Combobox = "COMBOBOX",
-	Complexvalue = "COMPLEXVALUE",
-	Currency = "CURRENCY",
-	Date = "DATE",
-	Datetime = "DATETIME",
-	Double = "DOUBLE",
-	Email = "EMAIL",
-	Encryptedstring = "ENCRYPTEDSTRING",
-	Int = "INT",
-	Json = "JSON",
-	Junctionidlist = "JUNCTIONIDLIST",
-	Location = "LOCATION",
-	Long = "LONG",
-	Multipicklist = "MULTIPICKLIST",
-	Percent = "PERCENT",
-	Phone = "PHONE",
-	Picklist = "PICKLIST",
-	Reference = "REFERENCE",
-	String = "STRING",
-	Textarea = "TEXTAREA",
-	Time = "TIME",
-	Url = "URL",
-}
-
-export enum FieldExtraTypeInfo {
-	ExternalLookup = "EXTERNAL_LOOKUP",
-	ImageUrl = "IMAGE_URL",
-	IndirectLookup = "INDIRECT_LOOKUP",
-	Personname = "PERSONNAME",
-	Plaintextarea = "PLAINTEXTAREA",
-	Richtextarea = "RICHTEXTAREA",
-	SwitchablePersonname = "SWITCHABLE_PERSONNAME",
-}
-
-/** Input for ObjectInfo and PickValues */
-export type ObjectInfoInput = {
-	apiName: Scalars["String"]["input"];
-	fieldNames?: InputMaybe<Array<Scalars["String"]["input"]>>;
-	recordTypeIDs?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-};
-
-export enum ResultOrder {
-	Asc = "ASC",
-	Desc = "DESC",
-}
-
-export type GetObjectInfosQueryVariables = Exact<{
-	apiNames: Array<Scalars["String"]["input"]> | Scalars["String"]["input"];
-}>;
-
-export type GetObjectInfosQuery = {
-	uiapi: {
-		objectInfos?: Array<{
-			ApiName: string;
-			label?: string | null;
-			labelPlural?: string | null;
-			nameFields: Array<string | null>;
-			defaultRecordTypeId?: string | null;
-			keyPrefix?: string | null;
-			layoutable: boolean;
-			queryable: boolean;
-			searchable: boolean;
-			updateable: boolean;
-			deletable: boolean;
-			createable: boolean;
-			custom: boolean;
-			mruEnabled: boolean;
-			feedEnabled: boolean;
-			fields: Array<
-				| {
-						ApiName: string;
-						label?: string | null;
-						dataType?: DataType | null;
-						relationshipName?: string | null;
-						reference: boolean;
-						compound: boolean;
-						compoundFieldName?: string | null;
-						compoundComponentName?: string | null;
-						controllingFields: Array<string | null>;
-						controllerName?: string | null;
-						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
-				  }
-				| {
-						ApiName: string;
-						label?: string | null;
-						dataType?: DataType | null;
-						relationshipName?: string | null;
-						reference: boolean;
-						compound: boolean;
-						compoundFieldName?: string | null;
-						compoundComponentName?: string | null;
-						controllingFields: Array<string | null>;
-						controllerName?: string | null;
-						referenceToInfos: Array<{ ApiName: string; nameFields: Array<string | null> } | null>;
-				  }
-				| null
-			>;
-			recordTypeInfos: Array<{
-				recordTypeId?: string | null;
-				name?: string | null;
-				master: boolean;
-				available: boolean;
-				defaultRecordTypeMapping: boolean;
-			} | null>;
-			themeInfo?: { color?: string | null; iconUrl?: string | null } | null;
-			childRelationships: Array<{
-				relationshipName?: string | null;
-				fieldName?: string | null;
-				childObjectApiName: string;
-			} | null>;
-			dependentFields: Array<{ controllingField: string } | null>;
-		} | null> | null;
-	};
-};
-
-export type GetPicklistValuesQueryVariables = Exact<{
-	objectInfoInputs: Array<ObjectInfoInput> | ObjectInfoInput;
-}>;
-
-export type GetPicklistValuesQuery = {
-	uiapi: {
-		objectInfos?: Array<{
-			ApiName: string;
-			fields: Array<
-				| {
-						ApiName: string;
-						picklistValuesByRecordTypeIDs?: Array<{
-							recordTypeID: string;
-							defaultValue?: { value?: string | null } | null;
-							picklistValues?: Array<{
-								label?: string | null;
-								value?: string | null;
-								validFor?: Array<number | null> | null;
-							}> | null;
-						} | null> | null;
-				  }
-				| { ApiName: string }
-				| null
-			>;
-		} | null> | null;
-	};
-};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/apiUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/apiUtils.ts
deleted file mode 100644
index 1c41e30..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/apiUtils.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * API Utilities
- *
- * Generic utility functions for API requests, validation, and URL handling.
- */
-
-import type { ZodSchema } from "zod";
-
-export interface FetchAndValidateOptions<T> {
-	schema: ZodSchema<T>;
-	errorContext: string;
-	extractData?: (data: unknown) => unknown;
-}
-
-export async function fetchAndValidate<T>(
-	fetchFn: () => Promise<Response>,
-	options: FetchAndValidateOptions<T>,
-): Promise<T> {
-	const { schema, errorContext, extractData } = options;
-
-	try {
-		const response = await fetchFn();
-
-		if (!response.ok) {
-			throw new Error(`Failed to fetch ${errorContext}: ${response.status} ${response.statusText}`);
-		}
-
-		const data = await response.json();
-		const dataToValidate = extractData ? extractData(data) : data;
-		const validationResult = schema.safeParse(dataToValidate);
-
-		if (!validationResult.success) {
-			throw new Error(`Invalid ${errorContext} response format: ${validationResult.error.message}`);
-		}
-
-		return validationResult.data;
-	} catch (error) {
-		if (error instanceof Error && error.name === "ZodError") {
-			throw new Error(`Invalid ${errorContext} response format: ${error.message}`);
-		}
-
-		if (
-			error instanceof Error &&
-			(error.message.includes("Failed to fetch") || error.message.includes("Invalid"))
-		) {
-			throw error;
-		}
-
-		throw new Error(
-			`Error fetching ${errorContext}: ${
-				error instanceof Error ? error.message : (error?.toString() ?? "Unknown error")
-			}`,
-		);
-	}
-}
-
-export function safeEncodePath(segment: string): string {
-	return encodeURIComponent(segment);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/cacheUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/cacheUtils.ts
deleted file mode 100644
index 31d6688..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/cacheUtils.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Cache Utilities
- *
- * Utility functions for creating deterministic cache keys and managing cache operations.
- */
-
-import type { FilterCriteria } from "../types/filters/filters";
-
-/**
- * Creates a deterministic cache key from filter criteria array.
- * Sorts filters and their values to ensure consistent keys regardless of input order.
- *
- * @param filters - Array of filter criteria (FilterCriteria[])
- * @returns Deterministic string key for caching
- *
- * @remarks
- * - Sorts filters by objectApiName, then fieldPath, then operator
- * - Sorts values within each filter to ensure consistency
- * - Handles null/undefined values safely
- * - Prevents cache key collisions from different object ordering
- *
- * Why is sorting required?
- * If a user filters by "Name" then "Date", the array is [Name, Date].
- * If they filter by "Date" then "Name", the array is [Date, Name].
- * - Without sorting, these would generate different cache keys ("Name-Date" vs "Date-Name"),
- * causing the app to re-fetch data it actually already has. Sorting ensures that
- * the order of user clicks doesn't invalidate the cache.
- *
- 
- * @example
- * ```tsx
- * const cacheKey = createFiltersKey(filters);
- * ```
- */
-export function createFiltersKey(filters: FilterCriteria[]): string {
-	if (!Array.isArray(filters) || filters.length === 0) {
-		return "[]";
-	}
-
-	const normalized = filters
-		.map((filter) => {
-			if (!filter || typeof filter !== "object") {
-				return null;
-			}
-
-			const f = filter as FilterCriteria;
-
-			const sortedValues =
-				Array.isArray(f.values) && f.values.length > 0
-					? [...f.values].sort((a, b) => {
-							const aStr = a.toString();
-							const bStr = b.toString();
-							return aStr.localeCompare(bStr);
-						})
-					: [];
-
-			return {
-				objectApiName: f.objectApiName ?? "",
-				fieldPath: f.fieldPath ?? "",
-				operator: f.operator ?? "",
-				values: sortedValues,
-			};
-		})
-		.filter((f): f is NonNullable<typeof f> => f !== null)
-		.sort((a, b) => {
-			const objectCompare = a.objectApiName.localeCompare(b.objectApiName);
-			if (objectCompare !== 0) return objectCompare;
-
-			const fieldCompare = a.fieldPath.localeCompare(b.fieldPath);
-			if (fieldCompare !== 0) return fieldCompare;
-
-			return a.operator.localeCompare(b.operator);
-		});
-
-	return JSON.stringify(normalized);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/debounce.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/debounce.ts
deleted file mode 100644
index def0b68..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/debounce.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Debounce Utility
- *
- * Provides debouncing functionality for functions with React-safe cleanup methods.
- */
-
-/**
- * Interface for the debounced function, exposing utility methods.
- */
-export interface DebouncedFunc<T extends (...args: any[]) => any> {
-	/**
-	 * Call the original function, but delayed.
-	 */
-	(...args: Parameters<T>): void;
-	/**
-	 * Cancel any pending execution.
-	 */
-	cancel: () => void;
-	/**
-	 * Immediately execute the pending function (if any) and clear the timer.
-	 * Useful for saving data before unmounting.
-	 */
-	flush: () => void;
-}
-
-/**
- * Creates a debounced function that delays invoking func until after wait milliseconds
- * have elapsed since the last time the debounced function was invoked.
- *
- * @param func - The function to debounce
- * @param wait - The number of milliseconds to delay
- * @returns A debounced function with .cancel() and .flush() methods
- *
- * @remarks
- * - Includes .cancel() method for cleanup in React useEffects
- * - Includes .flush() method to immediately execute pending calls
- * - Preserves function context (this binding)
- * - Type-safe with TypeScript generics
- *
- * @example
- * ```tsx
- * const debouncedSearch = debounce((query: string) => {
- *   performSearch(query);
- * }, 300);
- *
- * // In useEffect cleanup
- * return () => debouncedSearch.cancel();
- * ```
- */
-export function debounce<T extends (...args: any[]) => any>(
-	func: T,
-	wait: number,
-): DebouncedFunc<T> {
-	// 1. Type Safety: Use a generic return type compatible with Browser and Node
-	let timeoutId: ReturnType<typeof setTimeout> | null = null;
-	let lastContext: ThisParameterType<T> | null = null;
-	let lastArgs: Parameters<T> | null = null;
-	function debounced(this: ThisParameterType<T>, ...args: Parameters<T>) {
-		// 2. Context Safety: Capture 'this' to support class methods
-		// eslint-disable-next-line @typescript-eslint/no-this-alias -- required for debouncing class methods
-		lastContext = this;
-		lastArgs = args;
-		if (timeoutId) {
-			clearTimeout(timeoutId);
-		}
-		timeoutId = setTimeout(() => {
-			func.apply(lastContext, lastArgs as Parameters<T>);
-			timeoutId = null;
-			lastArgs = null;
-			lastContext = null;
-		}, wait);
-	}
-	// 3. React Safety: Add a cancel method to clear pending timers
-	debounced.cancel = () => {
-		if (timeoutId) {
-			clearTimeout(timeoutId);
-			timeoutId = null;
-		}
-		lastArgs = null;
-		lastContext = null;
-	};
-
-	debounced.flush = () => {
-		if (timeoutId && lastArgs) {
-			func.apply(lastContext, lastArgs);
-			debounced.cancel();
-		}
-	};
-	return debounced;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldUtils.ts
deleted file mode 100644
index b2611cb..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldUtils.ts
+++ /dev/null
@@ -1,354 +0,0 @@
-/**
- * Field value extraction and formatting for Salesforce UI API record shapes.
- * Handles primitives, nested paths (e.g. Owner.Alias), reference/relationship display,
- * address and modstamp compound formatting, and layout-item value clubbing.
- */
-
-import type { FieldValue, ComplexFieldValue } from "../types/search/searchResults";
-
-/** Fallback field names for reference/relationship display when object info nameFields are not available. */
-const DISPLAY_FIELD_CANDIDATES = [
-	"Name",
-	"CaseNumber",
-	"Subject",
-	"Title",
-	"DeveloperName",
-	"ContractNumber",
-] as const;
-
-function isDefined(val: unknown): val is string | number | boolean {
-	return val !== null && val !== undefined;
-}
-
-function isComplexValue(val: unknown): val is ComplexFieldValue {
-	return typeof val === "object" && val !== null && "fields" in val;
-}
-
-function extractComplexValue(complex: ComplexFieldValue): string | null {
-	const fields = complex.fields;
-	if (!fields) return null;
-
-	for (const fieldName of DISPLAY_FIELD_CANDIDATES) {
-		const field = fields[fieldName];
-		if (field) {
-			if (isDefined(field.displayValue)) {
-				return field.displayValue;
-			}
-			if (isDefined(field.value)) {
-				return field.value.toString();
-			}
-		}
-	}
-
-	return null;
-}
-
-function extractFieldPrimitive(field: FieldValue): string | number | boolean | null {
-	if (isDefined(field.displayValue)) {
-		return field.displayValue;
-	}
-
-	if (isComplexValue(field.value)) {
-		const extracted = extractComplexValue(field.value);
-		return extracted !== null ? extracted : null;
-	}
-
-	if (isDefined(field.value)) {
-		return field.value;
-	}
-
-	return null;
-}
-
-export type FieldValueWithRelationship = FieldValue & {
-	relationshipField?: FieldValue | null;
-	constituents?: Record<string, FieldValue>;
-};
-
-/** Id + Date pairs for Created By / Last Modified By (UI API modstamp convention). */
-const MODSTAMP_FIELDS = [
-	{ idFieldName: "CreatedById", dateFieldName: "CreatedDate" },
-	{ idFieldName: "LastModifiedById", dateFieldName: "LastModifiedDate" },
-] as const;
-
-function isModstampConstituents(constituents: Record<string, FieldValue>): boolean {
-	return MODSTAMP_FIELDS.some(
-		({ idFieldName, dateFieldName }) =>
-			idFieldName in constituents && dateFieldName in constituents,
-	);
-}
-
-/**
- * Formats an ISO 8601 date-time string to the user's locale and timezone.
- * Uses the browser's default locale and local timezone.
- */
-export function formatDateTimeForDisplay(isoOrDateString: string): string {
-	if (!isoOrDateString || typeof isoOrDateString !== "string") return isoOrDateString;
-	const trimmed = isoOrDateString.trim();
-	if (!trimmed) return isoOrDateString;
-	const date = new Date(trimmed);
-	if (Number.isNaN(date.getTime())) return isoOrDateString;
-	try {
-		return new Intl.DateTimeFormat(undefined, {
-			dateStyle: "medium",
-			timeStyle: "short",
-		}).format(date);
-	} catch {
-		return isoOrDateString;
-	}
-}
-
-function formatModstampDisplay(constituents: Record<string, FieldValue>): string {
-	for (const { idFieldName, dateFieldName } of MODSTAMP_FIELDS) {
-		const idField = constituents[idFieldName];
-		const dateField = constituents[dateFieldName];
-		if (!idField || !dateField) continue;
-		const idWithRel = idField as FieldValueWithRelationship;
-		const name =
-			idWithRel.relationshipField != null
-				? getPrimitiveString(idWithRel.relationshipField)
-				: getPrimitiveString(idField);
-		const dateRaw = getPrimitiveString(dateField);
-		const date = dateRaw ? formatDateTimeForDisplay(dateRaw) : "";
-		const parts = [name, date].filter(Boolean);
-		if (parts.length) return parts.join(" ");
-	}
-	return "";
-}
-
-const ADDRESS_STREET_SUFFIXES = ["Street"];
-const ADDRESS_CITY_SUFFIXES = ["City"];
-const ADDRESS_STATE_SUFFIXES = ["State", "StateCode"];
-const ADDRESS_POSTAL_SUFFIXES = ["PostalCode"];
-const ADDRESS_COUNTRY_SUFFIXES = ["Country", "CountryCode"];
-
-function getPrimitiveString(fv: FieldValue | undefined): string {
-	if (!fv) return "";
-	const p = extractFieldPrimitive(fv);
-	return ((p as string) || "").trim();
-}
-
-function fieldNameEndsWithOneOf(name: string, suffixes: string[]): boolean {
-	return suffixes.some(
-		(s) =>
-			name === s || name.endsWith(s) || (name.endsWith("__c") && name.slice(0, -3).endsWith(s)),
-	);
-}
-
-function findAddressPartKey(keys: string[], suffixes: string[]): string | undefined {
-	return keys.find((k) => fieldNameEndsWithOneOf(k, suffixes));
-}
-
-export interface AddressParts {
-	street: string;
-	city: string;
-	state: string;
-	postalCode: string;
-	country: string;
-}
-
-export function getAddressPartsFromConstituents(
-	constituents: Record<string, FieldValue>,
-): AddressParts {
-	const keys = Object.keys(constituents);
-	const streetKey = findAddressPartKey(keys, ADDRESS_STREET_SUFFIXES);
-	const cityKey = findAddressPartKey(keys, ADDRESS_CITY_SUFFIXES);
-	const stateKey = findAddressPartKey(keys, ADDRESS_STATE_SUFFIXES);
-	const postalKey = findAddressPartKey(keys, ADDRESS_POSTAL_SUFFIXES);
-	const countryKey = findAddressPartKey(keys, ADDRESS_COUNTRY_SUFFIXES);
-	return {
-		street: streetKey ? getPrimitiveString(constituents[streetKey]) : "",
-		city: cityKey ? getPrimitiveString(constituents[cityKey]) : "",
-		state: stateKey ? getPrimitiveString(constituents[stateKey]) : "",
-		postalCode: postalKey ? getPrimitiveString(constituents[postalKey]) : "",
-		country: countryKey ? getPrimitiveString(constituents[countryKey]) : "",
-	};
-}
-
-export function isAddressConstituents(constituents: Record<string, FieldValue>): boolean {
-	const keys = Object.keys(constituents);
-	const hasStreet = !!findAddressPartKey(keys, ADDRESS_STREET_SUFFIXES);
-	const hasCity = !!findAddressPartKey(keys, ADDRESS_CITY_SUFFIXES);
-	const hasState = !!findAddressPartKey(keys, ADDRESS_STATE_SUFFIXES);
-	const hasCountry = !!findAddressPartKey(keys, ADDRESS_COUNTRY_SUFFIXES);
-	return hasStreet && (hasCity || hasState || hasCountry);
-}
-
-export function formatAddressDisplay(parts: AddressParts): string {
-	const { street, city, state, postalCode, country } = parts;
-	const statePostal = [state, postalCode].filter(Boolean).join(" ");
-	const line2 = city ? (statePostal ? `${city}, ${statePostal}` : city) : statePostal;
-	const lines = [street, line2, country].filter(Boolean);
-	return lines.join("\n").trim();
-}
-
-export function formatAddressFromConstituents(constituents: Record<string, FieldValue>): string {
-	const parts = getAddressPartsFromConstituents(constituents);
-	return formatAddressDisplay(parts);
-}
-
-function isModstampApiNames(apiNames: string[]): boolean {
-	return MODSTAMP_FIELDS.some(
-		({ idFieldName, dateFieldName }) =>
-			apiNames.includes(idFieldName) && apiNames.includes(dateFieldName),
-	);
-}
-
-function isAddressApiNames(apiNames: string[]): boolean {
-	const hasStreet = apiNames.some((n) => fieldNameEndsWithOneOf(n, ADDRESS_STREET_SUFFIXES));
-	const hasCity = apiNames.some((n) => fieldNameEndsWithOneOf(n, ADDRESS_CITY_SUFFIXES));
-	const hasState = apiNames.some((n) => fieldNameEndsWithOneOf(n, ADDRESS_STATE_SUFFIXES));
-	const hasCountry = apiNames.some((n) => fieldNameEndsWithOneOf(n, ADDRESS_COUNTRY_SUFFIXES));
-	return hasStreet && (hasCity || hasState || hasCountry);
-}
-
-export interface LayoutItemDisplayResult {
-	value: string | number | boolean | null;
-	dataType?: string;
-}
-
-export function getDisplayValueForLayoutItem(
-	fields: Record<string, FieldValue> | undefined,
-	componentApiNames: string[],
-): LayoutItemDisplayResult {
-	if (!fields || componentApiNames.length === 0) {
-		return { value: null };
-	}
-	if (componentApiNames.length === 1) {
-		const value = getDisplayValueForDetailField(
-			fields[componentApiNames[0]] as FieldValueWithRelationship | undefined,
-		);
-		return { value };
-	}
-	const constituents: Record<string, FieldValue> = {};
-	for (const apiName of componentApiNames) {
-		if (fields[apiName] != null) constituents[apiName] = fields[apiName];
-	}
-	if (isModstampApiNames(componentApiNames)) {
-		const value = formatModstampDisplay(constituents);
-		return { value: value || null };
-	}
-	if (isAddressApiNames(componentApiNames)) {
-		const parts = getAddressPartsFromConstituents(constituents);
-		const value = formatAddressDisplay(parts);
-		return { value: value || null, dataType: "Address" };
-	}
-	const values = componentApiNames
-		.map((apiName) =>
-			getDisplayValueForDetailField(fields[apiName] as FieldValueWithRelationship | undefined),
-		)
-		.filter((v) => v !== null && v !== undefined && v !== "");
-	return { value: values.length > 0 ? values.join(", ") : null };
-}
-
-export function getDisplayValueForDetailField(
-	field: FieldValueWithRelationship | undefined,
-): string | number | boolean | null {
-	if (!field) return null;
-	const withExt = field as FieldValueWithRelationship;
-	if (withExt.relationshipField != null) {
-		const fromRel = extractFieldPrimitive(withExt.relationshipField);
-		if (fromRel !== null && fromRel !== undefined && fromRel !== "") {
-			return fromRel;
-		}
-	}
-	if (withExt.constituents != null) {
-		if (isModstampConstituents(withExt.constituents)) {
-			const formatted = formatModstampDisplay(withExt.constituents);
-			if (formatted) return formatted;
-		} else if (isAddressConstituents(withExt.constituents)) {
-			const formatted = formatAddressFromConstituents(withExt.constituents);
-			if (formatted) return formatted;
-		}
-	}
-	return extractFieldPrimitive(field);
-}
-
-export function getNestedFieldValue(
-	fields: Record<string, FieldValue> | undefined,
-	fieldPath: string,
-): string | number | boolean | null {
-	if (!fields || !fieldPath) {
-		return null;
-	}
-
-	const pathParts = fieldPath.split(".");
-	if (pathParts.length === 1) {
-		const field = fields[fieldPath];
-		if (!field) return null;
-
-		return extractFieldPrimitive(field);
-	}
-
-	let currentFields: Record<string, FieldValue> | undefined = fields;
-	for (let i = 0; i < pathParts.length - 1; i++) {
-		const part = pathParts[i];
-		if (!currentFields || !currentFields[part]) {
-			return null;
-		}
-
-		const field: FieldValue = currentFields[part];
-		if (isComplexValue(field.value)) {
-			currentFields = field.value.fields;
-		} else {
-			return null;
-		}
-	}
-
-	const finalFieldName = pathParts[pathParts.length - 1];
-	if (!currentFields || !currentFields[finalFieldName]) {
-		return null;
-	}
-
-	const finalField = currentFields[finalFieldName];
-	return extractFieldPrimitive(finalField);
-}
-
-/** Minimal metadata for record display name (nameFields from object info API). */
-export type RecordDisplayNameMetadata = { nameFields?: string[] } | null;
-
-/**
- * Resolves a display name for a record: tries metadata.nameFields first, then
- * DISPLAY_FIELD_CANDIDATES (Name, Subject, etc.), then record.id.
- */
-export function getRecordDisplayName(
-	record: { id: string; fields: Record<string, FieldValue> },
-	metadata?: RecordDisplayNameMetadata,
-): string {
-	const candidates = [...(metadata?.nameFields ?? []), ...DISPLAY_FIELD_CANDIDATES];
-	for (const fieldPath of candidates) {
-		const v = getNestedFieldValue(record.fields, fieldPath);
-		return v as string;
-	}
-	return record.id;
-}
-
-/** Adapts object info (e.g. ObjectInfoResult) to the shape expected by getRecordDisplayName. */
-export function toRecordDisplayNameMetadata(obj: unknown): RecordDisplayNameMetadata {
-	if (obj != null && typeof obj === "object" && "nameFields" in obj) {
-		const nameFields = (obj as { nameFields?: string[] }).nameFields;
-		if (Array.isArray(nameFields)) return { nameFields };
-	}
-	return null;
-}
-
-export function extractFieldValue(
-	fieldValue: FieldValue | undefined,
-	useDisplayValue: boolean = false,
-): string {
-	if (!fieldValue) {
-		return "—";
-	}
-
-	if (useDisplayValue && isDefined(fieldValue.displayValue)) {
-		return fieldValue.displayValue;
-	}
-
-	const extracted = extractFieldPrimitive(fieldValue);
-
-	if (extracted !== null) {
-		return extracted as string;
-	}
-
-	return "—";
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldValueExtractor.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldValueExtractor.ts
deleted file mode 100644
index 4859d0e..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/fieldValueExtractor.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import type { FieldValue, ComplexFieldValue } from "../types/search/searchResults";
-
-const DISPLAY_FIELD_CANDIDATES = [
-	"Name",
-	"CaseNumber",
-	"Subject",
-	"Title",
-	"DeveloperName",
-	"ContractNumber",
-];
-/**
- * Extracts the display value from a field value, handling nested structures
- * For complex fields like Owner, extracts nested values from fields.Name.value
- */
-export function extractFieldValue(
-	fieldValue: FieldValue | undefined,
-	useDisplayValue: boolean = false,
-): string {
-	if (!fieldValue) {
-		return "—";
-	}
-
-	// If displayValue exists and is not null, use it (highest priority)
-	if (useDisplayValue && isDefined(fieldValue.displayValue)) {
-		return fieldValue.displayValue;
-	}
-
-	// If value is a complex object (like Owner), extract nested value
-	if (isComplexValue(fieldValue.value)) {
-		return extractComplexValue(fieldValue.value as ComplexFieldValue) ?? "—";
-	}
-
-	// Otherwise use the value directly (for simple fields)
-	if (isDefined(fieldValue.value)) {
-		return fieldValue.value as string;
-	}
-
-	return "—";
-}
-
-/**
- * Helper to safely extract name from related object
- */
-function extractComplexValue(complex: ComplexFieldValue): string | null {
-	const fields = complex.fields;
-	if (!fields) return null;
-	// Scale: Check the candidate list until we find a field that exists and has a value
-	for (const fieldName of DISPLAY_FIELD_CANDIDATES) {
-		const field = fields[fieldName];
-		if (field) {
-			// Priority: DisplayValue -> Value
-			if (isDefined(field.displayValue)) return field.displayValue;
-			if (isDefined(field.value)) return field.value as string;
-		}
-	}
-
-	return null;
-}
-/**
- * Type Guard checks
- */
-function isDefined(val: unknown): val is string | number | boolean {
-	return val !== null && val !== undefined;
-}
-function isComplexValue(val: unknown): val is ComplexFieldValue {
-	return typeof val === "object" && val !== null;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/filterUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/filterUtils.ts
deleted file mode 100644
index 8fcfd21..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/filterUtils.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Filter Utilities
- *
- * Utility functions for filter value parsing and transformation.
- * These utilities handle the conversion of form values to filter criteria.
- */
-
-/**
- * Parses a string value to either a number or string
- * Attempts to parse as integer, falls back to trimmed string if not a valid number
- *
- * @param val - The value to parse (string)
- * @returns Parsed number if valid, otherwise trimmed string, or empty string if input is empty
- *
- * @remarks
- * - Returns empty string for empty/whitespace input
- * - Attempts integer parsing first
- * - Falls back to trimmed string if parsing fails
- * - Used for filter values that can be either numeric or text
- *
- * @example
- * ```tsx
- * const parsed = parseFilterValue("123"); // 123 (number)
- * const parsed = parseFilterValue("abc"); // "abc" (string)
- * const parsed = parseFilterValue("  "); // "" (empty string)
- * ```
- */
-export function parseFilterValue(val: string): string | number {
-	if (!val.trim()) return "";
-	const numVal = parseInt(val.trim(), 10);
-	return isNaN(numVal) ? val.trim() : numVal;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formDataTransformUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formDataTransformUtils.ts
deleted file mode 100644
index 038d428..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formDataTransformUtils.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Transforms UI API record + object info into detail form shape: Reference fields get
- * relationshipField, compound fields get constituents, metadata gets editable flag.
- * Aligns with LWC detailForm _calculateFormData and uiApiDataTransformHelper.
- */
-
-import type { FieldValue } from "../types/search/searchResults";
-
-/** Field metadata from object info API (subset used by form transform). */
-export interface ObjectInfoFieldMetadata {
-	compound?: boolean;
-	compoundFieldName?: string;
-	compoundComponentName?: string;
-	dataType?: string;
-	relationshipName?: string;
-	updateable?: boolean;
-	calculated?: boolean;
-	polymorphicForeignKey?: boolean;
-	apiName?: string;
-	label?: string;
-	[name: string]: unknown;
-}
-
-/** Minimal UI API object info (metadata) for form data transform. */
-export interface ObjectInfoMetadata {
-	apiName?: string;
-	fields?: Record<string, ObjectInfoFieldMetadata>;
-	[name: string]: unknown;
-}
-
-/** Transformed field value: base FieldValue + relationshipField (Reference) and constituents (compound). */
-export interface TransformedFieldValue extends FieldValue {
-	relationshipField?: FieldValue;
-	constituents?: Record<string, TransformedFieldValue & { metadata?: ObjectInfoFieldMetadata }>;
-}
-
-export type TransformedDataFields = Record<string, TransformedFieldValue>;
-
-/** Form values keyed by record context id (e.g. record.id). */
-export type FormValues = Record<string, TransformedDataFields>;
-
-/** Form metadata keyed by metadata context (e.g. object apiName). */
-export type FormMetadata = Record<string, ObjectInfoMetadata>;
-
-/** Contexts: recordId -> objectApiName. */
-export type FormContexts = Record<string, string>;
-
-/** Result of calculateFormData (single record). */
-export interface FormData {
-	formValues: FormValues;
-	formMetadata: FormMetadata;
-	formContexts: FormContexts;
-}
-
-/** Fields never editable per UI API (platform convention). */
-const NON_EDITABLE_FIELDS = ["OwnerId", "RecordTypeId"];
-
-/** Created By / Last Modified By: synthetic compound from Id + Date (modstampMetadataTransform). */
-const SYSTEM_FIELDS = [
-	{
-		fieldName: "CreatedBy",
-		idFieldName: "CreatedById",
-		dateFieldName: "CreatedDate",
-		apiName: "CreatedBy",
-		compound: true,
-		dataType: "String",
-		label: "Created By",
-	},
-	{
-		fieldName: "LastModifiedBy",
-		idFieldName: "LastModifiedById",
-		dateFieldName: "LastModifiedDate",
-		apiName: "LastModifiedBy",
-		compound: true,
-		dataType: "String",
-		label: "Last Modified By",
-	},
-];
-
-function modstampMetadataTransform(metadata: ObjectInfoMetadata): ObjectInfoMetadata {
-	const fields = { ...metadata.fields };
-	if (!fields) return metadata;
-
-	SYSTEM_FIELDS.forEach((systemField) => {
-		const field = systemField.fieldName;
-		const idField = systemField.idFieldName;
-		const dateField = systemField.dateFieldName;
-		if (idField in fields && dateField in fields && metadata.fields) {
-			fields[field] = { ...metadata.fields[idField], ...systemField };
-			fields[idField] = {
-				...(metadata.fields[idField] ?? {}),
-				compoundComponentName: "Id",
-				compoundFieldName: field,
-			};
-			fields[dateField] = {
-				...(metadata.fields[dateField] ?? {}),
-				compoundComponentName: "Date",
-				compoundFieldName: field,
-			};
-		}
-	});
-	return { ...metadata, fields };
-}
-
-export function metaDataTransform(metadata: ObjectInfoMetadata): ObjectInfoMetadata {
-	const newMetadata = modstampMetadataTransform(metadata);
-	const fields: Record<string, ObjectInfoFieldMetadata> = {};
-	const metaFields = newMetadata.fields ?? {};
-	Object.keys(metaFields).forEach((fieldName) => {
-		const fieldRep = metaFields[fieldName];
-		const isCalculated = Boolean(fieldRep.calculated);
-		const isUpdateable = Boolean(fieldRep.updateable);
-		const isPolymorphicLookup = Boolean(fieldRep.polymorphicForeignKey);
-		fields[fieldName] = {
-			...fieldRep,
-			editable:
-				!isCalculated &&
-				isUpdateable &&
-				!isPolymorphicLookup &&
-				!NON_EDITABLE_FIELDS.includes(fieldName),
-		} as ObjectInfoFieldMetadata;
-	});
-	return { ...newMetadata, fields };
-}
-
-export function getConstituentMap(
-	dataFields: Record<string, FieldValue>,
-	fieldMetadata: Record<string, ObjectInfoFieldMetadata>,
-): Record<string, Record<string, TransformedFieldValue & { metadata?: ObjectInfoFieldMetadata }>> {
-	const constituentMap: Record<
-		string,
-		Record<string, TransformedFieldValue & { metadata?: ObjectInfoFieldMetadata }>
-	> = {};
-	Object.keys(fieldMetadata).forEach((fieldApiName) => {
-		const { compoundFieldName } = fieldMetadata[fieldApiName];
-		if (compoundFieldName && dataFields[fieldApiName]) {
-			const constituentFields =
-				constituentMap[compoundFieldName] ??
-				({} as Record<string, TransformedFieldValue & { metadata?: ObjectInfoFieldMetadata }>);
-			const raw = dataFields[fieldApiName] as TransformedFieldValue;
-			constituentFields[fieldApiName] = {
-				...raw,
-				metadata: fieldMetadata[fieldApiName],
-			};
-			constituentMap[compoundFieldName] = constituentFields;
-
-			const compoundMeta = fieldMetadata[compoundFieldName];
-			if (
-				compoundMeta?.dataType === "Address" &&
-				(fieldApiName.endsWith("StateCode") || fieldApiName.endsWith("CountryCode"))
-			) {
-				const nonPicklistName = fieldApiName.replace("Code", "");
-				if (fieldMetadata[nonPicklistName] && dataFields[nonPicklistName]) {
-					constituentFields[nonPicklistName] = {
-						...(dataFields[nonPicklistName] as TransformedFieldValue),
-						metadata: fieldMetadata[nonPicklistName],
-					};
-				}
-			}
-		}
-	});
-	if (constituentMap.Name) {
-		const constituentApiNames = Object.keys(constituentMap.Name);
-		if (constituentApiNames.length === 1 && constituentApiNames[0] === "Name") {
-			delete constituentMap.Name;
-		}
-	}
-	return constituentMap;
-}
-
-export function objectInfoFieldsTransform(
-	dataFields: Record<string, FieldValue>,
-	metadata: ObjectInfoMetadata,
-): TransformedDataFields {
-	const fieldMetadata = metadata.fields ?? {};
-	const transformedDataFields: TransformedDataFields = { ...dataFields };
-
-	Object.keys(fieldMetadata).forEach((field) => {
-		const meta = fieldMetadata[field];
-		if (meta.dataType === "Reference" && meta.relationshipName != null) {
-			const existing = dataFields[field];
-			const relField = dataFields[meta.relationshipName];
-			transformedDataFields[field] = {
-				...(existing ?? {}),
-				relationshipField: {
-					...(relField ?? {}),
-					value: null,
-				},
-			};
-		}
-	});
-
-	Object.keys(fieldMetadata).forEach((field) => {
-		const meta = fieldMetadata[field];
-		const { compound, dataType } = meta;
-		const existing = dataFields[field];
-		if (dataType === "Reference") return;
-		if (compound) {
-			transformedDataFields[field] = { ...(existing ?? {}) };
-		} else if (existing) {
-			transformedDataFields[field] = existing as TransformedFieldValue;
-		}
-	});
-
-	const constituentMap = getConstituentMap(transformedDataFields, fieldMetadata);
-	Object.keys(constituentMap).forEach((field) => {
-		if (transformedDataFields[field]) {
-			transformedDataFields[field] = {
-				...transformedDataFields[field],
-				constituents: constituentMap[field],
-			};
-		}
-	});
-	return transformedDataFields;
-}
-
-export function multiRecordMetadataTransform(
-	metadata: Record<string, ObjectInfoMetadata>,
-): FormMetadata {
-	const result: FormMetadata = {};
-	Object.keys(metadata).forEach((metadataContext) => {
-		result[metadataContext] = metaDataTransform(metadata[metadataContext]);
-	});
-	return result;
-}
-
-export function multiRecordValuesTransform(
-	values: Record<string, Record<string, FieldValue>>,
-	metadata: FormMetadata,
-	contexts: FormContexts,
-): FormValues {
-	const result: FormValues = {};
-	Object.keys(values).forEach((recordContext) => {
-		const metadataContext = contexts[recordContext];
-		if (metadataContext && metadata[metadataContext]) {
-			result[recordContext] = objectInfoFieldsTransform(
-				values[recordContext],
-				metadata[metadataContext],
-			);
-		}
-	});
-	return result;
-}
-
-export function calculateFormData(
-	record: { id: string; apiName: string; fields: Record<string, FieldValue> },
-	metadata: ObjectInfoMetadata | null | undefined,
-): FormData {
-	const formValues: FormValues = {};
-	const formMetadata: FormMetadata = {};
-	const formContexts: FormContexts = { [record.id]: record.apiName };
-
-	if (!metadata?.fields) {
-		return { formValues, formMetadata, formContexts };
-	}
-
-	formMetadata[record.apiName] = metaDataTransform(metadata);
-	formValues[record.id] = objectInfoFieldsTransform(record.fields, formMetadata[record.apiName]);
-	return { formValues, formMetadata, formContexts };
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formUtils.ts
deleted file mode 100644
index cc587a9..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/formUtils.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Form Utilities
- *
- * Utility functions for form validation and error handling.
- * These utilities are framework-agnostic and can be used with any form library.
- */
-
-/**
- * Form error structure from TanStack Form
- * Errors can be objects with a message property or strings
- */
-export interface FormError {
-	message: string;
-	[key: string]: unknown;
-}
-
-/**
- * Type guard to check if an error has a message property
- * @param error - The error to check
- * @returns true if the error has a message property
- */
-export function isFormError(error: unknown): error is FormError {
-	return (
-		typeof error === "object" &&
-		error !== null &&
-		"message" in error &&
-		typeof (error as FormError).message === "string"
-	);
-}
-
-/**
- * Extracts unique errors by message, filtering out duplicates
- * Handles both Error objects and string errors
- * Converts FormError objects to Error instances for compatibility with UI components
- *
- * @param errors - Array of error objects or strings from form libraries
- * @returns Array of unique Error objects (compatible with FieldError component)
- *
- * @example
- * ```tsx
- * const uniqueErrors = getUniqueErrors(formErrors);
- * ```
- */
-export function getUniqueErrors(errors: unknown[]): Error[] {
-	const errorMap = new Map<string, Error>();
-
-	for (const error of errors) {
-		if (isFormError(error)) {
-			// Use message as key to deduplicate
-			if (!errorMap.has(error.message)) {
-				// Convert FormError to Error for compatibility
-				const errorObj = new Error(error.message);
-				// Preserve additional properties if needed
-				Object.assign(errorObj, error);
-				errorMap.set(error.message, errorObj);
-			}
-		} else if (typeof error === "string") {
-			// Handle string errors
-			if (!errorMap.has(error)) {
-				errorMap.set(error, new Error(error));
-			}
-		} else if (error instanceof Error) {
-			// Handle Error objects directly
-			if (!errorMap.has(error.message)) {
-				errorMap.set(error.message, error);
-			}
-		}
-	}
-
-	return Array.from(errorMap.values());
-}
-
-/**
- * Validates that min value is less than or equal to max value for range filters
- * This utility can be used in form validation logic
- *
- * @param minValue - Minimum value (string or number)
- * @param maxValue - Maximum value (string or number)
- * @returns Error message if validation fails, null if valid
- *
- * @remarks
- * - If both values are empty, validation passes
- * - Only validates if both values can be parsed as numbers
- * - Returns null if values cannot be parsed (lets other validators handle it)
- *
- * @example
- * ```tsx
- * // In form validation
- * const minError = validateRangeValues(minFieldValue, maxFieldValue);
- * if (minError) {
- *   setFieldError('minField', minError);
- * }
- * ```
- */
-export function validateRangeValues(
-	minValue: string | number | null | undefined,
-	maxValue: string | number | null | undefined,
-): string | null {
-	// If both are empty, validation passes
-	if (!minValue && !maxValue) {
-		return null;
-	}
-
-	// Parse values to numbers if possible
-	const parseValue = (val: string | number | null | undefined): number | null => {
-		if (!val) {
-			return null;
-		}
-		if (typeof val === "number") {
-			return val;
-		}
-		const parsed = parseInt(val, 10);
-		return isNaN(parsed) ? null : parsed;
-	};
-
-	const minNum = parseValue(minValue);
-	const maxNum = parseValue(maxValue);
-
-	// If one is not a number, skip numeric validation (let other validators handle it)
-	if (minNum === null || maxNum === null) {
-		return null;
-	}
-
-	// Validate min <= max
-	if (minNum > maxNum) {
-		return "Minimum value must be less than or equal to maximum value";
-	}
-
-	return null;
-}
-
-export function getFormValueByPath(record: Record<string, unknown>, fieldPath: string): string {
-	if (!fieldPath) return "";
-	const parts = fieldPath.split(".");
-	let current: Record<string, unknown> = record;
-	for (const part of parts) {
-		if (current == null || typeof current !== "object") return "";
-		current = (current as Record<string, unknown>)[part] as unknown as Record<string, unknown>;
-	}
-	if (current === undefined || current === null) return "";
-	return "" + current;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLNodeFieldUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLNodeFieldUtils.ts
deleted file mode 100644
index cb3a148..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLNodeFieldUtils.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * GraphQL record node → display values for detail view.
- *
- * getGraphQLNodeValue: primitive by field path. getDisplayValueForDetailFieldFromNode: single field,
- * uses metadata to show relationship name instead of Id. getDisplayValueForLayoutItemFromNode:
- * single or compound (address, modstamp). getGraphQLRecordDisplayName: record title from nameFields.
- *
- * @module utils/graphQLNodeFieldUtils
- */
-
-import type { FieldValue } from "../types/search/searchResults";
-import type { GraphQLRecordNode } from "../api/recordListGraphQLService";
-import type { ObjectInfoMetadata } from "./formDataTransformUtils";
-import { getDisplayValueForLayoutItem, type LayoutItemDisplayResult } from "./fieldUtils";
-
-/** Metadata from getObjectInfoBatch (object metadata) used to resolve reference fields by relationshipName. */
-export type ObjectMetadataForDisplay = ObjectInfoMetadata | null | undefined;
-
-/**
- * Gets a primitive value from a GraphQL node by field path.
- * - "Id" -> node.Id (scalar)
- * - "Name" -> node.Name?.value
- * - "Owner.Alias" -> node.Owner?.Alias?.value
- */
-export function getGraphQLNodeValue(
-	node: GraphQLRecordNode | null | undefined,
-	fieldPath: string,
-): string | number | boolean | null {
-	if (!node || !fieldPath) return null;
-	const parts = fieldPath.split(".");
-	let current: unknown = node;
-	for (let i = 0; i < parts.length; i++) {
-		if (current == null || typeof current !== "object") return null;
-		current = (current as Record<string, unknown>)[parts[i]];
-	}
-	if (current == null) return null;
-	if (typeof current === "object" && current !== null && "value" in current) {
-		const v = (current as { value: unknown }).value;
-		if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") {
-			return v;
-		}
-		if (v === null) return null;
-		return v as string;
-	}
-	if (typeof current === "string" || typeof current === "number" || typeof current === "boolean") {
-		return current as string | number | boolean;
-	}
-	// Relationship/lookup objects: try DisplayValue (scalar or object), Name.value, then Id
-	if (typeof current === "object" && current !== null) {
-		const obj = current as Record<string, unknown>;
-		const displayVal = obj.DisplayValue ?? obj.displayValue;
-		if (displayVal != null) {
-			if (
-				typeof displayVal === "string" ||
-				typeof displayVal === "number" ||
-				typeof displayVal === "boolean"
-			) {
-				return displayVal;
-			}
-			if (typeof displayVal === "object" && "value" in displayVal) {
-				const v = (displayVal as { value: unknown }).value;
-				if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") return v;
-				if (v === null) return null;
-				return v as string;
-			}
-		}
-		const nameObj = obj.Name ?? obj.name;
-		if (nameObj != null && typeof nameObj === "object" && "value" in nameObj) {
-			const v = (nameObj as { value: unknown }).value;
-			if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") return v;
-			if (v === null) return null;
-			return v as string;
-		}
-		const idVal = obj.Id ?? obj.id;
-		if (
-			idVal != null &&
-			(typeof idVal === "string" || typeof idVal === "number" || typeof idVal === "boolean")
-		) {
-			return idVal;
-		}
-	}
-	return null;
-}
-
-/** Builds a minimal Record<string, FieldValue> from node for the given api names (for reuse with fieldUtils formatters). */
-function nodeToConstituentFields(
-	node: GraphQLRecordNode,
-	componentApiNames: string[],
-	metadata?: ObjectMetadataForDisplay,
-): Record<string, FieldValue> {
-	const fields: Record<string, FieldValue> = {};
-	for (const apiName of componentApiNames) {
-		const v = getDisplayValueForDetailFieldFromNode(node, apiName, metadata);
-		const displayValue = v as string | null;
-		fields[apiName] = { displayValue, value: v };
-	}
-	return fields;
-}
-
-/**
- * Resolves display value for a layout item from a GraphQL node (single or multiple components).
- * Reuses address/modstamp formatting from fieldUtils by building minimal constituent fields from the node.
- * Pass metadata from getObjectInfoBatch so reference fields show the relationship's name instead of Id.
- */
-export function getDisplayValueForLayoutItemFromNode(
-	node: GraphQLRecordNode | null | undefined,
-	componentApiNames: string[],
-	metadata?: ObjectMetadataForDisplay,
-): LayoutItemDisplayResult {
-	if (!node || componentApiNames.length === 0) {
-		return { value: null };
-	}
-	if (componentApiNames.length === 1) {
-		const apiName = componentApiNames[0];
-		const value = getDisplayValueForDetailFieldFromNode(node, apiName, metadata);
-		const dataType = metadata?.fields?.[apiName]?.dataType;
-		return { value, dataType };
-	}
-	const constituents = nodeToConstituentFields(node, componentApiNames, metadata);
-	const result = getDisplayValueForLayoutItem(constituents, componentApiNames);
-	return { value: result.value, dataType: result.dataType };
-}
-
-/**
- * Resolves display value for a single detail field from a GraphQL node.
- * When metadata from getObjectInfoBatch is provided and the field is a Reference (dataType === "Reference")
- * with a relationshipName, shows the related record's display value (e.g. Owner.Name) instead of the Id.
- */
-/** Treat dataType as Reference regardless of casing (e.g. REFERENCE from GraphQL). */
-function isReferenceDataType(dataType: string | undefined): boolean {
-	return dataType != null && dataType.toLowerCase() === "reference";
-}
-
-export function getDisplayValueForDetailFieldFromNode(
-	node: GraphQLRecordNode | null | undefined,
-	apiName: string,
-	metadata?: ObjectMetadataForDisplay,
-): string | number | boolean | null {
-	if (!node || !apiName) return null;
-	const fieldMeta = metadata?.fields?.[apiName];
-	if (
-		fieldMeta &&
-		isReferenceDataType(fieldMeta.dataType) &&
-		fieldMeta.relationshipName != null &&
-		fieldMeta.relationshipName !== ""
-	) {
-		const displayValue = getGraphQLNodeValue(node, fieldMeta.relationshipName);
-		if (displayValue !== null && displayValue !== undefined && displayValue !== "") {
-			return displayValue;
-		}
-	}
-	return getGraphQLNodeValue(node, apiName);
-}
-
-/** Fallback field names for record display name when nameFields are not available. */
-const DISPLAY_FIELD_CANDIDATES = [
-	"Name",
-	"CaseNumber",
-	"Subject",
-	"Title",
-	"DeveloperName",
-	"ContractNumber",
-] as const;
-
-/** Minimal metadata for record display name. */
-export type GraphQLRecordDisplayNameMetadata = { nameFields?: string[] } | null;
-
-/**
- * Resolves a display name for a record from a GraphQL node.
- * Tries metadata.nameFields first, then DISPLAY_FIELD_CANDIDATES, then node.Id.
- */
-export function getGraphQLRecordDisplayName(
-	node: GraphQLRecordNode | null | undefined,
-	metadata?: GraphQLRecordDisplayNameMetadata,
-): string {
-	if (!node) return "";
-	const id = (node.Id as string) ?? "";
-	const candidates = [...(metadata?.nameFields ?? []), ...DISPLAY_FIELD_CANDIDATES];
-	for (const fieldPath of candidates) {
-		const v = getGraphQLNodeValue(node, fieldPath);
-		if (v !== null && v !== undefined && v !== "") {
-			return v as string;
-		}
-	}
-	return id;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLObjectInfoAdapter.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLObjectInfoAdapter.ts
deleted file mode 100644
index 1cba6b0..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLObjectInfoAdapter.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * GraphQL objectInfos → REST-compatible object info and picklist.
- *
- * graphQLObjectInfoToObjectInfoResult / graphQLObjectInfosToBatchResponse: used by objectInfoService
- * after getObjectInfosGraphQL. extractPicklistValuesFromGraphQLObjectInfo: used for getPicklistValues.
- * Normalizes casing and adds synthetic compound fields (e.g. BillingAddress) for layout/dataType.
- *
- * @module utils/graphQLObjectInfoAdapter
- */
-
-import type {
-	ObjectInfoBatchResponse,
-	GetObjectInfosQueryObjectInfos,
-	GetPicklistValuesQueryObjectInfo,
-	GetPicklistValuesQueryField,
-	GetObjectInfosQueryObjectInfo,
-	ObjectInfoResult,
-	PicklistValue as GraphQLPicklistValue,
-} from "../types/objectInfo/objectInfo";
-import type { PicklistValue } from "../types/filters/picklist";
-
-export function graphQLObjectInfoToObjectInfoResult(
-	objectInfo: GetObjectInfosQueryObjectInfo,
-): ObjectInfoResult {
-	const { fields, ...rest } = objectInfo;
-	const fieldsRecord = Object.fromEntries((fields ?? []).map((field) => [field?.ApiName, field]));
-	return {
-		...rest,
-		fields: fieldsRecord,
-	};
-}
-
-/** Convert GraphQL objectInfos array to ObjectInfoBatchResponse (REST shape). */
-export function graphQLObjectInfosToBatchResponse(
-	objectInfos: GetObjectInfosQueryObjectInfos,
-	_requestedApiNames: string[],
-): ObjectInfoBatchResponse {
-	const results = objectInfos.map((objectInfo) => ({
-		result: graphQLObjectInfoToObjectInfoResult(objectInfo!),
-		statusCode: 200,
-	}));
-	return { results };
-}
-
-/**
- * Extract picklist values for a field from a GraphQL ObjectInfo node (raw response).
- * Uses picklistValuesByRecordTypeIDs; prefers the given recordTypeId or first available.
- */
-export function extractPicklistValuesFromGraphQLObjectInfo(
-	objectInfo: NonNullable<GetPicklistValuesQueryObjectInfo>,
-	fieldName: string,
-	recordTypeId?: string,
-): PicklistValue[] {
-	const fields = objectInfo.fields;
-	if (fields == null) return [];
-	const fieldMap: Record<string, GetPicklistValuesQueryField> = Object.fromEntries(
-		fields.map((field) => {
-			return [field?.ApiName, field];
-		}),
-	);
-	const field = fieldMap[fieldName];
-	if (!field) return [];
-	const picklistData =
-		"picklistValuesByRecordTypeIDs" in field ? field.picklistValuesByRecordTypeIDs : undefined;
-	if (!picklistData) return [];
-	const rtId = recordTypeId ?? "012000000000000AAA";
-	const byRecordType = picklistData.find((p) => p!.recordTypeID === rtId) ?? picklistData[0];
-	return mapPicklistValues(byRecordType?.picklistValues ?? []);
-}
-
-function mapPicklistValues(values: GraphQLPicklistValue[]): PicklistValue[] {
-	return values.map((item) => ({
-		...item,
-		value: item.value ?? "",
-		label: item.label ?? "",
-	}));
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLRecordAdapter.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLRecordAdapter.ts
deleted file mode 100644
index 1122960..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/graphQLRecordAdapter.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Adapts GraphQL UI API node shape to SearchResultRecordData so existing list UI
- * (SearchResultCard, ResultCardFields, getNestedFieldValue) works unchanged.
- *
- * GraphQL node: { Id, Name: { value }, Owner: { Alias: { value } }, ... }
- * SearchResultRecordData: { id, fields: Record<string, FieldValue>, apiName, ... }
- * FieldValue: { displayValue, value }
- */
-
-import type { FieldValue, SearchResultRecordData } from "../types/search/searchResults";
-
-function isValueLeaf(obj: unknown): obj is { value: string | number | boolean | null } {
-	return (
-		typeof obj === "object" &&
-		obj !== null &&
-		"value" in obj &&
-		(Object.keys(obj).length === 1 || (Object.keys(obj).length === 2 && "displayValue" in obj))
-	);
-}
-
-function graphQLValueToFieldValue(val: unknown): FieldValue {
-	if (val === null || val === undefined) {
-		return { displayValue: null, value: null };
-	}
-	if (isValueLeaf(val)) {
-		const v = val.value;
-		const display =
-			typeof v === "string" || typeof v === "number" || typeof v === "boolean" ? v : null;
-		return { displayValue: display as string | null, value: v };
-	}
-	if (typeof val === "object" && val !== null && !Array.isArray(val)) {
-		const nested = graphQLNodeToFields(val as Record<string, unknown>);
-		const firstFv = nested && Object.values(nested)[0];
-		const display =
-			firstFv && typeof (firstFv as FieldValue).value !== "object"
-				? ((firstFv as FieldValue).value as string | null)
-				: null;
-		return { displayValue: display, value: { fields: nested ?? {} } };
-	}
-	return { displayValue: null, value: val };
-}
-
-function graphQLNodeToFields(node: Record<string, unknown>): Record<string, FieldValue> {
-	const fields: Record<string, FieldValue> = {};
-	for (const [key, val] of Object.entries(node)) {
-		if (key === "Id" || val === undefined) continue;
-		fields[key] = graphQLValueToFieldValue(val);
-	}
-	return fields;
-}
-
-/**
- * Converts a GraphQL connection node (from getRecordsGraphQL) to SearchResultRecordData
- * so it can be passed to SearchResultCard and other components that expect the keyword-search record shape.
- */
-export function graphQLNodeToSearchResultRecordData(
-	node: Record<string, unknown> | undefined,
-	objectApiName: string,
-): SearchResultRecordData {
-	if (!node || typeof node !== "object") {
-		return {
-			id: "",
-			apiName: objectApiName,
-			childRelationships: {},
-			eTag: "",
-			fields: {},
-			lastModifiedById: null,
-			lastModifiedDate: null,
-			recordTypeId: null,
-			recordTypeInfo: null,
-			systemModstamp: null,
-			weakEtag: 0,
-		};
-	}
-	const id = (node.Id as string) ?? "";
-	const fields = graphQLNodeToFields(node);
-	return {
-		id,
-		apiName: objectApiName,
-		childRelationships: {},
-		eTag: "",
-		fields,
-		lastModifiedById: null,
-		lastModifiedDate: null,
-		recordTypeId: null,
-		recordTypeInfo: null,
-		systemModstamp: null,
-		weakEtag: 0,
-	};
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/layoutTransformUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/layoutTransformUtils.ts
deleted file mode 100644
index 32566e3..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/layoutTransformUtils.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Transforms Layout API sections into a structure for the detail form: section → rows → items.
- * Uses layout response (sections, layoutRows, layoutItems, layoutComponents) and optional
- * object info for compound field names and dataType. Section merge when useHeading === false.
- */
-
-import type { LayoutSection, LayoutRow, LayoutItem } from "../types/recordDetail/recordDetail";
-
-const HIDE_EMPTY_SECTIONS = true;
-const EMPTY_OPTIONS: PicklistOption[] = [];
-
-export interface ObjectInfoField {
-	compoundFieldName?: string;
-	dataType?: string;
-}
-
-export interface ObjectInfo {
-	apiName?: string;
-	fields?: Record<string, ObjectInfoField>;
-}
-
-/** Picklist/lookup options for a field (e.g. [{ label, value }]). */
-export type PicklistOption = {
-	label: string | null;
-	value: string | number | boolean;
-	validFor?: unknown[];
-};
-
-export interface LayoutTransformContext {
-	recordId: string;
-	objectInfo?: ObjectInfo | null;
-	lookupRecords?: Record<string, PicklistOption[] | null> | null;
-	getSectionCollapsedState: (sectionId: string) => boolean;
-	calculatePicklistValues?: (itemApiName: string, item: LayoutItem) => PicklistOption[] | null;
-	formOverrides?: { fieldVariant?: string } | null;
-}
-
-export interface TransformedLayoutItem {
-	key: string;
-	isField: boolean;
-	label?: string;
-	required?: boolean;
-	readOnly?: boolean;
-	apiName?: string;
-	contextName?: string;
-	options?: PicklistOption[];
-	variant?: string;
-	dataType?: string;
-	layoutComponentApiNames?: string[];
-}
-
-/** Single row in a section. */
-export interface TransformedLayoutRow {
-	key: string;
-	layoutItems: TransformedLayoutItem[];
-}
-
-/** Section ready for Section/SectionRow rendering. */
-export interface TransformedSection {
-	id: string;
-	key: string;
-	heading: string;
-	useHeading: boolean;
-	collapsible: boolean;
-	collapsed: boolean;
-	layoutRows: TransformedLayoutRow[];
-}
-
-export function createSectionKey(index: number): string {
-	return "section-" + index;
-}
-
-export function getTransformedSections(
-	sections: LayoutSection[],
-	transformContext: LayoutTransformContext,
-): TransformedSection[] {
-	const calculatedSections: TransformedSection[] = [];
-	let previousSection: TransformedSection | null = null;
-
-	sections.forEach((section, index) => {
-		if (previousSection !== null && section.useHeading === false) {
-			const sectionKey = createSectionKey(index);
-			const appendedRows = section.layoutRows
-				.map((row, i) => rowTransform(row, i, sectionKey, transformContext))
-				.filter((r): r is TransformedLayoutRow => r !== null);
-			previousSection.layoutRows.push(...appendedRows);
-			return;
-		}
-
-		const newSection = sectionTransform(section, index, transformContext);
-		if (newSection) {
-			calculatedSections.push(newSection);
-			previousSection = newSection;
-		}
-	});
-
-	return calculatedSections;
-}
-
-export function sectionTransform(
-	section: LayoutSection,
-	index: number,
-	transformContext: LayoutTransformContext,
-): TransformedSection | null {
-	const { getSectionCollapsedState } = transformContext;
-	const sectionKey = createSectionKey(index);
-	const layoutRows = section.layoutRows
-		.map((row, i) => rowTransform(row, i, sectionKey, transformContext))
-		.filter((r): r is TransformedLayoutRow => r !== null);
-
-	if (layoutRows.length === 0 && HIDE_EMPTY_SECTIONS) {
-		return null;
-	}
-
-	return {
-		key: sectionKey,
-		collapsible: section.collapsible,
-		collapsed: getSectionCollapsedState(section.id),
-		useHeading: section.useHeading,
-		heading: section.heading,
-		id: section.id,
-		layoutRows,
-	};
-}
-
-export function rowTransform(
-	row: LayoutRow,
-	index: number,
-	sectionKey: string,
-	transformContext: LayoutTransformContext,
-): TransformedLayoutRow | null {
-	const layoutItems = row.layoutItems.map((item, i) => transformItem(item, i, transformContext));
-
-	const allItemsHaveNoComponents = layoutItems.every((item) => !item.apiName || !item.isField);
-	if (allItemsHaveNoComponents) {
-		return null;
-	}
-	return {
-		key: sectionKey + "-" + index,
-		layoutItems,
-	};
-}
-
-export function transformItem(
-	item: LayoutItem,
-	index: number,
-	transformContext: LayoutTransformContext,
-): TransformedLayoutItem {
-	const { recordId, objectInfo, lookupRecords, calculatePicklistValues, formOverrides } =
-		transformContext;
-
-	let itemApiName: string | undefined;
-	let itemComponentType: string | undefined;
-
-	if (item.layoutComponents.length >= 1) {
-		const itemComponent = item.layoutComponents[0];
-		itemComponentType = itemComponent.componentType;
-		const componentApiName = itemComponent.apiName;
-		const topLevelCompoundName =
-			item.layoutComponents.length > 1 &&
-			componentApiName &&
-			objectInfo?.fields?.[componentApiName]?.compoundFieldName;
-		if (topLevelCompoundName) {
-			itemApiName = topLevelCompoundName;
-		} else {
-			itemApiName = componentApiName ?? undefined;
-		}
-	}
-
-	const lookupOptions =
-		itemApiName != null && lookupRecords?.[itemApiName] != null ? lookupRecords[itemApiName] : null;
-
-	const isFieldType = itemComponentType === "Field";
-
-	const options: PicklistOption[] =
-		lookupOptions ??
-		(itemApiName ? (calculatePicklistValues?.(itemApiName, item) ?? null) : null) ??
-		EMPTY_OPTIONS;
-
-	const fieldMeta = itemApiName ? objectInfo?.fields?.[itemApiName] : undefined;
-	const layoutComponentApiNames = item.layoutComponents
-		.filter((c) => c.componentType === "Field" && c.apiName != null)
-		.map((c) => c.apiName as string);
-
-	let newItem: TransformedLayoutItem = {
-		key: "item-" + index,
-		apiName: itemApiName,
-		contextName: recordId,
-		label: item.label,
-		required: item.required,
-		variant: formOverrides?.fieldVariant ?? "label-stacked",
-		readOnly: !item.editableForUpdate,
-		isField: isFieldType,
-		options,
-		dataType: fieldMeta?.dataType,
-		layoutComponentApiNames:
-			layoutComponentApiNames.length > 0 ? layoutComponentApiNames : undefined,
-	};
-
-	if (objectInfo?.apiName?.endsWith("__kav")) {
-		newItem = { ...newItem, readOnly: true };
-	}
-
-	if (newItem.required === true && newItem.readOnly === true) {
-		newItem = { ...newItem, required: false };
-	}
-
-	return newItem;
-}
-
-export function layoutReducer<T>(
-	sections: TransformedSection[],
-	reducer: (
-		acc: T,
-		ctx: {
-			section: TransformedSection;
-			layoutRow: TransformedLayoutRow;
-			layoutItem: TransformedLayoutItem;
-		},
-	) => T,
-	initialValue: T,
-): T {
-	let accumulator = initialValue;
-	sections.forEach((section) =>
-		section.layoutRows.forEach((layoutRow) =>
-			layoutRow.layoutItems.forEach((layoutItem) => {
-				accumulator = reducer(accumulator, {
-					section,
-					layoutRow,
-					layoutItem,
-				});
-			}),
-		),
-	);
-	return accumulator;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/linkUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/linkUtils.ts
deleted file mode 100644
index a27b9fc..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/linkUtils.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Shared allowlist for link protocols (e.g. for FormattedUrl, and future mailto/tel if rendered as links).
- * Centralizes protocol checks so new link types can be added in one place.
- */
-export const ALLOWED_LINK_PROTOCOLS = ["http:", "https:"] as const;
-
-export function isAllowedLinkUrl(value: string): boolean {
-	try {
-		const u = new URL(value);
-		return (ALLOWED_LINK_PROTOCOLS as readonly string[]).includes(u.protocol);
-	} catch {
-		return false;
-	}
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/paginationUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/paginationUtils.ts
deleted file mode 100644
index 0141def..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/paginationUtils.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Pagination Utilities
- *
- * Utility functions for pagination-related operations including page size validation.
- */
-
-/**
- * Default page size options for pagination
- */
-export const PAGE_SIZE_OPTIONS = [
-	{ value: "10", label: "10" },
-	{ value: "20", label: "20" },
-	{ value: "50", label: "50" },
-] as const;
-
-/**
- * Valid page size values extracted from PAGE_SIZE_OPTIONS
- */
-export const VALID_PAGE_SIZES = PAGE_SIZE_OPTIONS.map((opt) => parseInt(opt.value, 10));
-
-/**
- * Validates that a page size is one of the allowed options
- * @param size - The page size to validate
- * @returns true if valid, false otherwise
- *
- * @example
- * ```tsx
- * if (isValidPageSize(userInput)) {
- *   setPageSize(userInput);
- * }
- * ```
- */
-export function isValidPageSize(size: number): boolean {
-	return VALID_PAGE_SIZES.includes(size);
-}
-
-/**
- * Gets a valid page size, defaulting to the first option if invalid
- * @param size - The page size to validate
- * @returns A valid page size
- *
- * @example
- * ```tsx
- * const safePageSize = getValidPageSize(userInput); // Returns valid size or default
- * ```
- */
-export function getValidPageSize(size: number): number {
-	return isValidPageSize(size) ? size : VALID_PAGE_SIZES[0];
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/recordUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/recordUtils.ts
deleted file mode 100644
index bc3ce48..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/recordUtils.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Record utilities: layout-derived fields for GraphQL fetch, safe keys, ID validation.
- *
- * calculateFieldsToFetch: from layout + object metadata → field names and relation map;
- * used by objectDetailService and list to build columns. findIdFieldForRelationship ensures
- * Id + relationship name are both requested for reference display.
- *
- * @module utils/recordUtils
- */
-
-import type { ObjectInfoResult } from "../types/objectInfo/objectInfo";
-import type {
-	LayoutResponse,
-	LayoutRow,
-	LayoutSection,
-	LayoutItem,
-	LayoutComponent,
-} from "../types/recordDetail/recordDetail";
-
-/**
- * Find the Id field (reference foreign key) whose relationshipName matches the given name,
- * so we can request both Id and relationship in the record query for display.
- */
-function findIdFieldForRelationship(
-	metadata: ObjectInfoResult,
-	relationshipName: string,
-): string | null {
-	if (!metadata.fields || !relationshipName) return null;
-	for (const [apiName, field] of Object.entries(metadata.fields)) {
-		const isReference = field.dataType != null && field.dataType.toLowerCase() === "reference";
-		if (field.relationshipName === relationshipName && (isReference || apiName.endsWith("Id"))) {
-			return apiName;
-		}
-	}
-	return null;
-}
-
-const getFetchableFieldsFromLayoutItem = function (
-	metadata: ObjectInfoResult,
-	layoutItem: LayoutItem,
-	relationFieldMap: Record<string, string>,
-) {
-	const fields: Record<string, string> = {};
-	layoutItem.layoutComponents.forEach((comp: LayoutComponent) => {
-		// check if this is a field to add
-		if (!comp.apiName || comp.componentType !== "Field") {
-			return;
-		}
-
-		// add field: fieldType
-		const fieldMetadata = metadata.fields[comp.apiName];
-		fields[comp.apiName] = fieldMetadata?.dataType ?? "";
-
-		// add relatedField if one exists (Id field -> add relationship name so we request Owner.Name)
-		if (comp.apiName in metadata.fields) {
-			const relationshipName = fieldMetadata?.relationshipName;
-			if (relationshipName) {
-				fields[relationshipName] = fieldMetadata.dataType ?? "";
-
-				relationFieldMap[comp.apiName] = relationshipName;
-			}
-		} else {
-			// layout component is relationship name (e.g. Owner); ensure we also request the Id
-			// so buildSelectionTree sees both OwnerId and Owner and requests Owner { Name { value } }
-			const idField = findIdFieldForRelationship(metadata, comp.apiName);
-			if (idField) {
-				const idMeta = metadata.fields[idField];
-				fields[idField] = idMeta?.dataType ?? "";
-				relationFieldMap[idField] = comp.apiName;
-			}
-		}
-	});
-	return fields;
-};
-
-const getFetchableFieldsFromLayoutRow = function (
-	metadata: ObjectInfoResult,
-	layoutRow: LayoutRow,
-	relationFieldMap: Record<string, string>,
-) {
-	let fieldsFromRow: Record<string, string> = {};
-	layoutRow.layoutItems.forEach((item: LayoutItem) => {
-		Object.assign(
-			fieldsFromRow,
-			getFetchableFieldsFromLayoutItem(metadata, item, relationFieldMap),
-		);
-	});
-	return fieldsFromRow;
-};
-
-const getFetchableFieldsFromSection = function (
-	metadata: ObjectInfoResult,
-	section: LayoutSection,
-	relationFieldMap: Record<string, string>,
-) {
-	let fieldsFromSection: Record<string, string> = {};
-	section.layoutRows.forEach((row: LayoutRow) => {
-		Object.assign(
-			fieldsFromSection,
-			getFetchableFieldsFromLayoutRow(metadata, row, relationFieldMap),
-		);
-	});
-	return fieldsFromSection;
-};
-
-const getFetchableFieldsFromLayout = function (
-	metadata: ObjectInfoResult,
-	layout: LayoutResponse,
-	relationFieldMap: Record<string, string>,
-) {
-	let fieldsFromLayout: Record<string, string> = {};
-	layout.sections.forEach((section) => {
-		Object.assign(
-			fieldsFromLayout,
-			getFetchableFieldsFromSection(metadata, section, relationFieldMap),
-		);
-	});
-	return fieldsFromLayout;
-};
-
-/**
- * Returns field API names to request for records from layout + object metadata.
- * Includes both Id and relationship name for reference fields so GraphQL can fetch display value.
- *
- * @param metadata - Object info (fields with dataType, relationshipName).
- * @param layout - Layout response (sections, layoutItems, layoutComponents).
- * @param shouldPrefixedWithEntityName - If true, prefix names with object (e.g. Account.Name).
- * @returns [fieldNames, fieldTypes, relationFieldMap] for buildSelectionTree / optionalFields.
- */
-export const calculateFieldsToFetch = function (
-	metadata: ObjectInfoResult,
-	layout: LayoutResponse,
-	shouldPrefixedWithEntityName: boolean,
-): [string[], string[], Record<string, string>] {
-	const relationFieldMap: Record<string, string> = {};
-	// populating fields to query for layout
-	const fields = getFetchableFieldsFromLayout(metadata, layout, relationFieldMap);
-	let fieldsToFetch = Object.keys(fields);
-	if (shouldPrefixedWithEntityName) {
-		fieldsToFetch = fieldsToFetch.map((field) => `${metadata.ApiName}.${field}`);
-	}
-	// populate field types for o11y logging
-	const fieldTypes = Object.values(fields).filter((fieldType) => fieldType !== "");
-	return [fieldsToFetch, fieldTypes, relationFieldMap];
-};
-/** Type guard: true if id is a non-empty string matching 15- or 18-char Salesforce ID format. */
-export function isValidSalesforceId(id: string | null | undefined): id is string {
-	if (!id || typeof id !== "string") return false;
-	return /^[a-zA-Z0-9]{15}$|^[a-zA-Z0-9]{18}$/.test(id);
-}
-
-/** Safe React key from record id or fallback to prefix-index. */
-export function getSafeKey(
-	recordId: string | null | undefined,
-	index: number,
-	prefix: string = "result",
-): string {
-	return isValidSalesforceId(recordId) ? recordId : `${prefix}-${index}`;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/sanitizationUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/sanitizationUtils.ts
deleted file mode 100644
index b1eaa64..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/utils/sanitizationUtils.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Sanitization Utilities
- *
- * Utility functions for sanitizing user input to prevent injection attacks.
- * These utilities provide basic sanitization for filter values.
- */
-
-/**
- * Sanitizes a string value by removing potentially dangerous characters
- * and trimming whitespace.
- *
- * This is a basic sanitization - for production, consider using a library like DOMPurify for more
- * comprehensive sanitization.
- * Also, note this is NOT an end-to-end security control.
- * Client-side sanitization can be bypassed by any attacker using `curl` or Postman.
- * To prevent injection attacks (SOSL Injection, XSS):
- * 1. The BACKEND (Salesforce API) handles SOSL injection if parameters are passed correctly.
- * 2. React handles XSS automatically when rendering variables in JSX (e.g., <div>{value}</div>).
- * Do not rely on this function for end-to-end security enforcement.
- *
- * @param value - The string value to sanitize
- * @returns Sanitized string value
- *
- * @remarks
- * - Removes control characters (except newlines, tabs, carriage returns)
- * - Trims leading/trailing whitespace
- * - Limits length to prevent DoS attacks (default: 1000 characters)
- * - Preserves alphanumeric, spaces, and common punctuation
- *
- * @example
- * ```tsx
- * const sanitized = sanitizeFilterValue(userInput);
- * ```
- */
-export function sanitizeFilterValue(value: string, maxLength: number = 1000): string {
-	if (typeof value !== "string") {
-		return "";
-	}
-
-	let sanitized = value.trim();
-
-	if (sanitized.length > maxLength) {
-		sanitized = sanitized.substring(0, maxLength);
-	}
-
-	// eslint-disable-next-line no-control-regex -- intentionally matching control chars for sanitization
-	sanitized = sanitized.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "");
-
-	return sanitized;
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts
new file mode 100644
index 0000000..93b487f
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts
@@ -0,0 +1,46 @@
+import SEARCH_ACCOUNTS_QUERY from "./query/searchAccounts.graphql?raw";
+import DISTINCT_INDUSTRIES_QUERY from "./query/distinctAccountIndustries.graphql?raw";
+import DISTINCT_TYPES_QUERY from "./query/distinctAccountTypes.graphql?raw";
+import {
+	searchObjects,
+	fetchDistinctValues,
+	type ObjectSearchOptions,
+	type PicklistOption,
+} from "../../api/objectSearchService";
+import type {
+	SearchAccountsQuery,
+	SearchAccountsQueryVariables,
+	DistinctAccountIndustriesQuery,
+	DistinctAccountTypesQuery,
+} from "../../../../api/graphql-operations-types";
+
+export type AccountSearchResult = NonNullable<SearchAccountsQuery["uiapi"]["query"]["Account"]>;
+
+export type AccountSearchOptions = ObjectSearchOptions<
+	SearchAccountsQueryVariables["where"],
+	SearchAccountsQueryVariables["orderBy"]
+>;
+
+export type { PicklistOption };
+
+export async function searchAccounts(
+	options: AccountSearchOptions = {},
+): Promise<AccountSearchResult> {
+	return searchObjects<AccountSearchResult, SearchAccountsQuery, SearchAccountsQueryVariables>(
+		SEARCH_ACCOUNTS_QUERY,
+		"Account",
+		options,
+	);
+}
+
+export async function fetchDistinctIndustries(): Promise<PicklistOption[]> {
+	return fetchDistinctValues<DistinctAccountIndustriesQuery>(
+		DISTINCT_INDUSTRIES_QUERY,
+		"Account",
+		"Industry",
+	);
+}
+
+export async function fetchDistinctTypes(): Promise<PicklistOption[]> {
+	return fetchDistinctValues<DistinctAccountTypesQuery>(DISTINCT_TYPES_QUERY, "Account", "Type");
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
new file mode 100644
index 0000000..b6396a6
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
@@ -0,0 +1,19 @@
+query DistinctAccountIndustries {
+	uiapi {
+		aggregate {
+			Account(groupBy: { Industry: { group: true } }) {
+				edges {
+					node {
+						aggregate @optional {
+							Industry @optional {
+								value
+								displayValue
+								label
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
new file mode 100644
index 0000000..3a422a1
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
@@ -0,0 +1,19 @@
+query DistinctAccountTypes {
+	uiapi {
+		aggregate {
+			Account(groupBy: { Type: { group: true } }) {
+				edges {
+					node {
+						aggregate @optional {
+							Type @optional {
+								value
+								displayValue
+								label
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
new file mode 100644
index 0000000..3d21c90
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
@@ -0,0 +1,121 @@
+query GetAccountDetail($id: ID!) {
+	uiapi {
+		query {
+			Account(where: { Id: { eq: $id } }) {
+				edges {
+					node {
+						Id
+						Name @optional {
+							value
+							displayValue
+						}
+						Owner @optional {
+							Name @optional {
+								value
+								displayValue
+							}
+						}
+						Phone @optional {
+							value
+							displayValue
+						}
+						Fax @optional {
+							value
+							displayValue
+						}
+						Parent @optional {
+							Name @optional {
+								value
+								displayValue
+							}
+						}
+						Website @optional {
+							value
+							displayValue
+						}
+						Type @optional {
+							value
+							displayValue
+						}
+						NumberOfEmployees @optional {
+							value
+							displayValue
+						}
+						Industry @optional {
+							value
+							displayValue
+						}
+						AnnualRevenue @optional {
+							value
+							displayValue
+						}
+						Description @optional {
+							value
+							displayValue
+						}
+						BillingStreet @optional {
+							value
+							displayValue
+						}
+						BillingCity @optional {
+							value
+							displayValue
+						}
+						BillingState @optional {
+							value
+							displayValue
+						}
+						BillingPostalCode @optional {
+							value
+							displayValue
+						}
+						BillingCountry @optional {
+							value
+							displayValue
+						}
+						ShippingStreet @optional {
+							value
+							displayValue
+						}
+						ShippingCity @optional {
+							value
+							displayValue
+						}
+						ShippingState @optional {
+							value
+							displayValue
+						}
+						ShippingPostalCode @optional {
+							value
+							displayValue
+						}
+						ShippingCountry @optional {
+							value
+							displayValue
+						}
+						CreatedBy @optional {
+							Name @optional {
+								value
+								displayValue
+							}
+						}
+						CreatedDate @optional {
+							value
+							displayValue
+						}
+						LastModifiedBy @optional {
+							Name @optional {
+								value
+								displayValue
+							}
+						}
+						LastModifiedDate @optional {
+							value
+							displayValue
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql
new file mode 100644
index 0000000..af505fa
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql
@@ -0,0 +1,51 @@
+query SearchAccounts(
+	$first: Int
+	$after: String
+	$where: Account_Filter
+	$orderBy: Account_OrderBy
+) {
+	uiapi {
+		query {
+			Account(first: $first, after: $after, where: $where, orderBy: $orderBy) {
+				edges {
+					node {
+						Id
+						Name @optional {
+							value
+							displayValue
+						}
+						Industry @optional {
+							value
+							displayValue
+						}
+						Type @optional {
+							value
+							displayValue
+						}
+						Phone @optional {
+							value
+							displayValue
+						}
+						Owner @optional {
+							Name @optional {
+								value
+								displayValue
+							}
+						}
+						AnnualRevenue @optional {
+							value
+							displayValue
+						}
+					}
+				}
+				pageInfo {
+					hasNextPage
+					hasPreviousPage
+					endCursor
+					startCursor
+				}
+				totalCount
+			}
+		}
+	}
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
new file mode 100644
index 0000000..6506b78
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
@@ -0,0 +1,357 @@
+import { useState } from "react";
+import { useParams, useNavigate } from "react-router";
+import { createDataSDK } from "@salesforce/sdk-data";
+import { AlertCircle, ChevronDown, ChevronRight, FileQuestion } from "lucide-react";
+import GET_ACCOUNT_DETAIL from "../api/query/getAccountDetail.graphql?raw";
+import type {
+	GetAccountDetailQuery,
+	GetAccountDetailQueryVariables,
+} from "../../../../api/graphql-operations-types";
+import { Alert, AlertTitle, AlertDescription } from "../../../../components/ui/alert";
+import { Button } from "../../../../components/ui/button";
+import { Card, CardContent } from "../../../../components/ui/card";
+import { fieldValue, getAddressFieldLines, formatDateTimeField } from "../../utils/fieldUtils";
+import {
+	Collapsible,
+	CollapsibleTrigger,
+	CollapsibleContent,
+} from "../../../../components/ui/collapsible";
+import { Separator } from "../../../../components/ui/separator";
+import { Skeleton } from "../../../../components/ui/skeleton";
+import { useCachedAsyncData } from "../../hooks/useCachedAsyncData";
+import { ObjectBreadcrumb } from "../../components/ObjectBreadcrumb";
+
+type AccountNode = NonNullable<
+	NonNullable<
+		NonNullable<NonNullable<GetAccountDetailQuery["uiapi"]["query"]["Account"]>["edges"]>[number]
+	>["node"]
+>;
+
+async function fetchAccountDetail(recordId: string): Promise<AccountNode | null | undefined> {
+	const data = await createDataSDK();
+	const response = await data.graphql?.<GetAccountDetailQuery, GetAccountDetailQueryVariables>(
+		GET_ACCOUNT_DETAIL,
+		{ id: recordId },
+	);
+
+	if (response?.errors?.length) {
+		throw new Error(response.errors.map((e) => e.message).join("; "));
+	}
+
+	return response?.data?.uiapi?.query?.Account?.edges?.[0]?.node;
+}
+
+export default function AccountObjectDetail() {
+	const { recordId } = useParams();
+	const navigate = useNavigate();
+
+	const {
+		data: account,
+		loading,
+		error,
+	} = useCachedAsyncData(() => fetchAccountDetail(recordId!), [recordId], {
+		key: `account:${recordId}`,
+	});
+
+	return (
+		<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
+			<ObjectBreadcrumb
+				listPath="/accounts"
+				listLabel="Accounts"
+				loading={loading}
+				recordName={
+					account
+						? (fieldValue(account.Name) ?? "")
+						: error
+							? "Error"
+							: loading
+								? undefined
+								: "Not Found"
+				}
+			/>
+
+			{/* Loading state */}
+			{loading && <AccountDetailSkeleton />}
+
+			{/* Error state */}
+			{error && <AccountDetailError onBack={() => navigate(-1)} />}
+
+			{/* Not found state */}
+			{!loading && !error && !account && <AccountDetailNotFound onBack={() => navigate(-1)} />}
+
+			{/* Content */}
+			{account && <AccountDetailContent account={account} />}
+		</div>
+	);
+}
+
+function AccountDetailContent({ account }: { account: AccountNode }) {
+	const billingAddress = getAddressFieldLines({
+		street: fieldValue(account.BillingStreet),
+		city: fieldValue(account.BillingCity),
+		state: fieldValue(account.BillingState),
+		postalCode: fieldValue(account.BillingPostalCode),
+		country: fieldValue(account.BillingCountry),
+	});
+
+	const shippingAddress = getAddressFieldLines({
+		street: fieldValue(account.ShippingStreet),
+		city: fieldValue(account.ShippingCity),
+		state: fieldValue(account.ShippingState),
+		postalCode: fieldValue(account.ShippingPostalCode),
+		country: fieldValue(account.ShippingCountry),
+	});
+
+	const dateTimeOptions = { dateStyle: "medium", timeStyle: "short" } as const;
+	const createdDate = formatDateTimeField(
+		fieldValue(account.CreatedDate),
+		undefined,
+		dateTimeOptions,
+	);
+	const lastModifiedDate = formatDateTimeField(
+		fieldValue(account.LastModifiedDate),
+		undefined,
+		dateTimeOptions,
+	);
+
+	return (
+		<>
+			<h1 className="text-2xl font-bold mb-4">Account: {fieldValue(account.Name)}</h1>
+
+			<Card>
+				<CardContent className="space-y-8 pt-6">
+					{/* Top section */}
+					<div>
+						<div className="space-y-4">
+							<FieldRow>
+								<FieldItem label="Account Owner">{fieldValue(account.Owner?.Name)}</FieldItem>
+								<FieldItem label="Phone">
+									<TelephoneField value={fieldValue(account.Phone)} />
+								</FieldItem>
+							</FieldRow>
+							<FieldRow>
+								<FieldItem label="Account Name">{fieldValue(account.Name)}</FieldItem>
+								<FieldItem label="Fax">
+									<TelephoneField value={fieldValue(account.Fax)} />
+								</FieldItem>
+							</FieldRow>
+							<FieldRow>
+								<FieldItem label="Parent Account">{fieldValue(account.Parent?.Name)}</FieldItem>
+								<FieldItem label="Website">{fieldValue(account.Website)}</FieldItem>
+							</FieldRow>
+						</div>
+					</div>
+
+					<Separator />
+
+					{/* Additional Information */}
+					<Section title="Additional Information">
+						<FieldRow>
+							<FieldItem label="Type">{fieldValue(account.Type)}</FieldItem>
+							<FieldItem label="Employees">{fieldValue(account.NumberOfEmployees)}</FieldItem>
+						</FieldRow>
+						<FieldRow>
+							<FieldItem label="Industry">{fieldValue(account.Industry)}</FieldItem>
+							<FieldItem label="Annual Revenue">{fieldValue(account.AnnualRevenue)}</FieldItem>
+						</FieldRow>
+						<FieldItem label="Description">{fieldValue(account.Description)}</FieldItem>
+					</Section>
+
+					<Separator />
+
+					{/* Address Information */}
+					<Section title="Address Information">
+						<FieldRow>
+							<FieldItem label="Billing Address">
+								{billingAddress ? billingAddress.map((line, i) => <div key={i}>{line}</div>) : null}
+							</FieldItem>
+							<FieldItem label="Shipping Address">
+								{shippingAddress
+									? shippingAddress.map((line, i) => <div key={i}>{line}</div>)
+									: null}
+							</FieldItem>
+						</FieldRow>
+					</Section>
+
+					<Separator />
+
+					{/* System Information */}
+					<Section title="System Information">
+						<FieldRow>
+							<FieldItem label="Created By">
+								{[fieldValue(account.CreatedBy?.Name), createdDate].filter(Boolean).join(" ") ||
+									null}
+							</FieldItem>
+							<FieldItem label="Last Modified By">
+								{[fieldValue(account.LastModifiedBy?.Name), lastModifiedDate]
+									.filter(Boolean)
+									.join(" ") || null}
+							</FieldItem>
+						</FieldRow>
+					</Section>
+				</CardContent>
+			</Card>
+		</>
+	);
+}
+
+function TelephoneField({ value }: { value?: string | null }) {
+	if (!value) return null;
+	return (
+		<a href={`tel:${value}`} className="underline">
+			{value}
+		</a>
+	);
+}
+
+function FieldItem({ label, children }: { label: string; children: React.ReactNode }) {
+	return (
+		<div>
+			<dt className="text-sm text-muted-foreground">{label}</dt>
+			<dd className="mt-0.5">{children ?? "—"}</dd>
+		</div>
+	);
+}
+
+function FieldRow({ children }: { children: React.ReactNode }) {
+	return <div className="grid grid-cols-2 gap-x-8 gap-y-4">{children}</div>;
+}
+
+function Section({ title, children }: { title: string; children: React.ReactNode }) {
+	const [open, setOpen] = useState(true);
+	return (
+		<Collapsible open={open} onOpenChange={setOpen}>
+			<CollapsibleTrigger className="flex items-center gap-2 cursor-pointer text-lg font-semibold py-2">
+				{open ? <ChevronDown className="size-5" /> : <ChevronRight className="size-5" />}
+				{title}
+			</CollapsibleTrigger>
+			<CollapsibleContent>
+				<div className="mt-2 space-y-4">{children}</div>
+			</CollapsibleContent>
+		</Collapsible>
+	);
+}
+
+function AccountDetailError({ onBack }: { onBack: () => void }) {
+	return (
+		<>
+			<Alert variant="destructive" role="alert">
+				<AlertCircle />
+				<AlertTitle>
+					<h2>Failed to load account</h2>
+				</AlertTitle>
+				<AlertDescription>
+					Something went wrong while loading this account. Please try again later.
+				</AlertDescription>
+			</Alert>
+			<div className="mt-4 flex gap-3">
+				<Button variant="outline" onClick={onBack}>
+					← Back
+				</Button>
+				<Button variant="outline" onClick={() => window.location.reload()}>
+					Retry
+				</Button>
+			</div>
+		</>
+	);
+}
+
+function AccountDetailNotFound({ onBack }: { onBack: () => void }) {
+	return (
+		<Card>
+			<CardContent className="flex flex-col items-center justify-center py-16 text-center">
+				<FileQuestion className="size-12 text-muted-foreground mb-4" />
+				<h2 className="text-lg font-semibold mb-1">Account not found</h2>
+				<p className="text-sm text-muted-foreground mb-6">
+					The account you're looking for doesn't exist or may have been deleted.
+				</p>
+				<Button variant="outline" onClick={onBack}>
+					← Go back
+				</Button>
+			</CardContent>
+		</Card>
+	);
+}
+
+function AccountDetailSkeleton() {
+	return (
+		<>
+			<Skeleton className="h-8 w-56 mb-4" />
+
+			<Card>
+				<CardContent className="space-y-8 pt-6">
+					{/* Top section: field rows */}
+					<div>
+						<div className="space-y-4">
+							<SkeletonFieldRow />
+							<SkeletonFieldRow />
+							<SkeletonFieldRow />
+						</div>
+					</div>
+
+					<Separator />
+
+					{/* Additional Information */}
+					<SkeletonSection />
+
+					<Separator />
+
+					{/* Address Information */}
+					<div className="space-y-4">
+						<Skeleton className="h-7 w-48 py-2" />
+						<div className="grid grid-cols-2 gap-x-8 gap-y-4">
+							<div>
+								<Skeleton className="h-4 w-28 mb-1.5" />
+								<Skeleton className="h-5 w-44 mb-1" />
+								<Skeleton className="h-5 w-36 mb-1" />
+								<Skeleton className="h-5 w-28" />
+							</div>
+							<div>
+								<Skeleton className="h-4 w-32 mb-1.5" />
+								<Skeleton className="h-5 w-44 mb-1" />
+								<Skeleton className="h-5 w-36 mb-1" />
+								<Skeleton className="h-5 w-28" />
+							</div>
+						</div>
+					</div>
+
+					<Separator />
+
+					{/* System Information */}
+					<div className="space-y-4">
+						<Skeleton className="h-7 w-48 py-2" />
+						<SkeletonFieldRow />
+					</div>
+				</CardContent>
+			</Card>
+		</>
+	);
+}
+
+function SkeletonField() {
+	return (
+		<div>
+			<Skeleton className="h-4 w-24 mb-1.5" />
+			<Skeleton className="h-5 w-40" />
+		</div>
+	);
+}
+
+function SkeletonFieldRow() {
+	return (
+		<div className="grid grid-cols-2 gap-x-8 gap-y-4">
+			<SkeletonField />
+			<SkeletonField />
+		</div>
+	);
+}
+
+function SkeletonSection() {
+	return (
+		<div className="space-y-4">
+			<Skeleton className="h-7 w-48 py-2" />
+			<SkeletonFieldRow />
+			<SkeletonFieldRow />
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx
new file mode 100644
index 0000000..2d14f28
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx
@@ -0,0 +1,303 @@
+import { useMemo, useState } from "react";
+import { Link } from "react-router";
+import { AlertCircle, ChevronDown, SearchX } from "lucide-react";
+import {
+	searchAccounts,
+	fetchDistinctIndustries,
+	fetchDistinctTypes,
+} from "../api/accountSearchService";
+import { useCachedAsyncData } from "../../hooks/useCachedAsyncData";
+import { fieldValue } from "../../utils/fieldUtils";
+import { useObjectSearchParams } from "../../hooks/useObjectSearchParams";
+import { Alert, AlertTitle, AlertDescription } from "../../../../components/ui/alert";
+import {
+	Card,
+	CardContent,
+	CardHeader,
+	CardTitle,
+} from "../../../../components/ui/card";
+import { Button } from "../../../../components/ui/button";
+import {
+	Collapsible,
+	CollapsibleContent,
+	CollapsibleTrigger,
+} from "../../../../components/ui/collapsible";
+import { Skeleton } from "../../../../components/ui/skeleton";
+import { FilterProvider, FilterResetButton } from "../../components/FilterContext";
+import { SearchFilter } from "../../components/filters/SearchFilter";
+import { TextFilter } from "../../components/filters/TextFilter";
+import { SelectFilter } from "../../components/filters/SelectFilter";
+import { MultiSelectFilter } from "../../components/filters/MultiSelectFilter";
+import { NumericRangeFilter } from "../../components/filters/NumericRangeFilter";
+import { DateFilter } from "../../components/filters/DateFilter";
+import { DateRangeFilter } from "../../components/filters/DateRangeFilter";
+import { ActiveFilters } from "../../components/ActiveFilters";
+import { SortControl } from "../../components/SortControl";
+import type { FilterFieldConfig } from "../../utils/filterUtils";
+import type { SortFieldConfig } from "../../utils/sortUtils";
+import type { Account_Filter, Account_OrderBy } from "../../../../api/graphql-operations-types";
+import type { AccountSearchResult } from "../api/accountSearchService";
+import { ObjectBreadcrumb } from "../../components/ObjectBreadcrumb";
+import PaginationControls from "../../components/PaginationControls";
+import type { PaginationConfig } from "../../hooks/useObjectSearchParams";
+
+const PAGINATION_CONFIG: PaginationConfig = {
+	defaultPageSize: 6,
+	validPageSizes: [6, 12, 24, 48],
+};
+
+type AccountNode = NonNullable<
+	NonNullable<NonNullable<AccountSearchResult["edges"]>[number]>["node"]
+>;
+
+const FILTER_CONFIGS: FilterFieldConfig[] = [
+	{
+		field: "search",
+		label: "Search",
+		type: "search",
+		searchFields: ["Name", "Phone", "Industry"],
+		placeholder: "Search by name, phone, or industry...",
+	},
+	{ field: "Name", label: "Account Name", type: "text", placeholder: "Search by name..." },
+	{ field: "Industry", label: "Industry", type: "picklist" },
+	{ field: "Type", label: "Type", type: "multipicklist" },
+	{ field: "AnnualRevenue", label: "Annual Revenue", type: "numeric" },
+	{ field: "CreatedDate", label: "Created Date", type: "date" },
+	{ field: "LastModifiedDate", label: "Last Modified Date", type: "daterange" },
+];
+
+const ACCOUNT_SORT_CONFIGS: SortFieldConfig<keyof Account_OrderBy>[] = [
+	{ field: "Name", label: "Name" },
+	{ field: "AnnualRevenue", label: "Annual Revenue" },
+	{ field: "Industry", label: "Industry" },
+	{ field: "CreatedDate", label: "Created Date" },
+];
+
+// -- Component --------------------------------------------------------------
+
+export default function AccountSearch() {
+	const [filtersOpen, setFiltersOpen] = useState(true);
+	const { data: industryOptions } = useCachedAsyncData(fetchDistinctIndustries, [], {
+		key: "distinctIndustries",
+		ttl: 300_000,
+	});
+	const { data: typeOptions } = useCachedAsyncData(fetchDistinctTypes, [], {
+		key: "distinctTypes",
+		ttl: 300_000,
+	});
+
+	const { filters, sort, query, pagination, resetAll } = useObjectSearchParams<
+		Account_Filter,
+		Account_OrderBy
+	>(FILTER_CONFIGS, ACCOUNT_SORT_CONFIGS, PAGINATION_CONFIG);
+
+	const searchKey = `accounts:${JSON.stringify({ where: query.where, orderBy: query.orderBy, first: pagination.pageSize, after: pagination.afterCursor })}`;
+	const { data, loading, error } = useCachedAsyncData(
+		() =>
+			searchAccounts({
+				where: query.where,
+				orderBy: query.orderBy,
+				first: pagination.pageSize,
+				after: pagination.afterCursor,
+			}),
+		[query.where, query.orderBy, pagination.pageSize, pagination.afterCursor],
+		{ key: searchKey },
+	);
+
+	const pageInfo = data?.pageInfo;
+	const totalCount = data?.totalCount;
+	const hasNextPage = pageInfo?.hasNextPage ?? false;
+	const hasPreviousPage = pagination.pageIndex > 0;
+
+	const validAccountNodes = useMemo(
+		() =>
+			(data?.edges ?? []).reduce<AccountNode[]>((acc, edge) => {
+				if (edge?.node) acc.push(edge.node);
+				return acc;
+			}, []),
+		[data?.edges],
+	);
+
+	return (
+		<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
+			<ObjectBreadcrumb listPath="/accounts" listLabel="Accounts" />
+
+			<h1 className="text-2xl font-bold mb-4">Search Accounts</h1>
+
+			<div className="flex flex-col lg:flex-row gap-6">
+				{/* Sidebar — Filter Panel */}
+				<aside className="w-full lg:w-80 shrink-0">
+					<FilterProvider
+						filters={filters.active}
+						onFilterChange={filters.set}
+						onFilterRemove={filters.remove}
+						onReset={resetAll}
+					>
+						<Card>
+							<Collapsible open={filtersOpen} onOpenChange={setFiltersOpen}>
+								<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+									<CardTitle className="text-base font-semibold">
+										<h2>Filters</h2>
+									</CardTitle>
+									<div className="flex items-center gap-1">
+										<FilterResetButton variant="destructive" size="sm" />
+										<CollapsibleTrigger asChild>
+											<Button variant="ghost" size="icon">
+												<ChevronDown
+													className={`h-4 w-4 transition-transform ${filtersOpen ? "" : "-rotate-90"}`}
+												/>
+												<span className="sr-only">Toggle filters</span>
+											</Button>
+										</CollapsibleTrigger>
+									</div>
+								</CardHeader>
+								<CollapsibleContent>
+									<CardContent className="space-y-4 pt-0">
+										<SearchFilter
+											field="search"
+											label="Search"
+											placeholder="Search by name, phone, or industry..."
+										/>
+										<TextFilter field="Name" label="Account Name" placeholder="Search by name..." />
+										<SelectFilter
+											field="Industry"
+											label="Industry"
+											options={industryOptions ?? []}
+										/>
+										<MultiSelectFilter field="Type" label="Type" options={typeOptions ?? []} />
+										<NumericRangeFilter field="AnnualRevenue" label="Annual Revenue" />
+										<DateFilter field="CreatedDate" label="Created Date" />
+										<DateRangeFilter field="LastModifiedDate" label="Last Modified Date" />
+									</CardContent>
+								</CollapsibleContent>
+							</Collapsible>
+						</Card>
+					</FilterProvider>
+				</aside>
+
+				{/* Main area — Sort + Results */}
+				<div className="flex-1 min-w-0">
+					{/* Sort control + active filters */}
+					<div className="flex flex-wrap items-center gap-2 mb-4">
+						<SortControl
+							configs={ACCOUNT_SORT_CONFIGS}
+							sort={sort.current}
+							onSortChange={sort.set}
+						/>
+						<ActiveFilters filters={filters.active} onRemove={filters.remove} />
+					</div>
+
+					<div className="min-h-112">
+						{/* Loading state */}
+						{loading && (
+							<>
+								<Skeleton className="h-5 w-30 mb-3" />
+								<div className="divide-y">
+									{Array.from({ length: pagination.pageSize }, (_, i) => (
+										<div key={i} className="flex items-center justify-between py-3">
+											<div className="space-y-2">
+												<Skeleton className="h-5 w-40" />
+												<Skeleton className="h-4 w-28" />
+											</div>
+											<div className="space-y-2 flex flex-col items-end">
+												<Skeleton className="h-4 w-24" />
+												<Skeleton className="h-4 w-20" />
+											</div>
+										</div>
+									))}
+								</div>
+							</>
+						)}
+
+						{/* Error state */}
+						{error && (
+							<>
+								<p className="text-sm text-muted-foreground mb-3">0 accounts found</p>
+								<Alert variant="destructive" role="alert">
+									<AlertCircle />
+									<AlertTitle>Failed to load accounts</AlertTitle>
+									<AlertDescription>
+										Something went wrong while loading accounts. Please try again later.
+									</AlertDescription>
+								</Alert>
+							</>
+						)}
+
+						{/* Results list */}
+						{!loading && !error && validAccountNodes.length > 0 && (
+							<>
+								<p className="text-sm text-muted-foreground mb-3">
+									{totalCount != null && (hasNextPage || hasPreviousPage)
+										? `${totalCount} account${totalCount !== 1 ? "s" : ""} found`
+										: `Showing ${validAccountNodes.length} account${validAccountNodes.length !== 1 ? "s" : ""}`}
+								</p>
+								<AccountResultsList nodes={validAccountNodes} />
+							</>
+						)}
+
+						{/* No results state */}
+						{!loading && !error && validAccountNodes.length === 0 && (
+							<div className="flex flex-col items-center justify-center py-16 text-center">
+								<SearchX className="size-12 text-muted-foreground mb-4" />
+								<h2 className="text-lg font-semibold mb-1">No accounts found</h2>
+								<p className="text-sm text-muted-foreground">
+									Try adjusting your filters or search criteria.
+								</p>
+							</div>
+						)}
+					</div>
+
+					{/* Pagination — always visible, disabled while loading or on error */}
+					<PaginationControls
+						pageIndex={pagination.pageIndex}
+						hasNextPage={hasNextPage}
+						hasPreviousPage={hasPreviousPage}
+						pageSize={pagination.pageSize}
+						pageSizeOptions={PAGINATION_CONFIG.validPageSizes}
+						onNextPage={() => {
+							if (pageInfo?.endCursor) pagination.goToNextPage(pageInfo.endCursor);
+						}}
+						onPreviousPage={pagination.goToPreviousPage}
+						onPageSizeChange={pagination.setPageSize}
+						disabled={loading || !!error}
+					/>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+// -- Result Components ------------------------------------------------------
+
+function AccountResultsList({ nodes }: { nodes: AccountNode[] }) {
+	return (
+		<ul className="divide-y">
+			{nodes.map((node) => (
+				<AccountResultItem key={node.Id} node={node} />
+			))}
+		</ul>
+	);
+}
+
+function AccountResultItem({ node }: { node: AccountNode }) {
+	return (
+		<li>
+			<Link
+				to={`/accounts/${node.Id}`}
+				className="flex items-center justify-between py-3 px-3 -mx-3 rounded-md transition-colors hover:bg-accent"
+			>
+				<div>
+					<span className="font-medium">{fieldValue(node.Name) ?? "\u2014"}</span>
+					<p className="text-sm text-muted-foreground">
+						{[fieldValue(node.Industry), fieldValue(node.Type)].filter(Boolean).join(" \u00B7 ") ||
+							"\u2014"}
+					</p>
+				</div>
+				<div className="text-right text-sm">
+					<p>{fieldValue(node.Phone) ?? ""}</p>
+					<p className="text-muted-foreground">{fieldValue(node.Owner?.Name) ?? ""}</p>
+				</div>
+			</Link>
+		</li>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx
new file mode 100644
index 0000000..07495a8
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx
@@ -0,0 +1,34 @@
+import { useState } from "react";
+import { useNavigate } from "react-router";
+import { SearchBar } from "../../components/SearchBar";
+import { Button } from "../../../../components/ui/button";
+
+export default function HomePage() {
+	const navigate = useNavigate();
+	const [text, setText] = useState("");
+
+	const handleSubmit = (e: React.SyntheticEvent<HTMLFormElement>) => {
+		e.preventDefault();
+		const params = text ? `?q=${encodeURIComponent(text)}` : "";
+		navigate(`/accounts${params}`);
+	};
+
+	return (
+		<div className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
+			<div className="flex items-center gap-6 mb-6">
+				<h1 className="text-2xl font-bold">Account Search</h1>
+				<Button variant="outline" size="sm" onClick={() => navigate("/accounts")}>
+					Browse All Accounts
+				</Button>
+			</div>
+			<form onSubmit={handleSubmit} className="flex gap-2">
+				<SearchBar
+					placeholder="Search by name, phone, or industry..."
+					value={text}
+					handleChange={setText}
+				/>
+				<Button type="submit">Search</Button>
+			</form>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts
new file mode 100644
index 0000000..e53fb8d
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts
@@ -0,0 +1,84 @@
+import { createDataSDK } from "@salesforce/sdk-data";
+
+export interface ObjectSearchOptions<TWhere, TOrderBy> {
+	where?: TWhere;
+	orderBy?: TOrderBy;
+	first?: number;
+	after?: string;
+}
+
+export type PicklistOption = { value: string; label: string };
+
+/**
+ * Executes a GraphQL search query and extracts the result for the given object name
+ * from the standard `uiapi.query.<ObjectName>` response shape.
+ */
+export async function searchObjects<TResult, TQuery, TVariables>(
+	query: string,
+	objectName: string,
+	options: ObjectSearchOptions<unknown, unknown> = {},
+): Promise<TResult> {
+	const { where, orderBy, first = 20, after } = options;
+
+	const data = await createDataSDK();
+	const response = await data.graphql?.<TQuery, TVariables>(query, {
+		first,
+		after,
+		where,
+		orderBy,
+	} as TVariables);
+
+	if (response?.errors?.length) {
+		throw new Error(response.errors.map((e) => e.message).join("; "));
+	}
+
+	const result = (response?.data as Record<string, unknown> | undefined)?.uiapi as
+		| Record<string, unknown>
+		| undefined;
+	const queryResult = (result?.query as Record<string, unknown> | undefined)?.[objectName] as
+		| TResult
+		| undefined;
+
+	if (!queryResult) {
+		throw new Error(`No ${objectName} data returned`);
+	}
+
+	return queryResult;
+}
+
+/**
+ * Executes a GraphQL aggregate/groupBy query and extracts picklist options
+ * from the standard `uiapi.aggregate.<ObjectName>` response shape.
+ */
+export async function fetchDistinctValues<TQuery>(
+	query: string,
+	objectName: string,
+	fieldName: string,
+): Promise<PicklistOption[]> {
+	const data = await createDataSDK();
+	const response = await data.graphql?.<TQuery>(query);
+	const errors = response?.errors;
+
+	if (errors?.length) {
+		throw new Error(errors.map((e) => e.message).join("; "));
+	}
+
+	const result = (response?.data as Record<string, unknown> | undefined)?.uiapi as
+		| Record<string, unknown>
+		| undefined;
+	const aggregate = (result?.aggregate as Record<string, unknown> | undefined)?.[objectName] as
+		| { edges?: Array<{ node?: { aggregate?: Record<string, unknown> } }> }
+		| undefined;
+
+	const edges = aggregate?.edges ?? [];
+	return edges
+		.map((edge) => {
+			const field = edge?.node?.aggregate?.[fieldName] as
+				| { value?: string | null; displayValue?: string | null; label?: string | null }
+				| undefined;
+			const value = field?.value;
+			if (!value) return null;
+			return { value, label: field.label ?? field.displayValue ?? value };
+		})
+		.filter((opt): opt is PicklistOption => opt !== null);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx
new file mode 100644
index 0000000..d0ef8d4
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx
@@ -0,0 +1,89 @@
+import { X } from "lucide-react";
+import { Button } from "../../../components/ui/button";
+import { cn } from "../../../lib/utils";
+import type { ActiveFilterValue } from "../utils/filterUtils";
+
+function formatFilterLabel(filter: ActiveFilterValue): string {
+	const { label, type, value, min, max } = filter;
+
+	switch (type) {
+		case "search":
+			return `Search: ${value}`;
+		case "text":
+		case "picklist":
+			return `${label}: ${value}`;
+		case "multipicklist": {
+			const values = value ? value.split(",") : [];
+			if (values.length <= 2) return `${label}: ${values.join(", ")}`;
+			return `${label}: ${values.length} selected`;
+		}
+		case "boolean":
+			return `${label}: ${value === "true" ? "Yes" : "No"}`;
+		case "numeric": {
+			if (min && max) return `${label}: ${min} - ${max}`;
+			if (min) return `${label}: >= ${min}`;
+			return `${label}: <= ${max}`;
+		}
+		case "date": {
+			if (min && max) return `${label}: ${min} to ${max}`;
+			if (min) return `${label}: from ${min}`;
+			return `${label}: until ${max}`;
+		}
+		default:
+			return label;
+	}
+}
+
+interface ActiveFiltersProps extends React.ComponentProps<"div"> {
+	filters: ActiveFilterValue[];
+	onRemove: (field: string) => void;
+	buttonProps?: Omit<React.ComponentProps<typeof ActiveFilterButton>, "filter" | "onRemove">;
+}
+
+export function ActiveFilters({
+	filters,
+	onRemove,
+	className,
+	buttonProps,
+	...props
+}: ActiveFiltersProps) {
+	if (filters.length === 0) return null;
+
+	return (
+		<div className={cn("flex flex-wrap gap-2", className)} {...props}>
+			{filters.map((filter) => (
+				<ActiveFilterButton
+					key={filter.field}
+					filter={filter}
+					onRemove={onRemove}
+					{...buttonProps}
+				/>
+			))}
+		</div>
+	);
+}
+
+interface ActiveFilterButtonProps extends React.ComponentProps<typeof Button> {
+	filter: ActiveFilterValue;
+	onRemove: (field: string) => void;
+}
+
+export function ActiveFilterButton({
+	filter,
+	onRemove,
+	className,
+	...props
+}: ActiveFilterButtonProps) {
+	return (
+		<Button
+			variant="outline"
+			size="sm"
+			className={cn("gap-1 h-7 text-xs", className)}
+			onClick={() => onRemove(filter.field)}
+			{...props}
+		>
+			{formatFilterLabel(filter)}
+			<X className="h-3 w-3" />
+		</Button>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx
new file mode 100644
index 0000000..27720df
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx
@@ -0,0 +1,73 @@
+import { createContext, useContext, useCallback, type ReactNode } from "react";
+import { Button } from "../../../components/ui/button";
+import type { ActiveFilterValue } from "../utils/filterUtils";
+
+interface FilterContextValue {
+	filters: ActiveFilterValue[];
+	onFilterChange: (field: string, value: ActiveFilterValue | undefined) => void;
+	onFilterRemove: (field: string) => void;
+	onReset: () => void;
+}
+
+const FilterContext = createContext<FilterContextValue | null>(null);
+
+interface FilterProviderProps {
+	filters: ActiveFilterValue[];
+	onFilterChange: (field: string, value: ActiveFilterValue | undefined) => void;
+	onFilterRemove: (field: string) => void;
+	onReset: () => void;
+	children: ReactNode;
+}
+
+export function FilterProvider({
+	filters,
+	onFilterChange,
+	onFilterRemove,
+	onReset,
+	children,
+}: FilterProviderProps) {
+	return (
+		<FilterContext.Provider value={{ filters, onFilterChange, onFilterRemove, onReset }}>
+			{children}
+		</FilterContext.Provider>
+	);
+}
+
+function useFilterContext() {
+	const ctx = useContext(FilterContext);
+	if (!ctx) throw new Error("useFilterField must be used within a FilterProvider");
+	return ctx;
+}
+
+export function useFilterField(field: string) {
+	const { filters, onFilterChange, onFilterRemove } = useFilterContext();
+	const value = filters.find((f) => f.field === field);
+	const onChange = useCallback(
+		(next: ActiveFilterValue | undefined) => {
+			if (next) {
+				onFilterChange(field, next);
+			} else {
+				onFilterRemove(field);
+			}
+		},
+		[field, onFilterChange, onFilterRemove],
+	);
+	return { value, onChange };
+}
+
+export function useFilterPanel() {
+	const { filters, onReset } = useFilterContext();
+	return { hasActiveFilters: filters.length > 0, resetAll: onReset };
+}
+
+interface FilterResetButtonProps extends Omit<React.ComponentProps<typeof Button>, "onClick"> {}
+
+export function FilterResetButton({ children, ...props }: FilterResetButtonProps) {
+	const { hasActiveFilters, resetAll } = useFilterPanel();
+	if (!hasActiveFilters) return null;
+	return (
+		<Button onClick={resetAll} aria-label="Reset filters" variant="destructive" {...props}>
+			{children ?? "Reset"}
+		</Button>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx
new file mode 100644
index 0000000..a265d15
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx
@@ -0,0 +1,66 @@
+import { Link } from "react-router";
+import {
+	Breadcrumb,
+	BreadcrumbList,
+	BreadcrumbItem,
+	BreadcrumbLink,
+	BreadcrumbSeparator,
+	BreadcrumbPage,
+} from "../../../components/ui/breadcrumb";
+import { Skeleton } from "../../../components/ui/skeleton";
+
+interface ObjectBreadcrumbProps {
+	listPath: string;
+	listLabel: string;
+	recordName?: string;
+	loading?: boolean;
+	includeHome?: boolean; // default is true
+	homeLabel?: string; // default is "Home"
+}
+
+export function ObjectBreadcrumb({
+	listPath,
+	listLabel,
+	recordName,
+	loading,
+	includeHome = true,
+	homeLabel = "Home",
+}: ObjectBreadcrumbProps) {
+	const isDetailView = loading || recordName;
+
+	return (
+		<Breadcrumb className="mb-3">
+			<BreadcrumbList>
+				{includeHome && (
+					<BreadcrumbItem>
+						<BreadcrumbLink asChild>
+							<Link to="/">{homeLabel}</Link>
+						</BreadcrumbLink>
+					</BreadcrumbItem>
+				)}
+				<BreadcrumbSeparator />
+				{isDetailView ? (
+					<>
+						<BreadcrumbItem>
+							<BreadcrumbLink asChild>
+								<Link to={listPath}>{listLabel}</Link>
+							</BreadcrumbLink>
+						</BreadcrumbItem>
+						<BreadcrumbSeparator />
+						<BreadcrumbItem>
+							{loading && !recordName ? (
+								<Skeleton className="h-4 w-32" />
+							) : (
+								<BreadcrumbPage>{recordName}</BreadcrumbPage>
+							)}
+						</BreadcrumbItem>
+					</>
+				) : (
+					<BreadcrumbItem>
+						<BreadcrumbPage>{listLabel}</BreadcrumbPage>
+					</BreadcrumbItem>
+				)}
+			</BreadcrumbList>
+		</Breadcrumb>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx
new file mode 100644
index 0000000..3bb3937
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx
@@ -0,0 +1,109 @@
+import {
+	Pagination,
+	PaginationContent,
+	PaginationItem,
+	PaginationPrevious,
+	PaginationNext,
+} from "../../../components/ui/pagination";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "../../../components/ui/select";
+import { Label } from "../../../components/ui/label";
+
+interface PaginationControlsProps {
+	pageIndex: number;
+	hasNextPage: boolean;
+	hasPreviousPage: boolean;
+	pageSize: number;
+	pageSizeOptions: readonly number[];
+	onNextPage: () => void;
+	onPreviousPage: () => void;
+	onPageSizeChange: (newPageSize: number) => void;
+	disabled?: boolean;
+}
+
+export default function PaginationControls({
+	pageIndex,
+	hasNextPage,
+	hasPreviousPage,
+	pageSize,
+	pageSizeOptions,
+	onNextPage,
+	onPreviousPage,
+	onPageSizeChange,
+	disabled = false,
+}: PaginationControlsProps) {
+	const handlePageSizeChange = (newValue: string) => {
+		const newSize = parseInt(newValue, 10);
+		if (!isNaN(newSize) && newSize !== pageSize) {
+			onPageSizeChange(newSize);
+		}
+	};
+	const currentPage = pageIndex + 1;
+	const prevDisabled = disabled || !hasPreviousPage;
+	const nextDisabled = disabled || !hasNextPage;
+
+	return (
+		<div className="w-full grid grid-cols-1 sm:grid-cols-2 items-center justify-center gap-4 py-2">
+			<div
+				className="flex justify-center sm:justify-start items-center gap-2 shrink-0 row-2 sm:row-1"
+				role="group"
+				aria-label="Page size selector"
+			>
+				<Label htmlFor="page-size-select" className="text-sm font-normal whitespace-nowrap">
+					Results per page:
+				</Label>
+				<Select
+					value={pageSize.toString()}
+					onValueChange={handlePageSizeChange}
+					disabled={disabled}
+				>
+					<SelectTrigger
+						id="page-size-select"
+						className="w-16"
+						aria-label="Select number of results per page"
+					>
+						<SelectValue />
+					</SelectTrigger>
+					<SelectContent>
+						{pageSizeOptions.map((size) => (
+							<SelectItem key={size} value={size.toString()}>
+								{size}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+			</div>
+			<Pagination className="w-full mx-0 sm:justify-end">
+				<PaginationContent>
+					<PaginationItem>
+						<PaginationPrevious
+							onClick={prevDisabled ? undefined : onPreviousPage}
+							aria-disabled={prevDisabled}
+							className={prevDisabled ? "pointer-events-none opacity-50" : "cursor-pointer"}
+						/>
+					</PaginationItem>
+					<PaginationItem>
+						<span
+							className="min-w-16 text-center text-sm text-muted-foreground px-2"
+							aria-current="page"
+						>
+							Page {currentPage}
+						</span>
+					</PaginationItem>
+					<PaginationItem>
+						<PaginationNext
+							onClick={nextDisabled ? undefined : onNextPage}
+							aria-disabled={nextDisabled}
+							className={nextDisabled ? "pointer-events-none opacity-50" : "cursor-pointer"}
+						/>
+					</PaginationItem>
+				</PaginationContent>
+			</Pagination>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx
new file mode 100644
index 0000000..3a4e9ae
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx
@@ -0,0 +1,41 @@
+import { Search } from "lucide-react";
+import { Input } from "../../../components/ui/input";
+import { cn } from "../../../lib/utils";
+
+interface SearchBarProps extends React.ComponentProps<"div"> {
+	value: string;
+	handleChange: (value: string) => void;
+	placeholder?: string;
+	iconProps?: React.ComponentProps<typeof Search>;
+	inputProps?: Omit<React.ComponentProps<typeof Input>, "value">;
+}
+
+export function SearchBar({
+	value,
+	handleChange,
+	placeholder,
+	className,
+	iconProps,
+	inputProps,
+	...props
+}: SearchBarProps) {
+	return (
+		<div className={cn("relative flex-1", className)} title={placeholder} {...props}>
+			<Search
+				{...iconProps}
+				className={cn(
+					"absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground",
+					iconProps?.className,
+				)}
+			/>
+			<Input
+				type="text"
+				value={value}
+				onChange={(e) => handleChange(e.target.value)}
+				placeholder={placeholder}
+				{...inputProps}
+				className={cn("pl-9", inputProps?.className)}
+			/>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx
new file mode 100644
index 0000000..4fd911a
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx
@@ -0,0 +1,143 @@
+import { ArrowUp, ArrowDown } from "lucide-react";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "../../../components/ui/select";
+import { Button } from "../../../components/ui/button";
+import { cn } from "../../../lib/utils";
+import type { SortFieldConfig, SortState } from "../utils/sortUtils";
+
+const NONE_VALUE = "__none__";
+
+interface SortControlProps extends React.ComponentProps<"div"> {
+	configs: SortFieldConfig[];
+	sort: SortState | null;
+	onSortChange: (sort: SortState | null) => void;
+	labelProps?: React.ComponentProps<"span">;
+	selectProps?: Omit<
+		React.ComponentProps<typeof SortControlSelect>,
+		"configs" | "sort" | "onSortChange"
+	>;
+	directionButtonProps?: Omit<
+		React.ComponentProps<typeof SortDirectionButton>,
+		"sort" | "onSortChange"
+	>;
+}
+
+export function SortControl({
+	configs,
+	sort,
+	onSortChange,
+	className,
+	labelProps,
+	selectProps,
+	directionButtonProps,
+	...props
+}: SortControlProps) {
+	return (
+		<div className={cn("flex items-center gap-2", className)} {...props}>
+			<span
+				{...labelProps}
+				className={cn("text-sm text-muted-foreground whitespace-nowrap", labelProps?.className)}
+			>
+				{labelProps?.children ?? "Sort by"}
+			</span>
+			<SortControlSelect
+				configs={configs}
+				sort={sort}
+				onSortChange={onSortChange}
+				{...selectProps}
+			/>
+			{sort && (
+				<SortDirectionButton sort={sort} onSortChange={onSortChange} {...directionButtonProps} />
+			)}
+		</div>
+	);
+}
+
+interface SortControlSelectProps {
+	configs: SortFieldConfig[];
+	sort: SortState | null;
+	onSortChange: (sort: SortState | null) => void;
+	triggerProps?: React.ComponentProps<typeof SelectTrigger>;
+	contentProps?: React.ComponentProps<typeof SelectContent>;
+	selectValueProps?: React.ComponentProps<typeof SelectValue>;
+	selectItemProps?: Omit<React.ComponentProps<typeof SelectItem>, "value">;
+}
+
+export function SortControlSelect({
+	configs,
+	sort,
+	onSortChange,
+	triggerProps,
+	contentProps,
+	selectValueProps,
+	selectItemProps,
+}: SortControlSelectProps) {
+	return (
+		<Select
+			value={sort?.field ?? NONE_VALUE}
+			onValueChange={(v) => {
+				if (v === NONE_VALUE) {
+					onSortChange(null);
+				} else {
+					onSortChange({
+						field: v,
+						direction: sort?.direction ?? "ASC",
+					});
+				}
+			}}
+		>
+			<SelectTrigger
+				size="sm"
+				{...triggerProps}
+				className={cn("w-[160px]", triggerProps?.className)}
+			>
+				<SelectValue placeholder="Default" {...selectValueProps} />
+			</SelectTrigger>
+			<SelectContent {...contentProps}>
+				<SelectItem value={NONE_VALUE} {...selectItemProps}>
+					Default
+				</SelectItem>
+				{configs.map((c) => (
+					<SelectItem key={c.field} value={c.field} {...selectItemProps}>
+						{c.label}
+					</SelectItem>
+				))}
+			</SelectContent>
+		</Select>
+	);
+}
+
+interface SortDirectionButtonProps extends React.ComponentProps<typeof Button> {
+	sort: SortState;
+	onSortChange: (sort: SortState) => void;
+}
+
+export function SortDirectionButton({
+	sort,
+	onSortChange,
+	className,
+	...props
+}: SortDirectionButtonProps) {
+	return (
+		<Button
+			variant="ghost"
+			size="icon-sm"
+			className={cn(className)}
+			onClick={() =>
+				onSortChange({
+					...sort,
+					direction: sort.direction === "ASC" ? "DESC" : "ASC",
+				})
+			}
+			aria-label={`Sort ${sort.direction === "ASC" ? "descending" : "ascending"}`}
+			{...props}
+		>
+			{sort.direction === "ASC" ? <ArrowUp /> : <ArrowDown />}
+		</Button>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx
new file mode 100644
index 0000000..a7d4ed1
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx
@@ -0,0 +1,74 @@
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "../../../../components/ui/select";
+import { Label } from "../../../../components/ui/label";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import type { ActiveFilterValue } from "../../utils/filterUtils";
+
+const ALL_VALUE = "__all__";
+
+interface BooleanFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	helpText?: string;
+}
+
+export function BooleanFilter({ field, label, helpText, className, ...props }: BooleanFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label htmlFor={`filter-${field}`}>{label}</Label>
+			<BooleanFilterSelect field={field} label={label} value={value} onChange={onChange} />
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
+
+interface BooleanFilterSelectProps {
+	field: string;
+	label: string;
+	value: ActiveFilterValue | undefined;
+	onChange: (value: ActiveFilterValue | undefined) => void;
+	triggerProps?: React.ComponentProps<typeof SelectTrigger>;
+	contentProps?: React.ComponentProps<typeof SelectContent>;
+}
+
+export function BooleanFilterSelect({
+	field,
+	label,
+	value,
+	onChange,
+	triggerProps,
+	contentProps,
+}: BooleanFilterSelectProps) {
+	return (
+		<Select
+			value={value?.value ?? ALL_VALUE}
+			onValueChange={(v) => {
+				if (v === ALL_VALUE) {
+					onChange(undefined);
+				} else {
+					onChange({ field, label, type: "boolean", value: v });
+				}
+			}}
+		>
+			<SelectTrigger
+				id={`filter-${field}`}
+				{...triggerProps}
+				className={cn("w-full", triggerProps?.className)}
+			>
+				<SelectValue />
+			</SelectTrigger>
+			<SelectContent {...contentProps}>
+				<SelectItem value={ALL_VALUE}>All</SelectItem>
+				<SelectItem value="true">Yes</SelectItem>
+				<SelectItem value="false">No</SelectItem>
+			</SelectContent>
+		</Select>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx
new file mode 100644
index 0000000..7985ffd
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx
@@ -0,0 +1,121 @@
+import { useState } from "react";
+import { parseISO } from "date-fns";
+import { Label } from "../../../../components/ui/label";
+import {
+	DatePicker,
+	DatePickerTrigger,
+	DatePickerContent,
+	DatePickerCalendar,
+} from "../../../../components/ui/datePicker";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "../../../../components/ui/select";
+
+type DateOperator = "gt" | "lt";
+
+const OPERATOR_OPTIONS: { value: DateOperator; label: string }[] = [
+	{ value: "gt", label: "After" },
+	{ value: "lt", label: "Before" },
+];
+
+function operatorToField(op: DateOperator): "min" | "max" {
+	return op === "gt" ? "min" : "max";
+}
+
+interface DateFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	helpText?: string;
+}
+
+export function DateFilter({ field, label, helpText, className, ...props }: DateFilterProps) {
+	const { value, onChange } = useFilterField(field);
+
+	const initialOp: DateOperator = value?.min ? "gt" : "lt";
+	const [operator, setOperator] = useState<DateOperator>(initialOp);
+
+	const currentDate = toDate(value?.min ?? value?.max);
+
+	function handleOperatorChange(op: DateOperator) {
+		setOperator(op);
+		if (currentDate) {
+			emitChange(op, currentDate);
+		}
+	}
+
+	function handleDateChange(date: Date | undefined) {
+		if (!date) {
+			onChange(undefined);
+		} else {
+			emitChange(operator, date);
+		}
+	}
+
+	function emitChange(op: DateOperator, date: Date) {
+		const dateStr = toDateString(date);
+		const f = operatorToField(op);
+		onChange({
+			field,
+			label,
+			type: "date",
+			value: op,
+			min: f === "min" ? dateStr : undefined,
+			max: f === "max" ? dateStr : undefined,
+		});
+	}
+
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label>{label}</Label>
+			<div className="flex gap-2">
+				<Select value={operator} onValueChange={(v) => handleOperatorChange(v as DateOperator)}>
+					<SelectTrigger className="w-full flex-1">
+						<SelectValue />
+					</SelectTrigger>
+					<SelectContent>
+						{OPERATOR_OPTIONS.map((opt) => (
+							<SelectItem key={opt.value} value={opt.value}>
+								{opt.label}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+				<DatePicker>
+					<DatePickerTrigger
+						className="w-full flex-2"
+						date={currentDate}
+						dateFormat="MMM do, yyyy"
+						placeholder="Pick a date"
+						aria-label={label}
+					/>
+					<DatePickerContent>
+						<DatePickerCalendar
+							mode="single"
+							captionLayout="dropdown"
+							selected={currentDate}
+							onSelect={handleDateChange}
+						/>
+					</DatePickerContent>
+				</DatePicker>
+			</div>
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
+
+export function toDate(value: string | undefined): Date | undefined {
+	if (!value) return undefined;
+	const parsed = parseISO(value);
+	return isNaN(parsed.getTime()) ? undefined : parsed;
+}
+
+export function toDateString(date: Date | undefined): string {
+	if (!date) return "";
+	return date.toISOString().split("T")[0];
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx
new file mode 100644
index 0000000..d638f91
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx
@@ -0,0 +1,69 @@
+import type { DateRange } from "react-day-picker";
+import { Label } from "../../../../components/ui/label";
+import {
+	DatePicker,
+	DatePickerRangeTrigger,
+	DatePickerContent,
+	DatePickerCalendar,
+} from "../../../../components/ui/datePicker";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import { toDate, toDateString } from "./DateFilter";
+
+interface DateRangeFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	helpText?: string;
+}
+
+export function DateRangeFilter({
+	field,
+	label,
+	helpText,
+	className,
+	...props
+}: DateRangeFilterProps) {
+	const { value, onChange } = useFilterField(field);
+
+	const dateRange: DateRange | undefined =
+		value?.min || value?.max ? { from: toDate(value?.min), to: toDate(value?.max) } : undefined;
+
+	function handleRangeSelect(range: DateRange | undefined) {
+		if (!range?.from && !range?.to) {
+			onChange(undefined);
+		} else {
+			onChange({
+				field,
+				label,
+				type: "daterange",
+				min: toDateString(range?.from),
+				max: toDateString(range?.to),
+			});
+		}
+	}
+
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label>{label}</Label>
+			<DatePicker>
+				<DatePickerRangeTrigger
+					className="w-full"
+					dateRange={dateRange}
+					placeholder="Pick a date range"
+					aria-label={label}
+				/>
+				<DatePickerContent align="start">
+					<DatePickerCalendar
+						mode="range"
+						captionLayout="dropdown"
+						defaultMonth={dateRange?.from}
+						selected={dateRange}
+						onSelect={handleRangeSelect}
+						numberOfMonths={2}
+					/>
+				</DatePickerContent>
+			</DatePicker>
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx
new file mode 100644
index 0000000..afbb540
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx
@@ -0,0 +1,98 @@
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "../../../../components/ui/popover";
+import { Checkbox } from "../../../../components/ui/checkbox";
+import { Label } from "../../../../components/ui/label";
+import { Button } from "../../../../components/ui/button";
+import { cn } from "../../../../lib/utils";
+import { ChevronDown } from "lucide-react";
+import { useFilterField } from "../FilterContext";
+
+interface MultiSelectFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	options: Array<{ value: string; label: string }>;
+	helpText?: string;
+}
+
+export function MultiSelectFilter({
+	field,
+	label,
+	options,
+	helpText,
+	className,
+	...props
+}: MultiSelectFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	const selected = value?.value ? value.value.split(",") : [];
+
+	const triggerLabel =
+		selected.length === 0
+			? `Select ${label.toLowerCase()}`
+			: selected.length === 1
+				? (options.find((o) => o.value === selected[0])?.label ?? selected[0])
+				: `${selected.length} selected`;
+
+	function handleToggle(optionValue: string) {
+		const next = selected.includes(optionValue)
+			? selected.filter((v) => v !== optionValue)
+			: [...selected, optionValue];
+
+		if (next.length === 0) {
+			onChange(undefined);
+		} else {
+			onChange({
+				field,
+				label,
+				type: "multipicklist",
+				value: next.join(","),
+			});
+		}
+	}
+
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label>{label}</Label>
+			<Popover>
+				<PopoverTrigger asChild>
+					<Button
+						variant="outline"
+						role="combobox"
+						className={cn(
+							"w-full justify-between font-normal",
+							selected.length === 0 && "text-muted-foreground",
+						)}
+					>
+						<span className="truncate">{triggerLabel}</span>
+						<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+					</Button>
+				</PopoverTrigger>
+				<PopoverContent className="p-2" align="start">
+					<div className="max-h-48 overflow-y-auto space-y-1">
+						{options.map((opt) => {
+							const id = `filter-${field}-${opt.value}`;
+							return (
+								<div
+									key={opt.value}
+									className="flex items-center gap-2 rounded px-1 py-0.5 hover:bg-accent"
+								>
+									<Checkbox
+										id={id}
+										checked={selected.includes(opt.value)}
+										onCheckedChange={() => handleToggle(opt.value)}
+									/>
+									<Label htmlFor={id} className="text-sm font-normal cursor-pointer w-full">
+										{opt.label}
+									</Label>
+								</div>
+							);
+						})}
+					</div>
+				</PopoverContent>
+			</Popover>
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx
new file mode 100644
index 0000000..9554bdd
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx
@@ -0,0 +1,85 @@
+import { Input } from "../../../../components/ui/input";
+import { Label } from "../../../../components/ui/label";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import type { ActiveFilterValue } from "../../utils/filterUtils";
+
+interface NumericRangeFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	helpText?: string;
+}
+
+export function NumericRangeFilter({
+	field,
+	label,
+	helpText,
+	className,
+	...props
+}: NumericRangeFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label>{label}</Label>
+			<NumericRangeFilterInputs field={field} label={label} value={value} onChange={onChange} />
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
+
+interface NumericRangeFilterInputsProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	value: ActiveFilterValue | undefined;
+	onChange: (value: ActiveFilterValue | undefined) => void;
+	minInputProps?: React.ComponentProps<typeof Input>;
+	maxInputProps?: React.ComponentProps<typeof Input>;
+}
+
+export function NumericRangeFilterInputs({
+	field,
+	label,
+	value,
+	onChange,
+	className,
+	minInputProps,
+	maxInputProps,
+	...props
+}: NumericRangeFilterInputsProps) {
+	const handleChange = (bound: "min" | "max", v: string) => {
+		const next = {
+			field,
+			label,
+			type: "numeric" as const,
+			min: value?.min ?? "",
+			max: value?.max ?? "",
+			[bound]: v,
+		};
+		if (!next.min && !next.max) {
+			onChange(undefined);
+		} else {
+			onChange(next);
+		}
+	};
+
+	return (
+		<div className={cn("flex gap-2", className)} {...props}>
+			<Input
+				type="number"
+				placeholder="Min"
+				value={value?.min ?? ""}
+				onChange={(e) => handleChange("min", e.target.value)}
+				aria-label={`${label} minimum`}
+				{...minInputProps}
+			/>
+			<Input
+				type="number"
+				placeholder="Max"
+				value={value?.max ?? ""}
+				onChange={(e) => handleChange("max", e.target.value)}
+				aria-label={`${label} maximum`}
+				{...maxInputProps}
+			/>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx
new file mode 100644
index 0000000..c0ba308
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx
@@ -0,0 +1,37 @@
+import { Label } from "../../../../components/ui/label";
+import { cn } from "../../../../lib/utils";
+import { SearchBar } from "../SearchBar";
+import { useFilterField } from "../FilterContext";
+
+interface SearchFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	placeholder?: string;
+}
+
+export function SearchFilter({
+	field,
+	label,
+	placeholder,
+	className,
+	...props
+}: SearchFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label htmlFor={`filter-${field}`}>{label}</Label>
+			<SearchBar
+				value={value?.value ?? ""}
+				handleChange={(v) => {
+					if (v) {
+						onChange({ field, label, type: "search", value: v });
+					} else {
+						onChange(undefined);
+					}
+				}}
+				placeholder={placeholder}
+				inputProps={{ id: `filter-${field}` }}
+			/>
+		</div>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx
new file mode 100644
index 0000000..08801cb
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx
@@ -0,0 +1,93 @@
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "../../../../components/ui/select";
+import { Label } from "../../../../components/ui/label";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import type { ActiveFilterValue } from "../../utils/filterUtils";
+
+const ALL_VALUE = "__all__";
+
+interface SelectFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	options: Array<{ value: string; label: string }>;
+	helpText?: string;
+}
+
+export function SelectFilter({
+	field,
+	label,
+	options,
+	helpText,
+	className,
+	...props
+}: SelectFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label htmlFor={`filter-${field}`}>{label}</Label>
+			<SelectFilterControl
+				field={field}
+				label={label}
+				options={options}
+				value={value}
+				onChange={onChange}
+			/>
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
+
+interface SelectFilterControlProps {
+	field: string;
+	label: string;
+	options: Array<{ value: string; label: string }>;
+	value: ActiveFilterValue | undefined;
+	onChange: (value: ActiveFilterValue | undefined) => void;
+	triggerProps?: React.ComponentProps<typeof SelectTrigger>;
+	contentProps?: React.ComponentProps<typeof SelectContent>;
+}
+
+export function SelectFilterControl({
+	field,
+	label,
+	options,
+	value,
+	onChange,
+	triggerProps,
+	contentProps,
+}: SelectFilterControlProps) {
+	return (
+		<Select
+			value={value?.value ?? ALL_VALUE}
+			onValueChange={(v) => {
+				if (v === ALL_VALUE) {
+					onChange(undefined);
+				} else {
+					onChange({ field, label, type: "picklist", value: v });
+				}
+			}}
+		>
+			<SelectTrigger
+				id={`filter-${field}`}
+				{...triggerProps}
+				className={cn("w-full", triggerProps?.className)}
+			>
+				<SelectValue placeholder={`Select ${label.toLowerCase()}`} />
+			</SelectTrigger>
+			<SelectContent {...contentProps}>
+				<SelectItem value={ALL_VALUE}>All</SelectItem>
+				{options.map((opt) => (
+					<SelectItem key={opt.value} value={opt.value}>
+						{opt.label}
+					</SelectItem>
+				))}
+			</SelectContent>
+		</Select>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx
new file mode 100644
index 0000000..396abfd
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx
@@ -0,0 +1,74 @@
+import { Input } from "../../../../components/ui/input";
+import { Label } from "../../../../components/ui/label";
+import { cn } from "../../../../lib/utils";
+import { useFilterField } from "../FilterContext";
+import type { ActiveFilterValue } from "../../utils/filterUtils";
+
+interface TextFilterProps extends Omit<React.ComponentProps<"div">, "onChange"> {
+	field: string;
+	label: string;
+	placeholder?: string;
+	helpText?: string;
+}
+
+export function TextFilter({
+	field,
+	label,
+	placeholder,
+	helpText,
+	className,
+	...props
+}: TextFilterProps) {
+	const { value, onChange } = useFilterField(field);
+	return (
+		<div className={cn("space-y-1.5", className)} {...props}>
+			<Label htmlFor={`filter-${field}`}>{label}</Label>
+			<TextFilterInput
+				field={field}
+				label={label}
+				placeholder={placeholder}
+				value={value}
+				onChange={onChange}
+			/>
+			{helpText && <p className="text-xs text-muted-foreground">{helpText}</p>}
+		</div>
+	);
+}
+
+interface TextFilterInputProps extends Omit<
+	React.ComponentProps<typeof Input>,
+	"onChange" | "value"
+> {
+	field: string;
+	label: string;
+	value: ActiveFilterValue | undefined;
+	onChange: (value: ActiveFilterValue | undefined) => void;
+}
+
+export function TextFilterInput({
+	field,
+	label,
+	value,
+	onChange,
+	className,
+	...props
+}: TextFilterInputProps) {
+	return (
+		<Input
+			id={`filter-${field}`}
+			type="text"
+			placeholder={props.placeholder ?? `Filter by ${label.toLowerCase()}...`}
+			value={value?.value ?? ""}
+			onChange={(e) => {
+				const v = e.target.value;
+				if (v) {
+					onChange({ field, label, type: "text", value: v });
+				} else {
+					onChange(undefined);
+				}
+			}}
+			className={cn(className)}
+			{...props}
+		/>
+	);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts
new file mode 100644
index 0000000..f029379
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts
@@ -0,0 +1,54 @@
+import { useCallback, useEffect, useState } from "react";
+
+interface UseAsyncDataResult<T> {
+	data: T | null;
+	loading: boolean;
+	error: string | null;
+}
+
+/**
+ * Runs an async fetcher on mount and whenever `deps` change.
+ * Returns the loading/error/data state. Does not cache — every call
+ * to the fetcher hits the source directly.
+ *
+ * A cleanup flag prevents state updates if the component unmounts
+ * or deps change before the fetch completes (avoids React warnings
+ * and stale updates from out-of-order responses).
+ */
+export function useAsyncData<T>(
+	fetcher: () => Promise<T>,
+	deps: React.DependencyList,
+): UseAsyncDataResult<T> {
+	const [data, setData] = useState<T | null>(null);
+	const [loading, setLoading] = useState(true);
+	const [error, setError] = useState<string | null>(null);
+
+	// Re-create the fetcher reference only when deps change.
+	// eslint-disable-next-line react-hooks/exhaustive-deps --- deps are explicitly managed by the caller
+	const memoizedFetcher = useCallback(fetcher, deps);
+
+	useEffect(() => {
+		// Guard against setting state after unmount or dep change.
+		let cancelled = false;
+		setLoading(true);
+		setError(null);
+
+		memoizedFetcher()
+			.then((result) => {
+				if (!cancelled) setData(result);
+			})
+			.catch((err) => {
+				console.error(err);
+				if (!cancelled) setError(err instanceof Error ? err.message : "An error occurred");
+			})
+			.finally(() => {
+				if (!cancelled) setLoading(false);
+			});
+
+		return () => {
+			cancelled = true;
+		};
+	}, [memoizedFetcher]);
+
+	return { data, loading, error };
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts
new file mode 100644
index 0000000..ab08d27
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts
@@ -0,0 +1,184 @@
+import { useCallback, useEffect, useState } from "react";
+
+interface UseAsyncDataResult<T> {
+	data: T | null;
+	loading: boolean;
+	error: string | null;
+}
+
+interface CacheOptions {
+	/** Unique cache key. Used for lookups and invalidation via `clearCacheEntry`. */
+	key: string;
+	/** Time-to-live in ms. Default: 30_000 (30s) */
+	ttl?: number;
+	/** Max entries in the cache. Default: 50. Evicts oldest entry when exceeded. */
+	maxSize?: number;
+}
+
+interface CacheEntry {
+	data: unknown;
+	timestamp: number;
+}
+
+/**
+ * Module-level cache shared across all useCachedAsyncData consumers.
+ * Cleared automatically on page reload since it only lives in memory.
+ * Keys are caller-provided so different hook call-sites get independent entries.
+ */
+const cache = new Map<string, CacheEntry>();
+
+/**
+ * Returns a cached entry if it exists and hasn't exceeded its TTL.
+ * Expired entries are deleted lazily here rather than on a timer,
+ * so there's no background cleanup overhead.
+ */
+function getValidEntry(key: string, ttl: number): CacheEntry | undefined {
+	const entry = cache.get(key);
+	if (!entry) return undefined;
+	if (Date.now() - entry.timestamp > ttl) {
+		cache.delete(key);
+		return undefined;
+	}
+	return entry;
+}
+
+/**
+ * Stores a result in the cache. If the cache is at capacity and the key
+ * is new, the oldest entry (first in Map insertion order — FIFO) is evicted.
+ */
+function setEntry(key: string, data: unknown, maxSize: number): void {
+	if (!cache.has(key) && cache.size >= maxSize) {
+		const firstKey = cache.keys().next().value;
+		if (firstKey !== undefined) cache.delete(firstKey);
+	}
+	cache.set(key, { data, timestamp: Date.now() });
+}
+
+/**
+ * Removes a single cache entry by key. The key must match the
+ * `options.key` passed to `useCachedAsyncData`.
+ *
+ * @example
+ * // Hook:
+ * useCachedAsyncData(() => fetchAccountDetail(id), [id], { key: `account:${id}` });
+ *
+ * // Invalidate after a mutation:
+ * await updateAccount(id, fields);
+ * clearCacheEntry(`account:${id}`);
+ */
+export function clearCacheEntry(key: string): void {
+	cache.delete(key);
+}
+
+/**
+ * Removes all cache entries. Useful for global invalidation scenarios
+ * like user logout or after a bulk operation.
+ *
+ * @example
+ * async function handleLogout() {
+ *   await logout();
+ *   clearCache();
+ *   navigate("/login");
+ * }
+ */
+export function clearCache(): void {
+	cache.clear();
+}
+
+/**
+ * Async data hook with in-memory caching. Works like `useAsyncData` but
+ * avoids redundant network calls when the same data is requested again
+ * (e.g. navigating away from a page and back).
+ *
+ * Cache behaviour:
+ * - **Key**: Provided via `options.key`. Must be unique per logical data source.
+ *   Use the same key with `clearCacheEntry` to invalidate.
+ * - **Hit**: Data is returned synchronously on the initial render —
+ *   `loading` starts as `false`, so there's no flash of a loading state.
+ * - **Miss**: The fetcher runs, and the result is stored for future hits.
+ * - **TTL**: Entries expire after `options.ttl` ms (default 30 s).
+ *   Expiry is checked lazily on read, not on a timer.
+ * - **Max size**: Oldest entries are evicted FIFO when the cache exceeds
+ *   `options.maxSize` (default 50).
+ *
+ * @example
+ * // Cache picklist options for 5 minutes (data rarely changes)
+ * const { data: types } = useCachedAsyncData(fetchDistinctTypes, [], {
+ *   key: "distinctTypes",
+ *   ttl: 300_000,
+ * });
+ *
+ * // Cache search results with default 30 s TTL (back-nav returns instantly)
+ * const { data } = useCachedAsyncData(
+ *   () => searchAccounts({ where, orderBy, first, after }),
+ *   [where, orderBy, first, after],
+ *   { key: `accounts:${JSON.stringify({ where, orderBy, first, after })}` },
+ * );
+ *
+ * // Invalidate a specific entry after a mutation
+ * await updateAccount(id, fields);
+ * clearCacheEntry(`account:${id}`);
+ *
+ * // Or clear everything (e.g. on logout)
+ * clearCache();
+ */
+export function useCachedAsyncData<T>(
+	fetcher: () => Promise<T>,
+	deps: React.DependencyList,
+	options: CacheOptions,
+): UseAsyncDataResult<T> {
+	const ttl = options.ttl ?? 30_000;
+	const maxSize = options.maxSize ?? 50;
+	const cacheKey = options.key;
+
+	// Synchronous cache check during state initialization so a cache hit
+	// never triggers a loading → loaded transition (avoids UI flicker).
+	const cached = getValidEntry(cacheKey, ttl);
+
+	const [data, setData] = useState<T | null>((cached?.data as T) ?? null);
+	const [loading, setLoading] = useState(!cached);
+	const [error, setError] = useState<string | null>(null);
+
+	// eslint-disable-next-line react-hooks/exhaustive-deps --- deps are explicitly managed by the caller
+	const memoizedFetcher = useCallback(fetcher, deps);
+
+	useEffect(() => {
+		// Re-check the cache inside the effect because deps may have changed
+		// since the initial render (e.g. StrictMode double-invoke).
+		const entry = getValidEntry(cacheKey, ttl);
+		if (entry) {
+			setData(entry.data as T);
+			setLoading(false);
+			setError(null);
+			return;
+		}
+
+		// No cache hit — fetch from the network.
+		let cancelled = false;
+		setLoading(true);
+		setError(null);
+
+		memoizedFetcher()
+			.then((result) => {
+				if (!cancelled) {
+					setEntry(cacheKey, result, maxSize);
+					setData(result);
+				}
+			})
+			.catch((err) => {
+				console.error(err);
+				if (!cancelled) setError(err instanceof Error ? err.message : "An error occurred");
+			})
+			.finally(() => {
+				if (!cancelled) setLoading(false);
+			});
+
+		// Cleanup: if deps change or the component unmounts before the fetch
+		// completes, the cancelled flag prevents stale state updates.
+		return () => {
+			cancelled = true;
+		};
+	}, [memoizedFetcher, cacheKey, ttl, maxSize]);
+
+	return { data, loading, error };
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts
new file mode 100644
index 0000000..7eff96e
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts
@@ -0,0 +1,247 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useSearchParams } from "react-router";
+import type { FilterFieldConfig, ActiveFilterValue } from "../utils/filterUtils";
+import type { SortFieldConfig, SortState } from "../utils/sortUtils";
+import { filtersToSearchParams, searchParamsToFilters, buildFilter } from "../utils/filterUtils";
+import { buildOrderBy } from "../utils/sortUtils";
+import { debounce } from "../utils/debounce";
+
+/** How long to wait before flushing local state changes to the URL. */
+const URL_SYNC_DEBOUNCE_MS = 300;
+
+export interface PaginationConfig {
+	defaultPageSize: number;
+	validPageSizes: number[];
+}
+
+export interface UseObjectSearchParamsReturn<TFilter, TOrderBy> {
+	filters: {
+		active: ActiveFilterValue[];
+		set: (field: string, value: ActiveFilterValue | undefined) => void;
+		remove: (field: string) => void;
+	};
+	sort: {
+		current: SortState | null;
+		set: (sort: SortState | null) => void;
+	};
+	query: { where: TFilter; orderBy: TOrderBy };
+	pagination: {
+		pageSize: number;
+		pageIndex: number;
+		afterCursor: string | undefined;
+		setPageSize: (size: number) => void;
+		goToNextPage: (cursor: string) => void;
+		goToPreviousPage: () => void;
+	};
+	resetAll: () => void;
+}
+
+/**
+ * Manages filter, sort, and cursor-based pagination state for an object search page.
+ *
+ * ## State model
+ * Local React state is the primary driver for instant UI updates.
+ * URL search params act as the durable source of truth so that a page
+ * refresh or shared link restores the same view. Changes are synced to
+ * the URL via a debounced write (300 ms) to avoid excessive history entries.
+ *
+ * ## Return shape
+ * Returns memoized groups so each group's reference is stable unless its
+ * contents change — safe to pass directly as props to `React.memo` children.
+ *
+ * - `filters`    — active filter values + set/remove callbacks
+ * - `sort`       — current sort state + set callback
+ * - `query`      — derived `where` / `orderBy` objects ready for the API
+ * - `pagination` — page size, page index, cursor, and navigation callbacks
+ * - `resetAll`   — clears all filters, sort, and pagination in one call
+ */
+export function useObjectSearchParams<TFilter, TOrderBy>(
+	filterConfigs: FilterFieldConfig[],
+	_sortConfigs?: SortFieldConfig[],
+	paginationConfig?: PaginationConfig,
+) {
+	const defaultPageSize = paginationConfig?.defaultPageSize ?? 10;
+	const validPageSizes = paginationConfig?.validPageSizes ?? [defaultPageSize];
+	const [searchParams, setSearchParams] = useSearchParams();
+
+	// Seed local state from URL on initial load
+	const initial = useMemo(
+		() => searchParamsToFilters(searchParams, filterConfigs),
+		// Only run on mount — local state takes over after that, no deps needed
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+		[],
+	);
+
+	const [filters, setFilters] = useState<ActiveFilterValue[]>(initial.filters);
+	const [sort, setLocalSort] = useState<SortState | null>(initial.sort);
+
+	// Pagination — cursor-based with a stack to support "previous page" navigation.
+	const getValidPageSize = (size: number) =>
+		validPageSizes.includes(size) ? size : defaultPageSize;
+
+	const [pageSize, setPageSizeState] = useState<number>(
+		getValidPageSize(initial.pageSize ?? defaultPageSize),
+	);
+	const [pageIndex, setPageIndex] = useState(initial.pageIndex);
+	const [afterCursor, setAfterCursor] = useState<string | undefined>(undefined);
+	const cursorStackRef = useRef<string[]>([]);
+
+	// Debounced URL sync — keeps URL in sync without blocking the UI
+	const syncToUrl = useCallback(
+		(
+			nextFilters: ActiveFilterValue[],
+			nextSort: SortState | null,
+			nextPageSize?: number,
+			nextPageIndex?: number,
+		) => {
+			const params = filtersToSearchParams(nextFilters, nextSort, nextPageSize, nextPageIndex);
+			setSearchParams(params, { replace: true });
+		},
+		[setSearchParams],
+	);
+
+	const debouncedSyncRef = useRef(debounce(syncToUrl, URL_SYNC_DEBOUNCE_MS));
+	useEffect(() => {
+		debouncedSyncRef.current = debounce(syncToUrl, URL_SYNC_DEBOUNCE_MS);
+	}, [syncToUrl]);
+
+	// Snapshot ref — lets callbacks read the latest state without being
+	// recreated on every render (avoids infinite useCallback chains).
+	const stateRef = useRef({ filters, sort, pageSize, pageIndex });
+	stateRef.current = { filters, sort, pageSize, pageIndex };
+
+	// Any filter/sort change resets pagination to the first page.
+	const resetPagination = useCallback(() => {
+		setPageIndex(0);
+		setAfterCursor(undefined);
+		cursorStackRef.current = [];
+	}, []);
+
+	// -- Filter callbacks -------------------------------------------------------
+
+	const setFilter = useCallback(
+		(field: string, value: ActiveFilterValue | undefined) => {
+			const { sort: s, pageSize: ps } = stateRef.current;
+			setFilters((prev) => {
+				const next = prev.filter((f) => f.field !== field);
+				if (value) next.push(value);
+				debouncedSyncRef.current(next, s, ps);
+				return next;
+			});
+			resetPagination();
+		},
+		[resetPagination],
+	);
+
+	const removeFilter = useCallback(
+		(field: string) => {
+			const { sort: s, pageSize: ps } = stateRef.current;
+			setFilters((prev) => {
+				const next = prev.filter((f) => f.field !== field);
+				debouncedSyncRef.current(next, s, ps);
+				return next;
+			});
+			resetPagination();
+		},
+		[resetPagination],
+	);
+
+	// -- Sort callback ----------------------------------------------------------
+
+	const setSort = useCallback(
+		(nextSort: SortState | null) => {
+			const { filters: f, pageSize: ps } = stateRef.current;
+			setLocalSort(nextSort);
+			debouncedSyncRef.current(f, nextSort, ps);
+			resetPagination();
+		},
+		[resetPagination],
+	);
+
+	// -- Reset ------------------------------------------------------------------
+
+	const resetAll = useCallback(() => {
+		setFilters([]);
+		setLocalSort(null);
+		resetPagination();
+		syncToUrl([], null, defaultPageSize, 0);
+		setPageSizeState(defaultPageSize);
+	}, [syncToUrl, resetPagination]);
+
+	// -- Pagination callbacks ---------------------------------------------------
+	// Uses a cursor stack to track visited pages. "Next" pushes the current
+	// endCursor onto the stack; "Previous" pops it to restore the prior cursor.
+
+	const goToNextPage = useCallback((endCursor: string) => {
+		cursorStackRef.current = [...cursorStackRef.current, endCursor];
+		setAfterCursor(endCursor);
+		setPageIndex((prev) => {
+			const nextIndex = prev + 1;
+			const { filters: f, sort: s, pageSize: ps } = stateRef.current;
+			debouncedSyncRef.current(f, s, ps, nextIndex);
+			return nextIndex;
+		});
+	}, []);
+
+	const goToPreviousPage = useCallback(() => {
+		const stack = cursorStackRef.current;
+		const next = stack.slice(0, -1);
+		cursorStackRef.current = next;
+		setAfterCursor(next.length > 0 ? next[next.length - 1] : undefined);
+		setPageIndex((prev) => {
+			const nextIndex = Math.max(0, prev - 1);
+			const { filters: f, sort: s, pageSize: ps } = stateRef.current;
+			debouncedSyncRef.current(f, s, ps, nextIndex);
+			return nextIndex;
+		});
+	}, []);
+
+	const setPageSize = useCallback(
+		(newSize: number) => {
+			const validated = getValidPageSize(newSize);
+			const { filters: f, sort: s } = stateRef.current;
+			setPageSizeState(validated);
+			resetPagination();
+			debouncedSyncRef.current(f, s, validated);
+		},
+		[resetPagination],
+	);
+
+	// -- Derived query objects ---------------------------------------------------
+	// Translate local filter/sort state into API-ready `where` and `orderBy`.
+
+	const where = useMemo(
+		() => buildFilter<TFilter>(filters, filterConfigs),
+		[filters, filterConfigs],
+	);
+
+	const orderBy = useMemo(() => buildOrderBy<TOrderBy>(sort), [sort]);
+
+	// -- Memoized return groups -------------------------------------------------
+	// Each group is individually memoized so its object reference stays stable
+	// unless the contained values change. This makes it safe to pass a group
+	// (e.g. `pagination`) directly as props to a React.memo child without
+	// causing unnecessary re-renders.
+
+	const filtersGroup = useMemo(
+		() => ({ active: filters, set: setFilter, remove: removeFilter }),
+		[filters, setFilter, removeFilter],
+	);
+
+	const sortGroup = useMemo(() => ({ current: sort, set: setSort }), [sort, setSort]);
+
+	const query = useMemo(() => ({ where, orderBy }), [where, orderBy]);
+
+	const pagination = useMemo(
+		() => ({ pageSize, pageIndex, afterCursor, setPageSize, goToNextPage, goToPreviousPage }),
+		[pageSize, pageIndex, afterCursor, setPageSize, goToNextPage, goToPreviousPage],
+	);
+
+	return {
+		filters: filtersGroup,
+		sort: sortGroup,
+		query,
+		pagination,
+		resetAll,
+	};
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts
new file mode 100644
index 0000000..4fc1fe5
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts
@@ -0,0 +1,22 @@
+/**
+ * Creates a debounced version of the provided function.
+ *
+ * Each call to the returned function resets the internal timer. The wrapped
+ * function is only invoked once the timer expires without being reset. This
+ * makes it ideal for rate-limiting high-frequency events like input changes.
+ *
+ * @typeParam T - The function signature to debounce.
+ * @param fn - The function to debounce.
+ * @param ms - The debounce delay in milliseconds.
+ * @returns A new function with the same signature that delays execution.
+ */
+export function debounce<T extends (...args: never[]) => void>(
+	fn: T,
+	ms: number,
+): (...args: Parameters<T>) => void {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	return (...args: Parameters<T>) => {
+		clearTimeout(timer);
+		timer = setTimeout(() => fn(...args), ms);
+	};
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts
new file mode 100644
index 0000000..90edc90
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts
@@ -0,0 +1,29 @@
+export function fieldValue(
+	field: { displayValue?: string | null; value?: unknown } | null | undefined,
+): string | null {
+	if (field?.displayValue != null) return field.displayValue;
+	if (field?.value != null) return String(field.value);
+	return null;
+}
+
+export function getAddressFieldLines(address: {
+	street?: string | null;
+	city?: string | null;
+	state?: string | null;
+	postalCode?: string | null;
+	country?: string | null;
+}) {
+	const cityStateZip = [address.city, address.state].filter(Boolean).join(", ");
+	const cityStateZipLine = [cityStateZip, address.postalCode].filter(Boolean).join(" ");
+	const lines = [address.street, cityStateZipLine, address.country].filter(Boolean);
+	if (lines.length === 0) return null;
+	return lines;
+}
+
+export function formatDateTimeField(
+	value?: string | null,
+	...args: Parameters<Date["toLocaleString"]>
+) {
+	if (!value) return null;
+	return new Date(value).toLocaleString(...args);
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts
new file mode 100644
index 0000000..db8459a
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts
@@ -0,0 +1,372 @@
+/**
+ * filterUtils.ts
+ *
+ * Centralizes all filter-related transformations for the object search feature.
+ * This module handles two distinct concerns:
+ *
+ * 1. **URL serialization** — Converting filter/sort state to and from
+ *    URLSearchParams so that search criteria can be bookmarked, shared, and
+ *    restored on page load.
+ *
+ * 2. **GraphQL query building** — Converting the same filter state into the
+ *    `where` clause shape expected by the GraphQL API.
+ *
+ * Both concerns operate on the shared {@link ActiveFilterValue} type, which
+ * represents a single active filter with a field name, filter type, and one or
+ * more values (value, min, max).
+ */
+
+import type { SortState } from "./sortUtils";
+
+export type FilterFieldType =
+	| "text"
+	| "picklist"
+	| "numeric"
+	| "boolean"
+	| "date"
+	| "daterange"
+	| "multipicklist"
+	| "search";
+
+export type FilterFieldConfig<TFieldName extends string = string> = {
+	field: TFieldName;
+	label: string;
+	type: FilterFieldType;
+	placeholder?: string;
+	/** Required for picklist type. */
+	options?: Array<{ value: string; label: string }>;
+	helpText?: string;
+	/** Required for search type — the fields to match against with `or`. */
+	searchFields?: string[];
+};
+
+export type ActiveFilterValue<TFieldName extends string = string> = {
+	field: TFieldName;
+	label: string;
+	type: FilterFieldType;
+	value?: string;
+	min?: string;
+	max?: string;
+};
+
+// ---------------------------------------------------------------------------
+// URL Serialization
+// ---------------------------------------------------------------------------
+
+/**
+ * Prefix applied to all filter-related URL search params.
+ * This namespaces filter params so they don't collide with other query params
+ * (e.g. pagination, feature flags).
+ *
+ * @example "f.Industry=Technology" or "f.AnnualRevenue.min=1000000"
+ */
+const FILTER_PREFIX = "f.";
+
+/** URL param key for the multi-field search term. */
+const SEARCH_KEY = "q";
+
+/** URL param key for the currently sorted field name. */
+const SORT_KEY = "sort";
+
+/** URL param key for the sort direction (ASC or DESC). */
+const DIR_KEY = "dir";
+
+/** URL param key for the page size preference. */
+const PAGE_SIZE_KEY = "ps";
+const PAGE_KEY = "page";
+
+/**
+ * Serializes filter and sort state into URLSearchParams.
+ *
+ * Encoding scheme:
+ *   - Simple values (text, picklist, boolean, multipicklist):
+ *       `f.<field>=<value>`
+ *   - Range values (numeric, date, daterange):
+ *       `f.<field>.min=<min>` and/or `f.<field>.max=<max>`
+ *   - Sort: `sort=<field>&dir=ASC|DESC`
+ *
+ * @param filters - The currently active filters to serialize.
+ * @param sort    - The current sort state, or null if no sort is applied.
+ * @returns A URLSearchParams instance representing the full search state.
+ *
+ * @example
+ * ```ts
+ * const params = filtersToSearchParams(
+ *   [{ field: "Industry", type: "picklist", value: "Technology" }],
+ *   { field: "Name", direction: "ASC" },
+ * );
+ * // params.toString() => "f.Industry=Technology&sort=Name&dir=ASC"
+ * ```
+ */
+export function filtersToSearchParams(
+	filters: ActiveFilterValue[],
+	sort: SortState | null,
+	pageSize?: number,
+	pageIndex?: number,
+): URLSearchParams {
+	const params = new URLSearchParams();
+
+	for (const filter of filters) {
+		if (filter.type === "search") {
+			if (filter.value) params.set(SEARCH_KEY, filter.value);
+			continue;
+		}
+		if (filter.value !== undefined && filter.value !== "") {
+			params.set(`${FILTER_PREFIX}${filter.field}`, filter.value);
+		}
+		if (filter.min !== undefined && filter.min !== "") {
+			params.set(`${FILTER_PREFIX}${filter.field}.min`, filter.min);
+		}
+		if (filter.max !== undefined && filter.max !== "") {
+			params.set(`${FILTER_PREFIX}${filter.field}.max`, filter.max);
+		}
+	}
+
+	if (sort) {
+		params.set(SORT_KEY, sort.field);
+		params.set(DIR_KEY, sort.direction);
+	}
+
+	if (pageSize !== undefined) {
+		params.set(PAGE_SIZE_KEY, String(pageSize));
+	}
+
+	if (pageIndex !== undefined && pageIndex > 0) {
+		params.set(PAGE_KEY, String(pageIndex + 1));
+	}
+
+	return params;
+}
+
+/**
+ * Deserializes URLSearchParams back into filter and sort state.
+ *
+ * Requires the full list of filter configs so it knows which URL params to look
+ * for and what type each filter is. Params that don't match a known config are
+ * silently ignored, making this safe against stale or hand-edited URLs.
+ *
+ * @param params  - The URLSearchParams to parse (typically from the browser URL).
+ * @param configs - The filter field configurations defining available filters.
+ * @returns An object containing the deserialized `filters` array and `sort` state.
+ *
+ * @example
+ * ```ts
+ * const url = new URLSearchParams("f.Industry=Technology&sort=Name&dir=ASC");
+ * const { filters, sort } = searchParamsToFilters(url, filterConfigs);
+ * // filters => [{ field: "Industry", type: "picklist", value: "Technology" }]
+ * // sort    => { field: "Name", direction: "ASC" }
+ * ```
+ */
+export function searchParamsToFilters(
+	params: URLSearchParams,
+	configs: FilterFieldConfig[],
+): {
+	filters: ActiveFilterValue[];
+	sort: SortState | null;
+	pageSize: number | undefined;
+	pageIndex: number;
+} {
+	const filters: ActiveFilterValue[] = [];
+
+	for (const config of configs) {
+		const { field, label, type } = config;
+
+		if (type === "search") {
+			const q = params.get(SEARCH_KEY);
+			if (q) {
+				filters.push({ field, label, type: "search", value: q });
+			}
+			continue;
+		}
+
+		const value = params.get(`${FILTER_PREFIX}${field}`) ?? undefined;
+		const min = params.get(`${FILTER_PREFIX}${field}.min`) ?? undefined;
+		const max = params.get(`${FILTER_PREFIX}${field}.max`) ?? undefined;
+
+		const hasValue = value !== undefined && value !== "";
+		const hasRange = (min !== undefined && min !== "") || (max !== undefined && max !== "");
+
+		if (hasValue || hasRange) {
+			filters.push({ field, label, type, value, min, max });
+		}
+	}
+
+	let sort: SortState | null = null;
+	const sortField = params.get(SORT_KEY);
+	const sortDir = params.get(DIR_KEY);
+	if (sortField) {
+		sort = {
+			field: sortField,
+			direction: sortDir === "DESC" ? "DESC" : "ASC",
+		};
+	}
+
+	const pageSizeRaw = params.get(PAGE_SIZE_KEY);
+	const pageSize = pageSizeRaw ? parseInt(pageSizeRaw, 10) : undefined;
+
+	const pageRaw = params.get(PAGE_KEY);
+	const page = pageRaw ? parseInt(pageRaw, 10) : 1;
+	const pageIndex = !isNaN(page) && page > 1 ? page - 1 : 0;
+
+	return {
+		filters,
+		sort,
+		pageSize: pageSize && !isNaN(pageSize) ? pageSize : undefined,
+		pageIndex,
+	};
+}
+
+// ---------------------------------------------------------------------------
+// GraphQL Filter Building
+// ---------------------------------------------------------------------------
+
+/**
+ * Converts an array of active filter values into a GraphQL `where` clause.
+ *
+ * Each filter is individually converted to a clause via {@link buildSingleFilter},
+ * then multiple clauses are combined with a top-level `and` operator. This ensures
+ * all active filters are applied simultaneously (intersection semantics).
+ *
+ * @typeParam TFilter - The GraphQL filter input type (e.g. `AccountFilterInput`).
+ * @param filters - The active filters to convert.
+ * @returns A filter object for the GraphQL `where` variable, or `undefined` if
+ *          no filters are active (which tells the API to return unfiltered results).
+ *
+ * @example
+ * ```ts
+ * const where = buildFilter<AccountFilterInput>([
+ *   { field: "Industry", type: "picklist", value: "Technology" },
+ *   { field: "AnnualRevenue", type: "numeric", min: "1000000" },
+ * ]);
+ * // where => { and: [
+ * //   { Industry: { eq: "Technology" } },
+ * //   { AnnualRevenue: { gte: 1000000 } },
+ * // ]}
+ * ```
+ */
+export function buildFilter<TFilter>(
+	filters: ActiveFilterValue[],
+	configs: FilterFieldConfig[],
+): TFilter | undefined {
+	const configMap = new Map(configs.map((c) => [c.field, c]));
+	const clauses: TFilter[] = [];
+
+	for (const filter of filters) {
+		const clause = buildSingleFilter<TFilter>(filter, configMap.get(filter.field));
+		if (clause) clauses.push(clause);
+	}
+
+	if (clauses.length === 0) return undefined;
+	if (clauses.length === 1) return clauses[0];
+	return { and: clauses } as TFilter;
+}
+
+/**
+ * Converts a YYYY-MM-DD date string to a full ISO-8601 datetime at midnight UTC.
+ * Used as the inclusive lower bound for date range queries.
+ */
+function toStartOfDay(dateStr: string): string {
+	return `${dateStr}T00:00:00.000Z`;
+}
+
+/**
+ * Converts a YYYY-MM-DD date string to a full ISO-8601 datetime at the last
+ * millisecond of the day in UTC. Used as the inclusive upper bound for date
+ * range queries.
+ */
+function toEndOfDay(dateStr: string): string {
+	return `${dateStr}T23:59:59.999Z`;
+}
+
+/**
+ * Converts a single active filter value into a GraphQL filter clause.
+ *
+ * Supported filter types and their GraphQL mappings:
+ *
+ * | Type            | GraphQL operator(s) | Example output                                           |
+ * |-----------------|---------------------|----------------------------------------------------------|
+ * | `text`          | `like`              | `{ Name: { like: "%Acme%" } }`                           |
+ * | `picklist`      | `eq`                | `{ Industry: { eq: "Technology" } }`                      |
+ * | `multipicklist` | `eq` or `in`        | `{ Type: { in: ["A", "B"] } }`                            |
+ * | `numeric`       | `gte` / `lte`       | `{ Revenue: { gte: 1000, lte: 5000 } }`                   |
+ * | `boolean`       | `eq`                | `{ IsActive: { eq: true } }`                              |
+ * | `date`          | dynamic operator    | `{ CreatedDate: { gte: { value: "..." } } }`              |
+ * | `daterange`     | `gte` + `lte`       | Combined with `and` if both bounds set                    |
+ * | `search`        | `like` + `or`       | `{ or: [{ Name: { like: "%x%" } }, { Phone: { like: "%x%" } }] }` |
+ *
+ * The `search` type uses `config.searchFields` to build an `or` clause that
+ * matches the search term across multiple fields simultaneously (union semantics).
+ *
+ * @param filter - The active filter value to convert.
+ * @param config - The corresponding field config. Required for `search` type
+ *                 (provides `searchFields`); optional for all other types.
+ * @returns A single filter clause, or `null` if the filter has no meaningful value.
+ */
+function buildSingleFilter<TFilter>(
+	filter: ActiveFilterValue,
+	config?: FilterFieldConfig,
+): TFilter | null {
+	const { field, type, value, min, max } = filter;
+
+	switch (type) {
+		case "text": {
+			if (!value) return null;
+			return { [field]: { like: `%${value}%` } } as TFilter;
+		}
+		case "picklist": {
+			if (!value) return null;
+			return { [field]: { eq: value } } as TFilter;
+		}
+		case "numeric": {
+			if (!min && !max) return null;
+			const ops: Record<string, number> = {};
+			if (min) ops.gte = Number(min);
+			if (max) ops.lte = Number(max);
+			return { [field]: ops } as TFilter;
+		}
+		case "boolean": {
+			if (value === undefined || value === "") return null;
+			return { [field]: { eq: value === "true" } } as TFilter;
+		}
+		case "multipicklist": {
+			if (!value) return null;
+			const values = value.split(",");
+			if (values.length === 1) {
+				return { [field]: { eq: values[0] } } as TFilter;
+			}
+			return { [field]: { in: values } } as TFilter;
+		}
+		case "date": {
+			if (!min && !max) return null;
+			const op = value ?? (min ? "gte" : "lte");
+			const dateStr = min ?? max;
+			const isoStr = op === "gte" || op === "gt" ? toStartOfDay(dateStr!) : toEndOfDay(dateStr!);
+			return { [field]: { [op]: { value: isoStr } } } as TFilter;
+		}
+		case "daterange": {
+			if (!min && !max) return null;
+			const clauses: TFilter[] = [];
+			if (min) {
+				clauses.push({
+					[field]: { gte: { value: toStartOfDay(min) } },
+				} as TFilter);
+			}
+			if (max) {
+				clauses.push({
+					[field]: { lte: { value: toEndOfDay(max) } },
+				} as TFilter);
+			}
+			return clauses.length === 1 ? clauses[0] : ({ and: clauses } as TFilter);
+		}
+		case "search": {
+			if (!value) return null;
+			const searchFields = config?.searchFields ?? [];
+			if (searchFields.length === 0) return null;
+			const clauses = searchFields.map((f) => ({ [f]: { like: `%${value}%` } }) as TFilter);
+			if (clauses.length === 1) return clauses[0];
+			return { or: clauses } as TFilter;
+		}
+		default:
+			return null;
+	}
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts
new file mode 100644
index 0000000..cf1972c
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts
@@ -0,0 +1,38 @@
+import { ResultOrder, NullOrder } from "../../../api/graphql-operations-types";
+
+export type SortFieldConfig<TFieldName extends string = string> = {
+	field: TFieldName;
+	label: string;
+};
+
+export type SortState<TFieldName extends string = string> = {
+	field: TFieldName;
+	direction: "ASC" | "DESC";
+};
+
+/**
+ * Converts a {@link SortState} into a GraphQL order-by object.
+ *
+ * @typeParam TOrderBy - The GraphQL order-by input type (e.g. `AccountOrderByInput`).
+ * @param sort - The current sort state from the UI, or `null` if no sort is applied.
+ * @returns An order-by object for the GraphQL query's `orderBy` variable, or
+ *          `undefined` if no sort is active (which uses the API's default ordering).
+ *
+ * @example
+ * ```ts
+ * const orderBy = buildOrderBy<AccountOrderByInput>({
+ *   field: "Name",
+ *   direction: "ASC",
+ * });
+ * // orderBy => { Name: { order: ResultOrder.Asc, nulls: NullOrder.Last } }
+ * ```
+ */
+export function buildOrderBy<TOrderBy>(sort: SortState | null): TOrderBy | undefined {
+	if (!sort) return undefined;
+	return {
+		[sort.field]: {
+			order: sort.direction === "ASC" ? ResultOrder.Asc : ResultOrder.Desc,
+			nulls: NullOrder.Last,
+		},
+	} as TOrderBy;
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts
index a2d18a5..69c63a2 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts
@@ -5,7 +5,7 @@ import { useState, useEffect, useCallback } from "react";
 import {
 	queryMaintenanceRequests,
 	type MaintenanceRequestSummary,
-} from "@/api/maintenanceRequestApi";
+} from "@/api/maintenanceRequests/maintenanceRequestApi";
 
 export function useMaintenanceRequests(): {
 	requests: MaintenanceRequestSummary[];
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts
index 1071be1..da7e14a 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts
@@ -3,9 +3,9 @@
  * Returns propertyId -> address for display on listing cards.
  */
 import { useState, useEffect } from "react";
-import { fetchPropertyAddresses } from "@/api/propertyDetailGraphQL";
+import { fetchPropertyAddresses } from "@/api/properties/propertyDetailGraphQL";
 import { getPropertyIdFromRecord } from "@/hooks/usePropertyPrimaryImages";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 
 export function usePropertyAddresses(
 	results: SearchResultRecord[],
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts
index 31ed358..a13247b 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts
@@ -13,7 +13,7 @@ import {
 	type PropertyImageRecord,
 	type PropertyCostRecord,
 	type PropertyFeatureRecord,
-} from "@/api/propertyDetailGraphQL";
+} from "@/api/properties/propertyDetailGraphQL";
 
 export interface PropertyDetailState {
 	listing: ListingDetail | null;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts
index e1f8851..92eb251 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts
@@ -3,9 +3,9 @@
  * Returns a map of propertyId -> "Amenity 1 | Amenity 2 | ..." for use in listing cards.
  */
 import { useState, useEffect } from "react";
-import { fetchFeaturesByPropertyId } from "@/api/propertyDetailGraphQL";
+import { fetchFeaturesByPropertyId } from "@/api/properties/propertyDetailGraphQL";
 import { getPropertyIdFromRecord } from "@/hooks/usePropertyPrimaryImages";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 
 const AMENITIES_SEPARATOR = " | ";
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingPriceRange.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingPriceRange.ts
deleted file mode 100644
index be78a0a..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingPriceRange.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Fetches the available min/max listing price for the current search (no price/bedroom filters).
- * Use to render the filter bar only after knowing the available price range.
- */
-import { useState, useEffect, useRef } from "react";
-import { queryPropertyListingPriceRange } from "@/api/propertyListingGraphQL";
-
-/** Cap for slider max when dataset has outliers; UI never sees a higher max. */
-const SLIDER_PRICE_CAP = 50_000;
-
-export interface PropertyListingPriceRange {
-	priceMin: number;
-	priceMax: number;
-	/** True when raw max was > cap and we capped for the slider (show "50,000+"). */
-	maxCapped?: boolean;
-}
-
-/** Fallback when the price-range API call fails. */
-const DEFAULT_PRICE_RANGE: PropertyListingPriceRange = { priceMin: 0, priceMax: 100_000 };
-
-function capPriceRange(range: { priceMin: number; priceMax: number }): PropertyListingPriceRange {
-	if (range.priceMax <= SLIDER_PRICE_CAP)
-		return { priceMin: range.priceMin, priceMax: range.priceMax };
-	return {
-		priceMin: range.priceMin,
-		priceMax: SLIDER_PRICE_CAP,
-		maxCapped: true,
-	};
-}
-
-export function usePropertyListingPriceRange(searchQuery: string): {
-	priceRange: PropertyListingPriceRange | null;
-	loading: boolean;
-	error: string | null;
-} {
-	const [priceRange, setPriceRange] = useState<PropertyListingPriceRange | null>(null);
-	const [loading, setLoading] = useState(true);
-	const [error, setError] = useState<string | null>(null);
-	const cancelledRef = useRef(false);
-
-	useEffect(() => {
-		cancelledRef.current = false;
-		setLoading(true);
-		setError(null);
-		queryPropertyListingPriceRange(searchQuery)
-			.then((range) => {
-				if (!cancelledRef.current) setPriceRange(range ? capPriceRange(range) : null);
-			})
-			.catch((err) => {
-				if (!cancelledRef.current) {
-					setError(err instanceof Error ? err.message : "Failed to load price range");
-					setPriceRange(capPriceRange(DEFAULT_PRICE_RANGE));
-				}
-			})
-			.finally(() => {
-				if (!cancelledRef.current) setLoading(false);
-			});
-		return () => {
-			cancelledRef.current = true;
-		};
-	}, [searchQuery]);
-
-	return { priceRange, loading, error };
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts
index 8d23db0..8c5ea98 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts
@@ -5,8 +5,8 @@ import { useState, useEffect, useRef, useCallback } from "react";
 import {
 	queryPropertyListingsGraphQL,
 	type PropertyListingFilters,
-} from "@/api/propertyListingGraphQL";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+} from "@/api/properties/propertyListingGraphQL";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 
 export function usePropertyListingSearch(
 	searchQuery: string,
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts
index b4c1ee7..f76e042 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts
@@ -3,11 +3,11 @@
  * and returns map markers (one pin per property in the current window).
  */
 import { useState, useEffect } from "react";
-import { fetchPropertyAddresses } from "@/api/propertyDetailGraphQL";
+import { fetchPropertyAddresses } from "@/api/properties/propertyDetailGraphQL";
 import { geocodeAddress, getStateZipFromAddress } from "@/utils/geocode";
 import { getPropertyIdFromRecord } from "@/hooks/usePropertyPrimaryImages";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
-import type { MapMarker } from "@/components/PropertyMap";
+import type { SearchResultRecord } from "@/types/searchResults.js";
+import type { MapMarker } from "@/components/properties/PropertyMap";
 
 function getListingName(record: {
 	fields?: Record<string, { value?: unknown; displayValue?: string | null }>;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts
index f316b60..b510edd 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts
@@ -3,8 +3,8 @@
  * Returns a map of propertyId -> imageUrl for use in listing cards.
  */
 import { useState, useEffect } from "react";
-import { fetchPrimaryImagesByPropertyIds } from "@/api/propertyDetailGraphQL";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+import { fetchPrimaryImagesByPropertyIds } from "@/api/properties/propertyDetailGraphQL";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 
 export function getPropertyIdFromRecord(record: {
 	fields?: Record<string, { value?: unknown }>;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/index.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/index.ts
deleted file mode 100644
index adb2ca0..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/index.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Public API for the Global Search feature package.
- *
- * Design goals:
- * - Export **API services, hooks, types, schemas, and utilities** that customers can import from node_modules.
- * - Do **not** export UI components or feature constants (customers build their own UI).
- *
- * Source implementation lives under `src/features/global-search/**`.
- */
-
-// ---------------------------------------------------------------------------
-// API layer
-// ---------------------------------------------------------------------------
-
-export { objectInfoService } from "./features/global-search/api/objectInfoService";
-export {
-	objectDetailService,
-	extractFieldsFromLayout,
-} from "./features/global-search/api/objectDetailService";
-export type { RecordDetailResult } from "./features/global-search/api/objectDetailService";
-
-export {
-	getRecordsGraphQL,
-	getRecordByIdGraphQL,
-	buildGetRecordsQuery,
-	buildWhereFromCriteria,
-	buildOrderByFromSort,
-} from "./features/global-search/api/recordListGraphQLService";
-export type {
-	RecordListGraphQLResult,
-	RecordListGraphQLVariables,
-	RecordListGraphQLOptions,
-	GraphQLRecordNode,
-} from "./features/global-search/api/recordListGraphQLService";
-
-// ---------------------------------------------------------------------------
-// Hooks
-// ---------------------------------------------------------------------------
-
-export { useObjectInfoBatch } from "./features/global-search/hooks/useObjectInfoBatch";
-export {
-	useObjectListMetadata,
-	useObjectColumns,
-	useObjectFilters,
-} from "./features/global-search/hooks/useObjectSearchData";
-export { useRecordListGraphQL } from "./features/global-search/hooks/useRecordListGraphQL";
-export { useRecordDetailLayout } from "./features/global-search/hooks/useRecordDetailLayout";
-
-export type { ObjectListMetadata } from "./features/global-search/hooks/useObjectSearchData";
-
-export type {
-	UseRecordListGraphQLOptions,
-	UseRecordListGraphQLReturn,
-} from "./features/global-search/hooks/useRecordListGraphQL";
-
-export type {
-	UseRecordDetailLayoutParams,
-	UseRecordDetailLayoutReturn,
-} from "./features/global-search/hooks/useRecordDetailLayout";
-
-// ---------------------------------------------------------------------------
-// Types + Zod schemas (runtime validation)
-// ---------------------------------------------------------------------------
-
-export {
-	ColumnArraySchema,
-	SearchResultRecordArraySchema,
-	KeywordSearchResultSchema,
-	SearchResultsResponseSchema,
-} from "./features/global-search/types/search/searchResults";
-export type {
-	Column,
-	SearchResultRecord,
-	KeywordSearchResult,
-	SearchResultsResponse,
-} from "./features/global-search/types/search/searchResults";
-
-export {
-	FilterArraySchema,
-	FilterCriteriaArraySchema,
-	FILTER_OPERATORS,
-} from "./features/global-search/types/filters/filters";
-export type {
-	Filter,
-	FilterCriteria,
-	FilterOperator,
-	FiltersResponse,
-} from "./features/global-search/types/filters/filters";
-
-export type { PicklistValue } from "./features/global-search/types/filters/picklist";
-
-export type {
-	ObjectInfoBatchResponse,
-	ObjectInfoResult,
-} from "./features/global-search/types/objectInfo/objectInfo";
-
-export { LayoutResponseSchema } from "./features/global-search/types/recordDetail/recordDetail";
-export type { LayoutResponse } from "./features/global-search/types/recordDetail/recordDetail";
-
-// ---------------------------------------------------------------------------
-// Utilities
-// ---------------------------------------------------------------------------
-
-export { fetchAndValidate, safeEncodePath } from "./features/global-search/utils/apiUtils";
-export { debounce } from "./features/global-search/utils/debounce";
-export { createFiltersKey } from "./features/global-search/utils/cacheUtils";
-export {
-	calculateFieldsToFetch,
-	getSafeKey,
-	isValidSalesforceId,
-} from "./features/global-search/utils/recordUtils";
-export { parseFilterValue } from "./features/global-search/utils/filterUtils";
-export { sanitizeFilterValue } from "./features/global-search/utils/sanitizationUtils";
-export {
-	getGraphQLNodeValue,
-	getDisplayValueForDetailFieldFromNode,
-	getDisplayValueForLayoutItemFromNode,
-	getGraphQLRecordDisplayName,
-} from "./features/global-search/utils/graphQLNodeFieldUtils";
-export { graphQLNodeToSearchResultRecordData } from "./features/global-search/utils/graphQLRecordAdapter";
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/About.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/About.tsx
deleted file mode 100644
index c88fa69..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/About.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-export default function About() {
-	return (
-		<div className="mx-auto max-w-[600px]">
-			<h1 className="mb-3 text-2xl font-semibold text-primary">About ZENLEASE</h1>
-			<p className="leading-relaxed text-foreground">Placeholder content for the About page.</p>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx
index c5d615d..e766087 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx
@@ -10,9 +10,9 @@ import {
 	fetchListingById,
 	fetchPropertyById,
 	fetchPrimaryImagesByPropertyIds,
-} from "@/api/propertyDetailGraphQL";
-import { createApplicationRecord } from "@/api/applicationApi";
-import { useAuth } from "../features/authentication/context/AuthContext";
+} from "@/api/properties/propertyDetailGraphQL";
+import { createApplicationRecord } from "@/api/applications/applicationApi";
+import { useAuth } from "@/features/authentication/context/AuthContext";
 import { fetchUserContact } from "../features/authentication/api/userProfileApi";
 
 function ApplicationSkeleton() {
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx
index 6de2a27..597a77c 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx
@@ -1,7 +1,7 @@
 import { Card, CardContent } from "@/components/ui/card";
 import { Link } from "react-router";
-import MaintenanceRequestList from "@/components/MaintenanceRequestList";
-import { WeatherWidget } from "@/components/WeatherWidget";
+import MaintenanceRequestList from "@/components/maintenanceRequests/MaintenanceRequestList";
+import { WeatherWidget } from "@/components/dashboard/WeatherWidget";
 import { useMaintenanceRequests } from "@/hooks/useMaintenanceRequests";
 
 export default function Dashboard() {
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/HelpCenter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/HelpCenter.tsx
deleted file mode 100644
index 44b3ce7..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/HelpCenter.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
-
-export default function HelpCenter() {
-	return (
-		<div className="mx-auto max-w-[800px]">
-			<h1 className="mb-6 text-2xl font-semibold text-primary">Help Center</h1>
-			<Card className="mb-4">
-				<CardHeader>
-					<CardTitle>Frequently Asked Questions</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<p className="m-0 leading-relaxed text-foreground">
-						Placeholder content for help and FAQs.
-					</p>
-				</CardContent>
-			</Card>
-			<Card>
-				<CardHeader>
-					<CardTitle>Contact Support</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<p className="m-0 leading-relaxed text-foreground">
-						Reach out to the property management team for assistance.
-					</p>
-				</CardContent>
-			</Card>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx
index bff8a98..5d9088e 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx
@@ -10,8 +10,10 @@ import {
 } from "@/hooks/usePropertyPrimaryImages";
 import { usePropertyAddresses } from "@/hooks/usePropertyAddresses";
 import { usePropertyListingAmenities } from "@/hooks/usePropertyListingAmenities";
-import PropertyListingCard, { PropertyListingCardSkeleton } from "@/components/PropertyListingCard";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+import PropertyListingCard, {
+	PropertyListingCardSkeleton,
+} from "@/components/properties/PropertyListingCard";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 import { createNewsletterLead } from "@/api/leadApi";
 import {
 	Phone,
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx
index 08f8446..ae30ea6 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx
@@ -5,10 +5,10 @@ import { Label } from "@/components/ui/label";
 import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Calendar, ArrowRight } from "lucide-react";
-import MaintenanceRequestList from "@/components/MaintenanceRequestList";
+import MaintenanceRequestList from "@/components/maintenanceRequests/MaintenanceRequestList";
 import { SkeletonListRows, SkeletonField } from "@/components/SkeletonPrimitives";
 import { useMaintenanceRequests } from "@/hooks/useMaintenanceRequests";
-import { createMaintenanceRequest } from "@/api/maintenanceRequestApi";
+import { createMaintenanceRequest } from "@/api/maintenanceRequests/maintenanceRequestApi";
 import { useAuth } from "@/features/authentication/context/AuthContext";
 
 const TYPE_OPTIONS = [
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx
index eac12d5..c9f9820 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx
@@ -2,7 +2,7 @@ import { useParams, Link } from "react-router";
 import { Button } from "@/components/ui/button";
 import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
-import PropertyMap from "@/components/PropertyMap";
+import PropertyMap from "@/components/properties/PropertyMap";
 import { usePropertyDetail } from "@/hooks/usePropertyDetail";
 import { useGeocode } from "@/hooks/useGeocode";
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyListings.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyListings.tsx
deleted file mode 100644
index 5fffa03..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyListings.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { Link } from "react-router";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Card, CardContent } from "@/components/ui/card";
-
-const listings = [
-	{
-		id: "1",
-		name: "Verdana Apartments",
-		address: "301 Bryant St, San Francisco, CA 94107",
-		price: "$4,600+",
-		beds: "2 Beds",
-		phone: "(650) 440-1111",
-	},
-	{
-		id: "2",
-		name: "South Beach Lofts",
-		address: "250 Brannan St, San Francisco, CA 94107",
-		price: "$5,379+",
-		beds: "2 Beds",
-		phone: "(650) 555-0123",
-	},
-];
-
-export default function PropertyListings() {
-	return (
-		<div className="grid min-h-[500px] grid-cols-1 gap-6 lg:grid-cols-[320px_1fr]">
-			<div className="min-h-[400px] rounded-xl bg-muted" aria-label="Map placeholder" />
-			<div>
-				<div className="mb-4 flex flex-wrap gap-3">
-					<Input
-						type="text"
-						defaultValue="San Francisco, CA"
-						className="min-w-[200px] flex-1 flex-[1_1_200px] rounded-xl"
-					/>
-					<Button
-						variant="outline"
-						className="cursor-pointer rounded-xl transition-colors duration-200"
-					>
-						Price
-					</Button>
-					<Button
-						variant="outline"
-						className="cursor-pointer rounded-xl transition-colors duration-200"
-					>
-						Beds/Bath
-					</Button>
-					<Button className="cursor-pointer rounded-xl transition-colors duration-200">
-						All Filters
-					</Button>
-				</div>
-				<h2 className="mb-1 text-lg font-semibold text-foreground">
-					2 Bedroom Apartments for Rent in San Francisco CA
-				</h2>
-				<p className="mb-4 text-sm text-muted-foreground">1,181 Rentals Available</p>
-				<div className="space-y-4">
-					{listings.map((p) => (
-						<Card key={p.name} className="rounded-2xl shadow-md">
-							<CardContent className="flex gap-4 p-4">
-								<Link
-									to={`/property/${p.id}`}
-									className="relative block size-[120px] sm:size-[200px] shrink-0 cursor-pointer rounded-xl bg-muted transition-opacity duration-200 hover:opacity-95"
-								>
-									<span className="absolute left-2 top-2 rounded-full bg-violet-600 px-2 py-0.5 text-xs font-medium text-white">
-										Virtual Tours
-									</span>
-								</Link>
-								<div className="min-w-0 flex-1">
-									<h3 className="mb-1 text-base font-semibold">
-										<Link
-											to={`/property/${p.id}`}
-											className="cursor-pointer text-primary no-underline transition-colors duration-200 hover:underline"
-										>
-											{p.name}
-										</Link>
-									</h3>
-									<p className="mb-2 text-sm text-muted-foreground">{p.address}</p>
-									<p className="mb-1 text-sm text-foreground">
-										{p.price} {p.beds}
-									</p>
-									<p className="mb-2 text-sm text-muted-foreground">
-										In Unit Washer & Dryer, Pets Allowed, Fitness Center
-									</p>
-									<p className="mb-2 text-sm text-primary">{p.phone}</p>
-									<Button
-										asChild
-										size="sm"
-										className="cursor-pointer rounded-xl transition-colors duration-200"
-									>
-										<Link to={`/application?listingId=${encodeURIComponent(p.id)}`}>Apply</Link>
-									</Button>
-								</div>
-							</CardContent>
-						</Card>
-					))}
-				</div>
-			</div>
-		</div>
-	);
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx
index 19ce2dc..3c0d121 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx
@@ -4,7 +4,7 @@
  */
 import { useState, useCallback, useMemo, useEffect } from "react";
 import { useSearchParams } from "react-router";
-import { DEFAULT_PAGE_SIZE } from "@/features/global-search/constants";
+import { DEFAULT_PAGE_SIZE } from "@/constants/propertyListing";
 import { usePropertyListingSearch } from "@/hooks/usePropertyListingSearch";
 import {
 	usePropertyPrimaryImages,
@@ -13,17 +13,19 @@ import {
 import { usePropertyAddresses } from "@/hooks/usePropertyAddresses";
 import { usePropertyListingAmenities } from "@/hooks/usePropertyListingAmenities";
 import { usePropertyMapMarkers } from "@/hooks/usePropertyMapMarkers";
-import SearchPagination from "@/features/global-search/components/search/SearchPagination";
-import PropertyListingCard, { PropertyListingCardSkeleton } from "@/components/PropertyListingCard";
+import PropertyListingSearchPagination from "@/components/properties/PropertyListingSearchPagination";
+import PropertyListingCard, {
+	PropertyListingCardSkeleton,
+} from "@/components/properties/PropertyListingCard";
 import PropertySearchFilters, {
 	type BedroomFilter,
 	type SortBy,
-} from "@/components/PropertySearchFilters";
-import PropertyMap from "@/components/PropertyMap";
-import type { MapMarker, MapBounds } from "@/components/PropertyMap";
+} from "@/components/properties/PropertySearchFilters";
+import PropertyMap from "@/components/properties/PropertyMap";
+import type { MapMarker, MapBounds } from "@/components/properties/PropertyMap";
 import PropertySearchPlaceholder from "@/pages/PropertySearchPlaceholder";
 import { Skeleton } from "@/components/ui/skeleton";
-import type { SearchResultRecord } from "@/features/global-search/types/search/searchResults.js";
+import type { SearchResultRecord } from "@/types/searchResults.js";
 
 /** Fallback map center when there are no geocoded markers yet. Zoom 7 ≈ 100-mile radius view. */
 const MAP_CENTER_FALLBACK: [number, number] = [37.7897484, -122.3998086];
@@ -267,7 +269,7 @@ export default function PropertySearch() {
 							{searchQuery.trim() ? ` matching "${searchQuery.trim()}"` : ""}
 						</h2>
 						<div className="flex flex-wrap items-center gap-2">
-							<p className="text-sm text-muted-foreground">
+							<div className="text-sm text-muted-foreground">
 								{apiUnavailable ? (
 									"Placeholder (API unavailable)"
 								) : resultsLoading ? (
@@ -277,7 +279,7 @@ export default function PropertySearch() {
 								) : (
 									`${sortedResults.length} result(s)`
 								)}
-							</p>
+							</div>
 							{mapBounds != null && sortedResults.length > 0 && !resultsLoading && (
 								<button
 									type="button"
@@ -345,7 +347,7 @@ export default function PropertySearch() {
 									})}
 								</ul>
 								<div className="mt-4">
-									<SearchPagination
+									<PropertyListingSearchPagination
 										currentPageToken={currentPageToken}
 										nextPageToken={nextPageToken}
 										previousPageToken={previousPageToken}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx
index ae71053..182da33 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx
@@ -1,10 +1,8 @@
 import type { RouteObject } from 'react-router';
 import Home from '@/pages/Home';
 import NotFound from '@/pages/NotFound';
-import GlobalSearch from "./features/global-search/pages/GlobalSearch";
-import DetailPage from "./features/global-search/pages/DetailPage";
-import { Suspense } from "react";
-import LoadingFallback from "./features/global-search/components/shared/LoadingFallback";
+import AccountSearch from "./features/object-search/__examples__/pages/AccountSearch";
+import AccountObjectDetail from "./features/object-search/__examples__/pages/AccountObjectDetailPage";
 import Login from "./features/authentication/pages/Login";
 import Register from "./features/authentication/pages/Register";
 import ForgotPassword from "./features/authentication/pages/ForgotPassword";
@@ -37,22 +35,12 @@ export const routes: RouteObject[] = [
         element: <NotFound />
       },
       {
-        path: "global-search/:query",
-        element: (
-					<Suspense fallback={<LoadingFallback />}>
-						<GlobalSearch />
-					</Suspense>
-				),
-        handle: { showInNavigation: false }
+        path: "accounts/:recordId",
+        element: <AccountObjectDetail />
       },
       {
-        path: "object/:objectApiName/:recordId",
-        element: (
-					<Suspense fallback={<LoadingFallback />}>
-						<DetailPage />
-					</Suspense>
-				),
-        handle: { showInNavigation: false }
+        path: "accounts",
+        element: <AccountSearch />
       },
       {
         element: <AuthenticationRoute />,
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/search/searchResults.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/searchResults.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/global-search/types/search/searchResults.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/searchResults.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts
new file mode 100644
index 0000000..e0421ef
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts
@@ -0,0 +1,18 @@
+/**
+ * Page size options for property listing (token-based) pagination.
+ */
+export const PAGE_SIZE_OPTIONS = [
+	{ value: "10", label: "10" },
+	{ value: "20", label: "20" },
+	{ value: "50", label: "50" },
+] as const;
+
+export const VALID_PAGE_SIZES = PAGE_SIZE_OPTIONS.map((opt) => parseInt(opt.value, 10));
+
+export function isValidPageSize(size: number): boolean {
+	return VALID_PAGE_SIZES.includes(size);
+}
+
+export function getValidPageSize(size: number): number {
+	return isValidPageSize(size) ? size : VALID_PAGE_SIZES[0];
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json b/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
index b98c1a4..5d3ff7e 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.7",
+  "version": "1.112.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.112.7",
+      "version": "1.112.10",
       "license": "SEE LICENSE IN LICENSE.txt",
       "devDependencies": {
         "@lwc/eslint-plugin-lwc": "^3.3.0",
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package.json b/samples/webapp-template-app-react-sample-b2x-experimental/package.json
index f421ec5..7566445 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/package.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.7",
+  "version": "1.112.10",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh b/samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh
index a9863de..e11f41e 100755
--- a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/scripts/graphql-search.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail  # exit on error (-e), undefined vars (-u), and propagate pipeline failures (-o pipefail)
 # graphql-search.sh — Look up one or more Salesforce entities in schema.graphql.
 #
 # Run from the SFDX project root (where schema.graphql lives):
@@ -10,11 +11,13 @@
 #   bash scripts/graphql-search.sh --schema ./other/schema.graphql Account Contact
 #
 # Output sections per entity:
-#   1. Type definition   — all fields and relationships
-#   2. Filter options    — <Entity>_Filter input (for `where:`)
-#   3. Sort options      — <Entity>_OrderBy input (for `orderBy:`)
-#   4. Create input      — <Entity>CreateRepresentation (for create mutations)
-#   5. Update input      — <Entity>UpdateRepresentation (for update mutations)
+#   1. Type definition          — all fields and relationships
+#   2. Filter options           — <Entity>_Filter input (for `where:`)
+#   3. Sort options             — <Entity>_OrderBy input (for `orderBy:`)
+#   4. Create mutation wrapper  — <Entity>CreateInput
+#   5. Create mutation fields   — <Entity>CreateRepresentation (for create mutations)
+#   6. Update mutation wrapper  — <Entity>UpdateInput
+#   7. Update mutation fields   — <Entity>UpdateRepresentation (for update mutations)
 
 SCHEMA="./schema.graphql"
 
@@ -62,6 +65,19 @@ if [ ! -f "$SCHEMA" ]; then
   exit 1
 fi
 
+if [ ! -r "$SCHEMA" ]; then
+  echo "ERROR: schema.graphql is not readable at $SCHEMA"
+  echo "  Check file permissions: ls -la $SCHEMA"
+  exit 1
+fi
+
+if [ ! -s "$SCHEMA" ]; then
+  echo "ERROR: schema.graphql is empty at $SCHEMA"
+  echo "  Regenerate it from the webapp dir:"
+  echo "    cd force-app/main/default/webapplications/<app-name> && npm run graphql:schema"
+  exit 1
+fi
+
 # ── Helper: extract lines from a grep match through the closing brace ────────
 # Prints up to MAX_LINES lines after (and including) the first match of PATTERN.
 # Uses a generous line count — blocks are always closed by a "}" line.
@@ -72,68 +88,104 @@ extract_block() {
   local max_lines="$3"
 
   local match
-  match=$(grep -nE "$pattern" "$SCHEMA" | head -1)
+  local grep_exit=0
+  match=$(grep -nE "$pattern" "$SCHEMA" | head -1) || grep_exit=$?
+
+  if [ "$grep_exit" -eq 2 ]; then
+    echo "  ERROR: grep failed on pattern: $pattern" >&2
+    return 1
+  fi
 
   if [ -z "$match" ]; then
     echo "  (not found: $pattern)"
-    return
+    return 3
   fi
 
   echo "### $label"
   grep -E "$pattern" "$SCHEMA" -A "$max_lines" | \
     awk '/^\}$/{print; exit} {print}' | \
-    head -n "$max_lines"
+    head -n "$max_lines" || true
   echo ""
 }
 
 # ── Main loop ────────────────────────────────────────────────────────────────
 
 for ENTITY in "$@"; do
+  # Validate entity name: must be a valid PascalCase identifier (letters, digits, underscores)
+  if [[ ! "$ENTITY" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+    echo "ERROR: Invalid entity name: '$ENTITY'"
+    echo "  Entity names must start with a letter or underscore, followed by letters, digits, or underscores."
+    echo "  Examples: Account, My_Custom_Object__c"
+    continue
+  fi
+
   echo ""
   echo "======================================================================"
   echo "  SCHEMA LOOKUP: $ENTITY"
   echo "======================================================================"
   echo ""
 
+  found=0
+
+  # Helper: call extract_block, track matches, surface errors
+  try_extract() {
+    local rc=0
+    extract_block "$@" || rc=$?
+    if [ "$rc" -eq 0 ]; then
+      found=$((found + 1))
+    elif [ "$rc" -eq 1 ]; then
+      echo "  Aborting lookup for '$ENTITY' due to grep error" >&2
+    fi
+    # rc=3 is not-found — continue silently (already printed by extract_block)
+  }
+
   # 1. Type definition — all fields and relationships
-  extract_block \
+  try_extract \
     "Type definition — fields and relationships" \
     "^type ${ENTITY} implements Record" \
     200
 
   # 2. Filter input — used in `where:` arguments
-  extract_block \
+  try_extract \
     "Filter options — use in where: { ... }" \
     "^input ${ENTITY}_Filter" \
     100
 
   # 3. OrderBy input — used in `orderBy:` arguments
-  extract_block \
+  try_extract \
     "Sort options — use in orderBy: { ... }" \
     "^input ${ENTITY}_OrderBy" \
     60
 
-  # 4. Create mutation inputs
-  extract_block \
+  # 4. Create mutation wrapper
+  try_extract \
     "Create mutation wrapper — ${ENTITY}CreateInput" \
     "^input ${ENTITY}CreateInput" \
     10
 
-  extract_block \
+  # 5. Create mutation fields
+  try_extract \
     "Create mutation fields — ${ENTITY}CreateRepresentation" \
     "^input ${ENTITY}CreateRepresentation" \
     100
 
-  # 5. Update mutation inputs
-  extract_block \
+  # 6. Update mutation wrapper
+  try_extract \
     "Update mutation wrapper — ${ENTITY}UpdateInput" \
     "^input ${ENTITY}UpdateInput" \
     10
 
-  extract_block \
+  # 7. Update mutation fields
+  try_extract \
     "Update mutation fields — ${ENTITY}UpdateRepresentation" \
     "^input ${ENTITY}UpdateRepresentation" \
     100
 
+  if [ "$found" -eq 0 ]; then
+    echo "WARNING: No schema entries found for '$ENTITY'."
+    echo "  - Names are PascalCase (e.g., 'Account' not 'account')"
+    echo "  - Custom objects may need deployment first"
+  fi
+
   echo ""
 done

From bba4327cd8362dc6ceaf28a718ffdc4dca7147c8 Mon Sep 17 00:00:00 2001
From: Jeff Douglas <jdouglas@salesforce.com>
Date: Wed, 25 Mar 2026 14:07:54 -0400
Subject: [PATCH 03/14] Add Apex & Unit Test Skills (#105)

* added apex and apex test
---
 skills/creating-webapp/SKILL.md               |   2 -
 skills/generating-apex-test/SKILL.md          | 108 +++++++
 .../assets/test-class-template.cls            | 124 ++++++++
 .../assets/test-data-factory-template.cls     | 112 +++++++
 .../references/assertion-patterns.md          | 165 +++++++++++
 .../references/async-testing.md               | 276 ++++++++++++++++++
 .../references/mocking-patterns.md            | 219 ++++++++++++++
 .../references/test-data-factory.md           | 176 +++++++++++
 skills/generating-apex/SKILL.md               | 253 ++++++++++++++++
 skills/generating-apex/assets/abstract.cls    | 128 ++++++++
 skills/generating-apex/assets/batch.cls       | 125 ++++++++
 skills/generating-apex/assets/domain.cls      | 102 +++++++
 skills/generating-apex/assets/dto.cls         | 108 +++++++
 skills/generating-apex/assets/exception.cls   |  51 ++++
 skills/generating-apex/assets/interface.cls   |  25 ++
 skills/generating-apex/assets/queueable.cls   |  92 ++++++
 skills/generating-apex/assets/schedulable.cls |  75 +++++
 skills/generating-apex/assets/selector.cls    |  92 ++++++
 skills/generating-apex/assets/service.cls     |  69 +++++
 skills/generating-apex/assets/utility.cls     |  97 ++++++
 .../references/AccountDeduplicationBatch.cls  | 148 ++++++++++
 .../references/AccountSelector.cls            | 193 ++++++++++++
 .../references/AccountService.cls             | 201 +++++++++++++
 23 files changed, 2939 insertions(+), 2 deletions(-)
 create mode 100644 skills/generating-apex-test/SKILL.md
 create mode 100644 skills/generating-apex-test/assets/test-class-template.cls
 create mode 100644 skills/generating-apex-test/assets/test-data-factory-template.cls
 create mode 100644 skills/generating-apex-test/references/assertion-patterns.md
 create mode 100644 skills/generating-apex-test/references/async-testing.md
 create mode 100644 skills/generating-apex-test/references/mocking-patterns.md
 create mode 100644 skills/generating-apex-test/references/test-data-factory.md
 create mode 100644 skills/generating-apex/SKILL.md
 create mode 100644 skills/generating-apex/assets/abstract.cls
 create mode 100644 skills/generating-apex/assets/batch.cls
 create mode 100644 skills/generating-apex/assets/domain.cls
 create mode 100644 skills/generating-apex/assets/dto.cls
 create mode 100644 skills/generating-apex/assets/exception.cls
 create mode 100644 skills/generating-apex/assets/interface.cls
 create mode 100644 skills/generating-apex/assets/queueable.cls
 create mode 100644 skills/generating-apex/assets/schedulable.cls
 create mode 100644 skills/generating-apex/assets/selector.cls
 create mode 100644 skills/generating-apex/assets/service.cls
 create mode 100644 skills/generating-apex/assets/utility.cls
 create mode 100644 skills/generating-apex/references/AccountDeduplicationBatch.cls
 create mode 100644 skills/generating-apex/references/AccountSelector.cls
 create mode 100644 skills/generating-apex/references/AccountService.cls

diff --git a/skills/creating-webapp/SKILL.md b/skills/creating-webapp/SKILL.md
index d7b8b9c..c95367f 100644
--- a/skills/creating-webapp/SKILL.md
+++ b/skills/creating-webapp/SKILL.md
@@ -1,8 +1,6 @@
 ---
 name: creating-webapp
 description: "Use this skill when creating or setting up a new SFDX React web application. Covers first steps, npm install, skills-first protocol, deployment order, and core web app rules."
-paths:
-  - "**/webapplications/**/*"
 ---
 
 # First Steps (MUST FOLLOW)
diff --git a/skills/generating-apex-test/SKILL.md b/skills/generating-apex-test/SKILL.md
new file mode 100644
index 0000000..cc314e4
--- /dev/null
+++ b/skills/generating-apex-test/SKILL.md
@@ -0,0 +1,108 @@
+---
+name: generating-apex-test
+description: Apex test class generation with TestDataFactory patterns, bulk testing (200+ records), mocking strategies, and assertion best practices. Use this skill when the user asks to create, write, or improve Apex test classes, add coverage, build mocks, or implement testing patterns for triggers, services, batch jobs, queueables, and integrations.
+---
+
+# Apex Test Class Skill
+
+## Core Principles
+
+1. **Bulkify tests** - Always test with 200+ records to catch governor limit issues
+2. **Isolate test data** - Use `@TestSetup` and TestDataFactory; never rely on org data
+3. **Assert meaningfully** - Test behavior, not just coverage; include failure messages
+4. **Mock external dependencies** - Use `HttpCalloutMock`, `Test.setMock()` for integrations
+5. **Test negative paths** - Validate error handling, not just happy paths
+
+## Test Class Structure
+
+```apex
+@isTest
+private class MyServiceTest {
+
+    @TestSetup
+    static void setupTestData() {
+        // Create shared test data using TestDataFactory
+        List<Account> accounts = TestDataFactory.createAccounts(200, true);
+    }
+
+    @isTest
+    static void shouldPerformExpectedBehavior_WhenValidInput() {
+        // Given: Setup specific test state
+        List<Account> accounts = [SELECT Id, Name FROM Account];
+        
+        // When: Execute the code under test
+        Test.startTest();
+        MyService.processAccounts(accounts);
+        Test.stopTest();
+        
+        // Then: Assert expected outcomes
+        List<Account> updated = [SELECT Id, Status__c FROM Account];
+        System.assertEquals(200, updated.size(), 'All accounts should be processed');
+        for (Account acc : updated) {
+            System.assertEquals('Processed', acc.Status__c, 'Status should be updated');
+        }
+    }
+
+    @isTest
+    static void shouldThrowException_WhenInvalidInput() {
+        // Given
+        List<Account> emptyList = new List<Account>();
+        
+        // When/Then
+        Test.startTest();
+        try {
+            MyService.processAccounts(emptyList);
+            System.assert(false, 'Expected MyCustomException to be thrown');
+        } catch (MyCustomException e) {
+            System.assert(e.getMessage().contains('cannot be empty'), 
+                'Exception message should indicate empty input');
+        }
+        Test.stopTest();
+    }
+}
+```
+
+## Naming Convention
+
+Use descriptive method names: `should[ExpectedBehavior]_When[Condition]`
+
+Examples:
+- `shouldCreateContact_WhenAccountIsActive`
+- `shouldThrowException_WhenEmailIsInvalid`
+- `shouldSendNotification_WhenOpportunityClosedWon`
+- `shouldBypassTrigger_WhenRunningAsBatch`
+
+## Test.startTest() / Test.stopTest()
+
+Always wrap the code under test:
+- Resets governor limits for accurate limit testing
+- Executes async operations synchronously (queueables, batch, future)
+- Fires scheduled jobs immediately
+
+## Asset Templates
+
+Ready-to-use scaffolds for common test patterns:
+
+- **[assets/test-class-template.cls](assets/test-class-template.cls)** - Starter test class with positive, negative, bulk, and governor limit test stubs
+- **[assets/test-data-factory-template.cls](assets/test-data-factory-template.cls)** - TestDataFactory with Account, Contact, Opportunity, User factories and field override support
+
+## Reference Files
+
+Detailed patterns for specific scenarios:
+
+- **[references/test-data-factory.md](references/test-data-factory.md)** - TestDataFactory class patterns and field defaults
+- **[references/assertion-patterns.md](references/assertion-patterns.md)** - Assertion best practices and common pitfalls
+- **[references/mocking-patterns.md](references/mocking-patterns.md)** - HttpCalloutMock, Test.setMock(), stubbing
+- **[references/async-testing.md](references/async-testing.md)** - Batch, Queueable, Future, Scheduled job testing
+
+## Quick Reference: What to Test
+
+| Component | Key Test Scenarios |
+|-----------|-------------------|
+| Trigger | Bulk insert/update/delete, recursion, field changes |
+| Service | Valid/invalid inputs, bulk operations, exceptions |
+| Controller | Page load, action methods, view state |
+| Batch | Start/execute/finish, chunking, error records |
+| Queueable | Chaining, bulkification, error handling |
+| Callout | Success response, error response, timeout |
+| Scheduled | Execution, CRON validation |
\ No newline at end of file
diff --git a/skills/generating-apex-test/assets/test-class-template.cls b/skills/generating-apex-test/assets/test-class-template.cls
new file mode 100644
index 0000000..e759fd3
--- /dev/null
+++ b/skills/generating-apex-test/assets/test-class-template.cls
@@ -0,0 +1,124 @@
+/**
+ * @description Test class for {ClassUnderTest}.
+ *              Tests bulk operations (200+ records), positive/negative paths,
+ *              and exception handling.
+ * @author Generated by Apex Test Writer Skill
+ */
+@isTest
+private class {ClassUnderTest}Test {
+
+    // ─── Test Setup ───────────────────────────────────────────────────────
+
+    @TestSetup
+    static void setupTestData() {
+        // Create shared test data using TestDataFactory
+        // List<Account> accounts = TestDataFactory.createAccounts(200, true);
+    }
+
+    // ─── Positive Tests ───────────────────────────────────────────────────
+
+    @isTest
+    static void shouldPerformExpectedBehavior_WhenValidInput() {
+        // Given: Setup specific test state
+        // List<Account> accounts = [SELECT Id, Name FROM Account];
+
+        // When: Execute the code under test
+        Test.startTest();
+        // {ClassUnderTest}.methodUnderTest(params);
+        Test.stopTest();
+
+        // Then: Assert expected outcomes
+        // System.assertEquals(expected, actual, 'Descriptive failure message');
+    }
+
+    @isTest
+    static void shouldHandleBulkRecords_WhenProcessing200() {
+        // Given: 200+ records to verify bulkification
+        // List<Account> accounts = [SELECT Id FROM Account];
+        // System.assertEquals(200, accounts.size(), 'Should have 200 test records');
+
+        // When
+        Test.startTest();
+        // {ClassUnderTest}.bulkMethod(accounts);
+        Test.stopTest();
+
+        // Then: Verify all records processed
+        // List<Account> results = [SELECT Id, Status__c FROM Account];
+        // for (Account acc : results) {
+        //     System.assertEquals('Processed', acc.Status__c, 'All records should be processed');
+        // }
+    }
+
+    // ─── Negative Tests ───────────────────────────────────────────────────
+
+    @isTest
+    static void shouldThrowException_WhenNullInput() {
+        Boolean exceptionThrown = false;
+        String exceptionMessage = '';
+
+        Test.startTest();
+        try {
+            // {ClassUnderTest}.methodUnderTest(null);
+        } catch (Exception e) {
+            exceptionThrown = true;
+            exceptionMessage = e.getMessage();
+        }
+        Test.stopTest();
+
+        System.assert(exceptionThrown, 'Exception should be thrown for null input');
+        System.assert(exceptionMessage.contains('cannot be null'),
+            'Exception message should mention null input');
+    }
+
+    @isTest
+    static void shouldReturnEmpty_WhenEmptyInput() {
+        Test.startTest();
+        // List<SObject> results = {ClassUnderTest}.methodUnderTest(new List<Id>());
+        Test.stopTest();
+
+        // System.assert(results.isEmpty(), 'Should return empty list for empty input');
+    }
+
+    // ─── Edge Case Tests ──────────────────────────────────────────────────
+
+    @isTest
+    static void shouldHandleMixedRecords_WhenSomeQualify() {
+        // Given: Mix of qualifying and non-qualifying records
+        // List<Account> accounts = [SELECT Id, Status__c FROM Account];
+        // Integer half = accounts.size() / 2;
+        // for (Integer i = 0; i < half; i++) {
+        //     accounts[i].Status__c = 'Qualifying';
+        // }
+        // update accounts;
+
+        // When
+        Test.startTest();
+        // {ClassUnderTest}.conditionalMethod(accounts);
+        Test.stopTest();
+
+        // Then: Only qualifying records should be affected
+        // List<Account> qualifying = [SELECT Id FROM Account WHERE Processed__c = true];
+        // System.assertEquals(half, qualifying.size(), 'Only qualifying records should be processed');
+    }
+
+    // ─── Governor Limit Tests ─────────────────────────────────────────────
+
+    @isTest
+    static void shouldNotExceedGovernorLimits_WhenBulkProcessing() {
+        // Given
+        // List<Account> accounts = [SELECT Id FROM Account];
+
+        Test.startTest();
+        // {ClassUnderTest}.heavyMethod(accounts);
+        Test.stopTest();
+
+        System.assert(Limits.getDmlStatements() < Limits.getLimitDmlStatements(),
+            'Should not exceed DML statement limit');
+        System.assert(Limits.getQueries() < Limits.getLimitQueries(),
+            'Should not exceed SOQL query limit');
+    }
+
+    // ─── Helper Methods ───────────────────────────────────────────────────
+
+    // Add test-specific helper methods here
+}
diff --git a/skills/generating-apex-test/assets/test-data-factory-template.cls b/skills/generating-apex-test/assets/test-data-factory-template.cls
new file mode 100644
index 0000000..bd0304c
--- /dev/null
+++ b/skills/generating-apex-test/assets/test-data-factory-template.cls
@@ -0,0 +1,112 @@
+/**
+ * @description Centralized factory for creating test data with sensible defaults.
+ *              All methods accept a doInsert flag for flexibility.
+ *              Bulk methods create multiple records; single-record methods delegate to bulk.
+ * @author Generated by Apex Test Writer Skill
+ */
+@isTest
+public class TestDataFactory {
+
+    // ─── Accounts ─────────────────────────────────────────────────────────
+
+    public static List<Account> createAccounts(Integer count, Boolean doInsert) {
+        List<Account> accounts = new List<Account>();
+        for (Integer i = 0; i < count; i++) {
+            accounts.add(new Account(
+                Name = 'Test Account ' + i,
+                BillingCity = 'San Francisco',
+                BillingState = 'CA',
+                BillingCountry = 'USA',
+                Industry = 'Technology',
+                Type = 'Customer'
+            ));
+        }
+        if (doInsert) insert accounts;
+        return accounts;
+    }
+
+    public static Account createAccount(Boolean doInsert) {
+        return createAccounts(1, doInsert)[0];
+    }
+
+    // ─── Contacts ─────────────────────────────────────────────────────────
+
+    public static List<Contact> createContacts(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
+        List<Contact> contacts = new List<Contact>();
+        Integer idx = 0;
+        for (Account acc : accounts) {
+            for (Integer i = 0; i < countPerAccount; i++) {
+                contacts.add(new Contact(
+                    FirstName = 'Test',
+                    LastName = 'Contact ' + idx,
+                    Email = 'test.contact' + idx + '@example.com',
+                    AccountId = acc.Id
+                ));
+                idx++;
+            }
+        }
+        if (doInsert) insert contacts;
+        return contacts;
+    }
+
+    // ─── Opportunities ────────────────────────────────────────────────────
+
+    public static List<Opportunity> createOpportunities(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
+        List<Opportunity> opps = new List<Opportunity>();
+        Integer idx = 0;
+        for (Account acc : accounts) {
+            for (Integer i = 0; i < countPerAccount; i++) {
+                opps.add(new Opportunity(
+                    Name = 'Test Opportunity ' + idx,
+                    AccountId = acc.Id,
+                    StageName = 'Prospecting',
+                    CloseDate = Date.today().addDays(30),
+                    Amount = 10000 + (idx * 1000)
+                ));
+                idx++;
+            }
+        }
+        if (doInsert) insert opps;
+        return opps;
+    }
+
+    // ─── Users ────────────────────────────────────────────────────────────
+
+    public static User createUser(String profileName, Boolean doInsert) {
+        Profile p = [SELECT Id FROM Profile WHERE Name = :profileName LIMIT 1];
+        String uniqueKey = String.valueOf(DateTime.now().getTime());
+
+        User u = new User(
+            FirstName = 'Test',
+            LastName = 'User ' + uniqueKey,
+            Email = 'testuser' + uniqueKey + '@example.com',
+            Username = 'testuser' + uniqueKey + '@example.com.test',
+            Alias = 'tuser',
+            TimeZoneSidKey = 'America/Los_Angeles',
+            LocaleSidKey = 'en_US',
+            EmailEncodingKey = 'UTF-8',
+            LanguageLocaleKey = 'en_US',
+            ProfileId = p.Id
+        );
+        if (doInsert) insert u;
+        return u;
+    }
+
+    // ─── Field Override Pattern ────────────────────────────────────────────
+
+    public static Account createAccount(Map<String, Object> fieldOverrides, Boolean doInsert) {
+        Account acc = new Account(
+            Name = 'Test Account',
+            Industry = 'Technology'
+        );
+        for (String fieldName : fieldOverrides.keySet()) {
+            acc.put(fieldName, fieldOverrides.get(fieldName));
+        }
+        if (doInsert) insert acc;
+        return acc;
+    }
+
+    // ─── Custom Objects ───────────────────────────────────────────────────
+    // Add methods for your custom objects following the same pattern:
+    // public static List<MyObject__c> createMyObjects(Integer count, Boolean doInsert) { ... }
+}
diff --git a/skills/generating-apex-test/references/assertion-patterns.md b/skills/generating-apex-test/references/assertion-patterns.md
new file mode 100644
index 0000000..f74bc84
--- /dev/null
+++ b/skills/generating-apex-test/references/assertion-patterns.md
@@ -0,0 +1,165 @@
+# Assertion Patterns
+
+## Assertion Methods
+
+| Method | Use Case |
+|--------|----------|
+| `System.assertEquals(expected, actual, msg)` | Exact equality |
+| `System.assertNotEquals(expected, actual, msg)` | Value should differ |
+| `System.assert(condition, msg)` | Boolean condition |
+
+**Always include the third parameter (message)** - Makes test failures meaningful.
+
+## Good vs Bad Assertions
+
+### ❌ Bad: No message, tests coverage not behavior
+
+```apex
+System.assertEquals(true, result);
+System.assert(accounts.size() > 0);
+```
+
+### ✅ Good: Descriptive message, tests specific behavior
+
+```apex
+System.assertEquals(true, result, 'Service should return true for valid input');
+System.assertEquals(200, accounts.size(), 'All 200 accounts should be processed');
+```
+
+## Common Assertion Patterns
+
+### Collection Size
+
+```apex
+// Exact count
+System.assertEquals(200, results.size(), 'Should process all 200 records');
+
+// Not empty
+System.assert(!results.isEmpty(), 'Results should not be empty');
+
+// Empty
+System.assert(results.isEmpty(), 'No results expected for invalid input');
+```
+
+### Field Values
+
+```apex
+// Single record
+System.assertEquals('Processed', acc.Status__c, 'Account status should be updated to Processed');
+
+// All records in collection
+for (Account acc : updatedAccounts) {
+    System.assertEquals('Active', acc.Status__c, 
+        'Account ' + acc.Name + ' should have Active status');
+}
+```
+
+### Exception Testing
+
+```apex
+@isTest
+static void shouldThrowException_WhenInputInvalid() {
+    Boolean exceptionThrown = false;
+    String exceptionMessage = '';
+    
+    Test.startTest();
+    try {
+        MyService.process(null);
+    } catch (MyCustomException e) {
+        exceptionThrown = true;
+        exceptionMessage = e.getMessage();
+    }
+    Test.stopTest();
+    
+    System.assert(exceptionThrown, 'MyCustomException should be thrown for null input');
+    System.assert(exceptionMessage.contains('cannot be null'), 
+        'Exception message should mention null input');
+}
+```
+
+### DML Results
+
+```apex
+// Insert success
+Database.SaveResult[] results = Database.insert(accounts, false);
+for (Database.SaveResult sr : results) {
+    System.assert(sr.isSuccess(), 'Insert should succeed: ' + sr.getErrors());
+}
+
+// Expected failures
+Database.SaveResult sr = Database.insert(invalidAccount, false);
+System.assert(!sr.isSuccess(), 'Insert should fail for invalid data');
+System.assert(sr.getErrors()[0].getMessage().contains('REQUIRED_FIELD_MISSING'),
+    'Error should indicate missing required field');
+```
+
+### Comparing Objects
+
+```apex
+// Compare specific fields, not entire objects
+System.assertEquals(expected.Name, actual.Name, 'Names should match');
+System.assertEquals(expected.Status__c, actual.Status__c, 'Status should match');
+
+// Or use JSON for deep comparison (use sparingly)
+System.assertEquals(
+    JSON.serialize(expected), 
+    JSON.serialize(actual), 
+    'Objects should be identical'
+);
+```
+
+### Date/DateTime Assertions
+
+```apex
+// Exact date
+System.assertEquals(Date.today(), record.CreatedDate__c, 'Should be created today');
+
+// Date within range
+System.assert(record.DueDate__c >= Date.today(), 'Due date should be in the future');
+System.assert(record.DueDate__c <= Date.today().addDays(30), 
+    'Due date should be within 30 days');
+```
+
+### Null Checks
+
+```apex
+// Should be null
+System.assertEquals(null, result.ErrorMessage__c, 'No error expected for valid input');
+
+// Should not be null
+System.assertNotEquals(null, result.Id, 'Record should have been inserted');
+```
+
+## Anti-Patterns to Avoid
+
+### ❌ Testing implementation, not behavior
+
+```apex
+// Bad: Testing that a specific method was called
+System.assert(MyClass.methodWasCalled, 'Method should be called');
+
+// Good: Testing the observable outcome
+System.assertEquals('Expected Value', record.Field__c, 'Field should be updated');
+```
+
+### ❌ Overly generic assertions
+
+```apex
+// Bad: Passes for any non-empty result
+System.assert(results.size() > 0);
+
+// Good: Verifies exact expected count
+System.assertEquals(200, results.size(), 'All 200 records should be returned');
+```
+
+### ❌ Missing negative test assertions
+
+```apex
+// Bad: Only tests that no exception occurred
+MyService.process(data); // Test passes if no exception
+
+// Good: Verifies the actual outcome
+Result r = MyService.process(data);
+System.assertEquals('Success', r.status, 'Processing should succeed');
+System.assertEquals(0, r.errorCount, 'No errors should occur');
+```
diff --git a/skills/generating-apex-test/references/async-testing.md b/skills/generating-apex-test/references/async-testing.md
new file mode 100644
index 0000000..db651f9
--- /dev/null
+++ b/skills/generating-apex-test/references/async-testing.md
@@ -0,0 +1,276 @@
+# Async Testing Patterns
+
+## Key Principle
+
+`Test.stopTest()` forces all async operations to execute synchronously, allowing assertions on their results.
+
+## Batch Apex Testing
+
+### Basic Batch Test
+
+```apex
+@isTest
+static void shouldProcessAllRecords_WhenBatchExecutes() {
+    // Given: Create test data
+    List<Account> accounts = TestDataFactory.createAccounts(200, true);
+    
+    // When: Execute batch
+    Test.startTest();
+    MyBatchClass batch = new MyBatchClass();
+    Id batchId = Database.executeBatch(batch, 200);
+    Test.stopTest(); // Forces batch to complete
+    
+    // Then: Verify results
+    List<Account> updated = [SELECT Id, Status__c FROM Account];
+    for (Account acc : updated) {
+        System.assertEquals('Processed', acc.Status__c, 
+            'Batch should update all account statuses');
+    }
+}
+```
+
+### Testing Batch with Failures
+
+```apex
+@isTest
+static void shouldLogErrors_WhenRecordsFail() {
+    // Given: Create mix of valid and invalid records
+    List<Account> accounts = TestDataFactory.createAccounts(198, true);
+    
+    // Create 2 accounts that will fail processing
+    List<Account> invalidAccounts = new List<Account>();
+    for (Integer i = 0; i < 2; i++) {
+        invalidAccounts.add(new Account(
+            Name = 'Invalid Account ' + i,
+            Invalid_Field__c = 'triggers_validation_error'
+        ));
+    }
+    insert invalidAccounts;
+    
+    // When
+    Test.startTest();
+    MyBatchClass batch = new MyBatchClass();
+    Database.executeBatch(batch, 50);
+    Test.stopTest();
+    
+    // Then
+    List<Error_Log__c> errors = [SELECT Id, Message__c FROM Error_Log__c];
+    System.assertEquals(2, errors.size(), 'Should log 2 failed records');
+}
+```
+
+### Testing Batch Scope
+
+```apex
+@isTest
+static void shouldRespectBatchSize() {
+    // Given
+    List<Account> accounts = TestDataFactory.createAccounts(250, true);
+    
+    Test.startTest();
+    MyBatchClass batch = new MyBatchClass();
+    Database.executeBatch(batch, 50); // 5 batches of 50
+    Test.stopTest();
+    
+    // Note: In tests, all batches execute but you can verify total processing
+    List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
+    System.assertEquals(250, processed.size(), 'All records should be processed');
+}
+```
+
+## Queueable Testing
+
+### Basic Queueable Test
+
+```apex
+@isTest
+static void shouldCompleteProcessing_WhenQueueableEnqueued() {
+    // Given
+    Account acc = TestDataFactory.createAccount(true);
+    
+    // When
+    Test.startTest();
+    MyQueueableClass queueable = new MyQueueableClass(acc.Id);
+    System.enqueueJob(queueable);
+    Test.stopTest(); // Forces queueable to complete
+    
+    // Then
+    Account updated = [SELECT Id, Status__c FROM Account WHERE Id = :acc.Id];
+    System.assertEquals('Processed', updated.Status__c, 
+        'Queueable should update account status');
+}
+```
+
+### Testing Queueable Chaining
+
+Chained queueables only execute the first job in tests:
+
+```apex
+@isTest
+static void shouldChainNextJob_WhenMoreRecordsExist() {
+    // Given: More records than one queueable can process
+    List<Account> accounts = TestDataFactory.createAccounts(500, true);
+    
+    Test.startTest();
+    // First queueable processes batch 1 and chains next
+    MyChainedQueueable queueable = new MyChainedQueueable(0, 100);
+    System.enqueueJob(queueable);
+    Test.stopTest();
+    
+    // Verify first batch processed
+    List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
+    System.assertEquals(100, processed.size(), 'First batch should process 100 records');
+    
+    // Verify chain was enqueued (check AsyncApexJob)
+    List<AsyncApexJob> jobs = [
+        SELECT Id, Status, JobType 
+        FROM AsyncApexJob 
+        WHERE ApexClass.Name = 'MyChainedQueueable'
+    ];
+    System.assert(jobs.size() >= 1, 'Chained job should be enqueued');
+}
+```
+
+### Testing Queueable with Callouts
+
+```apex
+@isTest
+static void shouldMakeCallout_WhenQueueableWithCallout() {
+    // Given
+    Test.setMock(HttpCalloutMock.class, new MockHttpResponse(200, '{"status":"ok"}'));
+    Account acc = TestDataFactory.createAccount(true);
+    
+    // When
+    Test.startTest();
+    MyQueueableWithCallout queueable = new MyQueueableWithCallout(acc.Id);
+    System.enqueueJob(queueable);
+    Test.stopTest();
+    
+    // Then
+    Account updated = [SELECT Id, External_Status__c FROM Account WHERE Id = :acc.Id];
+    System.assertEquals('Synced', updated.External_Status__c, 
+        'Should update status after successful callout');
+}
+```
+
+## Future Method Testing
+
+```apex
+@isTest
+static void shouldExecuteFutureMethod() {
+    // Given
+    Account acc = TestDataFactory.createAccount(true);
+    
+    // When
+    Test.startTest();
+    MyClass.processFuture(acc.Id); // @future method
+    Test.stopTest(); // Forces future to complete
+    
+    // Then
+    Account updated = [SELECT Id, Processed__c FROM Account WHERE Id = :acc.Id];
+    System.assertEquals(true, updated.Processed__c, 'Future should process record');
+}
+```
+
+## Scheduled Apex Testing
+
+### Testing Scheduled Execution
+
+```apex
+@isTest
+static void shouldExecuteScheduledJob() {
+    // Given
+    List<Account> accounts = TestDataFactory.createAccounts(50, true);
+    
+    // When
+    Test.startTest();
+    String cronExp = '0 0 0 1 1 ? 2099'; // Arbitrary future time
+    String jobId = System.schedule('Test Job', cronExp, new MyScheduledClass());
+    
+    // Execute the scheduled job immediately
+    MyScheduledClass scheduled = new MyScheduledClass();
+    scheduled.execute(null); // Pass null SchedulableContext in tests
+    Test.stopTest();
+    
+    // Then
+    List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
+    System.assertEquals(50, processed.size(), 'Scheduled job should process records');
+}
+```
+
+### Testing Schedule Registration
+
+```apex
+@isTest
+static void shouldScheduleJob() {
+    Test.startTest();
+    String cronExp = '0 0 6 * * ?'; // Daily at 6 AM
+    String jobId = System.schedule('Daily Processing', cronExp, new MyScheduledClass());
+    Test.stopTest();
+    
+    // Verify job is scheduled
+    CronTrigger ct = [
+        SELECT Id, CronExpression, State 
+        FROM CronTrigger 
+        WHERE Id = :jobId
+    ];
+    System.assertEquals('0 0 6 * * ?', ct.CronExpression, 'CRON should match');
+    System.assertEquals('WAITING', ct.State, 'Job should be waiting');
+}
+```
+
+## Testing Async Limits
+
+```apex
+@isTest
+static void shouldNotExceedQueueableLimits() {
+    // Given: Setup that might enqueue multiple jobs
+    List<Account> accounts = TestDataFactory.createAccounts(100, true);
+    
+    Test.startTest();
+    Integer queueablesBefore = Limits.getQueueableJobs();
+    
+    MyService.processWithQueueables(accounts);
+    
+    Integer queueablesUsed = Limits.getQueueableJobs() - queueablesBefore;
+    Test.stopTest();
+    
+    // Verify limit not exceeded (50 in synchronous context, 1 in queueable)
+    System.assert(queueablesUsed <= 50, 
+        'Should not exceed queueable limit. Used: ' + queueablesUsed);
+}
+```
+
+## Common Pitfalls
+
+### ❌ Forgetting Test.stopTest()
+
+```apex
+// Bad: Async never executes
+Test.startTest();
+System.enqueueJob(new MyQueueable());
+// Missing Test.stopTest()!
+
+List<Account> results = [SELECT Id FROM Account WHERE Processed__c = true];
+System.assertEquals(100, results.size()); // FAILS - queueable didn't run
+```
+
+### ❌ Testing chained jobs without understanding limits
+
+```apex
+// Only the FIRST chained queueable runs in tests
+// Design tests to verify:
+// 1. First job completes correctly
+// 2. Chain is properly enqueued (check AsyncApexJob)
+// 3. Each job works independently
+```
+
+### ❌ Not mocking callouts in async
+
+```apex
+// Async with callouts MUST have mock set BEFORE Test.startTest()
+Test.setMock(HttpCalloutMock.class, new MockResponse()); // Before startTest!
+Test.startTest();
+System.enqueueJob(new QueueableWithCallout());
+Test.stopTest();
+```
diff --git a/skills/generating-apex-test/references/mocking-patterns.md b/skills/generating-apex-test/references/mocking-patterns.md
new file mode 100644
index 0000000..a308227
--- /dev/null
+++ b/skills/generating-apex-test/references/mocking-patterns.md
@@ -0,0 +1,219 @@
+# Mocking Patterns
+
+## HTTP Callout Mocking
+
+Apex doesn't allow real HTTP callouts in tests. Use `HttpCalloutMock` interface.
+
+### Basic Mock Implementation
+
+```apex
+@isTest
+public class MockHttpResponse implements HttpCalloutMock {
+    
+    private Integer statusCode;
+    private String body;
+    
+    public MockHttpResponse(Integer statusCode, String body) {
+        this.statusCode = statusCode;
+        this.body = body;
+    }
+    
+    public HTTPResponse respond(HTTPRequest req) {
+        HttpResponse res = new HttpResponse();
+        res.setStatusCode(statusCode);
+        res.setBody(body);
+        res.setHeader('Content-Type', 'application/json');
+        return res;
+    }
+}
+```
+
+### Using the Mock
+
+```apex
+@isTest
+static void shouldProcessApiResponse_WhenCalloutSucceeds() {
+    // Given
+    String mockResponse = '{"status": "success", "data": [{"id": "123"}]}';
+    Test.setMock(HttpCalloutMock.class, new MockHttpResponse(200, mockResponse));
+    
+    // When
+    Test.startTest();
+    List<ExternalRecord> results = MyIntegrationService.fetchRecords();
+    Test.stopTest();
+    
+    // Then
+    System.assertEquals(1, results.size(), 'Should parse one record from response');
+    System.assertEquals('123', results[0].externalId, 'Should extract correct ID');
+}
+
+@isTest
+static void shouldHandleError_WhenCalloutFails() {
+    // Given
+    String errorResponse = '{"error": "Unauthorized"}';
+    Test.setMock(HttpCalloutMock.class, new MockHttpResponse(401, errorResponse));
+    
+    // When
+    Test.startTest();
+    CalloutResult result = MyIntegrationService.fetchRecords();
+    Test.stopTest();
+    
+    // Then
+    System.assertEquals(false, result.isSuccess, 'Should indicate failure');
+    System.assert(result.errorMessage.contains('Unauthorized'), 'Should capture error');
+}
+```
+
+### Multi-Request Mock
+
+For services making multiple callouts:
+
+```apex
+@isTest
+public class MultiRequestMock implements HttpCalloutMock {
+    
+    private Map<String, HttpResponse> endpointResponses;
+    
+    public MultiRequestMock(Map<String, HttpResponse> responses) {
+        this.endpointResponses = responses;
+    }
+    
+    public HTTPResponse respond(HTTPRequest req) {
+        String endpoint = req.getEndpoint();
+        
+        for (String key : endpointResponses.keySet()) {
+            if (endpoint.contains(key)) {
+                return endpointResponses.get(key);
+            }
+        }
+        
+        // Default 404 if no match
+        HttpResponse res = new HttpResponse();
+        res.setStatusCode(404);
+        res.setBody('{"error": "Not found"}');
+        return res;
+    }
+}
+
+// Usage:
+Map<String, HttpResponse> mocks = new Map<String, HttpResponse>();
+
+HttpResponse authResponse = new HttpResponse();
+authResponse.setStatusCode(200);
+authResponse.setBody('{"token": "abc123"}');
+mocks.put('/oauth/token', authResponse);
+
+HttpResponse dataResponse = new HttpResponse();
+dataResponse.setStatusCode(200);
+dataResponse.setBody('{"records": []}');
+mocks.put('/api/records', dataResponse);
+
+Test.setMock(HttpCalloutMock.class, new MultiRequestMock(mocks));
+```
+
+## StaticResourceCalloutMock
+
+For complex response bodies, store JSON in Static Resources:
+
+```apex
+@isTest
+static void shouldParseComplexResponse() {
+    StaticResourceCalloutMock mock = new StaticResourceCalloutMock();
+    mock.setStaticResource('TestApiResponse'); // Static Resource name
+    mock.setStatusCode(200);
+    mock.setHeader('Content-Type', 'application/json');
+    
+    Test.setMock(HttpCalloutMock.class, mock);
+    
+    Test.startTest();
+    Result r = MyService.callExternalApi();
+    Test.stopTest();
+    
+    System.assertNotEquals(null, r, 'Should parse response');
+}
+```
+
+## Stub API (Enterprise Pattern)
+
+For mocking Apex class dependencies using `System.StubProvider`:
+
+```apex
+@isTest
+public class MyServiceMock implements System.StubProvider {
+    
+    public Object handleMethodCall(
+        Object stubbedObject,
+        String stubbedMethodName,
+        Type returnType,
+        List<Type> paramTypes,
+        List<String> paramNames,
+        List<Object> args
+    ) {
+        if (stubbedMethodName == 'getAccountData') {
+            return new AccountData('Mock Account', 'Active');
+        }
+        return null;
+    }
+}
+
+// Usage in test:
+@isTest
+static void shouldUseAccountData() {
+    MyServiceMock mockProvider = new MyServiceMock();
+    IMyService mockService = (IMyService)Test.createStub(IMyService.class, mockProvider);
+    
+    // Inject mock into class under test
+    MyController controller = new MyController(mockService);
+    
+    Test.startTest();
+    String result = controller.displayAccountInfo();
+    Test.stopTest();
+    
+    System.assert(result.contains('Mock Account'), 'Should use mocked data');
+}
+```
+
+## Email Mocking
+
+Apex sends real emails by default. Use limits to verify:
+
+```apex
+@isTest
+static void shouldSendEmail_WhenTriggered() {
+    Integer emailsBefore = Limits.getEmailInvocations();
+    
+    Test.startTest();
+    MyService.sendNotification(testContact);
+    Test.stopTest();
+    
+    // Verify email was queued (not actually sent in tests)
+    System.assertEquals(
+        emailsBefore + 1, 
+        Limits.getEmailInvocations(), 
+        'One email should be sent'
+    );
+}
+```
+
+## Platform Event Testing
+
+```apex
+@isTest
+static void shouldPublishEvent_WhenRecordCreated() {
+    Test.startTest();
+    
+    // Enable event delivery in test context
+    Test.enableChangeDataCapture();
+    
+    Account acc = TestDataFactory.createAccount(true);
+    
+    // Deliver events
+    Test.getEventBus().deliver();
+    
+    Test.stopTest();
+    
+    // Query platform event trigger results
+    List<EventLog__c> logs = [SELECT Id FROM EventLog__c WHERE AccountId__c = :acc.Id];
+    System.assertEquals(1, logs.size(), 'Event handler should create log record');
+}
+```
diff --git a/skills/generating-apex-test/references/test-data-factory.md b/skills/generating-apex-test/references/test-data-factory.md
new file mode 100644
index 0000000..b4cc3df
--- /dev/null
+++ b/skills/generating-apex-test/references/test-data-factory.md
@@ -0,0 +1,176 @@
+# TestDataFactory Patterns
+
+## Overview
+
+TestDataFactory is a centralized utility class for creating test records with sensible defaults. It ensures consistent test data across all test classes and reduces duplication.
+
+## Base Template
+
+```apex
+@isTest
+public class TestDataFactory {
+    
+    // ============ ACCOUNTS ============
+    
+    public static List<Account> createAccounts(Integer count, Boolean doInsert) {
+        List<Account> accounts = new List<Account>();
+        for (Integer i = 0; i < count; i++) {
+            accounts.add(new Account(
+                Name = 'Test Account ' + i,
+                BillingStreet = '123 Test St',
+                BillingCity = 'San Francisco',
+                BillingState = 'CA',
+                BillingPostalCode = '94105',
+                BillingCountry = 'USA',
+                Industry = 'Technology',
+                Type = 'Customer'
+            ));
+        }
+        if (doInsert) insert accounts;
+        return accounts;
+    }
+    
+    public static Account createAccount(Boolean doInsert) {
+        return createAccounts(1, doInsert)[0];
+    }
+    
+    // ============ CONTACTS ============
+    
+    public static List<Contact> createContacts(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
+        List<Contact> contacts = new List<Contact>();
+        Integer index = 0;
+        for (Account acc : accounts) {
+            for (Integer i = 0; i < countPerAccount; i++) {
+                contacts.add(new Contact(
+                    FirstName = 'Test',
+                    LastName = 'Contact ' + index,
+                    Email = 'test.contact' + index + '@example.com',
+                    Phone = '555-000-' + String.valueOf(index).leftPad(4, '0'),
+                    AccountId = acc.Id
+                ));
+                index++;
+            }
+        }
+        if (doInsert) insert contacts;
+        return contacts;
+    }
+    
+    // ============ OPPORTUNITIES ============
+    
+    public static List<Opportunity> createOpportunities(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
+        List<Opportunity> opps = new List<Opportunity>();
+        Integer index = 0;
+        for (Account acc : accounts) {
+            for (Integer i = 0; i < countPerAccount; i++) {
+                opps.add(new Opportunity(
+                    Name = 'Test Opportunity ' + index,
+                    AccountId = acc.Id,
+                    StageName = 'Prospecting',
+                    CloseDate = Date.today().addDays(30),
+                    Amount = 10000 + (index * 1000)
+                ));
+                index++;
+            }
+        }
+        if (doInsert) insert opps;
+        return opps;
+    }
+    
+    // ============ USERS ============
+    
+    public static User createUser(String profileName, Boolean doInsert) {
+        Profile p = [SELECT Id FROM Profile WHERE Name = :profileName LIMIT 1];
+        String uniqueKey = String.valueOf(DateTime.now().getTime());
+        
+        User u = new User(
+            FirstName = 'Test',
+            LastName = 'User ' + uniqueKey,
+            Email = 'testuser' + uniqueKey + '@example.com',
+            Username = 'testuser' + uniqueKey + '@example.com.test',
+            Alias = 'tuser',
+            TimeZoneSidKey = 'America/Los_Angeles',
+            LocaleSidKey = 'en_US',
+            EmailEncodingKey = 'UTF-8',
+            LanguageLocaleKey = 'en_US',
+            ProfileId = p.Id
+        );
+        if (doInsert) insert u;
+        return u;
+    }
+    
+    // ============ CUSTOM OBJECTS ============
+    
+    // Add methods for your custom objects following the same pattern:
+    // public static List<MyObject__c> createMyObjects(Integer count, Boolean doInsert) { ... }
+}
+```
+
+## Field Override Pattern
+
+Allow callers to override default values:
+
+```apex
+public static Account createAccount(Map<String, Object> fieldOverrides, Boolean doInsert) {
+    Account acc = new Account(
+        Name = 'Test Account',
+        Industry = 'Technology'
+    );
+    
+    // Apply overrides
+    for (String fieldName : fieldOverrides.keySet()) {
+        acc.put(fieldName, fieldOverrides.get(fieldName));
+    }
+    
+    if (doInsert) insert acc;
+    return acc;
+}
+
+// Usage:
+Account acc = TestDataFactory.createAccount(new Map<String, Object>{
+    'Name' => 'Custom Name',
+    'Industry' => 'Healthcare'
+}, true);
+```
+
+## Handling Required Fields and Validation Rules
+
+```apex
+public static Account createAccountWithRequiredFields(Boolean doInsert) {
+    Account acc = new Account(
+        Name = 'Test Account',
+        // Required custom fields
+        External_Id__c = 'EXT-' + String.valueOf(DateTime.now().getTime()),
+        // Fields required by validation rules
+        Phone = '555-123-4567',
+        Website = 'https://example.com'
+    );
+    if (doInsert) insert acc;
+    return acc;
+}
+```
+
+## Record Type Support
+
+```apex
+public static Account createAccountByRecordType(String recordTypeName, Boolean doInsert) {
+    Id recordTypeId = Schema.SObjectType.Account
+        .getRecordTypeInfosByDeveloperName()
+        .get(recordTypeName)
+        .getRecordTypeId();
+    
+    Account acc = new Account(
+        Name = 'Test Account',
+        RecordTypeId = recordTypeId
+    );
+    if (doInsert) insert acc;
+    return acc;
+}
+```
+
+## Best Practices
+
+1. **Always include doInsert parameter** - Allows flexibility for tests that need to modify records before insert
+2. **Use unique identifiers** - Include index or timestamp in Name/Email fields to avoid duplicates
+3. **Set all required fields** - Include all fields required by validation rules
+4. **Return the created records** - Enables chaining and further manipulation
+5. **Create bulk methods first** - Single record methods should call bulk methods with count=1
diff --git a/skills/generating-apex/SKILL.md b/skills/generating-apex/SKILL.md
new file mode 100644
index 0000000..3d6ab5c
--- /dev/null
+++ b/skills/generating-apex/SKILL.md
@@ -0,0 +1,253 @@
+---
+name: generating-apex
+description: Generate production-ready Apex classes for Salesforce following enterprise best practices. Covers service, selector, domain, batch, queueable, schedulable, DTO, utility, interface, abstract, and custom exception classes. Use this skill when the user asks to create, build, generate, scaffold, or refactor an Apex class. SCOPE Apex classes only — does not apply to triggers or unit tests.
+---
+
+# Apex Class
+
+Generate well-structured, production-ready Apex classes for Salesforce development.
+
+## Scope
+
+**Generates:**
+- Service classes (business logic layer)
+- Selector / query classes (SOQL encapsulation)
+- Domain classes (SObject-specific logic)
+- Batch Apex classes (`Database.Batchable`)
+- Queueable Apex classes (`Queueable`, optionally `Finalizer`)
+- Schedulable Apex classes (`Schedulable`)
+- DTO / wrapper / request-response classes
+- Utility / helper classes
+- Custom exception classes
+- Interfaces and abstract classes
+
+**Does NOT generate:**
+- Triggers (use a trigger framework skill)
+- Unit tests (use a test writer skill)
+- Aura controllers
+- LWC JavaScript controllers
+
+---
+
+## Gathering Requirements
+
+Before generating code, gather these inputs from the user (ask if not provided):
+
+1. **Class type** — Service, Selector, Batch, Queueable, Schedulable, Domain, DTO, Utility, Interface, Abstract, Exception
+2. **Class name** — or enough context to derive a meaningful name
+3. **SObject(s) involved** — if applicable
+4. **Business requirements** — plain-language description of what the class should do
+5. **Optional preferences:**
+   - Sharing model (`with sharing`, `without sharing`, `inherited sharing`)
+   - Access modifier (`public` or `global`)
+   - API version (default: `62.0`)
+   - Whether to include ApexDoc comments (default: yes)
+
+If the user provides a clear, complete request, generate immediately without unnecessary back-and-forth.
+
+---
+
+## Code Standards — ALWAYS Follow These
+
+### Separation of Concerns
+- **Service classes** contain business logic. They call Selectors for data and may call Domain classes for SObject-specific behavior.
+- **Selector classes** encapsulate all SOQL queries. Services never contain inline SOQL.
+- **Domain classes** encapsulate SObject-specific logic (field defaults, validation, transformation).
+- Keep classes focused on a single responsibility.
+
+### Bulkification
+- All methods must operate on collections (`List`, `Set`, `Map`) by default.
+- Never accept a single SObject when a `List<SObject>` is appropriate.
+- Provide convenience overloads for single-record callers only when it makes the API cleaner, and have them delegate to the bulk method.
+
+### Governor Limit Safety
+- **No SOQL or DML inside loops.** Ever.
+- Collect IDs/records first, query/DML once outside the loop.
+- Use `Limits` class checks in batch/bulk operations where appropriate.
+- Prefer `Database.insert(records, false)` with error handling in batch contexts.
+
+### Sharing Model
+- Default to `with sharing` unless the user specifies otherwise.
+- If `without sharing` or `inherited sharing` is used, add an ApexDoc `@description` comment explaining WHY.
+
+### Naming Conventions
+
+| Class Type   | Pattern                        | Example                        |
+|-------------|-------------------------------|-------------------------------|
+| Service      | `{SObject}Service`            | `AccountService`              |
+| Selector     | `{SObject}Selector`           | `AccountSelector`             |
+| Domain       | `{SObject}Domain`             | `OpportunityDomain`           |
+| Batch        | `{Descriptive}Batch`          | `AccountDeduplicationBatch`   |
+| Queueable    | `{Descriptive}Queueable`      | `ExternalSyncQueueable`       |
+| Schedulable  | `{Descriptive}Schedulable`    | `DailyCleanupSchedulable`     |
+| DTO          | `{Descriptive}DTO`            | `AccountMergeRequestDTO`      |
+| Wrapper      | `{Descriptive}Wrapper`        | `OpportunityLineWrapper`      |
+| Utility      | `{Descriptive}Util`           | `StringUtil`, `DateUtil`      |
+| Interface    | `I{Descriptive}`              | `INotificationService`        |
+| Abstract     | `Abstract{Descriptive}`       | `AbstractIntegrationService`  |
+| Exception    | `{Descriptive}Exception`      | `AccountServiceException`     |
+
+### ApexDoc Comments
+Include ApexDoc on every `public` and `global` method and on the class itself:
+
+```apex
+/**
+ * @description Brief description of what the class does
+ * @author Generated by Apex Class Writer Skill
+ */
+```
+
+```apex
+/**
+ * @description Brief description of what the method does
+ * @param paramName Description of the parameter
+ * @return Description of the return value
+ * @example
+ * List<Account> results = AccountService.deduplicateAccounts(accountIds);
+ */
+```
+
+### Null Safety
+- Use guard clauses at the top of methods for null/empty inputs.
+- Use safe navigation (`?.`) where appropriate.
+- Return empty collections rather than `null`.
+
+### Constants
+- No magic strings or numbers in logic.
+- Use `private static final` constants or a dedicated constants class.
+- Use `Label.` custom labels for user-facing strings when appropriate.
+
+### Custom Exceptions
+- Each service class should define or reference a corresponding custom exception.
+- Inner exception classes are preferred for simple cases: `public class AccountServiceException extends Exception {}`
+- Include meaningful error messages with context.
+
+### Error Handling
+- Catch specific exceptions, not generic `Exception` unless re-throwing.
+- Log errors meaningfully (assume a logging utility exists or stub one).
+- In batch contexts, use `Database.SaveResult` / `Database.UpsertResult` with partial success.
+
+---
+
+## Output Format
+
+For every class, produce TWO files:
+
+1. **`{ClassName}.cls`** — The Apex class source code
+2. **`{ClassName}.cls-meta.xml`** — The metadata file
+
+### Meta XML Template
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>{API_VERSION}</apiVersion>
+    <status>Active</status>
+</ApexClass>
+```
+
+Default `apiVersion` is `62.0` unless the user specifies otherwise.
+
+---
+
+## Class Type–Specific Instructions
+
+### Service Classes
+- Read and follow: `assets/service.cls`
+- Stateless — no instance variables holding mutable state
+- All public methods should be `static` unless there's a compelling reason for instance methods
+- Delegate queries to a Selector class
+- Wrap business logic errors in a custom exception
+
+### Selector Classes
+- Read and follow: `assets/selector.cls`
+- One Selector per SObject (or per logical query domain)
+- Return `List<SObject>` or `Map<Id, SObject>`
+- Accept filter criteria as method parameters, not hardcoded
+- Include a private method that returns the base field list to keep DRY
+
+### Domain Classes
+- Read and follow: `assets/domain.cls`
+- Encapsulate field-level defaults, derivations, and validations
+- Operate on `List<SObject>` — designed to be called from triggers or services
+- No SOQL or DML — only in-memory SObject manipulation
+
+### Batch Classes
+- Read and follow: `assets/batch.cls`
+- Implement `Database.Batchable<SObject>` and optionally `Database.Stateful`
+- Use `Database.QueryLocator` in `start()` for large datasets
+- Handle partial failures in `execute()` using `Database.SaveResult`
+- Implement meaningful `finish()` — at minimum, log completion
+
+### Queueable Classes
+- Read and follow: `assets/queueable.cls`
+- Implement `Queueable` and optionally `Database.AllowsCallouts`
+- Accept data through the constructor — queueables are stateful
+- For chaining, include guard logic to prevent infinite chains
+- Optionally implement `Finalizer` for error recovery
+
+### Schedulable Classes
+- Read and follow: `assets/schedulable.cls`
+- Implement `Schedulable`
+- Keep `execute()` lightweight — delegate to a Batch or Queueable
+- Include a static method that returns a CRON expression for convenience
+- Document the expected schedule in ApexDoc
+
+### DTO / Wrapper Classes
+- Read and follow: `assets/dto.cls`
+- Use `public` properties — no getters/setters unless validation is needed
+- Include a no-arg constructor and optionally a parameterized constructor
+- Implement `Comparable` if sorting is needed
+- Keep them serialization-friendly (no transient state unless intentional)
+
+### Utility Classes
+- Read and follow: `assets/utility.cls`
+- All methods `public static`
+- Class should be `public with sharing` with a `private` constructor to prevent instantiation
+- Group related utilities (e.g., `StringUtil`, `DateUtil`, `CollectionUtil`)
+- Every method must be side-effect-free (no DML, no SOQL)
+
+### Interfaces
+- Read and follow: `assets/interface.cls`
+- Define the contract clearly with ApexDoc on every method signature
+- Use meaningful names that describe the capability: `INotificationService`, `IRetryable`
+
+### Abstract Classes
+- Read and follow: `assets/abstract.cls`
+- Provide default implementations for common behavior
+- Mark extension points as `protected virtual` or `protected abstract`
+- Include a concrete example in the ApexDoc showing how to extend
+
+### Custom Exceptions
+- Read and follow: `assets/exception.cls`
+- Extend `Exception`
+- Keep them simple — Apex exceptions don't support custom constructors well
+- Name them descriptively: `AccountServiceException`, `IntegrationTimeoutException`
+
+---
+
+## Generation Workflow
+
+1. Determine the class type from the user's request
+2. Read the corresponding template from `assets/`
+3. Read relevant examples from `references/` if the class type has one
+4. Apply the user's requirements to the template pattern
+5. Generate the `.cls` file with full ApexDoc
+6. Generate the `.cls-meta.xml` file
+7. Present both files to the user
+8. Include a brief note on design decisions if any non-obvious choices were made
+
+---
+
+## Anti-Patterns to Avoid
+
+- ❌ SOQL or DML inside loops
+- ❌ Hardcoded IDs or record type names (use `Schema.SObjectType` or Custom Metadata)
+- ❌ God classes that mix query + logic + DML
+- ❌ `public` fields on service classes
+- ❌ Returning `null` from methods that should return collections
+- ❌ Generic `catch (Exception e)` without re-throwing or meaningful handling
+- ❌ Business logic in Batch `start()` methods
+- ❌ Tight coupling between classes — use interfaces for extensibility
+- ❌ Magic strings or numbers
+- ❌ Methods longer than ~40 lines — break them into private helpers
diff --git a/skills/generating-apex/assets/abstract.cls b/skills/generating-apex/assets/abstract.cls
new file mode 100644
index 0000000..cf2716a
--- /dev/null
+++ b/skills/generating-apex/assets/abstract.cls
@@ -0,0 +1,128 @@
+/**
+ * @description Abstract base class for {describe the family of classes this serves}.
+ *              Provides common behavior and defines extension points for subclasses.
+ *              Subclasses must implement the abstract methods to provide specific behavior.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Extending this abstract class:
+ * public class SalesforceIntegrationService extends {ClassName} {
+ *     protected override String getEndpoint() {
+ *         return 'callout:Salesforce_API/services/data/v62.0';
+ *     }
+ *
+ *     protected override Map<String, String> getHeaders() {
+ *         return new Map<String, String>{
+ *             'Content-Type' => 'application/json'
+ *         };
+ *     }
+ * }
+ */
+public abstract with sharing class {ClassName} {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final Integer DEFAULT_TIMEOUT_MS = 30000;
+
+    // ─── Protected State ─────────────────────────────────────────────────
+    protected Integer timeoutMs;
+
+    // ─── Constructor ─────────────────────────────────────────────────────
+
+    /**
+     * @description Initializes the base class with default configuration
+     */
+    protected {ClassName}() {
+        this.timeoutMs = DEFAULT_TIMEOUT_MS;
+    }
+
+    // ─── Abstract Methods (must be implemented by subclasses) ────────────
+
+    /**
+     * @description Returns the endpoint URL for this integration.
+     *              Subclasses must provide their specific endpoint.
+     * @return The endpoint URL as a String
+     */
+    protected abstract String getEndpoint();
+
+    /**
+     * @description Returns the HTTP headers for this integration.
+     *              Subclasses define their own required headers.
+     * @return Map of header name to header value
+     */
+    protected abstract Map<String, String> getHeaders();
+
+    // ─── Virtual Methods (can be overridden by subclasses) ───────────────
+
+    /**
+     * @description Hook called before the main operation executes.
+     *              Override to add pre-processing logic.
+     *              Default implementation does nothing.
+     * @param context Map of contextual data
+     */
+    protected virtual void beforeExecute(Map<String, Object> context) {
+        // Default: no-op — override in subclass if needed
+    }
+
+    /**
+     * @description Hook called after the main operation completes.
+     *              Override to add post-processing logic.
+     *              Default implementation does nothing.
+     * @param context Map of contextual data
+     * @param result The result from the operation
+     */
+    protected virtual void afterExecute(Map<String, Object> context, Object result) {
+        // Default: no-op — override in subclass if needed
+    }
+
+    // ─── Template Method (common workflow) ───────────────────────────────
+
+    /**
+     * @description Executes the operation using the template method pattern.
+     *              Calls beforeExecute → doExecute → afterExecute in sequence.
+     * @param context Map of data needed for the operation
+     * @return The result of the operation
+     */
+    public Object execute(Map<String, Object> context) {
+        beforeExecute(context);
+
+        Object result;
+        try {
+            result = doExecute(context);
+        } catch (Exception e) {
+            handleError(e);
+            throw e;
+        }
+
+        afterExecute(context, result);
+        return result;
+    }
+
+    // ─── Protected Helpers ───────────────────────────────────────────────
+
+    /**
+     * @description Core execution logic — override this for the main operation.
+     *              Default implementation throws — subclass must provide implementation.
+     * @param context Map of data needed for the operation
+     * @return The result of the operation
+     */
+    protected virtual Object doExecute(Map<String, Object> context) {
+        throw new UnsupportedOperationException(
+            'Subclass must override doExecute()'
+        );
+    }
+
+    /**
+     * @description Error handler called when doExecute throws.
+     *              Override to customize error handling (e.g., logging, retry).
+     * @param e The exception that was thrown
+     */
+    protected virtual void handleError(Exception e) {
+        System.debug(LoggingLevel.ERROR,
+            this.toString() + ' error: ' + e.getMessage() + '\n' + e.getStackTraceString()
+        );
+    }
+
+    // ─── Exception ───────────────────────────────────────────────────────
+
+    public class UnsupportedOperationException extends Exception {}
+}
diff --git a/skills/generating-apex/assets/batch.cls b/skills/generating-apex/assets/batch.cls
new file mode 100644
index 0000000..07807d5
--- /dev/null
+++ b/skills/generating-apex/assets/batch.cls
@@ -0,0 +1,125 @@
+/**
+ * @description Batch Apex class for {describe the batch operation}.
+ *              Processes {SObject} records in configurable batch sizes.
+ *              Implements Database.Stateful to track cumulative results across chunks.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Execute with default batch size
+ * Database.executeBatch(new {ClassName}());
+ *
+ * // Execute with custom batch size
+ * Database.executeBatch(new {ClassName}(), 100);
+ */
+public with sharing class {ClassName} implements Database.Batchable<SObject>, Database.Stateful {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final Integer DEFAULT_BATCH_SIZE = 200;
+
+    // ─── Stateful Tracking ───────────────────────────────────────────────
+    private Integer totalProcessed = 0;
+    private Integer totalErrors = 0;
+    private List<String> errorMessages = new List<String>();
+
+    // ─── Constructor ─────────────────────────────────────────────────────
+
+    /**
+     * @description Default constructor
+     */
+    public {ClassName}() {
+        // Default configuration
+    }
+
+    // ─── Batchable Interface ─────────────────────────────────────────────
+
+    /**
+     * @description Defines the scope of records to process.
+     *              Uses Database.QueryLocator for efficient large-dataset processing.
+     * @param bc The batch context
+     * @return QueryLocator for the records to process
+     */
+    public Database.QueryLocator start(Database.BatchableContext bc) {
+        return Database.getQueryLocator([
+            SELECT Id, Name
+            // TODO: Add fields needed for processing
+            FROM {SObject}
+            // TODO: Add WHERE clause to scope the records
+        ]);
+    }
+
+    /**
+     * @description Processes each batch of records.
+     *              Uses Database.update with allOrNone=false for partial success handling.
+     * @param bc The batch context
+     * @param scope List of {SObject} records in the current batch
+     */
+    public void execute(Database.BatchableContext bc, List<{SObject}> scope) {
+        List<{SObject}> recordsToUpdate = new List<{SObject}>();
+
+        for ({SObject} record : scope) {
+            // TODO: Apply business logic to each record
+            recordsToUpdate.add(record);
+        }
+
+        if (!recordsToUpdate.isEmpty()) {
+            List<Database.SaveResult> results = Database.update(recordsToUpdate, false);
+            processResults(results);
+        }
+    }
+
+    /**
+     * @description Performs post-processing after all batches complete.
+     *              Logs a summary of the batch execution.
+     * @param bc The batch context
+     */
+    public void finish(Database.BatchableContext bc) {
+        String summary = String.format(
+            '{0} completed. Processed: {1}, Errors: {2}',
+            new List<Object>{
+                {ClassName}.class.getName(),
+                totalProcessed,
+                totalErrors
+            }
+        );
+
+        System.debug(LoggingLevel.INFO, summary);
+
+        if (!errorMessages.isEmpty()) {
+            System.debug(LoggingLevel.ERROR, 'Error details: ' + String.join(errorMessages, '\n'));
+        }
+
+        // TODO: Send completion notification email or post to chatter if needed
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    /**
+     * @description Processes Database.SaveResult list, tracking successes and failures
+     * @param results List of SaveResult from a DML operation
+     */
+    private void processResults(List<Database.SaveResult> results) {
+        for (Database.SaveResult result : results) {
+            if (result.isSuccess()) {
+                totalProcessed++;
+            } else {
+                totalErrors++;
+                for (Database.Error err : result.getErrors()) {
+                    errorMessages.add(
+                        'Record ' + result.getId() + ': ' +
+                        err.getStatusCode() + ' - ' + err.getMessage()
+                    );
+                }
+            }
+        }
+    }
+
+    // ─── Static Helpers ──────────────────────────────────────────────────
+
+    /**
+     * @description Convenience method to execute with default batch size
+     * @return The batch job Id
+     */
+    public static Id run() {
+        return Database.executeBatch(new {ClassName}(), DEFAULT_BATCH_SIZE);
+    }
+}
diff --git a/skills/generating-apex/assets/domain.cls b/skills/generating-apex/assets/domain.cls
new file mode 100644
index 0000000..e32615a
--- /dev/null
+++ b/skills/generating-apex/assets/domain.cls
@@ -0,0 +1,102 @@
+/**
+ * @description Domain class for {SObject}.
+ *              Encapsulates field-level defaults, derivations, and validations.
+ *              Operates only on in-memory SObject data — no SOQL or DML.
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class {SObject}Domain {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    // TODO: Add constants for default values, statuses, etc.
+
+    // ─── Field Defaults ──────────────────────────────────────────────────
+
+    /**
+     * @description Applies default field values to new {SObject} records.
+     *              Call this before insert to ensure consistent defaults.
+     * @param records List of {SObject} records to apply defaults to
+     */
+    public static void applyDefaults(List<{SObject}> records) {
+        if (records == null || records.isEmpty()) {
+            return;
+        }
+
+        for ({SObject} record : records) {
+            // TODO: Set default field values
+            // Example:
+            // if (record.Status__c == null) {
+            //     record.Status__c = DEFAULT_STATUS;
+            // }
+        }
+    }
+
+    // ─── Derivations ────────────────────────────────────────────────────
+
+    /**
+     * @description Derives calculated field values based on other fields.
+     *              Call this before insert and before update.
+     * @param records List of {SObject} records to derive values for
+     */
+    public static void deriveFields(List<{SObject}> records) {
+        if (records == null || records.isEmpty()) {
+            return;
+        }
+
+        for ({SObject} record : records) {
+            // TODO: Derive calculated field values
+            // Example:
+            // record.FullAddress__c = buildFullAddress(record);
+        }
+    }
+
+    // ─── Validations ────────────────────────────────────────────────────
+
+    /**
+     * @description Validates {SObject} records and adds errors for any violations.
+     *              Call this before insert and before update.
+     * @param records List of {SObject} records to validate
+     */
+    public static void validate(List<{SObject}> records) {
+        if (records == null || records.isEmpty()) {
+            return;
+        }
+
+        for ({SObject} record : records) {
+            // TODO: Add validation rules
+            // Example:
+            // if (String.isBlank(record.Name)) {
+            //     record.addError('Name is required.');
+            // }
+        }
+    }
+
+    // ─── Comparisons ────────────────────────────────────────────────────
+
+    /**
+     * @description Determines which fields have changed between old and new record versions.
+     *              Useful in before update context.
+     * @param oldRecord The previous version of the record
+     * @param newRecord The current version of the record
+     * @return Set of field API names that have changed
+     */
+    public static Set<String> getChangedFields({SObject} oldRecord, {SObject} newRecord) {
+        Set<String> changedFields = new Set<String>();
+
+        if (oldRecord == null || newRecord == null) {
+            return changedFields;
+        }
+
+        Map<String, Schema.SObjectField> fieldMap = Schema.SObjectType.{SObject}.fields.getMap();
+        for (String fieldName : fieldMap.keySet()) {
+            if (oldRecord.get(fieldName) != newRecord.get(fieldName)) {
+                changedFields.add(fieldName);
+            }
+        }
+
+        return changedFields;
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    // TODO: Add private helper methods as needed
+}
diff --git a/skills/generating-apex/assets/dto.cls b/skills/generating-apex/assets/dto.cls
new file mode 100644
index 0000000..7477663
--- /dev/null
+++ b/skills/generating-apex/assets/dto.cls
@@ -0,0 +1,108 @@
+/**
+ * @description Data Transfer Object for {describe the data this DTO represents}.
+ *              Used to pass structured data between layers without exposing SObjects.
+ *              Serialization-friendly for use with JSON.serialize/deserialize and API responses.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Create from constructor
+ * {ClassName} dto = new {ClassName}('value1', 42);
+ *
+ * // Deserialize from JSON
+ * {ClassName} dto = ({ClassName}) JSON.deserialize(jsonString, {ClassName}.class);
+ */
+public with sharing class {ClassName} {
+
+    // ─── Properties ──────────────────────────────────────────────────────
+
+    /** @description {Describe this property} */
+    public String name { get; set; }
+
+    /** @description {Describe this property} */
+    public Id recordId { get; set; }
+
+    /** @description {Describe this property} */
+    public Boolean isActive { get; set; }
+
+    /** @description {Describe this property} */
+    public List<String> tags { get; set; }
+
+    // TODO: Add additional properties as needed
+
+    // ─── Constructors ────────────────────────────────────────────────────
+
+    /**
+     * @description No-arg constructor for deserialization compatibility
+     */
+    public {ClassName}() {
+        this.tags = new List<String>();
+        this.isActive = false;
+    }
+
+    /**
+     * @description Parameterized constructor for convenience
+     * @param name The name value
+     * @param recordId The associated record Id
+     */
+    public {ClassName}(String name, Id recordId) {
+        this();
+        this.name = name;
+        this.recordId = recordId;
+    }
+
+    // ─── Factory Methods ─────────────────────────────────────────────────
+
+    /**
+     * @description Creates a DTO instance from an SObject record
+     * @param record The source {SObject} record
+     * @return A populated {ClassName} instance
+     */
+    public static {ClassName} fromSObject(SObject record) {
+        if (record == null) {
+            return new {ClassName}();
+        }
+
+        {ClassName} dto = new {ClassName}();
+        dto.recordId = record.Id;
+        dto.name = (String) record.get('Name');
+        // TODO: Map additional fields
+
+        return dto;
+    }
+
+    /**
+     * @description Creates a list of DTOs from a list of SObject records
+     * @param records The source records
+     * @return List of populated {ClassName} instances
+     */
+    public static List<{ClassName}> fromSObjects(List<SObject> records) {
+        List<{ClassName}> dtos = new List<{ClassName}>();
+        if (records == null) {
+            return dtos;
+        }
+
+        for (SObject record : records) {
+            dtos.add(fromSObject(record));
+        }
+        return dtos;
+    }
+
+    // ─── Utility Methods ─────────────────────────────────────────────────
+
+    /**
+     * @description Serializes this DTO to a JSON string
+     * @return JSON representation of this DTO
+     */
+    public String toJson() {
+        return JSON.serialize(this);
+    }
+
+    /**
+     * @description Deserializes a JSON string into a {ClassName} instance
+     * @param jsonString The JSON string to deserialize
+     * @return A {ClassName} instance
+     */
+    public static {ClassName} fromJson(String jsonString) {
+        return ({ClassName}) JSON.deserialize(jsonString, {ClassName}.class);
+    }
+}
diff --git a/skills/generating-apex/assets/exception.cls b/skills/generating-apex/assets/exception.cls
new file mode 100644
index 0000000..1d14d94
--- /dev/null
+++ b/skills/generating-apex/assets/exception.cls
@@ -0,0 +1,51 @@
+/**
+ * @description Custom exception for {describe when this exception is thrown}.
+ *              Use this exception to signal domain-specific errors that callers
+ *              can catch and handle distinctly from system exceptions.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * throw new {ClassName}('Account merge failed: duplicate detected.');
+ *
+ * // Wrap a caught exception
+ * try {
+ *     // ... risky operation
+ * } catch (DmlException e) {
+ *     throw new {ClassName}('DML failed during account merge: ' + e.getMessage());
+ * }
+ */
+public with sharing class {ClassName} extends Exception {
+    // Apex custom exceptions automatically inherit:
+    //   - getMessage()
+    //   - getCause()
+    //   - getStackTraceString()
+    //   - setMessage(String)
+    //   - initCause(Exception)
+    //
+    // And support these constructor patterns:
+    //   - new {ClassName}()
+    //   - new {ClassName}('message')
+    //   - new {ClassName}(causeException)
+    //   - new {ClassName}('message', causeException)
+    //
+    // Note: Apex does NOT support custom constructors on Exception subclasses.
+    // To add context, use the message string or create a wrapper pattern:
+    //
+    // Example wrapper pattern (if you need structured error data):
+    //
+    // public class {ClassName}Detail {
+    //     public String errorCode;
+    //     public List<Id> failedRecordIds;
+    //     public String detail;
+    //
+    //     public {ClassName}Detail(String errorCode, List<Id> failedRecordIds, String detail) {
+    //         this.errorCode = errorCode;
+    //         this.failedRecordIds = failedRecordIds;
+    //         this.detail = detail;
+    //     }
+    //
+    //     public override String toString() {
+    //         return '[' + errorCode + '] ' + detail + ' (Records: ' + failedRecordIds + ')';
+    //     }
+    // }
+}
diff --git a/skills/generating-apex/assets/interface.cls b/skills/generating-apex/assets/interface.cls
new file mode 100644
index 0000000..fc1da63
--- /dev/null
+++ b/skills/generating-apex/assets/interface.cls
@@ -0,0 +1,25 @@
+/**
+ * @description Interface for {describe the capability or contract this interface defines}.
+ *              Implement this interface to provide {describe what implementations do}.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * public class EmailNotificationService implements {InterfaceName} {
+ *     public void execute(Map<String, Object> params) {
+ *         // Implementation
+ *     }
+ * }
+ */
+public interface {InterfaceName} {
+
+    /**
+     * @description {Describe what this method should do}
+     * @param params {Describe the parameter}
+     * @return {Describe the return value}
+     */
+    // TODO: Define interface methods
+    // Example:
+    // void execute(Map<String, Object> params);
+    // Boolean isEligible(SObject record);
+    // List<SObject> process(List<SObject> records);
+}
diff --git a/skills/generating-apex/assets/queueable.cls b/skills/generating-apex/assets/queueable.cls
new file mode 100644
index 0000000..eaa224a
--- /dev/null
+++ b/skills/generating-apex/assets/queueable.cls
@@ -0,0 +1,92 @@
+/**
+ * @description Queueable Apex class for {describe the async operation}.
+ *              Accepts data through the constructor for stateful processing.
+ *              Optionally implements Database.AllowsCallouts for external integrations.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Enqueue the job
+ * Id jobId = System.enqueueJob(new {ClassName}(recordIds));
+ */
+public with sharing class {ClassName} implements Queueable /*, Database.AllowsCallouts */ {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final Integer MAX_CHAIN_DEPTH = 5;
+
+    // ─── Instance Variables (Stateful) ───────────────────────────────────
+    private Set<Id> recordIds;
+    private Integer chainDepth;
+
+    // ─── Constructors ────────────────────────────────────────────────────
+
+    /**
+     * @description Creates a new queueable job to process the specified records
+     * @param recordIds Set of record Ids to process
+     */
+    public {ClassName}(Set<Id> recordIds) {
+        this(recordIds, 0);
+    }
+
+    /**
+     * @description Creates a new queueable job with chain depth tracking
+     * @param recordIds Set of record Ids to process
+     * @param chainDepth Current depth in the queueable chain
+     */
+    public {ClassName}(Set<Id> recordIds, Integer chainDepth) {
+        this.recordIds = recordIds ?? new Set<Id>();
+        this.chainDepth = chainDepth;
+    }
+
+    // ─── Queueable Interface ─────────────────────────────────────────────
+
+    /**
+     * @description Executes the asynchronous work
+     * @param context The queueable context
+     */
+    public void execute(QueueableContext context) {
+        if (this.recordIds.isEmpty()) {
+            return;
+        }
+
+        try {
+            // TODO: Implement the async processing logic
+            // List<{SObject}> records = {SObject}Selector.selectByIds(this.recordIds);
+            // ... process records ...
+
+            // Chain to next job if there's more work and we haven't hit the depth limit
+            chainIfNeeded();
+
+        } catch (Exception e) {
+            handleError(context.getJobId(), e);
+        }
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    /**
+     * @description Chains to the next queueable job if needed, with depth guard
+     */
+    private void chainIfNeeded() {
+        // TODO: Determine if chaining is needed (e.g., remaining records to process)
+        Set<Id> remainingIds = new Set<Id>();
+
+        if (!remainingIds.isEmpty() && this.chainDepth < MAX_CHAIN_DEPTH) {
+            if (!Test.isRunningTest()) {
+                System.enqueueJob(new {ClassName}(remainingIds, this.chainDepth + 1));
+            }
+        }
+    }
+
+    /**
+     * @description Handles errors during execution
+     * @param jobId The async job Id
+     * @param e The exception that occurred
+     */
+    private void handleError(Id jobId, Exception e) {
+        System.debug(LoggingLevel.ERROR,
+            '{ClassName} failed (Job: ' + jobId + '): ' +
+            e.getMessage() + '\n' + e.getStackTraceString()
+        );
+        // TODO: Persist error to a log object or send notification
+    }
+}
diff --git a/skills/generating-apex/assets/schedulable.cls b/skills/generating-apex/assets/schedulable.cls
new file mode 100644
index 0000000..1e9f932
--- /dev/null
+++ b/skills/generating-apex/assets/schedulable.cls
@@ -0,0 +1,75 @@
+/**
+ * @description Schedulable Apex class for {describe the scheduled operation}.
+ *              Delegates heavy processing to a Batch or Queueable job.
+ *              Keep execute() lightweight — it should only launch other jobs.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Schedule to run daily at 2 AM
+ * String jobId = System.schedule(
+ *     '{ClassName} - Daily',
+ *     {ClassName}.CRON_DAILY_2AM,
+ *     new {ClassName}()
+ * );
+ *
+ * // Or use the convenience method
+ * String jobId = {ClassName}.scheduleDaily();
+ */
+public with sharing class {ClassName} implements Schedulable {
+
+    // ─── CRON Expressions ────────────────────────────────────────────────
+    // Seconds Minutes Hours Day_of_month Month Day_of_week Optional_year
+
+    /** @description Runs daily at 2:00 AM */
+    public static final String CRON_DAILY_2AM = '0 0 2 * * ?';
+
+    /** @description Runs every weekday at 6:00 AM */
+    public static final String CRON_WEEKDAYS_6AM = '0 0 6 ? * MON-FRI';
+
+    /** @description Runs hourly at the top of the hour */
+    public static final String CRON_HOURLY = '0 0 * * * ?';
+
+    // ─── Schedulable Interface ───────────────────────────────────────────
+
+    /**
+     * @description Entry point for the scheduled execution.
+     *              Delegates to a Batch or Queueable for the actual work.
+     * @param sc The schedulable context
+     */
+    public void execute(SchedulableContext sc) {
+        // Option A: Launch a Batch job
+        // Database.executeBatch(new {BatchClassName}(), 200);
+
+        // Option B: Launch a Queueable job
+        // System.enqueueJob(new {QueueableClassName}(params));
+
+        // TODO: Implement delegation to appropriate async job
+    }
+
+    // ─── Convenience Scheduling Methods ──────────────────────────────────
+
+    /**
+     * @description Schedules this job to run daily at 2 AM
+     * @return The scheduled job Id
+     */
+    public static String scheduleDaily() {
+        return System.schedule(
+            '{ClassName} - Daily 2AM',
+            CRON_DAILY_2AM,
+            new {ClassName}()
+        );
+    }
+
+    /**
+     * @description Aborts this scheduled job by name
+     * @param jobName The name used when scheduling
+     */
+    public static void abort(String jobName) {
+        for (CronTrigger ct : [
+            SELECT Id FROM CronTrigger
+            WHERE CronJobDetail.Name = :jobName
+        ]) {
+            System.abortJob(ct.Id);
+        }
+    }
+}
diff --git a/skills/generating-apex/assets/selector.cls b/skills/generating-apex/assets/selector.cls
new file mode 100644
index 0000000..3512465
--- /dev/null
+++ b/skills/generating-apex/assets/selector.cls
@@ -0,0 +1,92 @@
+/**
+ * @description Selector class for {SObject} queries.
+ *              Encapsulates all SOQL for {SObject} records.
+ *              All methods return bulkified results (Lists or Maps).
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class {SObject}Selector {
+
+    // ─── Field Lists ─────────────────────────────────────────────────────
+
+    /**
+     * @description Returns the default set of fields to query for {SObject}.
+     *              Centralizes field references to keep queries DRY.
+     * @return Comma-separated field list as a String
+     */
+    private static String getDefaultFields() {
+        return String.join(
+            new List<String>{
+                'Id',
+                'Name',
+                'CreatedDate',
+                'LastModifiedDate'
+                // TODO: Add additional fields here
+            },
+            ', '
+        );
+    }
+
+    // ─── Query Methods ───────────────────────────────────────────────────
+
+    /**
+     * @description Selects {SObject} records by their Ids
+     * @param recordIds Set of {SObject} Ids to query
+     * @return List of {SObject} records matching the provided Ids
+     * @example
+     * Set<Id> ids = new Set<Id>{ '001xx000003DGbY' };
+     * List<{SObject}> results = {SObject}Selector.selectByIds(ids);
+     */
+    public static List<{SObject}> selectByIds(Set<Id> recordIds) {
+        if (recordIds == null || recordIds.isEmpty()) {
+            return new List<{SObject}>();
+        }
+
+        return Database.query(
+            'SELECT ' + getDefaultFields() +
+            ' FROM {SObject}' +
+            ' WHERE Id IN :recordIds'
+        );
+    }
+
+    /**
+     * @description Selects {SObject} records as a Map keyed by Id
+     * @param recordIds Set of {SObject} Ids to query
+     * @return Map of Id to {SObject}
+     */
+    public static Map<Id, {SObject}> selectMapByIds(Set<Id> recordIds) {
+        return new Map<Id, {SObject}>(selectByIds(recordIds));
+    }
+
+    /**
+     * @description Selects {SObject} records by a specific field value
+     * @param fieldName API name of the field to filter on
+     * @param values Set of values to match
+     * @return List of matching {SObject} records
+     * @example
+     * List<{SObject}> results = {SObject}Selector.selectByField('Status__c', new Set<String>{ 'Active' });
+     */
+    public static List<{SObject}> selectByField(String fieldName, Set<String> values) {
+        if (String.isBlank(fieldName) || values == null || values.isEmpty()) {
+            return new List<{SObject}>();
+        }
+
+        // Validate field name to prevent SOQL injection
+        Schema.SObjectField field = Schema.SObjectType.{SObject}.fields.getMap().get(fieldName);
+        if (field == null) {
+            throw new QueryException('Invalid field name: ' + fieldName);
+        }
+
+        return Database.query(
+            'SELECT ' + getDefaultFields() +
+            ' FROM {SObject}' +
+            ' WHERE ' + String.escapeSingleQuotes(fieldName) + ' IN :values'
+        );
+    }
+
+    // ─── Exception ───────────────────────────────────────────────────────
+
+    /**
+     * @description Custom exception for query errors
+     */
+    public class QueryException extends Exception {}
+}
diff --git a/skills/generating-apex/assets/service.cls b/skills/generating-apex/assets/service.cls
new file mode 100644
index 0000000..5f3a6c3
--- /dev/null
+++ b/skills/generating-apex/assets/service.cls
@@ -0,0 +1,69 @@
+/**
+ * @description Service class for {SObject} business logic.
+ *              Follows separation of concerns: delegates queries to {SObject}Selector
+ *              and SObject manipulation to {SObject}Domain where applicable.
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class {SObject}Service {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final String ERROR_NULL_INPUT = 'Input cannot be null or empty.';
+
+    // ─── Public API ──────────────────────────────────────────────────────
+
+    /**
+     * @description {Describe the primary operation}
+     * @param recordIds Set of {SObject} Ids to process
+     * @return List of processed {SObject} records
+     * @throws {SObject}ServiceException if processing fails
+     * @example
+     * Set<Id> ids = new Set<Id>{ '001xx000003DGbY' };
+     * List<{SObject}> results = {SObject}Service.process{SObject}s(ids);
+     */
+    public static List<{SObject}> process{SObject}s(Set<Id> recordIds) {
+        // Guard clause
+        if (recordIds == null || recordIds.isEmpty()) {
+            throw new {SObject}ServiceException(ERROR_NULL_INPUT);
+        }
+
+        // Query via Selector
+        List<{SObject}> records = {SObject}Selector.selectByIds(recordIds);
+
+        // Apply business logic
+        // TODO: Implement business logic here
+
+        // DML
+        try {
+            update records;
+        } catch (DmlException e) {
+            throw new {SObject}ServiceException(
+                'Failed to update {SObject} records: ' + e.getMessage()
+            );
+        }
+
+        return records;
+    }
+
+    // ─── Convenience Overloads ───────────────────────────────────────────
+
+    /**
+     * @description Single-record convenience overload
+     * @param recordId The {SObject} Id to process
+     * @return The processed {SObject} record
+     */
+    public static {SObject} process{SObject}(Id recordId) {
+        List<{SObject}> results = process{SObject}s(new Set<Id>{ recordId });
+        return results.isEmpty() ? null : results[0];
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    // TODO: Add private helper methods as needed
+
+    // ─── Exception ───────────────────────────────────────────────────────
+
+    /**
+     * @description Custom exception for {SObject}Service errors
+     */
+    public class {SObject}ServiceException extends Exception {}
+}
diff --git a/skills/generating-apex/assets/utility.cls b/skills/generating-apex/assets/utility.cls
new file mode 100644
index 0000000..9f3f9fc
--- /dev/null
+++ b/skills/generating-apex/assets/utility.cls
@@ -0,0 +1,97 @@
+/**
+ * @description Utility class for {describe the category of utilities: String, Date, Collection, etc.}.
+ *              All methods are static and side-effect-free (no SOQL, no DML).
+ *              Private constructor prevents instantiation.
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class {ClassName} {
+
+    // ─── Private Constructor ─────────────────────────────────────────────
+
+    /**
+     * @description Prevents instantiation — use static methods only
+     */
+    @TestVisible
+    private {ClassName}() {
+        // Utility class — do not instantiate
+    }
+
+    // ─── Public Methods ──────────────────────────────────────────────────
+
+    // TODO: Add utility methods below. Examples:
+
+    /**
+     * @description Safely converts a String to an Integer, returning a default if parsing fails
+     * @param value The String to parse
+     * @param defaultValue The fallback value if parsing fails
+     * @return The parsed Integer or the default value
+     * @example
+     * Integer result = {ClassName}.safeParseInteger('42', 0); // returns 42
+     * Integer result = {ClassName}.safeParseInteger('abc', 0); // returns 0
+     */
+    public static Integer safeParseInteger(String value, Integer defaultValue) {
+        if (String.isBlank(value)) {
+            return defaultValue;
+        }
+        try {
+            return Integer.valueOf(value.trim());
+        } catch (TypeException e) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * @description Chunks a list into smaller sublists of the specified size.
+     *              Useful for processing records in governor-limit-safe batches.
+     * @param items The list to chunk
+     * @param chunkSize The maximum size of each chunk
+     * @return A list of sublists, each containing up to chunkSize elements
+     * @example
+     * List<List<String>> chunks = {ClassName}.chunkList(myList, 200);
+     */
+    public static List<List<Object>> chunkList(List<Object> items, Integer chunkSize) {
+        List<List<Object>> chunks = new List<List<Object>>();
+        if (items == null || items.isEmpty() || chunkSize <= 0) {
+            return chunks;
+        }
+
+        List<Object> currentChunk = new List<Object>();
+        for (Object item : items) {
+            currentChunk.add(item);
+            if (currentChunk.size() == chunkSize) {
+                chunks.add(currentChunk);
+                currentChunk = new List<Object>();
+            }
+        }
+
+        if (!currentChunk.isEmpty()) {
+            chunks.add(currentChunk);
+        }
+
+        return chunks;
+    }
+
+    /**
+     * @description Extracts a Set of non-null field values from a list of SObjects
+     * @param records The SObject records to extract from
+     * @param fieldName The API name of the field to extract
+     * @return A Set of non-null String values
+     * @example
+     * Set<String> emails = {ClassName}.pluckStrings(contacts, 'Email');
+     */
+    public static Set<String> pluckStrings(List<SObject> records, String fieldName) {
+        Set<String> values = new Set<String>();
+        if (records == null || String.isBlank(fieldName)) {
+            return values;
+        }
+
+        for (SObject record : records) {
+            Object val = record.get(fieldName);
+            if (val != null) {
+                values.add(String.valueOf(val));
+            }
+        }
+
+        return values;
+    }
+}
diff --git a/skills/generating-apex/references/AccountDeduplicationBatch.cls b/skills/generating-apex/references/AccountDeduplicationBatch.cls
new file mode 100644
index 0000000..30ba97d
--- /dev/null
+++ b/skills/generating-apex/references/AccountDeduplicationBatch.cls
@@ -0,0 +1,148 @@
+/**
+ * @description Batch Apex class for identifying and flagging duplicate Account records.
+ *              Compares Accounts by Name and BillingPostalCode to find potential duplicates.
+ *              Flags duplicates by setting the Is_Potential_Duplicate__c checkbox.
+ *              Implements Database.Stateful to track results across batch chunks.
+ * @author Generated by Apex Class Writer Skill
+ *
+ * @example
+ * // Run with default batch size (200)
+ * Id jobId = AccountDeduplicationBatch.run();
+ *
+ * // Run with smaller batch size for complex processing
+ * Database.executeBatch(new AccountDeduplicationBatch(), 50);
+ */
+public with sharing class AccountDeduplicationBatch implements Database.Batchable<SObject>, Database.Stateful {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final Integer DEFAULT_BATCH_SIZE = 200;
+
+    // ─── Stateful Tracking ───────────────────────────────────────────────
+    private Integer totalScanned = 0;
+    private Integer duplicatesFound = 0;
+    private Integer totalErrors = 0;
+    private List<String> errorMessages = new List<String>();
+
+    // ─── Batchable Interface ─────────────────────────────────────────────
+
+    /**
+     * @description Queries all active Accounts that haven't already been flagged
+     * @param bc The batch context
+     * @return QueryLocator scoped to unflagged active Accounts
+     */
+    public Database.QueryLocator start(Database.BatchableContext bc) {
+        return Database.getQueryLocator([
+            SELECT Id, Name, BillingPostalCode, Is_Potential_Duplicate__c
+            FROM Account
+            WHERE IsDeleted = FALSE
+            AND Is_Potential_Duplicate__c = FALSE
+            ORDER BY Name ASC
+        ]);
+    }
+
+    /**
+     * @description Processes each batch by building a duplicate key and checking for matches.
+     *              Uses a composite key of normalized Name + BillingPostalCode.
+     * @param bc The batch context
+     * @param scope List of Account records in the current batch
+     */
+    public void execute(Database.BatchableContext bc, List<Account> scope) {
+        totalScanned += scope.size();
+
+        // Build duplicate keys for this batch
+        Map<String, List<Account>> dupeKeyMap = new Map<String, List<Account>>();
+        for (Account acct : scope) {
+            String key = buildDuplicateKey(acct);
+            if (String.isNotBlank(key)) {
+                if (!dupeKeyMap.containsKey(key)) {
+                    dupeKeyMap.put(key, new List<Account>());
+                }
+                dupeKeyMap.get(key).add(acct);
+            }
+        }
+
+        // Flag records that share a key with another record
+        List<Account> toUpdate = new List<Account>();
+        for (String key : dupeKeyMap.keySet()) {
+            List<Account> group = dupeKeyMap.get(key);
+            if (group.size() > 1) {
+                for (Account acct : group) {
+                    toUpdate.add(new Account(
+                        Id = acct.Id,
+                        Is_Potential_Duplicate__c = true
+                    ));
+                }
+            }
+        }
+
+        if (!toUpdate.isEmpty()) {
+            List<Database.SaveResult> results = Database.update(toUpdate, false);
+            processResults(results);
+        }
+    }
+
+    /**
+     * @description Logs a summary of the deduplication batch run
+     * @param bc The batch context
+     */
+    public void finish(Database.BatchableContext bc) {
+        String summary = String.format(
+            'AccountDeduplicationBatch completed. Scanned: {0}, Duplicates flagged: {1}, Errors: {2}',
+            new List<Object>{ totalScanned, duplicatesFound, totalErrors }
+        );
+
+        System.debug(LoggingLevel.INFO, summary);
+
+        if (!errorMessages.isEmpty()) {
+            System.debug(LoggingLevel.ERROR, 'Error details:\n' + String.join(errorMessages, '\n'));
+        }
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    /**
+     * @description Builds a normalized composite key for duplicate detection
+     * @param acct The Account record
+     * @return Normalized key string, or null if insufficient data
+     */
+    private String buildDuplicateKey(Account acct) {
+        if (String.isBlank(acct.Name)) {
+            return null;
+        }
+
+        String normalizedName = acct.Name.trim().toUpperCase().replaceAll('\\s+', ' ');
+        String postalCode = (acct.BillingPostalCode ?? '').trim().toUpperCase();
+
+        return normalizedName + '|' + postalCode;
+    }
+
+    /**
+     * @description Processes DML results, tracking successes and failures
+     * @param results List of Database.SaveResult from update operation
+     */
+    private void processResults(List<Database.SaveResult> results) {
+        for (Database.SaveResult sr : results) {
+            if (sr.isSuccess()) {
+                duplicatesFound++;
+            } else {
+                totalErrors++;
+                for (Database.Error err : sr.getErrors()) {
+                    errorMessages.add(
+                        'Record ' + sr.getId() + ': ' +
+                        err.getStatusCode() + ' - ' + err.getMessage()
+                    );
+                }
+            }
+        }
+    }
+
+    // ─── Static Helpers ──────────────────────────────────────────────────
+
+    /**
+     * @description Convenience method to execute with default batch size
+     * @return The batch job Id
+     */
+    public static Id run() {
+        return Database.executeBatch(new AccountDeduplicationBatch(), DEFAULT_BATCH_SIZE);
+    }
+}
diff --git a/skills/generating-apex/references/AccountSelector.cls b/skills/generating-apex/references/AccountSelector.cls
new file mode 100644
index 0000000..990f043
--- /dev/null
+++ b/skills/generating-apex/references/AccountSelector.cls
@@ -0,0 +1,193 @@
+/**
+ * @description Selector class for Account queries.
+ *              Encapsulates all SOQL for Account records.
+ *              All methods return bulkified results (Lists or Maps).
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class AccountSelector {
+
+    // ─── Field Lists ─────────────────────────────────────────────────────
+
+    /**
+     * @description Returns the default set of fields to query for Account.
+     *              Centralizes field references to keep queries DRY.
+     * @return Comma-separated field list as a String
+     */
+    private static String getDefaultFields() {
+        return String.join(
+            new List<String>{
+                'Id',
+                'Name',
+                'AccountNumber',
+                'Type',
+                'Industry',
+                'AnnualRevenue',
+                'NumberOfEmployees',
+                'Phone',
+                'Website',
+                'OwnerId',
+                'CreatedDate',
+                'LastModifiedDate'
+            },
+            ', '
+        );
+    }
+
+    /**
+     * @description Returns fields needed for billing/territory operations
+     * @return Comma-separated field list as a String
+     */
+    private static String getBillingFields() {
+        return String.join(
+            new List<String>{
+                'Id',
+                'Name',
+                'BillingStreet',
+                'BillingCity',
+                'BillingState',
+                'BillingPostalCode',
+                'BillingCountry',
+                'Territory__c'
+            },
+            ', '
+        );
+    }
+
+    // ─── Query Methods ───────────────────────────────────────────────────
+
+    /**
+     * @description Selects Account records by their Ids
+     * @param recordIds Set of Account Ids to query
+     * @return List of Account records matching the provided Ids
+     * @example
+     * Set<Id> ids = new Set<Id>{ '001xx000003DGbY' };
+     * List<Account> results = AccountSelector.selectByIds(ids);
+     */
+    public static List<Account> selectByIds(Set<Id> recordIds) {
+        if (recordIds == null || recordIds.isEmpty()) {
+            return new List<Account>();
+        }
+
+        return Database.query(
+            'SELECT ' + getDefaultFields() +
+            ' FROM Account' +
+            ' WHERE Id IN :recordIds'
+        );
+    }
+
+    /**
+     * @description Selects Account records as a Map keyed by Id
+     * @param recordIds Set of Account Ids to query
+     * @return Map of Id to Account
+     */
+    public static Map<Id, Account> selectMapByIds(Set<Id> recordIds) {
+        return new Map<Id, Account>(selectByIds(recordIds));
+    }
+
+    /**
+     * @description Selects Accounts with billing address fields for territory assignment
+     * @param recordIds Set of Account Ids to query
+     * @return List of Account records with billing address fields populated
+     */
+    public static List<Account> selectWithBillingAddress(Set<Id> recordIds) {
+        if (recordIds == null || recordIds.isEmpty()) {
+            return new List<Account>();
+        }
+
+        return Database.query(
+            'SELECT ' + getBillingFields() +
+            ' FROM Account' +
+            ' WHERE Id IN :recordIds'
+        );
+    }
+
+    /**
+     * @description Selects Accounts by Account Type
+     * @param accountTypes Set of Account Type values to filter by
+     * @return List of matching Account records
+     * @example
+     * List<Account> prospects = AccountSelector.selectByType(
+     *     new Set<String>{ 'Prospect', 'Customer - Direct' }
+     * );
+     */
+    public static List<Account> selectByType(Set<String> accountTypes) {
+        if (accountTypes == null || accountTypes.isEmpty()) {
+            return new List<Account>();
+        }
+
+        return Database.query(
+            'SELECT ' + getDefaultFields() +
+            ' FROM Account' +
+            ' WHERE Type IN :accountTypes' +
+            ' ORDER BY Name ASC'
+        );
+    }
+
+    /**
+     * @description Selects Accounts by Industry with a minimum annual revenue
+     * @param industries Set of Industry values to filter by
+     * @param minRevenue Minimum AnnualRevenue threshold
+     * @return List of matching Account records ordered by revenue descending
+     * @example
+     * List<Account> techAccounts = AccountSelector.selectByIndustryAndRevenue(
+     *     new Set<String>{ 'Technology' },
+     *     1000000
+     * );
+     */
+    public static List<Account> selectByIndustryAndRevenue(Set<String> industries, Decimal minRevenue) {
+        if (industries == null || industries.isEmpty()) {
+            return new List<Account>();
+        }
+
+        Decimal revenueThreshold = minRevenue ?? 0;
+
+        return Database.query(
+            'SELECT ' + getDefaultFields() +
+            ' FROM Account' +
+            ' WHERE Industry IN :industries' +
+            ' AND AnnualRevenue >= :revenueThreshold' +
+            ' ORDER BY AnnualRevenue DESC'
+        );
+    }
+
+    /**
+     * @description Selects Accounts with their related Contacts (subquery)
+     * @param recordIds Set of Account Ids to query
+     * @return List of Account records with nested Contacts
+     */
+    public static List<Account> selectWithContacts(Set<Id> recordIds) {
+        if (recordIds == null || recordIds.isEmpty()) {
+            return new List<Account>();
+        }
+
+        return [
+            SELECT Id, Name, Type, Industry,
+                   (SELECT Id, FirstName, LastName, Email, Title
+                    FROM Contacts
+                    ORDER BY LastName ASC)
+            FROM Account
+            WHERE Id IN :recordIds
+        ];
+    }
+
+    // ─── Aggregate Queries ───────────────────────────────────────────────
+
+    /**
+     * @description Returns a count of Accounts grouped by Industry
+     * @return List of AggregateResult with Industry and record count
+     * @example
+     * List<AggregateResult> results = AccountSelector.countByIndustry();
+     * for (AggregateResult ar : results) {
+     *     System.debug(ar.get('Industry') + ': ' + ar.get('cnt'));
+     * }
+     */
+    public static List<AggregateResult> countByIndustry() {
+        return [
+            SELECT Industry, COUNT(Id) cnt
+            FROM Account
+            WHERE Industry != NULL
+            GROUP BY Industry
+            ORDER BY COUNT(Id) DESC
+        ];
+    }
+}
diff --git a/skills/generating-apex/references/AccountService.cls b/skills/generating-apex/references/AccountService.cls
new file mode 100644
index 0000000..eafee0a
--- /dev/null
+++ b/skills/generating-apex/references/AccountService.cls
@@ -0,0 +1,201 @@
+/**
+ * @description Service class for Account business logic.
+ *              Provides account deduplication, enrichment, and territory assignment.
+ *              Delegates queries to AccountSelector and SObject manipulation to AccountDomain.
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class AccountService {
+
+    // ─── Constants ───────────────────────────────────────────────────────
+    private static final String ERROR_NULL_INPUT = 'Input cannot be null or empty.';
+    private static final String ERROR_MERGE_FAILED = 'Account merge failed for master Id: ';
+    private static final Integer MAX_MERGE_BATCH = 3;
+
+    // ─── Public API ──────────────────────────────────────────────────────
+
+    /**
+     * @description Merges duplicate Account records into a master record.
+     *              The master record retains its field values; child records are reparented.
+     * @param masterIds Map of master Account Id to Set of duplicate Account Ids to merge
+     * @return List of master Account Ids that were successfully merged
+     * @throws AccountServiceException if merge processing fails
+     * @example
+     * Map<Id, Set<Id>> mergeMap = new Map<Id, Set<Id>>{
+     *     masterAcctId => new Set<Id>{ dupeId1, dupeId2 }
+     * };
+     * List<Id> mergedIds = AccountService.mergeAccounts(mergeMap);
+     */
+    public static List<Id> mergeAccounts(Map<Id, Set<Id>> mergeMap) {
+        if (mergeMap == null || mergeMap.isEmpty()) {
+            throw new AccountServiceException(ERROR_NULL_INPUT);
+        }
+
+        // Collect all Ids for a single query
+        Set<Id> allIds = new Set<Id>();
+        allIds.addAll(mergeMap.keySet());
+        for (Set<Id> dupeIds : mergeMap.values()) {
+            allIds.addAll(dupeIds);
+        }
+
+        // Query all records at once via Selector
+        Map<Id, Account> accountMap = AccountSelector.selectMapByIds(allIds);
+
+        List<Id> successfulMerges = new List<Id>();
+        List<String> errors = new List<String>();
+
+        for (Id masterId : mergeMap.keySet()) {
+            Account master = accountMap.get(masterId);
+            if (master == null) {
+                errors.add('Master account not found: ' + masterId);
+                continue;
+            }
+
+            List<Account> duplicates = new List<Account>();
+            for (Id dupeId : mergeMap.get(masterId)) {
+                Account dupe = accountMap.get(dupeId);
+                if (dupe != null) {
+                    duplicates.add(dupe);
+                }
+            }
+
+            try {
+                // Apex merge supports up to 3 records at a time
+                for (List<Account> chunk : chunkAccounts(duplicates, MAX_MERGE_BATCH)) {
+                    Database.merge(master, chunk);
+                }
+                successfulMerges.add(masterId);
+            } catch (DmlException e) {
+                errors.add(ERROR_MERGE_FAILED + masterId + ' - ' + e.getMessage());
+            }
+        }
+
+        if (!errors.isEmpty()) {
+            System.debug(LoggingLevel.WARN, 'Merge errors: ' + String.join(errors, '\n'));
+        }
+
+        return successfulMerges;
+    }
+
+    /**
+     * @description Assigns accounts to territories based on Billing State/Country.
+     *              Uses Custom Metadata Type (Territory_Mapping__mdt) for mappings.
+     * @param accountIds Set of Account Ids to assign territories for
+     * @return Number of accounts successfully updated
+     * @throws AccountServiceException if territory assignment fails
+     */
+    public static Integer assignTerritories(Set<Id> accountIds) {
+        if (accountIds == null || accountIds.isEmpty()) {
+            throw new AccountServiceException(ERROR_NULL_INPUT);
+        }
+
+        List<Account> accounts = AccountSelector.selectWithBillingAddress(accountIds);
+        Map<String, String> territoryMap = loadTerritoryMappings();
+
+        List<Account> toUpdate = new List<Account>();
+        for (Account acct : accounts) {
+            String key = buildTerritoryKey(acct.BillingState, acct.BillingCountry);
+            String territory = territoryMap.get(key);
+
+            if (territory != null && territory != acct.Territory__c) {
+                toUpdate.add(new Account(
+                    Id = acct.Id,
+                    Territory__c = territory
+                ));
+            }
+        }
+
+        if (!toUpdate.isEmpty()) {
+            List<Database.SaveResult> results = Database.update(toUpdate, false);
+            return countSuccesses(results);
+        }
+
+        return 0;
+    }
+
+    // ─── Convenience Overloads ───────────────────────────────────────────
+
+    /**
+     * @description Single-account territory assignment convenience method
+     * @param accountId The Account Id to assign a territory for
+     * @return 1 if updated, 0 if no change needed
+     */
+    public static Integer assignTerritory(Id accountId) {
+        return assignTerritories(new Set<Id>{ accountId });
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    /**
+     * @description Loads territory mappings from Custom Metadata
+     * @return Map of territory key (State:Country) to territory name
+     */
+    private static Map<String, String> loadTerritoryMappings() {
+        Map<String, String> mappings = new Map<String, String>();
+        for (Territory_Mapping__mdt mapping : Territory_Mapping__mdt.getAll().values()) {
+            String key = buildTerritoryKey(mapping.State__c, mapping.Country__c);
+            mappings.put(key, mapping.Territory_Name__c);
+        }
+        return mappings;
+    }
+
+    /**
+     * @description Builds a consistent territory lookup key
+     * @param state The billing state
+     * @param country The billing country
+     * @return A normalized key string
+     */
+    private static String buildTerritoryKey(String state, String country) {
+        return (state ?? '').toUpperCase() + ':' + (country ?? '').toUpperCase();
+    }
+
+    /**
+     * @description Chunks a list of Accounts into sublists of the given size
+     * @param accounts The accounts to chunk
+     * @param chunkSize Maximum chunk size
+     * @return List of account sublists
+     */
+    private static List<List<Account>> chunkAccounts(List<Account> accounts, Integer chunkSize) {
+        List<List<Account>> chunks = new List<List<Account>>();
+        List<Account> current = new List<Account>();
+
+        for (Account acct : accounts) {
+            current.add(acct);
+            if (current.size() == chunkSize) {
+                chunks.add(current);
+                current = new List<Account>();
+            }
+        }
+        if (!current.isEmpty()) {
+            chunks.add(current);
+        }
+        return chunks;
+    }
+
+    /**
+     * @description Counts successful results from a DML operation
+     * @param results List of Database.SaveResult
+     * @return Count of successful operations
+     */
+    private static Integer countSuccesses(List<Database.SaveResult> results) {
+        Integer count = 0;
+        for (Database.SaveResult sr : results) {
+            if (sr.isSuccess()) {
+                count++;
+            } else {
+                for (Database.Error err : sr.getErrors()) {
+                    System.debug(LoggingLevel.WARN,
+                        'Update failed for ' + sr.getId() + ': ' + err.getMessage()
+                    );
+                }
+            }
+        }
+        return count;
+    }
+
+    // ─── Exception ───────────────────────────────────────────────────────
+
+    /**
+     * @description Custom exception for AccountService errors
+     */
+    public class AccountServiceException extends Exception {}
+}

From 6154ab3ac4c6e63263bdbfcf4cbe82908b7cbffe Mon Sep 17 00:00:00 2001
From: Ethan Clapham <eclapham@salesforce.com>
Date: Thu, 26 Mar 2026 00:23:07 -0700
Subject: [PATCH 04/14] W-21745944 dry run deployment and adding guardrails
 (#107)

W-21745944 make deployment command use --dry-run, add strict guardrails to prevent agent from further editing page

Co-authored-by: Hemant Singh Bisht <hsinghbisht@salesforce.com>
---
 skills/generating-flexipage/SKILL.md | 92 ++++++++++------------------
 1 file changed, 33 insertions(+), 59 deletions(-)

diff --git a/skills/generating-flexipage/SKILL.md b/skills/generating-flexipage/SKILL.md
index 7706cb2..e16c1e5 100644
--- a/skills/generating-flexipage/SKILL.md
+++ b/skills/generating-flexipage/SKILL.md
@@ -43,23 +43,22 @@ sf template generate flexipage \
   --output-dir force-app/main/default/flexipages
 ```
 
-**Field Selection Guidelines:**
-- **Validate fields exist**: Use MCP tools or describe commands to discover available fields for the object before specifying them in the command
-- **Prefer compound fields**: Use `Name` (not `FirstName`/`LastName`), `BillingAddress` (not `BillingStreet`/`BillingCity`/`BillingState`), `MailingAddress`, etc. when available
-
-**Template-specific requirements:**
-- **RecordPage**: Requires `--sobject` (e.g., Account, Custom_Object__c)
-- **RecordPage**: Requires `--primary-field` and `--secondary-fields` for dynamic highlights, `--detail-fields` for full record details. Use the most important identifying field as primary, e.g. Name. Use the secondary fields (max 12, recommended 4-6) to show a summary of the record. Use detail fields to show the full details of the record.
-- **AppPage**: No additional requirements
-- **HomePage**: No additional requirements
-
 **Note:** If the `sf template generate flexipage` command fails, recommend users upgrade to the latest version of the Salesforce CLI:
 ```bash
 npm install -g @salesforce/cli@latest
 ```
 
+#### **Field Selection Guidelines**
+- **Validate fields exist**: Use MCP tools or describe commands to discover available fields for the object before specifying them in the command
+- **Prefer compound fields**: Use `Name` (not `FirstName`/`LastName`), `BillingAddress` (not `BillingStreet`/`BillingCity`/`BillingState`), `MailingAddress`, etc. when available
 
-**What you get:**
+#### **Template-specific requirements**
+- **RecordPage**: Requires `--sobject` (e.g., Account, Custom_Object__c)
+- **RecordPage**: Requires `--primary-field` and `--secondary-fields` for dynamic highlights, `--detail-fields` for full record details. Use the most important identifying field as primary, e.g. Name. Use the secondary fields (max 12, recommended 4-6) to show a summary of the record. Use detail fields to show the full details of the record.
+- **AppPage**: No additional requirements
+- **HomePage**: No additional requirements
+
+#### **What you get**
 - Valid FlexiPage XML with correct structure
 - Pre-configured regions and basic components
 - Proper field references and facet structure
@@ -67,17 +66,31 @@ npm install -g @salesforce/cli@latest
 
 ### Step 2: Deploy Base Page
 
+Run a **dry-run** deployment of the entire project to validate the page and dependencies:
 ```bash
-sf project deploy start --source-dir force-app/main/default/flexipages
+sf project deploy start --dry-run -d "force-app/main/default" --test-level NoTestRun --wait 10 --json
 ```
 
-**Deploy early, deploy often.** Start with the bootstrapped page, validate it works, then enhance.
+**Critical:** Fix any deployment errors before proceeding. The page must validate successfully.
 
-### Step 3: Update and Redeploy
+### Step 3: **STOP - No Further Modifications**
 
-Modify the generated XML, adding components discovered via MCP. Deploy incrementally.
+**MANDATORY: Stop after Step 2. Do not add components or edit the FlexiPage XML.**
 
-**Note:** Warn users to use caution with updates beyond this step when using this command.
+This applies even if the user requested:
+- Additional components
+- Page customization
+- Component configuration
+
+What you CAN do:
+- Suggest what components would be useful
+- Explain what enhancements are possible
+- Document what would need to be added manually
+
+What you CANNOT do:
+- Modify the XML file
+- Add any components
+- Make any enhancements
 
 ---
 
@@ -223,6 +236,10 @@ Every fieldInstance requires:
 
 ## Common Deployment Errors
 
+### "We couldn't retrieve or load the information on the field"
+**Cause:** Invalid field API name - field doesn't exist on the object or has incorrect spelling
+**Fix:** Use MCP tools or describe commands to discover valid fields, then update the field reference (see Field Selection Guidelines)
+
 ### "Invalid field reference"
 **Cause:** Used `ObjectName.Field` instead of `Record.Field`  
 **Fix:** Change to `Record.{FieldApiName}`
@@ -253,49 +270,6 @@ Every fieldInstance requires:
 
 ---
 
-## Incremental Development Pattern
-
-**Philosophy:** Deploy small, working increments. Don't build entire complex page at once.
-
-**Process:**
-1. **CLI bootstrap** → Deploy base page
-2. **Add one component** → Deploy
-3. **Add another component** → Deploy
-4. **Repeat** until complete
-
-**Benefits:**
-- Isolated errors (know exactly what broke)
-- Faster debugging
-- Build confidence with each success
-- Get user feedback early
-
-**Anti-pattern:** Building entire complex page → one giant error cascade.
-
----
-
-## Adding Components to Existing FlexiPages
-
-### Workflow
-
-When user provides an existing FlexiPage file path:
-
-1. **Read the file** using native file I/O
-2. **Parse XML** to extract:
-   - **ALL existing component identifiers** (search for all `<identifier>` tags)
-   - **ALL existing region/facet names** (search for all `<name>` tags in `<flexiPageRegions>`)
-   - Available regions (parse from file, don't assume names)
-   - Existing facets
-3. **Verify uniqueness** - ensure your new identifiers and names don't conflict with ANY existing ones
-4. **Check if target facet exists** - if adding to a named facet like `detailTabContent` that already exists:
-   - **Add new `<itemInstances>` to existing region** (don't create duplicate region)
-   - **Insert before the closing `</flexiPageRegions>` tag of that region**
-5. **Generate component XML** (apply all rules from "Critical XML Rules" section)
-6. **Insert** into appropriate region or add itemInstances to existing facet
-7. **Write** modified XML back to file
-8. **Deploy**: `sf project deploy start --source-dir force-app/...`
-
----
-
 ### Generating Unique Identifiers
 
 **CRITICAL: Before generating ANY new identifier or facet name, follow the rules in section 5 of "Critical XML Rules" above.**

From a2c26f310d0ca1269ee1ff73edc2243c06048537 Mon Sep 17 00:00:00 2001
From: jluftglidden-tilt <53275453+jluftglidden-tilt@users.noreply.github.com>
Date: Thu, 26 Mar 2026 04:54:14 -0700
Subject: [PATCH 05/14] @W-21467732 Update react SKILL.md to add an execution
 note to doc read (#108)

Update SKILL.md to add an execution note to doc read

Co-authored-by: Hemant Singh Bisht <hsinghbisht@salesforce.com>
---
 skills/generating-experience-react-site/SKILL.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/skills/generating-experience-react-site/SKILL.md b/skills/generating-experience-react-site/SKILL.md
index 4ab563d..ab2acec 100644
--- a/skills/generating-experience-react-site/SKILL.md
+++ b/skills/generating-experience-react-site/SKILL.md
@@ -51,6 +51,17 @@ Use the default templates in the docs below. Values in `{braces}` are resolved p
 | DigitalExperienceBundle | [configure-metadata-digital-experience-bundle.md](docs/configure-metadata-digital-experience-bundle.md) |
 | DigitalExperience (sfdc_cms__site) | [configure-metadata-digital-experience.md](docs/configure-metadata-digital-experience.md) |
 
+### Execution Note for Step 3: Load and use the docs
+- Agents MUST read the full contents of each docs/*.md file referenced in Step 3 before attempting to populate metadata fields.
+- Use your platform's file-read tool (for example, `read_file`) to load these files in full, then perform placeholder substitution for values in `{braces}` using the resolved properties from Step 1.
+- Files to load:
+  - `docs/configure-metadata-network.md`
+  - `docs/configure-metadata-custom-site.md`
+  - `docs/configure-metadata-digital-experience-config.md`
+  - `docs/configure-metadata-digital-experience-bundle.md`
+  - `docs/configure-metadata-digital-experience.md`
+- Read entire file contents, replace placeholders (e.g. `{siteName}`) with the resolved values, then use the expanded templates to populate the metadata XML/JSON content.
+  
 ### Step 4: Resolve Additional Configurations
 Address any extra configurations the user requests. Use the schemas returned by `get_metadata_api_context` in Step 2 to understand each field's purpose, and update only the minimum necessary fields.
 

From 1624c21a5f68de3c99fe77a5b1b93b99023b3188 Mon Sep 17 00:00:00 2001
From: svc-idee-bot <SVC_idee_bot@salesforce.com>
Date: Thu, 26 Mar 2026 12:07:03 -0500
Subject: [PATCH 06/14] chore: sync React B2E (1.116.6) & B2X (1.116.6) samples
 from npm (#114)

---
 package-lock.json                             |  46 +-
 package.json                                  |   4 +-
 .../.a4drules/webapp-data.md                  | 353 -------
 .../.a4drules/webapp-ui.md                    |  16 -
 .../.version                                  |   2 +-
 .../CHANGELOG.md                              |  83 ++
 .../README.md                                 |  26 +-
 .../main/default/data/Property__c.json        | 100 +-
 .../fields/Coordinates__c.field-meta.xml      |  12 +
 ...y_Management_Access.permissionset-meta.xml |   5 +
 ..._Maintenance_Access.permissionset-meta.xml |   5 +
 .../appreactsampleb2e/src/lib/constants.ts    |  60 --
 .../appreactsampleb2e/src/lib/routeConfig.ts  |  35 -
 .../appreactsampleb2e/src/lib/utils.ts        |   6 -
 .../.forceignore                              |   0
 .../.graphqlrc.yml                            |   0
 .../.prettierignore                           |   0
 .../.prettierrc                               |   0
 .../CHANGELOG.md                              |   0
 .../README.md                                 |   4 +-
 .../codegen.yml                               |   0
 .../components.json                           |   0
 .../e2e/app.spec.ts                           |   0
 .../eslint.config.js                          |   0
 .../index.html                                |   0
 .../package.json                              |   6 +-
 .../playwright.config.ts                      |   0
 ...ertymanagementapp.webapplication-meta.xml} |   2 +-
 .../scripts/get-graphql-schema.mjs            |   0
 .../scripts/rewrite-e2e-assets.mjs            |   0
 .../applications/applicationSearchService.ts  |   0
 .../src/api/applications/applications.ts      |   0
 .../query/distinctApplicationStatus.graphql   |   0
 .../query/getApplications.graphql             |   0
 .../query/searchApplications.graphql          |   0
 .../query/updateApplicationStatus.graphql     |   0
 .../src/api/dashboard/dashboard.ts            |   0
 .../query/getDashboardMetrics.graphql         |   0
 .../query/getOpenApplications.graphql         |   0
 .../api/dashboard/query/getUserInfo.graphql   |   0
 .../src/api/graphql-operations-types.ts       |   0
 .../src/api/graphqlClient.ts                  |   0
 .../maintenanceRequestSearchService.ts        |   0
 .../maintenanceRequests.ts                    |   0
 ...distinctMaintenanceRequestPriority.graphql |   0
 .../distinctMaintenanceRequestStatus.graphql  |   0
 .../distinctMaintenanceRequestType.graphql    |   0
 .../query/getAllMaintenanceRequests.graphql   |   0
 .../query/getMaintenanceRequests.graphql      |   0
 .../query/searchMaintenanceRequests.graphql   |   0
 .../query/updateMaintenanceStatus.graphql     |   0
 .../maintenanceWorkerSearchService.ts         |   0
 ...nctMaintenanceWorkerEmploymentType.graphql |   0
 .../query/searchMaintenanceWorkers.graphql    |   0
 .../src/api/properties/properties.ts          |   0
 .../api/properties/propertySearchService.ts   |   0
 .../query/distinctPropertyStatus.graphql      |   0
 .../query/distinctPropertyType.graphql        |   0
 .../properties/query/getProperties.graphql    |   0
 .../properties/query/searchProperties.graphql |   0
 .../src/app.tsx                               |   0
 .../src/appLayout.tsx                         |   0
 .../src/assets/icons/appliances.svg           |   0
 .../src/assets/icons/book.svg                 |   0
 .../src/assets/icons/copy.svg                 |   0
 .../src/assets/icons/dashboard.svg            |   0
 .../src/assets/icons/downgraph.svg            |   0
 .../src/assets/icons/electrical.svg           |   0
 .../src/assets/icons/files.svg                |   0
 .../src/assets/icons/hvac.svg                 |   0
 .../src/assets/icons/maintenance-worker.svg   |   0
 .../src/assets/icons/maintenance.svg          |   0
 .../src/assets/icons/pest.svg                 |   0
 .../src/assets/icons/plumbing.svg             |   0
 .../src/assets/icons/properties.svg           |   0
 .../src/assets/icons/rocket.svg               |   0
 .../src/assets/icons/star.svg                 |   0
 .../src/assets/icons/support.svg              |   0
 .../src/assets/icons/upgraph.svg              |   0
 .../src/assets/icons/users.svg                |   0
 .../src/assets/icons/zen-logo.svg             |   0
 .../src/assets/images/codey-1.png             | Bin
 .../src/assets/images/codey-2.png             | Bin
 .../src/assets/images/codey-3.png             | Bin
 .../src/assets/images/vibe-codey.svg          |   0
 .../AgentforceConversationClient.tsx          |   0
 .../src/components/alerts/status-alert.tsx    |   0
 .../applications/ApplicationDetailsModal.tsx  |   0
 .../components/dashboard/GlobalSearchBar.tsx  |   0
 .../components/dashboard/IssuesDonutChart.tsx |   0
 .../components/dashboard/MaintenanceTable.tsx |   0
 .../src/components/dashboard/StatCard.tsx     |   0
 .../src/components/layout/FilterRow.tsx       |   0
 .../src/components/layout/PageContainer.tsx   |   0
 .../src/components/layout/PageHeader.tsx      |   0
 .../src/components/layout/TopBar.tsx          |   0
 .../src/components/layout/VerticalNav.tsx     |   0
 .../src/components/layouts/card-layout.tsx    |   0
 .../MaintenanceDetailsModal.tsx               |   0
 .../MaintenanceRequestCard.tsx                |   0
 .../maintenanceWorkers/WorkerDetailsModal.tsx |   0
 .../components/properties/PropertyCard.tsx    |   0
 .../properties/PropertyDetailsModal.tsx       |   0
 .../shared/ObjectSearchErrorState.tsx         |   0
 .../src/components/shared/UserAvatar.tsx      |   0
 .../src/components/ui/alert.tsx               |   0
 .../src/components/ui/badge.tsx               |   0
 .../src/components/ui/breadcrumb.tsx          |   0
 .../src/components/ui/button.tsx              |   0
 .../src/components/ui/calendar.tsx            |   0
 .../src/components/ui/card.tsx                |   0
 .../src/components/ui/checkbox.tsx            |   0
 .../src/components/ui/collapsible.tsx         |   0
 .../src/components/ui/datePicker.tsx          |   0
 .../src/components/ui/dialog.tsx              |   0
 .../src/components/ui/field.tsx               |   0
 .../src/components/ui/index.ts                |   0
 .../src/components/ui/input.tsx               |   0
 .../src/components/ui/label.tsx               |   0
 .../src/components/ui/pagination.tsx          |   0
 .../src/components/ui/popover.tsx             |   0
 .../src/components/ui/select.tsx              |   0
 .../src/components/ui/separator.tsx           |   0
 .../src/components/ui/skeleton.tsx            |   0
 .../src/components/ui/sonner.tsx              |   0
 .../src/components/ui/spinner.tsx             |   0
 .../src/components/ui/table.tsx               |   0
 .../src/components/ui/tabs.tsx                |   0
 .../__examples__/api/accountSearchService.ts  |   0
 .../query/distinctAccountIndustries.graphql   |   0
 .../api/query/distinctAccountTypes.graphql    |   0
 .../api/query/getAccountDetail.graphql        |   0
 .../api/query/searchAccounts.graphql          |   0
 .../pages/AccountObjectDetailPage.tsx         |   0
 .../__examples__/pages/AccountSearch.tsx      |   0
 .../object-search/__examples__/pages/Home.tsx |   0
 .../object-search/api/objectSearchService.ts  |   0
 .../components/ActiveFilters.tsx              |   0
 .../components/FilterContext.tsx              |   0
 .../components/ObjectBreadcrumb.tsx           |   0
 .../components/PaginationControls.tsx         |   0
 .../object-search/components/SearchBar.tsx    |   0
 .../object-search/components/SortControl.tsx  |   0
 .../components/filters/BooleanFilter.tsx      |   0
 .../components/filters/DateFilter.tsx         |   0
 .../components/filters/DateRangeFilter.tsx    |   0
 .../components/filters/MultiSelectFilter.tsx  |   0
 .../components/filters/NumericRangeFilter.tsx |   0
 .../components/filters/SearchFilter.tsx       |   0
 .../components/filters/SelectFilter.tsx       |   0
 .../components/filters/TextFilter.tsx         |   0
 .../object-search/hooks/useAsyncData.ts       |   0
 .../object-search/hooks/useCachedAsyncData.ts |   0
 .../hooks/useObjectSearchParams.ts            |   0
 .../features/object-search/utils/debounce.ts  |   0
 .../object-search/utils/fieldUtils.ts         |   0
 .../object-search/utils/filterUtils.ts        |   0
 .../features/object-search/utils/sortUtils.ts |   0
 .../src/index.ts                              |   0
 .../src/navigationMenu.tsx                    |   0
 .../src/pages/ApplicationSearch.tsx           |   0
 .../src/pages/Home.tsx                        |   0
 .../src/pages/MaintenanceRequestSearch.tsx    |   0
 .../src/pages/MaintenanceWorkerSearch.tsx     |   0
 .../src/pages/NotFound.tsx                    |   0
 .../src/pages/PropertySearch.tsx              |   0
 .../src/pages/TestAccPage.tsx                 |   0
 .../src/router-utils.tsx                      |   0
 .../src/routes.tsx                            |   0
 .../src/styles/global.css                     |   0
 .../src/types/conversation.ts                 |   0
 .../tsconfig.json                             |   0
 .../tsconfig.node.json                        |   0
 .../vite-env.d.ts                             |   0
 .../vite.config.ts                            |   0
 .../vitest-env.d.ts                           |   0
 .../vitest.config.ts                          |   0
 .../vitest.setup.ts                           |   0
 .../webapplication.json                       |   0
 .../package-lock.json                         |   4 +-
 .../package.json                              |   2 +-
 .../scripts/sf-project-setup.mjs              |   2 +-
 .../.a4drules/webapp-data.md                  | 353 -------
 .../.a4drules/webapp-ui.md                    |  16 -
 .../.version                                  |   2 +-
 .../CHANGELOG.md                              |  83 ++
 .../README.md                                 |  14 +-
 .../main/default/data/Property__c.json        | 100 +-
 ...ropertyrentalapp1.digitalExperienceConfig} |   6 +-
 ...ertyrentalapp1.digitalExperience-meta.xml} |   2 +-
 .../propertyrentalapp1}/_meta.json            |   2 +-
 .../propertyrentalapp1}/content.json          |   6 +-
 ...eb2x.network => propertyrentalapp.network} |  12 +-
 .../fields/Coordinates__c.field-meta.xml      |  12 +
 .../force-app/main/default/package.xml        |   8 +-
 ...y_Management_Access.permissionset-meta.xml |   5 +
 ..._Maintenance_Access.permissionset-meta.xml |   5 +
 ...tsampleb2x.site => propertyrentalapp.site} |   4 +-
 .../appreactsampleb2x/index.html              |  49 -
 .../appreactsampleb2x/src/lib/utils.ts        |   6 -
 .../.forceignore                              |   0
 .../.graphqlrc.yml                            |   0
 .../.prettierignore                           |   0
 .../.prettierrc                               |   0
 .../CHANGELOG.md                              |   0
 .../README.md                                 |   4 +-
 .../codegen.yml                               |   0
 .../components.json                           |   0
 .../e2e/app.spec.ts                           |   0
 .../eslint.config.js                          |   0
 .../propertyrentalapp/index.html              |  18 +
 .../package.json                              |   6 +-
 .../playwright.config.ts                      |   0
 ...propertyrentalapp.webapplication-meta.xml} |   2 +-
 .../scripts/get-graphql-schema.mjs            |   0
 .../scripts/rewrite-e2e-assets.mjs            |   0
 .../src/api/applications/applicationApi.ts    |   0
 .../src/api/graphql-operations-types.ts       | 990 +++++++-----------
 .../src/api/graphqlClient.ts                  |   0
 .../src/api/leadApi.ts                        |   0
 .../maintenanceRequestApi.ts                  |   0
 .../api/properties/propertyDetailGraphQL.ts   |  29 +
 .../api/properties/propertyListingGraphQL.ts  |  22 +
 .../src/app.tsx                               |   5 +-
 .../src/appLayout.tsx                         |   0
 .../src/assets/icons/appliances.svg           |   0
 .../src/assets/icons/book.svg                 |   0
 .../src/assets/icons/copy.svg                 |   0
 .../src/assets/icons/electrical.svg           |   0
 .../src/assets/icons/hvac.svg                 |   0
 .../src/assets/icons/pest.svg                 |   0
 .../src/assets/icons/plumbing.svg             |   0
 .../src/assets/icons/rocket.svg               |   0
 .../src/assets/icons/star.svg                 |   0
 .../src/assets/icons/zen-logo.svg             |   0
 .../src/assets/images/codey-1.png             | Bin
 .../src/assets/images/codey-2.png             | Bin
 .../src/assets/images/codey-3.png             | Bin
 .../src/assets/images/vibe-codey.svg          |   0
 .../src/components/SkeletonPrimitives.tsx     |   0
 .../src/components/alerts/status-alert.tsx    |   0
 .../components/dashboard/WeatherWidget.tsx    |   0
 .../src/components/layout/TopBar.tsx          |   0
 .../src/components/layout/VerticalNav.tsx     |   0
 .../src/components/layouts/card-layout.tsx    |   0
 .../MaintenanceRequestIcon.tsx                |   0
 .../MaintenanceRequestList.tsx                |   0
 .../MaintenanceRequestListItem.tsx            |   0
 .../MaintenanceSummaryDetailsModal.tsx        |   0
 .../maintenanceRequests/StatusBadge.tsx       |   0
 .../properties/PropertyListingCard.tsx        |   0
 .../PropertyListingSearchPagination.tsx       |   0
 .../src/components/properties/PropertyMap.tsx |   0
 .../properties/PropertySearchFilters.tsx      |   0
 .../src/components/ui/alert.tsx               |   0
 .../src/components/ui/badge.tsx               |   0
 .../src/components/ui/breadcrumb.tsx          |   0
 .../src/components/ui/button.tsx              |   0
 .../src/components/ui/calendar.tsx            |   0
 .../src/components/ui/card.tsx                |   0
 .../src/components/ui/checkbox.tsx            |   0
 .../src/components/ui/collapsible.tsx         |   0
 .../src/components/ui/datePicker.tsx          |   0
 .../src/components/ui/dialog.tsx              |   0
 .../src/components/ui/field.tsx               |   0
 .../src/components/ui/index.ts                |   0
 .../src/components/ui/input.tsx               |   0
 .../src/components/ui/label.tsx               |   0
 .../src/components/ui/pagination.tsx          |   0
 .../src/components/ui/popover.tsx             |   0
 .../src/components/ui/select.tsx              |   0
 .../src/components/ui/separator.tsx           |   0
 .../src/components/ui/skeleton.tsx            |   0
 .../src/components/ui/sonner.tsx              |   0
 .../src/components/ui/spinner.tsx             |   0
 .../src/components/ui/table.tsx               |   0
 .../src/components/ui/tabs.tsx                |   0
 .../src/constants/propertyListing.ts          |   0
 .../authentication/api/userProfileApi.ts      |   0
 .../features/authentication/authHelpers.ts    |   0
 .../authentication/authenticationConfig.ts    |   0
 .../authentication/context/AuthContext.tsx    |   0
 .../authentication/footers/footer-link.tsx    |   0
 .../authentication/forms/auth-form.tsx        |   0
 .../authentication/forms/submit-button.tsx    |   0
 .../features/authentication/hooks/form.tsx    |   0
 .../authentication/hooks/useCountdownTimer.ts |   0
 .../hooks/useRetryWithBackoff.ts              |   0
 .../authentication/layout/card-skeleton.tsx   |   0
 .../layout/centered-page-layout.tsx           |   0
 .../authentication/layouts/AuthAppLayout.tsx  |   0
 .../layouts/authenticationRouteLayout.tsx     |   0
 .../layouts/privateRouteLayout.tsx            |   0
 .../authentication/pages/ChangePassword.tsx   |   0
 .../authentication/pages/ForgotPassword.tsx   |   0
 .../features/authentication/pages/Login.tsx   |   0
 .../features/authentication/pages/Profile.tsx |   0
 .../authentication/pages/Register.tsx         |   0
 .../authentication/pages/ResetPassword.tsx    |   0
 .../SessionTimeoutValidator.tsx               |   0
 .../sessionTimeout/sessionTimeService.ts      |   0
 .../sessionTimeout/sessionTimeoutConfig.ts    |   0
 .../features/authentication/utils/helpers.ts  |   0
 .../__examples__/api/accountSearchService.ts  |   0
 .../query/distinctAccountIndustries.graphql   |   0
 .../api/query/distinctAccountTypes.graphql    |   0
 .../api/query/getAccountDetail.graphql        |   0
 .../api/query/searchAccounts.graphql          |   0
 .../pages/AccountObjectDetailPage.tsx         |   0
 .../__examples__/pages/AccountSearch.tsx      |   0
 .../object-search/__examples__/pages/Home.tsx |   0
 .../object-search/api/objectSearchService.ts  |   0
 .../components/ActiveFilters.tsx              |   0
 .../components/FilterContext.tsx              |   0
 .../components/ObjectBreadcrumb.tsx           |   0
 .../components/PaginationControls.tsx         |   0
 .../object-search/components/SearchBar.tsx    |   0
 .../object-search/components/SortControl.tsx  |   0
 .../components/filters/BooleanFilter.tsx      |   0
 .../components/filters/DateFilter.tsx         |   0
 .../components/filters/DateRangeFilter.tsx    |   0
 .../components/filters/MultiSelectFilter.tsx  |   0
 .../components/filters/NumericRangeFilter.tsx |   0
 .../components/filters/SearchFilter.tsx       |   0
 .../components/filters/SelectFilter.tsx       |   0
 .../components/filters/TextFilter.tsx         |   0
 .../object-search/hooks/useAsyncData.ts       |   0
 .../object-search/hooks/useCachedAsyncData.ts |   0
 .../hooks/useObjectSearchParams.ts            |   0
 .../features/object-search/utils/debounce.ts  |   0
 .../object-search/utils/fieldUtils.ts         |   0
 .../object-search/utils/filterUtils.ts        |   0
 .../features/object-search/utils/sortUtils.ts |   0
 .../src/hooks/useGeocode.ts                   |   0
 .../src/hooks/useMaintenanceRequests.ts       |   0
 .../src/hooks/usePropertyAddresses.ts         |   0
 .../src/hooks/usePropertyDetail.ts            |   0
 .../src/hooks/usePropertyListingAmenities.ts  |   0
 .../src/hooks/usePropertyListingSearch.ts     |   0
 .../src/hooks/usePropertyMapMarkers.ts        |  53 +-
 .../src/hooks/usePropertyPrimaryImages.ts     |   0
 .../src/hooks/useWeather.ts                   |   0
 .../src/navigationMenu.tsx                    |   0
 .../src/pages/Application.tsx                 |   0
 .../src/pages/Contact.tsx                     |   0
 .../src/pages/Dashboard.tsx                   |   0
 .../src/pages/Home.tsx                        |   0
 .../src/pages/Maintenance.tsx                 |   0
 .../src/pages/NotFound.tsx                    |   0
 .../src/pages/PropertyDetails.tsx             |   8 +-
 .../src/pages/PropertySearch.tsx              |   0
 .../src/pages/PropertySearchPlaceholder.tsx   |   0
 .../src/public/property-01.jpg                | Bin
 .../src/public/property-02.jpg                | Bin
 .../src/public/property-03.jpg                | Bin
 .../src/public/property-04.jpg                | Bin
 .../src/public/property-05.jpg                | Bin
 .../src/public/property-06.jpg                | Bin
 .../src/public/property-07.jpg                | Bin
 .../src/public/property-08.jpg                | Bin
 .../src/public/property-09.jpg                | Bin
 .../src/public/property-10.jpg                | Bin
 .../src/public/property-11.jpg                | Bin
 .../src/public/property-12.jpg                | Bin
 .../src/public/property-13.jpg                | Bin
 .../src/public/property-14.jpg                | Bin
 .../src/public/property-15.jpg                | Bin
 .../src/public/property-16.jpg                | Bin
 .../src/public/property-17.jpg                | Bin
 .../src/public/property-18.jpg                | Bin
 .../src/public/property-19.jpg                | Bin
 .../src/public/property-20.jpg                | Bin
 .../src/public/property-21.jpg                | Bin
 .../src/public/property-22.jpg                | Bin
 .../src/public/property-23.jpg                | Bin
 .../src/public/property-24.jpg                | Bin
 .../src/public/property-25.jpg                | Bin
 .../src/router-utils.tsx                      |   0
 .../src/routes.tsx                            |   4 +-
 .../src/styles/global.css                     |   0
 .../src/types/leaflet.d.ts                    |   0
 .../src/types/searchResults.ts                |   0
 .../src/utils/geocode.ts                      |   0
 .../utils/propertyListingPaginationUtils.ts   |   0
 .../tsconfig.json                             |   0
 .../tsconfig.node.json                        |   0
 .../vite-env.d.ts                             |   0
 .../vite.config.ts                            |   0
 .../vitest-env.d.ts                           |   0
 .../vitest.config.ts                          |   0
 .../vitest.setup.ts                           |   0
 .../webapplication.json                       |   0
 .../package-lock.json                         |   4 +-
 .../package.json                              |   2 +-
 .../scripts/sf-project-setup.mjs              |   2 +-
 395 files changed, 951 insertions(+), 1656 deletions(-)
 delete mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-data.md
 delete mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-ui.md
 create mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
 delete mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/constants.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/routeConfig.ts
 delete mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/utils.ts
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/.forceignore (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/.graphqlrc.yml (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/.prettierignore (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/.prettierrc (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/CHANGELOG.md (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/README.md (60%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/codegen.yml (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/components.json (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/e2e/app.spec.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/eslint.config.js (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/index.html (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/package.json (93%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/playwright.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e/appreactsampleb2e.webapplication-meta.xml => propertymanagementapp/propertymanagementapp.webapplication-meta.xml} (81%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/scripts/get-graphql-schema.mjs (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/scripts/rewrite-e2e-assets.mjs (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/applicationSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/applications.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/query/distinctApplicationStatus.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/query/getApplications.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/query/searchApplications.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/applications/query/updateApplicationStatus.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/dashboard/dashboard.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/dashboard/query/getDashboardMetrics.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/dashboard/query/getOpenApplications.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/dashboard/query/getUserInfo.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/graphql-operations-types.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/graphqlClient.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/maintenanceRequestSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/maintenanceRequests.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/properties.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/propertySearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/query/distinctPropertyStatus.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/query/distinctPropertyType.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/query/getProperties.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/api/properties/query/searchProperties.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/app.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/appLayout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/appliances.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/book.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/copy.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/dashboard.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/downgraph.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/electrical.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/files.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/hvac.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/maintenance-worker.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/maintenance.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/pest.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/plumbing.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/properties.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/rocket.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/star.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/support.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/upgraph.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/users.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/icons/zen-logo.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/images/codey-1.png (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/images/codey-2.png (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/images/codey-3.png (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/assets/images/vibe-codey.svg (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/AgentforceConversationClient.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/alerts/status-alert.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/applications/ApplicationDetailsModal.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/dashboard/GlobalSearchBar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/dashboard/IssuesDonutChart.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/dashboard/MaintenanceTable.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/dashboard/StatCard.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layout/FilterRow.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layout/PageContainer.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layout/PageHeader.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layout/TopBar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layout/VerticalNav.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/layouts/card-layout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/maintenanceRequests/MaintenanceRequestCard.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/maintenanceWorkers/WorkerDetailsModal.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/properties/PropertyCard.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/properties/PropertyDetailsModal.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/shared/ObjectSearchErrorState.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/shared/UserAvatar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/alert.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/badge.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/breadcrumb.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/button.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/calendar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/card.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/checkbox.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/collapsible.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/datePicker.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/dialog.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/field.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/index.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/input.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/label.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/pagination.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/popover.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/select.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/separator.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/skeleton.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/sonner.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/spinner.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/table.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/components/ui/tabs.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/api/accountSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/api/query/getAccountDetail.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/api/query/searchAccounts.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/pages/AccountSearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/__examples__/pages/Home.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/api/objectSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/ActiveFilters.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/FilterContext.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/ObjectBreadcrumb.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/PaginationControls.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/SearchBar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/SortControl.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/BooleanFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/DateFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/DateRangeFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/MultiSelectFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/NumericRangeFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/SearchFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/SelectFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/components/filters/TextFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/hooks/useAsyncData.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/hooks/useCachedAsyncData.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/hooks/useObjectSearchParams.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/utils/debounce.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/utils/fieldUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/utils/filterUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/features/object-search/utils/sortUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/index.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/navigationMenu.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/ApplicationSearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/Home.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/MaintenanceRequestSearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/MaintenanceWorkerSearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/NotFound.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/PropertySearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/pages/TestAccPage.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/router-utils.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/routes.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/styles/global.css (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/src/types/conversation.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/tsconfig.json (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/tsconfig.node.json (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/vite-env.d.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/vite.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/vitest-env.d.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/vitest.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/vitest.setup.ts (100%)
 rename samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/{appreactsampleb2e => propertymanagementapp}/webapplication.json (100%)
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-data.md
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-ui.md
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/{appreactsampleb2x1.digitalExperienceConfig => propertyrentalapp1.digitalExperienceConfig} (54%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/{appreactsampleb2x1/appreactsampleb2x1.digitalExperience-meta.xml => propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml} (90%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/{appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1 => propertyrentalapp1/sfdc_cms__site/propertyrentalapp1}/_meta.json (56%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/{appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1 => propertyrentalapp1/sfdc_cms__site/propertyrentalapp1}/content.json (59%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/{appreactsampleb2x.network => propertyrentalapp.network} (89%)
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/{appreactsampleb2x.site => propertyrentalapp.site} (93%)
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/index.html
 delete mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/utils.ts
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/.forceignore (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/.graphqlrc.yml (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/.prettierignore (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/.prettierrc (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/CHANGELOG.md (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/README.md (63%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/codegen.yml (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/components.json (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/e2e/app.spec.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/eslint.config.js (100%)
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/index.html
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/package.json (93%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/playwright.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x/appreactsampleb2x.webapplication-meta.xml => propertyrentalapp/propertyrentalapp.webapplication-meta.xml} (82%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/scripts/get-graphql-schema.mjs (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/scripts/rewrite-e2e-assets.mjs (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/applications/applicationApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/graphql-operations-types.ts (96%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/graphqlClient.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/leadApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/maintenanceRequests/maintenanceRequestApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/properties/propertyDetailGraphQL.ts (92%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/api/properties/propertyListingGraphQL.ts (92%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/app.tsx (89%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/appLayout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/appliances.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/book.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/copy.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/electrical.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/hvac.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/pest.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/plumbing.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/rocket.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/star.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/icons/zen-logo.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/images/codey-1.png (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/images/codey-2.png (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/images/codey-3.png (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/assets/images/vibe-codey.svg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/SkeletonPrimitives.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/alerts/status-alert.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/dashboard/WeatherWidget.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/layout/TopBar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/layout/VerticalNav.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/layouts/card-layout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/maintenanceRequests/MaintenanceRequestList.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/maintenanceRequests/StatusBadge.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/properties/PropertyListingCard.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/properties/PropertyListingSearchPagination.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/properties/PropertyMap.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/properties/PropertySearchFilters.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/alert.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/badge.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/breadcrumb.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/button.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/calendar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/card.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/checkbox.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/collapsible.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/datePicker.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/dialog.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/field.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/index.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/input.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/label.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/pagination.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/popover.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/select.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/separator.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/skeleton.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/sonner.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/spinner.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/table.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/components/ui/tabs.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/constants/propertyListing.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/api/userProfileApi.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/authHelpers.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/authenticationConfig.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/context/AuthContext.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/footers/footer-link.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/forms/auth-form.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/forms/submit-button.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/hooks/form.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/hooks/useCountdownTimer.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/hooks/useRetryWithBackoff.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/layout/card-skeleton.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/layout/centered-page-layout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/layouts/AuthAppLayout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/layouts/authenticationRouteLayout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/layouts/privateRouteLayout.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/ChangePassword.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/ForgotPassword.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/Login.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/Profile.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/Register.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/pages/ResetPassword.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/sessionTimeout/sessionTimeService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/authentication/utils/helpers.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/api/accountSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/api/query/getAccountDetail.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/api/query/searchAccounts.graphql (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/pages/AccountSearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/__examples__/pages/Home.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/api/objectSearchService.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/ActiveFilters.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/FilterContext.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/ObjectBreadcrumb.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/PaginationControls.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/SearchBar.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/SortControl.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/BooleanFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/DateFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/DateRangeFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/MultiSelectFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/NumericRangeFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/SearchFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/SelectFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/components/filters/TextFilter.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/hooks/useAsyncData.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/hooks/useCachedAsyncData.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/hooks/useObjectSearchParams.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/utils/debounce.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/utils/fieldUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/utils/filterUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/features/object-search/utils/sortUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/useGeocode.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/useMaintenanceRequests.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyAddresses.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyDetail.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyListingAmenities.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyListingSearch.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyMapMarkers.ts (72%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/usePropertyPrimaryImages.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/hooks/useWeather.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/navigationMenu.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/Application.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/Contact.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/Dashboard.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/Home.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/Maintenance.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/NotFound.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/PropertyDetails.tsx (95%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/PropertySearch.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/pages/PropertySearchPlaceholder.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-01.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-02.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-03.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-04.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-05.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-06.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-07.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-08.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-09.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-10.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-11.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-12.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-13.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-14.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-15.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-16.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-17.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-18.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-19.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-20.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-21.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-22.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-23.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-24.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/public/property-25.jpg (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/router-utils.tsx (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/routes.tsx (97%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/styles/global.css (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/types/leaflet.d.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/types/searchResults.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/utils/geocode.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/src/utils/propertyListingPaginationUtils.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/tsconfig.json (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/tsconfig.node.json (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/vite-env.d.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/vite.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/vitest-env.d.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/vitest.config.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/vitest.setup.ts (100%)
 rename samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/{appreactsampleb2x => propertyrentalapp}/webapplication.json (100%)

diff --git a/package-lock.json b/package-lock.json
index ce287af..8badc6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,8 @@
       "version": "1.5.0",
       "license": "CC-BY-NC-4.0",
       "devDependencies": {
-        "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.10",
-        "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.10",
+        "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.116.6",
+        "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.116.6",
         "@types/js-yaml": "^4.0.9",
         "js-yaml": "^4.1.1",
         "tsx": "^4.21.0"
@@ -678,9 +678,9 @@
       }
     },
     "node_modules/@salesforce/kit": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@salesforce/kit/-/kit-3.2.5.tgz",
-      "integrity": "sha512-Ad3H423ebBvi+q09BQL4pZC2ffwVUPoeuxwos+Sbr53TamkC3g5YT+ASB4MqqqAhMxFgyalFWIjzx9230tts7g==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/kit/-/kit-3.2.6.tgz",
+      "integrity": "sha512-O8S4LWerHa9Zosqh+IoQjgLtpxMOfObRxaRnUdRV4MLtFUi+bQxQiyFvve6eEaBaMP1b1xVDQpvSvQ+PXEDGFQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -688,22 +688,22 @@
       }
     },
     "node_modules/@salesforce/sdk-core": {
-      "version": "1.112.10",
-      "resolved": "https://registry.npmjs.org/@salesforce/sdk-core/-/sdk-core-1.112.10.tgz",
-      "integrity": "sha512-JUbzrDIg5PMuxGlABkNyMmXmQdlXIqdKrstR/lZGhrqektrI7TWc/owun2iXALLsODS3nh3nNV5p87KqYltpGA==",
+      "version": "1.116.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/sdk-core/-/sdk-core-1.116.6.tgz",
+      "integrity": "sha512-5IWfcnQRuaOxtWBbGiW00rk6f4ImNrDDnVhqZOphJhRePOvSLqWLirfIIhRK4j00Tr8w0tgn5H+hIAWCRZvIHw==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt"
     },
     "node_modules/@salesforce/sdk-data": {
-      "version": "1.112.10",
-      "resolved": "https://registry.npmjs.org/@salesforce/sdk-data/-/sdk-data-1.112.10.tgz",
-      "integrity": "sha512-YcQQUiPmdbq4wak9iRjY0FV3Xs+RRwZB0UEQ3ovWxy11rN3ZQBghdxNORYuYkjb4TCiiS6cWVy4/a+o4NspFHQ==",
+      "version": "1.116.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/sdk-data/-/sdk-data-1.116.6.tgz",
+      "integrity": "sha512-yjc1CQvBYAXWrouMmD3buu35u4DwgUGTaDZKU4//F5vIJJitsmPGrJCLDd0HdBzyu/J+77RuVGZBgsal7+zyZQ==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@conduit-client/service-fetch-network": "3.17.0",
         "@conduit-client/utils": "3.17.0",
-        "@salesforce/sdk-core": "^1.112.10"
+        "@salesforce/sdk-core": "^1.116.6"
       }
     },
     "node_modules/@salesforce/ts-types": {
@@ -717,14 +717,14 @@
       }
     },
     "node_modules/@salesforce/webapp-experimental": {
-      "version": "1.112.10",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-experimental/-/webapp-experimental-1.112.10.tgz",
-      "integrity": "sha512-QwV0j4XIkYt75W78m362H+bJEejX78y1TUvhdcQZLRt5zJWi5BdNg8IhSV+aVSsCM0k6cGuAxgfixgCOX8yHfg==",
+      "version": "1.116.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-experimental/-/webapp-experimental-1.116.6.tgz",
+      "integrity": "sha512-bbWVK70rv5Y+e26NLyTB2McTZ3MCQFe+NEYZDW/T4FCaAZ3Y57u1HYzgr8p4iWKlu7DU4V1sNTUGjt01mrN0Dg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@salesforce/core": "^8.23.4",
-        "@salesforce/sdk-data": "^1.112.10",
+        "@salesforce/sdk-data": "^1.116.6",
         "axios": "^1.7.7",
         "micromatch": "^4.0.8",
         "path-to-regexp": "^8.3.0"
@@ -734,20 +734,20 @@
       }
     },
     "node_modules/@salesforce/webapp-template-app-react-sample-b2e-experimental": {
-      "version": "1.112.10",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2e-experimental/-/webapp-template-app-react-sample-b2e-experimental-1.112.10.tgz",
-      "integrity": "sha512-LZCC61D3HCiGH3kxdQNaF/Z/lwj8s+vbPM/sHGC16amxfByRaxYnuIVJwITxmiKFxbrm19gqSvf9BQ6aH8Cnfg==",
+      "version": "1.116.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2e-experimental/-/webapp-template-app-react-sample-b2e-experimental-1.116.6.tgz",
+      "integrity": "sha512-RctkFfBfK+7HLAnP2ERmXG3Nn8apFF4ywh5LlSyOJVUjbQI48kd7PeiCX5v5G4C5Kvqp7wyhhucY0Mk4k8PLEQ==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
-        "@salesforce/webapp-experimental": "^1.112.10",
+        "@salesforce/webapp-experimental": "^1.116.6",
         "sonner": "^1.7.0"
       }
     },
     "node_modules/@salesforce/webapp-template-app-react-sample-b2x-experimental": {
-      "version": "1.112.10",
-      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2x-experimental/-/webapp-template-app-react-sample-b2x-experimental-1.112.10.tgz",
-      "integrity": "sha512-/VPf79iRzyiRjvKn7XzNRnYwhR6sBNRW9qV2wSvgLQhDQ7BIVU8nW5TPKcQOsTUtbgp2GxrV8I1B3XBkgx4TOw==",
+      "version": "1.116.6",
+      "resolved": "https://registry.npmjs.org/@salesforce/webapp-template-app-react-sample-b2x-experimental/-/webapp-template-app-react-sample-b2x-experimental-1.116.6.tgz",
+      "integrity": "sha512-Ql5l+WRvAIQ0iNTutj3k0GDjHRI7wwAbXjzBRKeCR3Tp0pHEXeoKuqj1AACxCv1APAvTOne4cvzb11eJblDOLA==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt"
     },
diff --git a/package.json b/package.json
index 95116de..b385186 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.112.10",
-    "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.112.10",
+    "@salesforce/webapp-template-app-react-sample-b2e-experimental": "^1.116.6",
+    "@salesforce/webapp-template-app-react-sample-b2x-experimental": "^1.116.6",
     "@types/js-yaml": "^4.0.9",
     "js-yaml": "^4.1.1",
     "tsx": "^4.21.0"
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-data.md b/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-data.md
deleted file mode 100644
index 37483a3..0000000
--- a/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-data.md
+++ /dev/null
@@ -1,353 +0,0 @@
-# Salesforce Data Access
-
-- **Fetch or display Salesforce data** — Query records (Account, Contact, Opportunity, custom objects) to show in a component
-- **Create, update, or delete records** — Perform mutations on Salesforce data
-- **Add data fetching to a component** — Wire up a React component to Salesforce data
-- **Call REST APIs** — Use Connect REST, Apex REST, or UI API endpoints
-- **Explore the org schema** — Discover available objects, fields, or relationships
-
-## Data SDK Requirement
-
-> **All Salesforce data access MUST use the Data SDK** (`@salesforce/sdk-data`). The SDK handles authentication, CSRF, and base URL resolution. Never use `fetch()` or `axios` directly.
-
-```typescript
-import { createDataSDK, gql } from "@salesforce/sdk-data";
-
-const sdk = await createDataSDK();
-
-// GraphQL for record queries/mutations (PREFERRED)
-const response = await sdk.graphql?.<ResponseType>(query, variables);
-
-// REST for Connect REST, Apex REST, UI API (when GraphQL insufficient)
-const res = await sdk.fetch?.("/services/apexrest/my-resource");
-```
-
-**Always use optional chaining** (`sdk.graphql?.()`, `sdk.fetch?.()`) — these methods may be undefined in some surfaces.
-
-## Supported APIs
-
-**Only the following APIs are permitted.** Any endpoint not listed here must not be used.
-
-| API | Method | Endpoints / Use Case |
-|-----|--------|----------------------|
-| GraphQL | `sdk.graphql` | All record queries and mutations via `uiapi { }` namespace |
-| UI API REST | `sdk.fetch` | `/services/data/v{ver}/ui-api/records/{id}` — record metadata when GraphQL is insufficient |
-| Apex REST | `sdk.fetch` | `/services/apexrest/{resource}` — custom server-side logic, aggregates, multi-step transactions |
-| Connect REST | `sdk.fetch` | `/services/data/v{ver}/connect/file/upload/config` — file upload config |
-| Einstein LLM | `sdk.fetch` | `/services/data/v{ver}/einstein/llm/prompt/generations` — AI text generation |
-
-**Not supported:**
-
-- **Enterprise REST query endpoint** (`/services/data/v*/query` with SOQL) — blocked at the proxy level. Use GraphQL for record reads; use Apex REST if server-side SOQL aggregates are required.
-- **Aura-enabled Apex** (`@AuraEnabled`) — an LWC/Aura pattern with no invocation path from React webapps.
-- **Chatter API** (`/chatter/users/me`) — use `uiapi { currentUser { ... } }` in a GraphQL query instead.
-- **Any other Salesforce REST endpoint** not listed in the supported table above.
-
-## Decision: GraphQL vs REST
-
-| Need | Method | Example |
-|------|--------|---------|
-| Query/mutate records | `sdk.graphql` | Account, Contact, custom objects |
-| Current user info | `sdk.graphql` | `uiapi { currentUser { Id Name { value } } }` |
-| UI API record metadata | `sdk.fetch` | `/ui-api/records/{id}` |
-| Connect REST | `sdk.fetch` | `/connect/file/upload/config` |
-| Apex REST | `sdk.fetch` | `/services/apexrest/auth/login` |
-| Einstein LLM | `sdk.fetch` | `/einstein/llm/prompt/generations` |
-
-**GraphQL is preferred** for record operations. Use REST only when GraphQL doesn't cover the use case.
-
----
-
-## GraphQL Workflow
-
-### Step 1: Acquire Schema
-
-The `schema.graphql` file (265K+ lines) is the source of truth. **Never open or parse it directly.**
-
-1. Check if `schema.graphql` exists at the SFDX project root
-2. If missing, run from the **webapp dir**: `npm run graphql:schema`
-3. Custom objects appear only after metadata is deployed
-
-### Step 2: Look Up Entity Schema
-
-Map user intent to PascalCase names ("accounts" → `Account`), then **run the search script from the project root**:
-
-```bash
-# From project root — look up all relevant schema info for one or more entities
-bash scripts/graphql-search.sh Account
-
-# Multiple entities at once
-bash scripts/graphql-search.sh Account Contact Opportunity
-```
-
-The script outputs five sections per entity:
-1. **Type definition** — all queryable fields and relationships
-2. **Filter options** — available fields for `where:` conditions
-3. **Sort options** — available fields for `orderBy:`
-4. **Create input** — fields accepted by create mutations
-5. **Update input** — fields accepted by update mutations
-
-Use this output to determine exact field names before writing any query or mutation. **Maximum 2 script runs.** If the entity still can't be found, ask the user — the object may not be deployed.
-
-### Step 3: Generate Query
-
-Use the templates below. Every field name **must** be verified from the script output in Step 2.
-
-#### Read Query Template
-
-```graphql
-query GetAccounts {
-  uiapi {
-    query {
-      Account(where: { Industry: { eq: "Technology" } }, first: 10) {
-        edges {
-          node {
-            Id
-            Name @optional { value }
-            Industry @optional { value }
-            # Parent relationship
-            Owner @optional { Name { value } }
-            # Child relationship
-            Contacts @optional {
-              edges { node { Name @optional { value } } }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-**FLS Resilience**: Apply `@optional` to all record fields. The server omits inaccessible fields instead of failing. Consuming code must use optional chaining:
-
-```typescript
-const name = node.Name?.value ?? "";
-```
-
-#### Mutation Template
-
-```graphql
-mutation CreateAccount($input: AccountCreateInput!) {
-  uiapi {
-    AccountCreate(input: $input) {
-      Record { Id Name { value } }
-    }
-  }
-}
-```
-
-**Mutation constraints:**
-- Create: Include required fields, only `createable` fields, no child relationships
-- Update: Include `Id`, only `updateable` fields
-- Delete: Include `Id` only
-
-#### Object Metadata & Picklist Values
-
-Use `uiapi { objectInfos(...) }` to fetch field metadata or picklist values. Pass **either** `apiNames` or `objectInfoInputs` — never both in the same query.
-
-**Object metadata** (field labels, data types, CRUD flags):
-
-```typescript
-const GET_OBJECT_INFO = gql`
-  query GetObjectInfo($apiNames: [String!]!) {
-    uiapi {
-      objectInfos(apiNames: $apiNames) {
-        ApiName
-        label
-        labelPlural
-        fields {
-          ApiName
-          label
-          dataType
-          updateable
-          createable
-        }
-      }
-    }
-  }
-`;
-
-const sdk = await createDataSDK();
-const response = await sdk.graphql?.(GET_OBJECT_INFO, { apiNames: ["Account"] });
-const objectInfos = response?.data?.uiapi?.objectInfos ?? [];
-```
-
-**Picklist values** (use `objectInfoInputs` + `... on PicklistField` inline fragment):
-
-```typescript
-const GET_PICKLIST_VALUES = gql`
-  query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
-    uiapi {
-      objectInfos(objectInfoInputs: $objectInfoInputs) {
-        ApiName
-        fields {
-          ApiName
-          ... on PicklistField {
-            picklistValuesByRecordTypeIDs {
-              recordTypeID
-              picklistValues {
-                label
-                value
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-const response = await sdk.graphql?.(GET_PICKLIST_VALUES, {
-  objectInfoInputs: [{ objectApiName: "Account" }],
-});
-const fields = response?.data?.uiapi?.objectInfos?.[0]?.fields ?? [];
-```
-
-### Step 4: Validate & Test
-
-1. **Lint**: `npx eslint <file>` from webapp dir
-2. **Test**: Ask user before testing. For mutations, request input values — never fabricate data.
-
-**If ESLint reports a GraphQL error** (e.g. `Cannot query field`, `Unknown type`, `Unknown argument`), the field or type name is wrong. Re-run the schema search script to find the correct name — do not guess:
-
-```bash
-# From project root — re-check the entity that caused the error
-bash scripts/graphql-search.sh <EntityName>
-```
-
-Then fix the query using the exact names from the script output.
-
----
-
-## Webapp Integration (React)
-
-```typescript
-import { createDataSDK, gql } from "@salesforce/sdk-data";
-
-const GET_ACCOUNTS = gql`
-  query GetAccounts {
-    uiapi {
-      query {
-        Account(first: 10) {
-          edges {
-            node {
-              Id
-              Name @optional { value }
-              Industry @optional { value }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-const sdk = await createDataSDK();
-const response = await sdk.graphql?.(GET_ACCOUNTS);
-
-if (response?.errors?.length) {
-  throw new Error(response.errors.map(e => e.message).join("; "));
-}
-
-const accounts = response?.data?.uiapi?.query?.Account?.edges?.map(e => e.node) ?? [];
-
----
-
-## REST API Patterns
-
-Use `sdk.fetch` when GraphQL is insufficient. See the [Supported APIs](#supported-apis) table for the full allowlist.
-
-```typescript
-declare const __SF_API_VERSION__: string;
-const API_VERSION = typeof __SF_API_VERSION__ !== "undefined" ? __SF_API_VERSION__ : "65.0";
-
-// Connect — file upload config
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/connect/file/upload/config`);
-
-// Apex REST (no version in path)
-const res = await sdk.fetch?.("/services/apexrest/auth/login", {
-  method: "POST",
-  body: JSON.stringify({ email, password }),
-  headers: { "Content-Type": "application/json" },
-});
-
-// UI API — record with metadata (prefer GraphQL for simple reads)
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/ui-api/records/${recordId}`);
-
-// Einstein LLM
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/einstein/llm/prompt/generations`, {
-  method: "POST",
-  body: JSON.stringify({ promptTextorId: prompt }),
-});
-```
-
-**Current user**: Do not use Chatter (`/chatter/users/me`). Use GraphQL instead:
-
-```typescript
-const GET_CURRENT_USER = gql`
-  query CurrentUser {
-    uiapi { currentUser { Id Name { value } } }
-  }
-`;
-const response = await sdk.graphql?.(GET_CURRENT_USER);
-```
-
----
-
-## Directory Structure
-
-```
-<project-root>/                              ← SFDX project root
-├── schema.graphql                           ← grep target (lives here)
-├── sfdx-project.json
-└── force-app/main/default/webapplications/<app-name>/  ← webapp dir
-    ├── package.json                         ← npm scripts
-    └── src/
-```
-
-| Command | Run From | Why |
-|---------|----------|-----|
-| `npm run graphql:schema` | webapp dir | Script in webapp's package.json |
-| `npx eslint <file>` | webapp dir | Reads eslint.config.js |
-| `bash scripts/graphql-search.sh <Entity>` | project root | Schema lookup |
-| `sf api request rest` | project root | Needs sfdx-project.json |
-
----
-
-## Quick Reference
-
-### Schema Lookup (from project root)
-
-Run the search script to get all relevant schema info in one step:
-
-```bash
-bash scripts/graphql-search.sh <EntityName>
-```
-
-| Script Output Section | Used For |
-|-----------------------|----------|
-| Type definition | Field names, parent/child relationships |
-| Filter options | `where:` conditions |
-| Sort options | `orderBy:` |
-| CreateRepresentation | Create mutation field list |
-| UpdateRepresentation | Update mutation field list |
-
-### Error Categories
-
-| Error Contains | Resolution |
-|----------------|------------|
-| `Cannot query field` | Field name is wrong — run `graphql-search.sh <Entity>` and use the exact name from the Type definition section |
-| `Unknown type` | Type name is wrong — run `graphql-search.sh <Entity>` to confirm the correct PascalCase entity name |
-| `Unknown argument` | Argument name is wrong — run `graphql-search.sh <Entity>` and check Filter or OrderBy sections |
-| `invalid syntax` | Fix syntax per error message |
-| `validation error` | Field name is wrong — run `graphql-search.sh <Entity>` to verify |
-| `VariableTypeMismatch` | Correct argument type from schema |
-| `invalid cross reference id` | Entity deleted — ask for valid Id |
-
-### Checklist
-
-- [ ] All field names verified via search script (Step 2)
-- [ ] `@optional` applied to record fields (reads)
-- [ ] Optional chaining in consuming code
-- [ ] Lint passes: `npx eslint <file>`
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-ui.md b/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-ui.md
deleted file mode 100644
index c170c8e..0000000
--- a/samples/webapp-template-app-react-sample-b2e-experimental/.a4drules/webapp-ui.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# UI Platform Rule
-
-**All new UI must be built as a Salesforce Web Application.**
-
-When any task involves creating a new UI, frontend, page, dashboard, form, or user-facing feature:
-
-1. Use `sf webapp generate` to scaffold the web app inside the SFDX project — do not use `create-react-app`, standalone Vite, or any other scaffold.
-2. The app must live under `<sfdx-source>/webapplications/<AppName>/` as a WebApplication bundle.
-3. Do not build new UIs as LWC components, Aura components, or Visualforce pages.
-
-For setup from the project root, use `node scripts/setup-cli.mjs --help` and the options documented there.
-
-## Data Access (MUST FOLLOW)
-
-- **Never hardcode data in the app.** All data displayed in the UI must come from live Salesforce data fetching — no static arrays, mock objects, or placeholder values in production code.
-- **Follow `.a4drules/webapp-data.md`** before writing any data access code. All implementation must match those rules (Data SDK, supported APIs, GraphQL workflow).
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/.version b/samples/webapp-template-app-react-sample-b2e-experimental/.version
index 4da2ae8..f31f902 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/.version
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/.version
@@ -1 +1 @@
-1.112.10
+1.116.6
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
index 96e9f54..1c3dfdd 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/CHANGELOG.md
@@ -3,6 +3,89 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.116.6](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.5...v1.116.6) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.5](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.4...v1.116.5) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.4](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.3...v1.116.4) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.2...v1.116.3) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.1...v1.116.2) (2026-03-25)
+
+
+### Bug Fixes
+
+* use public npm registry in sf-project-setup @W-21746844@ ([#355](https://github.com/salesforce-experience-platform-emu/webapps/issues/355)) ([4047d1e](https://github.com/salesforce-experience-platform-emu/webapps/commit/4047d1e0b79fcda14badc5a1826da2ae7ef68a68))
+
+
+
+
+
+## [1.116.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.0...v1.116.1) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.116.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.115.0...v1.116.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.115.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.114.0...v1.115.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.114.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.113.0...v1.114.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.113.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.10...v1.113.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.112.10](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.9...v1.112.10) (2026-03-24)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/README.md b/samples/webapp-template-app-react-sample-b2e-experimental/README.md
index 79f70ad..386cd89 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/README.md
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/README.md
@@ -1,42 +1,42 @@
-# App React Sample B2E
+# Property Management App
 
-A B2E (Business-to-Employee) sample React web app for the Salesforce platform. Demonstrates property management, maintenance requests, tenant applications, a dashboard, and an Agentforce conversation client. Built with React, Vite, TypeScript, and Tailwind/shadcn.
+A property management sample React web app for the Salesforce platform. Demonstrates property management, maintenance requests, tenant applications, a dashboard, and an Agentforce conversation client. Built with React, Vite, TypeScript, and Tailwind/shadcn.
 
 ## What's included
 
-| Path                                                        | Description                                                                                                                                                                                                                                                                                                                                                       |
-| ----------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `force-app/main/default/webapplications/appreactsampleb2e/` | React web app (source, config, tests)                                                                                                                                                                                                                                                                                                                             |
-| `force-app/main/default/objects/`                           | 17 custom objects — Agent\_\_c, Application\_\_c, KPI_Snapshot\_\_c, Lease\_\_c, Maintenance_Request\_\_c, Maintenance_Worker\_\_c, Notification\_\_c, Payment\_\_c, Property\_\_c, Property_Cost\_\_c, Property_Feature\_\_c, Property_Image\_\_c, Property_Listing\_\_c, Property_Management_Company\_\_c, Property_Owner\_\_c, Property_Sale\_\_c, Tenant\_\_c |
-| `force-app/main/default/layouts/`                           | Page layouts for each custom object                                                                                                                                                                                                                                                                                                                               |
-| `force-app/main/default/permissionsets/`                    | `Property_Management_Access` permission set                                                                                                                                                                                                                                                                                                                       |
-| `force-app/main/default/data/`                              | Sample data (JSON) for all objects, importable via `sf data import tree`                                                                                                                                                                                                                                                                                          |
+| Path                                                            | Description                                                                                                                                                                                                                                                                                                                                                       |
+| --------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `force-app/main/default/webapplications/propertymanagementapp/` | React web app (source, config, tests)                                                                                                                                                                                                                                                                                                                             |
+| `force-app/main/default/objects/`                               | 17 custom objects — Agent\_\_c, Application\_\_c, KPI_Snapshot\_\_c, Lease\_\_c, Maintenance_Request\_\_c, Maintenance_Worker\_\_c, Notification\_\_c, Payment\_\_c, Property\_\_c, Property_Cost\_\_c, Property_Feature\_\_c, Property_Image\_\_c, Property_Listing\_\_c, Property_Management_Company\_\_c, Property_Owner\_\_c, Property_Sale\_\_c, Tenant\_\_c |
+| `force-app/main/default/layouts/`                               | Page layouts for each custom object                                                                                                                                                                                                                                                                                                                               |
+| `force-app/main/default/permissionsets/`                        | `Property_Management_Access` permission set                                                                                                                                                                                                                                                                                                                       |
+| `force-app/main/default/data/`                                  | Sample data (JSON) for all objects, importable via `sf data import tree`                                                                                                                                                                                                                                                                                          |
 
 ## Getting started
 
 Navigate to the web app and install dependencies:
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2e
+cd force-app/main/default/webapplications/propertymanagementapp
 npm install
 npm run dev
 ```
 
-Opens at http://localhost:5173 by default. For build and test instructions, see the [web app README](force-app/main/default/webapplications/appreactsampleb2e/README.md).
+Opens at http://localhost:5173 by default. For build and test instructions, see the [web app README](force-app/main/default/webapplications/propertymanagementapp/README.md).
 
 ## Deploy
 
 ### Deploy everything (metadata + web app)
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2e && npm install && npm run build && cd -
+cd force-app/main/default/webapplications/propertymanagementapp && npm install && npm run build && cd -
 sf project deploy start --source-dir force-app --target-org <alias>
 ```
 
 ### Deploy the web app only
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2e && npm install && npm run build && cd -
+cd force-app/main/default/webapplications/propertymanagementapp && npm install && npm run build && cd -
 sf project deploy start --source-dir force-app/main/default/webapplications --target-org <alias>
 ```
 
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json
index ae16e95..4dcff23 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/data/Property__c.json
@@ -24,7 +24,9 @@
       "Description__c": "Modern 2-bedroom apartment with stunning city views. Features include balcony, in-unit washer/dryer, and central AC. Great location near restaurants and shopping.",
       "Tour_URL__c": "https://example.com/tour/sunset-4b",
       "Hero_Image__c": "https://images.unsplash.com/photo-1522708323590-d24dbb6b0267?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 34.1007222,
+      "Coordinates__Longitude__s": -118.329413
     },
     {
       "attributes": {
@@ -50,7 +52,9 @@
       "Description__c": "Spacious downtown loft with high ceilings and modern finishes. Building amenities include gym, pool, and secured parking.",
       "Tour_URL__c": "https://example.com/tour/downtown-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1554995207-c18c203602cb?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 34.052235,
+      "Coordinates__Longitude__s": -118.243683
     },
     {
       "attributes": {
@@ -76,7 +80,9 @@
       "Description__c": "Cozy garden studio in quiet neighborhood. Features private balcony and additional storage unit. No pets allowed.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1560448204-e02f11c3d0e2?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 34.18045,
+      "Coordinates__Longitude__s": -118.3101988
     },
     {
       "attributes": {
@@ -102,7 +108,9 @@
       "Description__c": "Elegant 3-bedroom penthouse in gated community with luxury amenities. Currently under maintenance, available mid-December.",
       "Tour_URL__c": "https://example.com/tour/luxury-penthouse",
       "Hero_Image__c": "https://images.unsplash.com/photo-1512917774080-9991f1c4c750?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 33.7777777,
+      "Coordinates__Longitude__s": -84.39
     },
     {
       "attributes": {
@@ -128,7 +136,9 @@
       "Description__c": "Modern high-rise apartment with floor-to-ceiling windows and stunning sunset views. Building features 24/7 doorman.",
       "Tour_URL__c": "https://example.com/tour/sunset-towers",
       "Hero_Image__c": "https://images.unsplash.com/photo-1545324418-cc1a3fa10c00?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 34.0914289,
+      "Coordinates__Longitude__s": -118.3617537
     },
     {
       "attributes": {
@@ -154,7 +164,9 @@
       "Description__c": "Stunning beachfront home with direct ocean access, modern kitchen, panoramic views, and private pool. Premium property.",
       "Tour_URL__c": "https://example.com/tour/ocean-villa",
       "Hero_Image__c": "https://images.unsplash.com/photo-1564013799919-ab600027ffc6?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 34.022352,
+      "Coordinates__Longitude__s": -118.4911912
     },
     {
       "attributes": {
@@ -180,7 +192,9 @@
       "Description__c": "Modern condo in Silicon Valley with smart home features, rooftop deck, and premium amenities. Perfect for tech professionals.",
       "Tour_URL__c": "https://example.com/tour/tech-hub",
       "Hero_Image__c": "https://images.unsplash.com/photo-1580587771525-78b9dba3b914?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.4446046,
+      "Coordinates__Longitude__s": -122.1595598
     },
     {
       "attributes": {
@@ -206,7 +220,9 @@
       "Description__c": "Charming historic brownstone with original hardwood floors, exposed brick, and modern updates. Rare Telegraph Hill location.",
       "Tour_URL__c": "https://example.com/tour/brownstone",
       "Hero_Image__c": "https://images.unsplash.com/photo-1568605114967-8130f3a36994?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.8022765,
+      "Coordinates__Longitude__s": -122.4062978
     },
     {
       "attributes": {
@@ -232,7 +248,9 @@
       "Description__c": "Bright studio in trendy Marina District with city views and modern amenities. Walking distance to shops and restaurants.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1502672023488-70e25813eb80?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7990915,
+      "Coordinates__Longitude__s": -122.4319382
     },
     {
       "attributes": {
@@ -258,7 +276,9 @@
       "Description__c": "Magnificent estate with pool, tennis court, wine cellar, and breathtaking city views. Ultimate luxury living.",
       "Tour_URL__c": "https://example.com/tour/beverly-estate",
       "Hero_Image__c": "https://images.unsplash.com/photo-1613490493576-7fde63acd811?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 34.0897964,
+      "Coordinates__Longitude__s": -118.392847
     },
     {
       "attributes": {
@@ -284,7 +304,9 @@
       "Description__c": "Modern office space with open floor plan, conference rooms, and panoramic bay views. Premium downtown location.",
       "Tour_URL__c": "https://example.com/tour/market-office",
       "Hero_Image__c": "https://images.unsplash.com/photo-1497366216548-37526070297c?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7886951,
+      "Coordinates__Longitude__s": -122.397125
     },
     {
       "attributes": {
@@ -310,7 +332,9 @@
       "Description__c": "Beautiful wine country home with vineyard views, gourmet kitchen, and outdoor entertainment area. Perfect for wine enthusiasts.",
       "Tour_URL__c": "https://example.com/tour/napa-retreat",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600596542815-ffad4c1539a9?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 38.3134748,
+      "Coordinates__Longitude__s": -122.2863822
     },
     {
       "attributes": {
@@ -336,7 +360,9 @@
       "Description__c": "Contemporary townhome near tech companies with private garage and community amenities. Ideal for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154340-be6161a56a0c?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.407126,
+      "Coordinates__Longitude__s": -122.0883981
     },
     {
       "attributes": {
@@ -362,7 +388,9 @@
       "Description__c": "Converted warehouse loft with soaring ceilings, exposed beams, and artistic neighborhood vibe.",
       "Tour_URL__c": "https://example.com/tour/artistic-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687939-ce8a6c25118c?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.8034013,
+      "Coordinates__Longitude__s": -122.2798006
     },
     {
       "attributes": {
@@ -388,7 +416,9 @@
       "Description__c": "Ultra-luxury penthouse with concierge service, gym, and incredible bay and city views. Currently under maintenance.",
       "Tour_URL__c": "https://example.com/tour/luxury-highrise",
       "Hero_Image__c": "https://images.unsplash.com/photo-1737898378296-94dc316cd443?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7886951,
+      "Coordinates__Longitude__s": -122.397125
     },
     {
       "attributes": {
@@ -414,7 +444,9 @@
       "Description__c": "Charming family home with large backyard, updated kitchen, and excellent school district. Perfect for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753190-17f0baa2a6c3?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.4863302,
+      "Coordinates__Longitude__s": -122.2247151
     },
     {
       "attributes": {
@@ -440,7 +472,9 @@
       "Description__c": "Brand new studio with smart home features, in-unit laundry, and rooftop terrace access. Modern living at its best.",
       "Tour_URL__c": "https://example.com/tour/modern-studio",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154084-4e5fe7c39198?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7873686,
+      "Coordinates__Longitude__s": -122.4055017
     },
     {
       "attributes": {
@@ -466,7 +500,9 @@
       "Description__c": "Sophisticated executive condo with marble finishes, city views, and luxury building amenities. Premium Nob Hill location.",
       "Tour_URL__c": "https://example.com/tour/executive-suite",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687920-4e2a09cf159d?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.7907054,
+      "Coordinates__Longitude__s": -122.406344
     },
     {
       "attributes": {
@@ -492,7 +528,9 @@
       "Description__c": "Fully restored Victorian mansion with period details, modern conveniences, and beautiful garden. Rare Pacific Heights gem.",
       "Tour_URL__c": "https://example.com/tour/victorian",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753151-384129cf4e3e?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.7933344,
+      "Coordinates__Longitude__s": -122.4200908
     },
     {
       "attributes": {
@@ -518,7 +556,9 @@
       "Description__c": "Bright apartment with bay views, hardwood floors, and walking distance to Marina Green. Great neighborhood.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154526-990dced4db0d?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7990915,
+      "Coordinates__Longitude__s": -122.4319382
     },
     {
       "attributes": {
@@ -544,7 +584,9 @@
       "Description__c": "Comfortable townhouse with private patio, attached garage, and close to UC Berkeley. Great for students or faculty.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1603661764782-a3c9812afada?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.8774835,
+      "Coordinates__Longitude__s": -122.2660899
     },
     {
       "attributes": {
@@ -570,7 +612,9 @@
       "Description__c": "Modern open office space perfect for tech startups with high-speed internet and flexible layout. Prime SOMA location.",
       "Tour_URL__c": "https://example.com/tour/startup-hub",
       "Hero_Image__c": "https://images.unsplash.com/photo-1497366811353-6870744d04b2?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7751904,
+      "Coordinates__Longitude__s": -122.4107713
     },
     {
       "attributes": {
@@ -596,7 +640,9 @@
       "Description__c": "Spacious family home with modern kitchen, large basement, and proximity to Golden Gate Park. Perfect for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753086-00f18fb6b3ea?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.7463285,
+      "Coordinates__Longitude__s": -122.4732595
     },
     {
       "attributes": {
@@ -622,7 +668,9 @@
       "Description__c": "Contemporary loft in vibrant Mission Bay with waterfront access and modern amenities. Great location near ballpark.",
       "Tour_URL__c": "https://example.com/tour/mission-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687920-4e2a09cf159d?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.7433669,
+      "Coordinates__Longitude__s": -122.4666667
     },
     {
       "attributes": {
@@ -648,7 +696,9 @@
       "Description__c": "Elegant apartment in prestigious Pacific Heights with hardwood floors, in-unit laundry, and 24/7 doorman service.",
       "Tour_URL__c": "https://example.com/tour/pac-heights",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585152220-90363fe7e115?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7851601,
+      "Coordinates__Longitude__s": -122.4351546
     }
   ]
 }
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
new file mode 100644
index 0000000..ee39c7f
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Coordinates__c</fullName>
+    <description>Location coordinates</description>
+    <displayLocationInDecimal>true</displayLocationInDecimal>
+    <label>Coordinates</label>
+    <required>false</required>
+    <scale>6</scale>
+    <trackHistory>false</trackHistory>
+    <trackTrending>false</trackTrending>
+    <type>Location</type>
+</CustomField>
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
index 32a52e3..6efccf6 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
@@ -416,6 +416,11 @@
         <field>Property__c.Address__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Property__c.Coordinates__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>true</editable>
         <field>Property__c.Type__c</field>
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
index 48dfb90..7171762 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
@@ -97,6 +97,11 @@
         <field>Property__c.Address__c</field>
         <readable>true</readable>
     </fieldPermissions>
+        <fieldPermissions>
+        <editable>false</editable>
+        <field>Property__c.Coordinates__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
 
     <!-- Field Permissions: Tenant__c -->
     <fieldPermissions>
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/constants.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/constants.ts
deleted file mode 100644
index e420ed7..0000000
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/constants.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Application-wide constants.
- */
-
-import type { PaginationConfig } from "../features/object-search/hooks/useObjectSearchParams";
-
-export const PAGE_SIZE_LIST = 12;
-export const DASHBOARD_MAINTENANCE_LIMIT = 5;
-
-export const PROPERTY_FILTER_EXCLUDED_FIELD_PATHS = new Set([
-	"CreatedDate",
-	"Hero_Image__c",
-	"Year_Built__c",
-	"Available_Date__c",
-]);
-
-export const MAINTENANCE_WORKER_FILTER_EXCLUDED_FIELD_PATHS = new Set<string>([]);
-export const MAINTENANCE_FILTER_EXCLUDED_FIELD_PATHS = new Set(["Scheduled__c"]);
-export const APPLICATION_FILTER_EXCLUDED_FIELD_PATHS = new Set<string>([]);
-
-export const MAINTENANCE_WORKER_OBJECT_API_NAME = "Maintenance_Worker__c" as const;
-
-export const FALLBACK_LABEL_PROPERTIES_PLURAL = "Properties";
-export const FALLBACK_LABEL_MAINTENANCE_PLURAL = "Maintenance Requests";
-export const FALLBACK_LABEL_MAINTENANCE_WORKERS_PLURAL = "Maintenance Workers";
-export const FALLBACK_LABEL_APPLICATIONS_PLURAL = "Applications";
-
-export const PROPERTY_OBJECT_API_NAME = "Property__c" as const;
-export const MAINTENANCE_OBJECT_API_NAME = "Maintenance_Request__c" as const;
-export const APPLICATION_OBJECT_API_NAME = "Application__c" as const;
-
-export const SEARCHABLE_OBJECTS = [
-	{
-		objectApiName: "Property__c" as const,
-		path: "/properties",
-		fallbackLabelPlural: FALLBACK_LABEL_PROPERTIES_PLURAL,
-	},
-	{
-		objectApiName: "Maintenance_Request__c" as const,
-		path: "/maintenance/requests",
-		fallbackLabelPlural: FALLBACK_LABEL_MAINTENANCE_PLURAL,
-	},
-	{
-		objectApiName: MAINTENANCE_WORKER_OBJECT_API_NAME,
-		path: "/maintenance/workers",
-		fallbackLabelPlural: FALLBACK_LABEL_MAINTENANCE_WORKERS_PLURAL,
-	},
-	{
-		objectApiName: "Application__c" as const,
-		path: "/applications",
-		fallbackLabelPlural: FALLBACK_LABEL_APPLICATIONS_PLURAL,
-	},
-] as const;
-
-export type SearchableObjectConfig = (typeof SEARCHABLE_OBJECTS)[number];
-
-export const PAGINATION_CONFIG: PaginationConfig = {
-	defaultPageSize: 6,
-	validPageSizes: [6, 12, 24, 48],
-};
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/routeConfig.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/routeConfig.ts
deleted file mode 100644
index 08332bf..0000000
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/routeConfig.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Central route configuration for list pages and navigation.
- * Use these paths for links and search redirects to avoid duplication.
- */
-export const PATHS = {
-	HOME: "/",
-	PROPERTIES: "/properties",
-	MAINTENANCE_REQUESTS: "/maintenance/requests",
-	MAINTENANCE_WORKERS: "/maintenance/workers",
-	APPLICATIONS: "/applications",
-} as const;
-
-export interface ListPageRoute {
-	path: string;
-	label: string;
-	searchParamKey?: string;
-}
-
-/** List pages that appear in the Home search object dropdown and in nav */
-export const LIST_PAGE_ROUTES: Record<string, ListPageRoute> = {
-	properties: { path: PATHS.PROPERTIES, label: "Properties", searchParamKey: "q" },
-	maintenance_requests: {
-		path: PATHS.MAINTENANCE_REQUESTS,
-		label: "Maintenance Requests",
-		searchParamKey: "q",
-	},
-	maintenance_workers: {
-		path: PATHS.MAINTENANCE_WORKERS,
-		label: "Maintenance Workers",
-		searchParamKey: "q",
-	},
-	applications: { path: PATHS.APPLICATIONS, label: "Applications", searchParamKey: "q" },
-} as const;
-
-export type ListPageKey = keyof typeof LIST_PAGE_ROUTES;
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/utils.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/utils.ts
deleted file mode 100644
index 2819a83..0000000
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.forceignore b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.forceignore
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.graphqlrc.yml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.graphqlrc.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.graphqlrc.yml
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.graphqlrc.yml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.prettierignore b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.prettierignore
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.prettierrc b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/.prettierrc
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/CHANGELOG.md
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/README.md b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/README.md
similarity index 60%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/README.md
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/README.md
index a6ed0b5..d599992 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/README.md
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/README.md
@@ -1,6 +1,6 @@
-# App React Sample B2E
+# Property Management App
 
-A sample B2E (Business-to-Employee) React web app on the Salesforce platform. Includes property management, maintenance requests, tenant applications, a dashboard, and an Agentforce conversation client. Built with React, Vite, TypeScript, and Tailwind/shadcn.
+Property management sample React web app on the Salesforce platform. Includes property management, maintenance requests, tenant applications, a dashboard, and an Agentforce conversation client. Built with React, Vite, TypeScript, and Tailwind/shadcn.
 
 For project-level details (metadata, deploy, sample data), see the [project README](../../../../../../README.md).
 
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/codegen.yml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/codegen.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/codegen.yml
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/codegen.yml
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/components.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/components.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/components.json
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/components.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/e2e/app.spec.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/e2e/app.spec.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/e2e/app.spec.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/e2e/app.spec.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/eslint.config.js b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/eslint.config.js
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/index.html b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/index.html
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/index.html
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/index.html
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/package.json
similarity index 93%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/package.json
index 82cae36..64f3607 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/package.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/package.json
@@ -15,8 +15,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/sdk-data": "^1.112.10",
-    "@salesforce/webapp-experimental": "^1.112.10",
+    "@salesforce/sdk-data": "^1.116.6",
+    "@salesforce/webapp-experimental": "^1.116.6",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -43,7 +43,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.112.10",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.116.6",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/playwright.config.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/playwright.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/playwright.config.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/playwright.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/appreactsampleb2e.webapplication-meta.xml b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/propertymanagementapp.webapplication-meta.xml
similarity index 81%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/appreactsampleb2e.webapplication-meta.xml
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/propertymanagementapp.webapplication-meta.xml
index f872254..1a87842 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/appreactsampleb2e.webapplication-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/propertymanagementapp.webapplication-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebApplication xmlns="http://soap.sforce.com/2006/04/metadata">
-    <masterLabel>appreactsampleb2e</masterLabel>
+    <masterLabel>propertymanagementapp</masterLabel>
     <description>A Salesforce web application.</description>
     <isActive>true</isActive>
     <version>1</version>
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/scripts/get-graphql-schema.mjs b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/scripts/get-graphql-schema.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/scripts/get-graphql-schema.mjs
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/scripts/get-graphql-schema.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/scripts/rewrite-e2e-assets.mjs b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/scripts/rewrite-e2e-assets.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/scripts/rewrite-e2e-assets.mjs
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/scripts/rewrite-e2e-assets.mjs
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/applicationSearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/applicationSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/applicationSearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/applicationSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/applications.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/applications.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/applications.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/applications.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/distinctApplicationStatus.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/distinctApplicationStatus.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/distinctApplicationStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/getApplications.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/getApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/getApplications.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/getApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/searchApplications.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/searchApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/searchApplications.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/searchApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/updateApplicationStatus.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications/query/updateApplicationStatus.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/applications/query/updateApplicationStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/dashboard.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/dashboard.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/dashboard.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/dashboard.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getDashboardMetrics.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getDashboardMetrics.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getDashboardMetrics.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getOpenApplications.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getOpenApplications.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getOpenApplications.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getUserInfo.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard/query/getUserInfo.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/dashboard/query/getUserInfo.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphql-operations-types.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/graphql-operations-types.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphql-operations-types.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/graphql-operations-types.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphqlClient.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/graphqlClient.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphqlClient.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/graphqlClient.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/maintenanceRequestSearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequestSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/maintenanceRequests.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/maintenanceRequests.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/maintenanceRequests.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestPriority.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/distinctMaintenanceRequestType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/getAllMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/getMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/searchMaintenanceRequests.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceRequests/query/updateMaintenanceStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/maintenanceWorkerSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/query/distinctMaintenanceWorkerEmploymentType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/maintenanceWorkers/query/searchMaintenanceWorkers.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/properties.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/properties.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/properties.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/properties.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/propertySearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/propertySearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/propertySearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/propertySearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/distinctPropertyStatus.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/distinctPropertyStatus.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/distinctPropertyStatus.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/distinctPropertyType.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/distinctPropertyType.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/distinctPropertyType.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/getProperties.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/getProperties.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/getProperties.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/getProperties.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/searchProperties.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/searchProperties.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties/query/searchProperties.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/api/properties/query/searchProperties.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/app.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/app.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/app.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/app.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/appLayout.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/appLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/appLayout.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/appLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/appliances.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/appliances.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/appliances.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/appliances.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/book.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/book.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/book.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/book.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/copy.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/copy.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/copy.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/copy.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/dashboard.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/dashboard.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/dashboard.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/dashboard.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/downgraph.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/downgraph.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/downgraph.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/downgraph.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/electrical.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/electrical.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/electrical.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/electrical.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/files.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/files.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/files.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/files.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/hvac.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/hvac.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/hvac.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/hvac.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/maintenance-worker.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/maintenance-worker.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/maintenance-worker.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/maintenance-worker.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/maintenance.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/maintenance.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/maintenance.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/maintenance.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/pest.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/pest.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/pest.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/pest.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/plumbing.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/plumbing.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/plumbing.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/plumbing.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/properties.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/properties.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/properties.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/properties.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/rocket.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/rocket.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/rocket.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/rocket.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/star.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/star.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/star.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/star.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/support.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/support.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/support.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/support.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/upgraph.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/upgraph.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/upgraph.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/upgraph.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/users.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/users.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/users.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/users.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/zen-logo.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/zen-logo.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/icons/zen-logo.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/icons/zen-logo.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-1.png b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-1.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-1.png
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-1.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-2.png b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-2.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-2.png
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-2.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-3.png b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-3.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/codey-3.png
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/codey-3.png
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/vibe-codey.svg b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/vibe-codey.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/assets/images/vibe-codey.svg
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/assets/images/vibe-codey.svg
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/AgentforceConversationClient.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/AgentforceConversationClient.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/AgentforceConversationClient.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/AgentforceConversationClient.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/alerts/status-alert.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/alerts/status-alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/alerts/status-alert.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/alerts/status-alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/applications/ApplicationDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/applications/ApplicationDetailsModal.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/applications/ApplicationDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/GlobalSearchBar.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/GlobalSearchBar.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/GlobalSearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/IssuesDonutChart.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/IssuesDonutChart.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/IssuesDonutChart.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/MaintenanceTable.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/MaintenanceTable.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/MaintenanceTable.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/StatCard.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/StatCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/dashboard/StatCard.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/dashboard/StatCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/FilterRow.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/FilterRow.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/FilterRow.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/FilterRow.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/PageContainer.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/PageContainer.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/PageContainer.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/PageContainer.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/PageHeader.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/PageHeader.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/PageHeader.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/PageHeader.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/TopBar.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/TopBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/TopBar.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/TopBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/VerticalNav.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/VerticalNav.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layout/VerticalNav.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layout/VerticalNav.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layouts/card-layout.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layouts/card-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/layouts/card-layout.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/layouts/card-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceRequests/MaintenanceDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceRequests/MaintenanceRequestCard.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceRequests/MaintenanceRequestCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceWorkers/WorkerDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/maintenanceWorkers/WorkerDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/properties/PropertyCard.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/properties/PropertyCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/properties/PropertyCard.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/properties/PropertyCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/properties/PropertyDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/properties/PropertyDetailsModal.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/properties/PropertyDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/shared/ObjectSearchErrorState.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/shared/ObjectSearchErrorState.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/shared/ObjectSearchErrorState.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/shared/UserAvatar.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/shared/UserAvatar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/shared/UserAvatar.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/shared/UserAvatar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/alert.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/alert.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/badge.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/badge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/badge.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/badge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/breadcrumb.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/breadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/breadcrumb.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/breadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/button.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/button.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/calendar.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/calendar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/calendar.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/calendar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/card.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/card.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/card.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/card.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/checkbox.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/checkbox.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/checkbox.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/checkbox.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/collapsible.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/collapsible.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/collapsible.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/collapsible.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/datePicker.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/datePicker.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/datePicker.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/datePicker.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/dialog.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/dialog.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/dialog.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/dialog.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/field.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/field.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/field.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/field.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/index.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/index.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/input.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/input.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/input.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/input.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/label.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/label.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/label.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/label.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/pagination.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/pagination.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/pagination.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/pagination.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/popover.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/popover.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/popover.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/popover.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/select.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/select.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/select.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/select.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/separator.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/separator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/separator.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/separator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/skeleton.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/skeleton.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/sonner.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/sonner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/sonner.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/sonner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/spinner.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/spinner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/spinner.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/spinner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/table.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/table.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/table.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/table.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/tabs.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/tabs.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/components/ui/tabs.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/components/ui/tabs.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/accountSearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/accountSearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/accountSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/getAccountDetail.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/searchAccounts.graphql b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/api/query/searchAccounts.graphql
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/AccountSearch.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/AccountSearch.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/__examples__/pages/Home.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/__examples__/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/api/objectSearchService.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/api/objectSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/api/objectSearchService.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/api/objectSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/ActiveFilters.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/ActiveFilters.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/ActiveFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/FilterContext.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/FilterContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/FilterContext.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/FilterContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/ObjectBreadcrumb.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/ObjectBreadcrumb.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/ObjectBreadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/PaginationControls.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/PaginationControls.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/PaginationControls.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/SearchBar.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/SearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/SearchBar.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/SearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/SortControl.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/SortControl.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/SortControl.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/SortControl.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/BooleanFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/BooleanFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/BooleanFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/DateFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/DateFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/DateFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/DateRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/DateRangeFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/DateRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/MultiSelectFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/MultiSelectFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/NumericRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/NumericRangeFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/SearchFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/SearchFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/SearchFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/SelectFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/SelectFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/SelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/TextFilter.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/components/filters/TextFilter.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/components/filters/TextFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useAsyncData.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useAsyncData.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useCachedAsyncData.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useCachedAsyncData.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useCachedAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useObjectSearchParams.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/hooks/useObjectSearchParams.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/hooks/useObjectSearchParams.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/debounce.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/debounce.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/debounce.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/debounce.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/fieldUtils.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/fieldUtils.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/fieldUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/filterUtils.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/filterUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/filterUtils.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/filterUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/sortUtils.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/sortUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/features/object-search/utils/sortUtils.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/features/object-search/utils/sortUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/index.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/index.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/navigationMenu.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/navigationMenu.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/navigationMenu.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/navigationMenu.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/ApplicationSearch.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/ApplicationSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/ApplicationSearch.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/ApplicationSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/Home.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/MaintenanceRequestSearch.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/MaintenanceRequestSearch.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/MaintenanceRequestSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/MaintenanceWorkerSearch.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/MaintenanceWorkerSearch.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/MaintenanceWorkerSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/NotFound.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/NotFound.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/NotFound.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/NotFound.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/PropertySearch.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/PropertySearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/PropertySearch.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/PropertySearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/TestAccPage.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/TestAccPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/pages/TestAccPage.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/pages/TestAccPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/router-utils.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/router-utils.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/router-utils.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/router-utils.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/routes.tsx b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/routes.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/routes.tsx
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/routes.tsx
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/styles/global.css b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/styles/global.css
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/styles/global.css
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/styles/global.css
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/types/conversation.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/types/conversation.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/types/conversation.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/types/conversation.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/tsconfig.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/tsconfig.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/tsconfig.json
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/tsconfig.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/tsconfig.node.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/tsconfig.node.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/tsconfig.node.json
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/tsconfig.node.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vite-env.d.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vite-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vite-env.d.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vite-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vite.config.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vite.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vite.config.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vite.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest-env.d.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest-env.d.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest.config.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest.config.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest.setup.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest.setup.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/vitest.setup.ts
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/vitest.setup.ts
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/webapplication.json b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/webapplication.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/webapplication.json
rename to samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/webapplication.json
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json b/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
index 5d3ff7e..326182b 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.10",
+  "version": "1.116.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.112.10",
+      "version": "1.116.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "devDependencies": {
         "@lwc/eslint-plugin-lwc": "^3.3.0",
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/package.json b/samples/webapp-template-app-react-sample-b2e-experimental/package.json
index 7566445..9d48005 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/package.json
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.10",
+  "version": "1.116.6",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs b/samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs
index 561fa39..95dcbba 100644
--- a/samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/scripts/sf-project-setup.mjs
@@ -60,7 +60,7 @@ const webappDir = discoverWebappDir();
 console.log('SFDX project root:', ROOT);
 console.log('Web app directory:', webappDir);
 
-run('npm install', 'npm', ['install'], { cwd: webappDir });
+run('npm install', 'npm', ['install', '--registry', 'https://registry.npmjs.org/'], { cwd: webappDir });
 run('npm run build', 'npm', ['run', 'build'], { cwd: webappDir });
 console.log('\n--- Launching dev server (Ctrl+C to stop) ---\n');
 run('npm run dev', 'npm', ['run', 'dev'], { cwd: webappDir });
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-data.md b/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-data.md
deleted file mode 100644
index 37483a3..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-data.md
+++ /dev/null
@@ -1,353 +0,0 @@
-# Salesforce Data Access
-
-- **Fetch or display Salesforce data** — Query records (Account, Contact, Opportunity, custom objects) to show in a component
-- **Create, update, or delete records** — Perform mutations on Salesforce data
-- **Add data fetching to a component** — Wire up a React component to Salesforce data
-- **Call REST APIs** — Use Connect REST, Apex REST, or UI API endpoints
-- **Explore the org schema** — Discover available objects, fields, or relationships
-
-## Data SDK Requirement
-
-> **All Salesforce data access MUST use the Data SDK** (`@salesforce/sdk-data`). The SDK handles authentication, CSRF, and base URL resolution. Never use `fetch()` or `axios` directly.
-
-```typescript
-import { createDataSDK, gql } from "@salesforce/sdk-data";
-
-const sdk = await createDataSDK();
-
-// GraphQL for record queries/mutations (PREFERRED)
-const response = await sdk.graphql?.<ResponseType>(query, variables);
-
-// REST for Connect REST, Apex REST, UI API (when GraphQL insufficient)
-const res = await sdk.fetch?.("/services/apexrest/my-resource");
-```
-
-**Always use optional chaining** (`sdk.graphql?.()`, `sdk.fetch?.()`) — these methods may be undefined in some surfaces.
-
-## Supported APIs
-
-**Only the following APIs are permitted.** Any endpoint not listed here must not be used.
-
-| API | Method | Endpoints / Use Case |
-|-----|--------|----------------------|
-| GraphQL | `sdk.graphql` | All record queries and mutations via `uiapi { }` namespace |
-| UI API REST | `sdk.fetch` | `/services/data/v{ver}/ui-api/records/{id}` — record metadata when GraphQL is insufficient |
-| Apex REST | `sdk.fetch` | `/services/apexrest/{resource}` — custom server-side logic, aggregates, multi-step transactions |
-| Connect REST | `sdk.fetch` | `/services/data/v{ver}/connect/file/upload/config` — file upload config |
-| Einstein LLM | `sdk.fetch` | `/services/data/v{ver}/einstein/llm/prompt/generations` — AI text generation |
-
-**Not supported:**
-
-- **Enterprise REST query endpoint** (`/services/data/v*/query` with SOQL) — blocked at the proxy level. Use GraphQL for record reads; use Apex REST if server-side SOQL aggregates are required.
-- **Aura-enabled Apex** (`@AuraEnabled`) — an LWC/Aura pattern with no invocation path from React webapps.
-- **Chatter API** (`/chatter/users/me`) — use `uiapi { currentUser { ... } }` in a GraphQL query instead.
-- **Any other Salesforce REST endpoint** not listed in the supported table above.
-
-## Decision: GraphQL vs REST
-
-| Need | Method | Example |
-|------|--------|---------|
-| Query/mutate records | `sdk.graphql` | Account, Contact, custom objects |
-| Current user info | `sdk.graphql` | `uiapi { currentUser { Id Name { value } } }` |
-| UI API record metadata | `sdk.fetch` | `/ui-api/records/{id}` |
-| Connect REST | `sdk.fetch` | `/connect/file/upload/config` |
-| Apex REST | `sdk.fetch` | `/services/apexrest/auth/login` |
-| Einstein LLM | `sdk.fetch` | `/einstein/llm/prompt/generations` |
-
-**GraphQL is preferred** for record operations. Use REST only when GraphQL doesn't cover the use case.
-
----
-
-## GraphQL Workflow
-
-### Step 1: Acquire Schema
-
-The `schema.graphql` file (265K+ lines) is the source of truth. **Never open or parse it directly.**
-
-1. Check if `schema.graphql` exists at the SFDX project root
-2. If missing, run from the **webapp dir**: `npm run graphql:schema`
-3. Custom objects appear only after metadata is deployed
-
-### Step 2: Look Up Entity Schema
-
-Map user intent to PascalCase names ("accounts" → `Account`), then **run the search script from the project root**:
-
-```bash
-# From project root — look up all relevant schema info for one or more entities
-bash scripts/graphql-search.sh Account
-
-# Multiple entities at once
-bash scripts/graphql-search.sh Account Contact Opportunity
-```
-
-The script outputs five sections per entity:
-1. **Type definition** — all queryable fields and relationships
-2. **Filter options** — available fields for `where:` conditions
-3. **Sort options** — available fields for `orderBy:`
-4. **Create input** — fields accepted by create mutations
-5. **Update input** — fields accepted by update mutations
-
-Use this output to determine exact field names before writing any query or mutation. **Maximum 2 script runs.** If the entity still can't be found, ask the user — the object may not be deployed.
-
-### Step 3: Generate Query
-
-Use the templates below. Every field name **must** be verified from the script output in Step 2.
-
-#### Read Query Template
-
-```graphql
-query GetAccounts {
-  uiapi {
-    query {
-      Account(where: { Industry: { eq: "Technology" } }, first: 10) {
-        edges {
-          node {
-            Id
-            Name @optional { value }
-            Industry @optional { value }
-            # Parent relationship
-            Owner @optional { Name { value } }
-            # Child relationship
-            Contacts @optional {
-              edges { node { Name @optional { value } } }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-**FLS Resilience**: Apply `@optional` to all record fields. The server omits inaccessible fields instead of failing. Consuming code must use optional chaining:
-
-```typescript
-const name = node.Name?.value ?? "";
-```
-
-#### Mutation Template
-
-```graphql
-mutation CreateAccount($input: AccountCreateInput!) {
-  uiapi {
-    AccountCreate(input: $input) {
-      Record { Id Name { value } }
-    }
-  }
-}
-```
-
-**Mutation constraints:**
-- Create: Include required fields, only `createable` fields, no child relationships
-- Update: Include `Id`, only `updateable` fields
-- Delete: Include `Id` only
-
-#### Object Metadata & Picklist Values
-
-Use `uiapi { objectInfos(...) }` to fetch field metadata or picklist values. Pass **either** `apiNames` or `objectInfoInputs` — never both in the same query.
-
-**Object metadata** (field labels, data types, CRUD flags):
-
-```typescript
-const GET_OBJECT_INFO = gql`
-  query GetObjectInfo($apiNames: [String!]!) {
-    uiapi {
-      objectInfos(apiNames: $apiNames) {
-        ApiName
-        label
-        labelPlural
-        fields {
-          ApiName
-          label
-          dataType
-          updateable
-          createable
-        }
-      }
-    }
-  }
-`;
-
-const sdk = await createDataSDK();
-const response = await sdk.graphql?.(GET_OBJECT_INFO, { apiNames: ["Account"] });
-const objectInfos = response?.data?.uiapi?.objectInfos ?? [];
-```
-
-**Picklist values** (use `objectInfoInputs` + `... on PicklistField` inline fragment):
-
-```typescript
-const GET_PICKLIST_VALUES = gql`
-  query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
-    uiapi {
-      objectInfos(objectInfoInputs: $objectInfoInputs) {
-        ApiName
-        fields {
-          ApiName
-          ... on PicklistField {
-            picklistValuesByRecordTypeIDs {
-              recordTypeID
-              picklistValues {
-                label
-                value
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-const response = await sdk.graphql?.(GET_PICKLIST_VALUES, {
-  objectInfoInputs: [{ objectApiName: "Account" }],
-});
-const fields = response?.data?.uiapi?.objectInfos?.[0]?.fields ?? [];
-```
-
-### Step 4: Validate & Test
-
-1. **Lint**: `npx eslint <file>` from webapp dir
-2. **Test**: Ask user before testing. For mutations, request input values — never fabricate data.
-
-**If ESLint reports a GraphQL error** (e.g. `Cannot query field`, `Unknown type`, `Unknown argument`), the field or type name is wrong. Re-run the schema search script to find the correct name — do not guess:
-
-```bash
-# From project root — re-check the entity that caused the error
-bash scripts/graphql-search.sh <EntityName>
-```
-
-Then fix the query using the exact names from the script output.
-
----
-
-## Webapp Integration (React)
-
-```typescript
-import { createDataSDK, gql } from "@salesforce/sdk-data";
-
-const GET_ACCOUNTS = gql`
-  query GetAccounts {
-    uiapi {
-      query {
-        Account(first: 10) {
-          edges {
-            node {
-              Id
-              Name @optional { value }
-              Industry @optional { value }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-const sdk = await createDataSDK();
-const response = await sdk.graphql?.(GET_ACCOUNTS);
-
-if (response?.errors?.length) {
-  throw new Error(response.errors.map(e => e.message).join("; "));
-}
-
-const accounts = response?.data?.uiapi?.query?.Account?.edges?.map(e => e.node) ?? [];
-
----
-
-## REST API Patterns
-
-Use `sdk.fetch` when GraphQL is insufficient. See the [Supported APIs](#supported-apis) table for the full allowlist.
-
-```typescript
-declare const __SF_API_VERSION__: string;
-const API_VERSION = typeof __SF_API_VERSION__ !== "undefined" ? __SF_API_VERSION__ : "65.0";
-
-// Connect — file upload config
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/connect/file/upload/config`);
-
-// Apex REST (no version in path)
-const res = await sdk.fetch?.("/services/apexrest/auth/login", {
-  method: "POST",
-  body: JSON.stringify({ email, password }),
-  headers: { "Content-Type": "application/json" },
-});
-
-// UI API — record with metadata (prefer GraphQL for simple reads)
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/ui-api/records/${recordId}`);
-
-// Einstein LLM
-const res = await sdk.fetch?.(`/services/data/v${API_VERSION}/einstein/llm/prompt/generations`, {
-  method: "POST",
-  body: JSON.stringify({ promptTextorId: prompt }),
-});
-```
-
-**Current user**: Do not use Chatter (`/chatter/users/me`). Use GraphQL instead:
-
-```typescript
-const GET_CURRENT_USER = gql`
-  query CurrentUser {
-    uiapi { currentUser { Id Name { value } } }
-  }
-`;
-const response = await sdk.graphql?.(GET_CURRENT_USER);
-```
-
----
-
-## Directory Structure
-
-```
-<project-root>/                              ← SFDX project root
-├── schema.graphql                           ← grep target (lives here)
-├── sfdx-project.json
-└── force-app/main/default/webapplications/<app-name>/  ← webapp dir
-    ├── package.json                         ← npm scripts
-    └── src/
-```
-
-| Command | Run From | Why |
-|---------|----------|-----|
-| `npm run graphql:schema` | webapp dir | Script in webapp's package.json |
-| `npx eslint <file>` | webapp dir | Reads eslint.config.js |
-| `bash scripts/graphql-search.sh <Entity>` | project root | Schema lookup |
-| `sf api request rest` | project root | Needs sfdx-project.json |
-
----
-
-## Quick Reference
-
-### Schema Lookup (from project root)
-
-Run the search script to get all relevant schema info in one step:
-
-```bash
-bash scripts/graphql-search.sh <EntityName>
-```
-
-| Script Output Section | Used For |
-|-----------------------|----------|
-| Type definition | Field names, parent/child relationships |
-| Filter options | `where:` conditions |
-| Sort options | `orderBy:` |
-| CreateRepresentation | Create mutation field list |
-| UpdateRepresentation | Update mutation field list |
-
-### Error Categories
-
-| Error Contains | Resolution |
-|----------------|------------|
-| `Cannot query field` | Field name is wrong — run `graphql-search.sh <Entity>` and use the exact name from the Type definition section |
-| `Unknown type` | Type name is wrong — run `graphql-search.sh <Entity>` to confirm the correct PascalCase entity name |
-| `Unknown argument` | Argument name is wrong — run `graphql-search.sh <Entity>` and check Filter or OrderBy sections |
-| `invalid syntax` | Fix syntax per error message |
-| `validation error` | Field name is wrong — run `graphql-search.sh <Entity>` to verify |
-| `VariableTypeMismatch` | Correct argument type from schema |
-| `invalid cross reference id` | Entity deleted — ask for valid Id |
-
-### Checklist
-
-- [ ] All field names verified via search script (Step 2)
-- [ ] `@optional` applied to record fields (reads)
-- [ ] Optional chaining in consuming code
-- [ ] Lint passes: `npx eslint <file>`
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-ui.md b/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-ui.md
deleted file mode 100644
index c170c8e..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/.a4drules/webapp-ui.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# UI Platform Rule
-
-**All new UI must be built as a Salesforce Web Application.**
-
-When any task involves creating a new UI, frontend, page, dashboard, form, or user-facing feature:
-
-1. Use `sf webapp generate` to scaffold the web app inside the SFDX project — do not use `create-react-app`, standalone Vite, or any other scaffold.
-2. The app must live under `<sfdx-source>/webapplications/<AppName>/` as a WebApplication bundle.
-3. Do not build new UIs as LWC components, Aura components, or Visualforce pages.
-
-For setup from the project root, use `node scripts/setup-cli.mjs --help` and the options documented there.
-
-## Data Access (MUST FOLLOW)
-
-- **Never hardcode data in the app.** All data displayed in the UI must come from live Salesforce data fetching — no static arrays, mock objects, or placeholder values in production code.
-- **Follow `.a4drules/webapp-data.md`** before writing any data access code. All implementation must match those rules (Data SDK, supported APIs, GraphQL workflow).
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/.version b/samples/webapp-template-app-react-sample-b2x-experimental/.version
index 4da2ae8..f31f902 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/.version
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/.version
@@ -1 +1 @@
-1.112.10
+1.116.6
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
index 96e9f54..1c3dfdd 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/CHANGELOG.md
@@ -3,6 +3,89 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.116.6](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.5...v1.116.6) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.5](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.4...v1.116.5) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.4](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.3...v1.116.4) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.2...v1.116.3) (2026-03-26)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.116.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.1...v1.116.2) (2026-03-25)
+
+
+### Bug Fixes
+
+* use public npm registry in sf-project-setup @W-21746844@ ([#355](https://github.com/salesforce-experience-platform-emu/webapps/issues/355)) ([4047d1e](https://github.com/salesforce-experience-platform-emu/webapps/commit/4047d1e0b79fcda14badc5a1826da2ae7ef68a68))
+
+
+
+
+
+## [1.116.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.116.0...v1.116.1) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.116.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.115.0...v1.116.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.115.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.114.0...v1.115.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.114.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.113.0...v1.114.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.113.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.10...v1.113.0) (2026-03-25)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.112.10](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.112.9...v1.112.10) (2026-03-24)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/README.md b/samples/webapp-template-app-react-sample-b2x-experimental/README.md
index 6b29397..e3dd3fb 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/README.md
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/README.md
@@ -1,12 +1,12 @@
-# App React Sample B2X
+# Property Rental App
 
-A B2X (Business-to-Consumer) sample React web app for Salesforce Experience Cloud. Demonstrates property listings, maintenance requests, and a dashboard with an app shell designed for external-facing deployment. Built with React, Vite, TypeScript, and Tailwind/shadcn.
+A property rental sample React web app for Salesforce Experience Cloud. Demonstrates property listings, maintenance requests, and a dashboard with an app shell designed for external-facing deployment. Built with React, Vite, TypeScript, and Tailwind/shadcn.
 
 ## What's included
 
 | Path                                                        | Description                                                                                                                                                                                                                                                                                                                                                       |
 | ----------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `force-app/main/default/webapplications/appreactsampleb2x/` | React web app (source, config, tests)                                                                                                                                                                                                                                                                                                                             |
+| `force-app/main/default/webapplications/propertyrentalapp/` | React web app (source, config, tests)                                                                                                                                                                                                                                                                                                                             |
 | `force-app/main/default/objects/`                           | 17 custom objects — Agent\_\_c, Application\_\_c, KPI_Snapshot\_\_c, Lease\_\_c, Maintenance_Request\_\_c, Maintenance_Worker\_\_c, Notification\_\_c, Payment\_\_c, Property\_\_c, Property_Cost\_\_c, Property_Feature\_\_c, Property_Image\_\_c, Property_Listing\_\_c, Property_Management_Company\_\_c, Property_Owner\_\_c, Property_Sale\_\_c, Tenant\_\_c |
 | `force-app/main/default/layouts/`                           | Page layouts for each custom object                                                                                                                                                                                                                                                                                                                               |
 | `force-app/main/default/permissionsets/`                    | `Property_Management_Access` permission set                                                                                                                                                                                                                                                                                                                       |
@@ -23,26 +23,26 @@ A B2X (Business-to-Consumer) sample React web app for Salesforce Experience Clou
 Navigate to the web app and install dependencies:
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2x
+cd force-app/main/default/webapplications/propertyrentalapp
 npm install
 npm run dev
 ```
 
-Opens at http://localhost:5173 by default. For build and test instructions, see the [web app README](force-app/main/default/webapplications/appreactsampleb2x/README.md).
+Opens at http://localhost:5173 by default. For build and test instructions, see the [web app README](force-app/main/default/webapplications/propertyrentalapp/README.md).
 
 ## Deploy
 
 ### Deploy everything (metadata + Experience Cloud site + web app)
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2x && npm install && npm run build && cd -
+cd force-app/main/default/webapplications/propertyrentalapp && npm install && npm run build && cd -
 sf project deploy start --source-dir force-app --target-org <alias>
 ```
 
 ### Deploy the web app only
 
 ```bash
-cd force-app/main/default/webapplications/appreactsampleb2x && npm install && npm run build && cd -
+cd force-app/main/default/webapplications/propertyrentalapp && npm install && npm run build && cd -
 sf project deploy start --source-dir force-app/main/default/webapplications --target-org <alias>
 ```
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json
index ae16e95..4dcff23 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/data/Property__c.json
@@ -24,7 +24,9 @@
       "Description__c": "Modern 2-bedroom apartment with stunning city views. Features include balcony, in-unit washer/dryer, and central AC. Great location near restaurants and shopping.",
       "Tour_URL__c": "https://example.com/tour/sunset-4b",
       "Hero_Image__c": "https://images.unsplash.com/photo-1522708323590-d24dbb6b0267?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 34.1007222,
+      "Coordinates__Longitude__s": -118.329413
     },
     {
       "attributes": {
@@ -50,7 +52,9 @@
       "Description__c": "Spacious downtown loft with high ceilings and modern finishes. Building amenities include gym, pool, and secured parking.",
       "Tour_URL__c": "https://example.com/tour/downtown-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1554995207-c18c203602cb?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 34.052235,
+      "Coordinates__Longitude__s": -118.243683
     },
     {
       "attributes": {
@@ -76,7 +80,9 @@
       "Description__c": "Cozy garden studio in quiet neighborhood. Features private balcony and additional storage unit. No pets allowed.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1560448204-e02f11c3d0e2?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 34.18045,
+      "Coordinates__Longitude__s": -118.3101988
     },
     {
       "attributes": {
@@ -102,7 +108,9 @@
       "Description__c": "Elegant 3-bedroom penthouse in gated community with luxury amenities. Currently under maintenance, available mid-December.",
       "Tour_URL__c": "https://example.com/tour/luxury-penthouse",
       "Hero_Image__c": "https://images.unsplash.com/photo-1512917774080-9991f1c4c750?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 33.7777777,
+      "Coordinates__Longitude__s": -84.39
     },
     {
       "attributes": {
@@ -128,7 +136,9 @@
       "Description__c": "Modern high-rise apartment with floor-to-ceiling windows and stunning sunset views. Building features 24/7 doorman.",
       "Tour_URL__c": "https://example.com/tour/sunset-towers",
       "Hero_Image__c": "https://images.unsplash.com/photo-1545324418-cc1a3fa10c00?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 34.0914289,
+      "Coordinates__Longitude__s": -118.3617537
     },
     {
       "attributes": {
@@ -154,7 +164,9 @@
       "Description__c": "Stunning beachfront home with direct ocean access, modern kitchen, panoramic views, and private pool. Premium property.",
       "Tour_URL__c": "https://example.com/tour/ocean-villa",
       "Hero_Image__c": "https://images.unsplash.com/photo-1564013799919-ab600027ffc6?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 34.022352,
+      "Coordinates__Longitude__s": -118.4911912
     },
     {
       "attributes": {
@@ -180,7 +192,9 @@
       "Description__c": "Modern condo in Silicon Valley with smart home features, rooftop deck, and premium amenities. Perfect for tech professionals.",
       "Tour_URL__c": "https://example.com/tour/tech-hub",
       "Hero_Image__c": "https://images.unsplash.com/photo-1580587771525-78b9dba3b914?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.4446046,
+      "Coordinates__Longitude__s": -122.1595598
     },
     {
       "attributes": {
@@ -206,7 +220,9 @@
       "Description__c": "Charming historic brownstone with original hardwood floors, exposed brick, and modern updates. Rare Telegraph Hill location.",
       "Tour_URL__c": "https://example.com/tour/brownstone",
       "Hero_Image__c": "https://images.unsplash.com/photo-1568605114967-8130f3a36994?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.8022765,
+      "Coordinates__Longitude__s": -122.4062978
     },
     {
       "attributes": {
@@ -232,7 +248,9 @@
       "Description__c": "Bright studio in trendy Marina District with city views and modern amenities. Walking distance to shops and restaurants.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1502672023488-70e25813eb80?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7990915,
+      "Coordinates__Longitude__s": -122.4319382
     },
     {
       "attributes": {
@@ -258,7 +276,9 @@
       "Description__c": "Magnificent estate with pool, tennis court, wine cellar, and breathtaking city views. Ultimate luxury living.",
       "Tour_URL__c": "https://example.com/tour/beverly-estate",
       "Hero_Image__c": "https://images.unsplash.com/photo-1613490493576-7fde63acd811?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 34.0897964,
+      "Coordinates__Longitude__s": -118.392847
     },
     {
       "attributes": {
@@ -284,7 +304,9 @@
       "Description__c": "Modern office space with open floor plan, conference rooms, and panoramic bay views. Premium downtown location.",
       "Tour_URL__c": "https://example.com/tour/market-office",
       "Hero_Image__c": "https://images.unsplash.com/photo-1497366216548-37526070297c?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7886951,
+      "Coordinates__Longitude__s": -122.397125
     },
     {
       "attributes": {
@@ -310,7 +332,9 @@
       "Description__c": "Beautiful wine country home with vineyard views, gourmet kitchen, and outdoor entertainment area. Perfect for wine enthusiasts.",
       "Tour_URL__c": "https://example.com/tour/napa-retreat",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600596542815-ffad4c1539a9?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 38.3134748,
+      "Coordinates__Longitude__s": -122.2863822
     },
     {
       "attributes": {
@@ -336,7 +360,9 @@
       "Description__c": "Contemporary townhome near tech companies with private garage and community amenities. Ideal for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154340-be6161a56a0c?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.407126,
+      "Coordinates__Longitude__s": -122.0883981
     },
     {
       "attributes": {
@@ -362,7 +388,9 @@
       "Description__c": "Converted warehouse loft with soaring ceilings, exposed beams, and artistic neighborhood vibe.",
       "Tour_URL__c": "https://example.com/tour/artistic-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687939-ce8a6c25118c?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.8034013,
+      "Coordinates__Longitude__s": -122.2798006
     },
     {
       "attributes": {
@@ -388,7 +416,9 @@
       "Description__c": "Ultra-luxury penthouse with concierge service, gym, and incredible bay and city views. Currently under maintenance.",
       "Tour_URL__c": "https://example.com/tour/luxury-highrise",
       "Hero_Image__c": "https://images.unsplash.com/photo-1737898378296-94dc316cd443?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7886951,
+      "Coordinates__Longitude__s": -122.397125
     },
     {
       "attributes": {
@@ -414,7 +444,9 @@
       "Description__c": "Charming family home with large backyard, updated kitchen, and excellent school district. Perfect for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753190-17f0baa2a6c3?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.4863302,
+      "Coordinates__Longitude__s": -122.2247151
     },
     {
       "attributes": {
@@ -440,7 +472,9 @@
       "Description__c": "Brand new studio with smart home features, in-unit laundry, and rooftop terrace access. Modern living at its best.",
       "Tour_URL__c": "https://example.com/tour/modern-studio",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154084-4e5fe7c39198?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7873686,
+      "Coordinates__Longitude__s": -122.4055017
     },
     {
       "attributes": {
@@ -466,7 +500,9 @@
       "Description__c": "Sophisticated executive condo with marble finishes, city views, and luxury building amenities. Premium Nob Hill location.",
       "Tour_URL__c": "https://example.com/tour/executive-suite",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687920-4e2a09cf159d?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.7907054,
+      "Coordinates__Longitude__s": -122.406344
     },
     {
       "attributes": {
@@ -492,7 +528,9 @@
       "Description__c": "Fully restored Victorian mansion with period details, modern conveniences, and beautiful garden. Rare Pacific Heights gem.",
       "Tour_URL__c": "https://example.com/tour/victorian",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753151-384129cf4e3e?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.7933344,
+      "Coordinates__Longitude__s": -122.4200908
     },
     {
       "attributes": {
@@ -518,7 +556,9 @@
       "Description__c": "Bright apartment with bay views, hardwood floors, and walking distance to Marina Green. Great neighborhood.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585154526-990dced4db0d?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7990915,
+      "Coordinates__Longitude__s": -122.4319382
     },
     {
       "attributes": {
@@ -544,7 +584,9 @@
       "Description__c": "Comfortable townhouse with private patio, attached garage, and close to UC Berkeley. Great for students or faculty.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1603661764782-a3c9812afada?w=800",
-      "Agent__c": "@AgentRef3"
+      "Agent__c": "@AgentRef3",
+      "Coordinates__Latitude__s": 37.8774835,
+      "Coordinates__Longitude__s": -122.2660899
     },
     {
       "attributes": {
@@ -570,7 +612,9 @@
       "Description__c": "Modern open office space perfect for tech startups with high-speed internet and flexible layout. Prime SOMA location.",
       "Tour_URL__c": "https://example.com/tour/startup-hub",
       "Hero_Image__c": "https://images.unsplash.com/photo-1497366811353-6870744d04b2?w=800",
-      "Agent__c": "@AgentRef4"
+      "Agent__c": "@AgentRef4",
+      "Coordinates__Latitude__s": 37.7751904,
+      "Coordinates__Longitude__s": -122.4107713
     },
     {
       "attributes": {
@@ -596,7 +640,9 @@
       "Description__c": "Spacious family home with modern kitchen, large basement, and proximity to Golden Gate Park. Perfect for families.",
       "Tour_URL__c": null,
       "Hero_Image__c": "https://images.unsplash.com/photo-1600566753086-00f18fb6b3ea?w=800",
-      "Agent__c": "@AgentRef5"
+      "Agent__c": "@AgentRef5",
+      "Coordinates__Latitude__s": 37.7463285,
+      "Coordinates__Longitude__s": -122.4732595
     },
     {
       "attributes": {
@@ -622,7 +668,9 @@
       "Description__c": "Contemporary loft in vibrant Mission Bay with waterfront access and modern amenities. Great location near ballpark.",
       "Tour_URL__c": "https://example.com/tour/mission-loft",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600607687920-4e2a09cf159d?w=800",
-      "Agent__c": "@AgentRef1"
+      "Agent__c": "@AgentRef1",
+      "Coordinates__Latitude__s": 37.7433669,
+      "Coordinates__Longitude__s": -122.4666667
     },
     {
       "attributes": {
@@ -648,7 +696,9 @@
       "Description__c": "Elegant apartment in prestigious Pacific Heights with hardwood floors, in-unit laundry, and 24/7 doorman service.",
       "Tour_URL__c": "https://example.com/tour/pac-heights",
       "Hero_Image__c": "https://images.unsplash.com/photo-1600585152220-90363fe7e115?w=800",
-      "Agent__c": "@AgentRef2"
+      "Agent__c": "@AgentRef2",
+      "Coordinates__Latitude__s": 37.7851601,
+      "Coordinates__Longitude__s": -122.4351546
     }
   ]
 }
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/appreactsampleb2x1.digitalExperienceConfig b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig
similarity index 54%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/appreactsampleb2x1.digitalExperienceConfig
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig
index d431760..c861845 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/appreactsampleb2x1.digitalExperienceConfig
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperienceConfigs/propertyrentalapp1.digitalExperienceConfig
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DigitalExperienceConfig xmlns="http://soap.sforce.com/2006/04/metadata">
-    <label>appreactsampleb2x</label>
+    <label>propertyrentalapp</label>
     <site>
-        <urlPathPrefix>appreactsampleb2x</urlPathPrefix>
+        <urlPathPrefix>propertyrentalapp</urlPathPrefix>
     </site>
-    <space>site/appreactsampleb2x1</space>
+    <space>site/propertyrentalapp1</space>
 </DigitalExperienceConfig>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/appreactsampleb2x1.digitalExperience-meta.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
similarity index 90%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/appreactsampleb2x1.digitalExperience-meta.xml
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
index 2cb31bb..de4b9d0 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/appreactsampleb2x1.digitalExperience-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/propertyrentalapp1.digitalExperience-meta.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DigitalExperienceBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <digitalExperienceFolderShares/>
-    <label>appreactsampleb2x1</label>
+    <label>propertyrentalapp1</label>
     <modules>
         <module>
             <fullyQualifiedName>sfdc_cms__collection</fullyQualifiedName>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/_meta.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
similarity index 56%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/_meta.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
index 1f94d50..ee01714 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/_meta.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/_meta.json
@@ -1,5 +1,5 @@
 {
-  "apiName": "appreactsampleb2x1",
+  "apiName": "propertyrentalapp1",
   "type": "sfdc_cms__site",
   "path": ""
 }
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/content.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
similarity index 59%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/content.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
index 1c386ae..2fac7a2 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/appreactsampleb2x1/sfdc_cms__site/appreactsampleb2x1/content.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/digitalExperiences/site/propertyrentalapp1/sfdc_cms__site/propertyrentalapp1/content.json
@@ -1,10 +1,10 @@
 {
   "type": "sfdc_cms__site",
-  "title": "appreactsampleb2x",
+  "title": "propertyrentalapp",
   "contentBody": {
     "authenticationType": "AUTHENTICATED_WITH_PUBLIC_ACCESS_ENABLED",
     "appContainer": true,
-    "appSpace": "c__appreactsampleb2x"
+    "appSpace": "c__propertyrentalapp"
   },
-  "urlName": "appreactsampleb2x"
+  "urlName": "propertyrentalapp"
 }
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/appreactsampleb2x.network b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/propertyrentalapp.network
similarity index 89%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/appreactsampleb2x.network
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/propertyrentalapp.network
index fbc93fb..2b59b64 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/appreactsampleb2x.network
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/networks/propertyrentalapp.network
@@ -5,8 +5,8 @@
     <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
     <communityRoles/>
     <disableReputationRecordConversations>true</disableReputationRecordConversations>
-    <emailSenderAddress>trialorgfarmforu@salesforce.com.invalid.invalid</emailSenderAddress>
-    <emailSenderName>appreactsampleb2x</emailSenderName>
+    <emailSenderAddress>admin@company.com</emailSenderAddress>
+    <emailSenderName>propertyrentalapp</emailSenderName>
     <embeddedLoginEnabled>false</embeddedLoginEnabled>
     <enableApexCDNCaching>true</enableApexCDNCaching>
     <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -44,17 +44,17 @@
         <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
         <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
     </networkPageOverrides>
-    <newSenderAddress>trialorgfarmforu@salesforce.com</newSenderAddress>
-    <picassoSite>appreactsampleb2x1</picassoSite>
+    <newSenderAddress>admin@company.com</newSenderAddress>
+    <picassoSite>propertyrentalapp1</picassoSite>
     <selfRegistration>false</selfRegistration>
     <sendWelcomeEmail>true</sendWelcomeEmail>
-    <site>appreactsampleb2x</site>
+    <site>propertyrentalapp</site>
     <siteArchiveStatus>NotArchived</siteArchiveStatus>
     <status>Live</status>
     <tabs>
         <defaultTab>home</defaultTab>
         <standardTab>Chatter</standardTab>
     </tabs>
-    <urlPathPrefix>appreactsampleb2xvforcesite</urlPathPrefix>
+    <urlPathPrefix>propertyrentalappvforcesite</urlPathPrefix>
     <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
 </Network>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
new file mode 100644
index 0000000..ee39c7f
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/objects/Property__c/fields/Coordinates__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Coordinates__c</fullName>
+    <description>Location coordinates</description>
+    <displayLocationInDecimal>true</displayLocationInDecimal>
+    <label>Coordinates</label>
+    <required>false</required>
+    <scale>6</scale>
+    <trackHistory>false</trackHistory>
+    <trackTrending>false</trackTrending>
+    <type>Location</type>
+</CustomField>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml
index d9cf4fe..03410dc 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/package.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
     <types>
-        <members>appreactsampleb2x</members>
+        <members>propertyrentalapp</members>
         <name>CustomSite</name>
     </types>
     <types>
-        <members>site/appreactsampleb2x1</members>
+        <members>site/propertyrentalapp1</members>
         <name>DigitalExperienceBundle</name>
     </types>
     <types>
-        <members>appreactsampleb2x1</members>
+        <members>propertyrentalapp1</members>
         <name>DigitalExperienceConfig</name>
     </types>
     <types>
-        <members>appreactsampleb2x</members>
+        <members>propertyrentalapp</members>
         <name>Network</name>
     </types>
     <version>66.0</version>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
index 32a52e3..6efccf6 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml
@@ -416,6 +416,11 @@
         <field>Property__c.Address__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Property__c.Coordinates__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>true</editable>
         <field>Property__c.Type__c</field>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
index 48dfb90..7171762 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/permissionsets/Tenant_Maintenance_Access.permissionset-meta.xml
@@ -97,6 +97,11 @@
         <field>Property__c.Address__c</field>
         <readable>true</readable>
     </fieldPermissions>
+        <fieldPermissions>
+        <editable>false</editable>
+        <field>Property__c.Coordinates__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
 
     <!-- Field Permissions: Tenant__c -->
     <fieldPermissions>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/appreactsampleb2x.site b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/propertyrentalapp.site
similarity index 93%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/appreactsampleb2x.site
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/propertyrentalapp.site
index 805780c..f0e437f 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/appreactsampleb2x.site
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/sites/propertyrentalapp.site
@@ -19,7 +19,7 @@
     <genericErrorPage>Exception</genericErrorPage>
     <inMaintenancePage>InMaintenance</inMaintenancePage>
      <indexPage>CommunitiesLanding</indexPage> 
-    <masterLabel>appreactsampleb2x</masterLabel>
+    <masterLabel>propertyrentalapp</masterLabel>
     <redirectToCustomDomain>false</redirectToCustomDomain>
     <referrerPolicyOriginWhenCrossOrigin>true</referrerPolicyOriginWhenCrossOrigin>
     <selfRegPage>CommunitiesSelfReg</selfRegPage>
@@ -27,5 +27,5 @@
    <!-- <siteAdmin>epic.out.d1d3a2d722c8@orgfarm.salesforce.com</siteAdmin> -->
    <!--  <siteGuestRecordDefaultOwner>epic.out.d1d3a2d722c8@orgfarm.salesforce.com</siteGuestRecordDefaultOwner> -->
     <siteType>ChatterNetwork</siteType>
-    <urlPathPrefix>appreactsampleb2xvforcesite</urlPathPrefix>
+    <urlPathPrefix>propertyrentalappvforcesite</urlPathPrefix>
 </CustomSite>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/index.html b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/index.html
deleted file mode 100644
index 4afb19d..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<link rel="preconnect" href="https://fonts.googleapis.com" />
-		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-		<link
-			href="https://fonts.googleapis.com/css2?family=Jost:wght@300;400;500;600;700&display=swap"
-			rel="stylesheet"
-		/>
-		<title>ZENLEASE</title>
-	</head>
-	<body>
-		<div id="root">
-			<div
-				style="
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					height: 100vh;
-					background: #f9fafb;
-				"
-			>
-				<svg
-					width="40"
-					height="40"
-					viewBox="0 0 24 24"
-					fill="none"
-					stroke="#0d9488"
-					stroke-width="2"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					style="animation: spin 1s linear infinite"
-				>
-					<style>
-						@keyframes spin {
-							to {
-								transform: rotate(360deg);
-							}
-						}
-					</style>
-					<path d="M21 12a9 9 0 1 1-6.219-8.56" />
-				</svg>
-			</div>
-		</div>
-		<script type="module" src="src/app.tsx"></script>
-	</body>
-</html>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/utils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/utils.ts
deleted file mode 100644
index 2819a83..0000000
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.forceignore b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.forceignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.forceignore
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.forceignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.graphqlrc.yml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.graphqlrc.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.graphqlrc.yml
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.graphqlrc.yml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.prettierignore b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.prettierignore
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.prettierignore
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.prettierignore
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.prettierrc b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.prettierrc
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/.prettierrc
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/.prettierrc
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/CHANGELOG.md b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/CHANGELOG.md
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/CHANGELOG.md
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/CHANGELOG.md
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/README.md b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/README.md
similarity index 63%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/README.md
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/README.md
index 8670101..a528138 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/README.md
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/README.md
@@ -1,6 +1,6 @@
-# App React Sample B2X
+# Property Rental App
 
-A sample B2X (Business-to-Consumer) React web app with an app shell for Salesforce Experience Cloud. Includes property listings, maintenance requests, and a dashboard. Built with React, Vite, TypeScript, and Tailwind/shadcn.
+A property rental sample React web app with an app shell for Salesforce Experience Cloud. Includes property listings, maintenance requests, and a dashboard. Built with React, Vite, TypeScript, and Tailwind/shadcn.
 
 For project-level details (metadata, deploy, sample data), see the [project README](../../../../../../README.md).
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/codegen.yml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/codegen.yml
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/codegen.yml
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/codegen.yml
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/components.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/components.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/components.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/components.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/e2e/app.spec.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/e2e/app.spec.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/e2e/app.spec.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/e2e/app.spec.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/eslint.config.js b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/eslint.config.js
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/eslint.config.js
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/eslint.config.js
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/index.html b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/index.html
new file mode 100644
index 0000000..70beefd
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+		<link
+			href="https://fonts.googleapis.com/css2?family=Jost:wght@300;400;500;600;700&display=swap"
+			rel="stylesheet"
+		/>
+		<title>ZENLEASE</title>
+	</head>
+	<body>
+		<div id="root"></div>
+		<script type="module" src="src/app.tsx"></script>
+	</body>
+</html>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/package.json
similarity index 93%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/package.json
index 2aa592b..082dee4 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/package.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/package.json
@@ -15,8 +15,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/sdk-data": "^1.112.10",
-    "@salesforce/webapp-experimental": "^1.112.10",
+    "@salesforce/sdk-data": "^1.116.6",
+    "@salesforce/webapp-experimental": "^1.116.6",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -47,7 +47,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.112.10",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.116.6",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/playwright.config.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/playwright.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/playwright.config.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/playwright.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/appreactsampleb2x.webapplication-meta.xml b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/propertyrentalapp.webapplication-meta.xml
similarity index 82%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/appreactsampleb2x.webapplication-meta.xml
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/propertyrentalapp.webapplication-meta.xml
index eeb947b..511924f 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/appreactsampleb2x.webapplication-meta.xml
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/propertyrentalapp.webapplication-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebApplication xmlns="http://soap.sforce.com/2006/04/metadata">
-    <masterLabel>appreactsampleb2x</masterLabel>
+    <masterLabel>propertyrentalapp</masterLabel>
     <description>A Salesforce web application.</description>
     <isActive>true</isActive>
     <version>1</version>
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/scripts/get-graphql-schema.mjs b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/scripts/get-graphql-schema.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/scripts/get-graphql-schema.mjs
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/scripts/get-graphql-schema.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/scripts/rewrite-e2e-assets.mjs b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/scripts/rewrite-e2e-assets.mjs
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/scripts/rewrite-e2e-assets.mjs
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/scripts/rewrite-e2e-assets.mjs
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applications/applicationApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/applications/applicationApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/applications/applicationApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/applications/applicationApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/graphql-operations-types.ts
similarity index 96%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/graphql-operations-types.ts
index 7337bc7..43c1823 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphql-operations-types.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/graphql-operations-types.ts
@@ -281,7 +281,6 @@ export const AggregateOrderByStringFunction = {
 	Max: "MAX",
 	Min: "MIN",
 } as const;
-
 export type AggregateOrderByStringFunction =
 	(typeof AggregateOrderByStringFunction)[keyof typeof AggregateOrderByStringFunction];
 
@@ -414,21 +413,6 @@ export type Application__History_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Application__History_Filter>>>;
 };
 
-export type Application__CUpdateInput = {
-	Application__c: Application__CUpdateRepresentation;
-	Id: Scalars["IdOrRef"]["input"];
-};
-
-export type Application__CUpdateRepresentation = {
-	Employment__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
-	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-	References__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
-	Start_Date__c?: InputMaybe<Scalars["Date"]["input"]>;
-	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
-	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-};
-
 export type Application__C_Filter = {
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
@@ -456,42 +440,12 @@ export type Application__C_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Application__C_Filter>>>;
 };
 
-export type Application__C_OrderBy = {
-	CreatedBy?: InputMaybe<User_OrderBy>;
-	CreatedById?: InputMaybe<OrderByClause>;
-	CreatedDate?: InputMaybe<OrderByClause>;
-	Employment__c?: InputMaybe<AggregateOrderByStringClause>;
-	Id?: InputMaybe<OrderByClause>;
-	IsDeleted?: InputMaybe<OrderByClause>;
-	LastActivityDate?: InputMaybe<OrderByClause>;
-	LastModifiedBy?: InputMaybe<User_OrderBy>;
-	LastModifiedById?: InputMaybe<OrderByClause>;
-	LastModifiedDate?: InputMaybe<OrderByClause>;
-	Name?: InputMaybe<OrderByClause>;
-	Owner?: InputMaybe<Application__C_Owner_OrderBys>;
-	OwnerId?: InputMaybe<OrderByClause>;
-	Property__c?: InputMaybe<OrderByClause>;
-	Property__r?: InputMaybe<Property__C_OrderBy>;
-	References__c?: InputMaybe<AggregateOrderByStringClause>;
-	Start_Date__c?: InputMaybe<OrderByClause>;
-	Status__c?: InputMaybe<OrderByClause>;
-	SystemModstamp?: InputMaybe<OrderByClause>;
-	User__c?: InputMaybe<OrderByClause>;
-	User__r?: InputMaybe<Contact_OrderBy>;
-};
-
 export type Application__C_Owner_Filters = {
 	Group?: InputMaybe<Group_Filter>;
 	Name?: InputMaybe<Name_Filter>;
 	User?: InputMaybe<User_Filter>;
 };
 
-export type Application__C_Owner_OrderBys = {
-	Group?: InputMaybe<Group_OrderBy>;
-	Name?: InputMaybe<Name_OrderBy>;
-	User?: InputMaybe<User_OrderBy>;
-};
-
 export type ApprovalSubmissionDetailHistory_Filter = {
 	ApprovalSubmissionDetail?: InputMaybe<ApprovalSubmissionDetail_Filter>;
 	ApprovalSubmissionDetailId?: InputMaybe<IdOperators>;
@@ -629,6 +583,7 @@ export type ApprovalSubmission_RelatedRecord_Filters = {
 	Customer?: InputMaybe<Customer_Filter>;
 	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
 	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
@@ -783,6 +738,7 @@ export type ApprovalWorkItem_RelatedRecord_Filters = {
 	Customer?: InputMaybe<Customer_Filter>;
 	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
 	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
@@ -1049,6 +1005,7 @@ export type Attachment_Parent_Filters = {
 	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
 	Contact?: InputMaybe<Contact_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	EmailMessage?: InputMaybe<EmailMessage_Filter>;
@@ -2507,6 +2464,7 @@ export type ContentDocumentLink_LinkedEntity_Filters = {
 	Contact?: InputMaybe<Contact_Filter>;
 	ContentWorkspace?: InputMaybe<ContentWorkspace_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	EmailMessage?: InputMaybe<EmailMessage_Filter>;
@@ -2523,6 +2481,7 @@ export type ContentDocumentLink_LinkedEntity_Filters = {
 	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
 	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
 	Name?: InputMaybe<Name_Filter>;
+	Network?: InputMaybe<Network_Filter>;
 	Notification__c?: InputMaybe<Notification__C_Filter>;
 	Opportunity?: InputMaybe<Opportunity_Filter>;
 	Order?: InputMaybe<Order_Filter>;
@@ -2777,6 +2736,7 @@ export type ContentVersion_Filter = {
 	MalwareScanDate?: InputMaybe<DateTimeOperators>;
 	MalwareScanStatus?: InputMaybe<PicklistOperators>;
 	NegativeRatingCount?: InputMaybe<IntegerOperators>;
+	NetworkId?: InputMaybe<IdOperators>;
 	Origin?: InputMaybe<PicklistOperators>;
 	Owner?: InputMaybe<User_Filter>;
 	OwnerId?: InputMaybe<IdOperators>;
@@ -2817,6 +2777,7 @@ export type ContentVersion_FirstPublishLocation_Filters = {
 	Contact?: InputMaybe<Contact_Filter>;
 	ContentWorkspace?: InputMaybe<ContentWorkspace_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	EmailMessage?: InputMaybe<EmailMessage_Filter>;
@@ -2833,6 +2794,7 @@ export type ContentVersion_FirstPublishLocation_Filters = {
 	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
 	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
 	Name?: InputMaybe<Name_Filter>;
+	Network?: InputMaybe<Network_Filter>;
 	Notification__c?: InputMaybe<Notification__C_Filter>;
 	Opportunity?: InputMaybe<Opportunity_Filter>;
 	Order?: InputMaybe<Order_Filter>;
@@ -3110,7 +3072,6 @@ export const DataType = {
 	Time: "TIME",
 	Url: "URL",
 } as const;
-
 export type DataType = (typeof DataType)[keyof typeof DataType];
 
 export type DataUseLegalBasisHistory_Filter = {
@@ -3245,7 +3206,6 @@ export const DateLiteral = {
 	Tomorrow: "TOMORROW",
 	Yesterday: "YESTERDAY",
 } as const;
-
 export type DateLiteral = (typeof DateLiteral)[keyof typeof DateLiteral];
 
 export type DateOperators = {
@@ -3340,6 +3300,58 @@ export type DateTimeOperators = {
 	nin?: InputMaybe<Array<InputMaybe<DateTimeInput>>>;
 };
 
+export type DelegatedAccountHistory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataType?: InputMaybe<PicklistOperators>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
+	DelegatedAccountId?: InputMaybe<IdOperators>;
+	Field?: InputMaybe<PicklistOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	NewvalNumber?: InputMaybe<DoubleOperators>;
+	NewvalString?: InputMaybe<StringOperators>;
+	OldvalNumber?: InputMaybe<DoubleOperators>;
+	OldvalString?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<DelegatedAccountHistory_Filter>>>;
+	not?: InputMaybe<DelegatedAccountHistory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DelegatedAccountHistory_Filter>>>;
+};
+
+export type DelegatedAccount_Filter = {
+	AccessManageUsers?: InputMaybe<BooleanOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LastReferencedDate?: InputMaybe<DateTimeOperators>;
+	LastViewedDate?: InputMaybe<DateTimeOperators>;
+	ManagedBy?: InputMaybe<User_Filter>;
+	ManagedById?: InputMaybe<IdOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Owner?: InputMaybe<DelegatedAccount_Owner_Filters>;
+	OwnerId?: InputMaybe<IdOperators>;
+	Parent?: InputMaybe<Account_Filter>;
+	ParentId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	Target?: InputMaybe<Account_Filter>;
+	TargetId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<DelegatedAccount_Filter>>>;
+	not?: InputMaybe<DelegatedAccount_Filter>;
+	or?: InputMaybe<Array<InputMaybe<DelegatedAccount_Filter>>>;
+};
+
+export type DelegatedAccount_Owner_Filters = {
+	Group?: InputMaybe<Group_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	User?: InputMaybe<User_Filter>;
+};
+
 export type DeleteEvent_Filter = {
 	DeletedBy?: InputMaybe<User_Filter>;
 	DeletedById?: InputMaybe<IdOperators>;
@@ -3468,6 +3480,11 @@ export type DevopsRequestInfo_Owner_Filters = {
 	User?: InputMaybe<User_Filter>;
 };
 
+export type DistanceInput = {
+	latitude: Scalars["Latitude"]["input"];
+	longitude: Scalars["Longitude"]["input"];
+};
+
 export type DoubleOperators = {
 	eq?: InputMaybe<Scalars["Double"]["input"]>;
 	gt?: InputMaybe<Scalars["Double"]["input"]>;
@@ -3638,6 +3655,7 @@ export type EmailMessage_RelatedTo_Filters = {
 	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
 	ContactRequest?: InputMaybe<ContactRequest_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	Image?: InputMaybe<Image_Filter>;
@@ -3930,6 +3948,7 @@ export type Event_What_Filters = {
 	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
 	ContactRequest?: InputMaybe<ContactRequest_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	Image?: InputMaybe<Image_Filter>;
@@ -4003,6 +4022,7 @@ export type FeedItem_Filter = {
 	LastModifiedDate?: InputMaybe<DateTimeOperators>;
 	LikeCount?: InputMaybe<IntegerOperators>;
 	LinkUrl?: InputMaybe<UrlOperators>;
+	NetworkScope?: InputMaybe<PicklistOperators>;
 	Parent?: InputMaybe<FeedItem_Parent_Filters>;
 	ParentId?: InputMaybe<IdOperators>;
 	RelatedRecordId?: InputMaybe<IdOperators>;
@@ -4011,6 +4031,7 @@ export type FeedItem_Filter = {
 	SystemModstamp?: InputMaybe<DateTimeOperators>;
 	Title?: InputMaybe<StringOperators>;
 	Type?: InputMaybe<PicklistOperators>;
+	Visibility?: InputMaybe<PicklistOperators>;
 	and?: InputMaybe<Array<InputMaybe<FeedItem_Filter>>>;
 	not?: InputMaybe<FeedItem_Filter>;
 	or?: InputMaybe<Array<InputMaybe<FeedItem_Filter>>>;
@@ -4035,6 +4056,7 @@ export type FeedItem_Parent_Filters = {
 	Contact?: InputMaybe<Contact_Filter>;
 	ContentDocument?: InputMaybe<ContentDocument_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
@@ -4085,7 +4107,6 @@ export const FieldExtraTypeInfo = {
 	Richtextarea: "RICHTEXTAREA",
 	SwitchablePersonname: "SWITCHABLE_PERSONNAME",
 } as const;
-
 export type FieldExtraTypeInfo = (typeof FieldExtraTypeInfo)[keyof typeof FieldExtraTypeInfo];
 
 export type FieldPermissions_Filter = {
@@ -4406,6 +4427,7 @@ export type FlowOrchestrationWorkItem_RelatedRecord_Filters = {
 	Customer?: InputMaybe<Customer_Filter>;
 	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
 	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
@@ -4859,6 +4881,18 @@ export type ForecastingType_Filter = {
 	or?: InputMaybe<Array<InputMaybe<ForecastingType_Filter>>>;
 };
 
+export type GeolocationInput = {
+	latitude: Scalars["Latitude"]["input"];
+	longitude: Scalars["Longitude"]["input"];
+	radius: Scalars["Float"]["input"];
+	unit: Unit;
+};
+
+export type GeolocationOperators = {
+	gt?: InputMaybe<GeolocationInput>;
+	lt?: InputMaybe<GeolocationInput>;
+};
+
 export type GroupMember_Filter = {
 	Group?: InputMaybe<Group_Filter>;
 	GroupId?: InputMaybe<IdOperators>;
@@ -5271,6 +5305,8 @@ export type JoinInput = {
 	DataUseLegalBasisHistory?: InputMaybe<DataUseLegalBasisHistory_Filter>;
 	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
 	DataUsePurposeHistory?: InputMaybe<DataUsePurposeHistory_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
+	DelegatedAccountHistory?: InputMaybe<DelegatedAccountHistory_Filter>;
 	DeleteEvent?: InputMaybe<DeleteEvent_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsEnvironmentHistory?: InputMaybe<DevopsEnvironmentHistory_Filter>;
@@ -5332,9 +5368,13 @@ export type JoinInput = {
 	ManagedContent?: InputMaybe<ManagedContent_Filter>;
 	ManagedContentPublishedUrl?: InputMaybe<ManagedContentPublishedUrl_Filter>;
 	ManagedContentVariant?: InputMaybe<ManagedContentVariant_Filter>;
+	Network?: InputMaybe<Network_Filter>;
+	NetworkDataCategory?: InputMaybe<NetworkDataCategory_Filter>;
 	Note?: InputMaybe<Note_Filter>;
 	Notification__c?: InputMaybe<Notification__C_Filter>;
+	ObjectMetadataTag?: InputMaybe<ObjectMetadataTag_Filter>;
 	ObjectPermissions?: InputMaybe<ObjectPermissions_Filter>;
+	ObjectRelatedUrl?: InputMaybe<ObjectRelatedUrl_Filter>;
 	Opportunity?: InputMaybe<Opportunity_Filter>;
 	OpportunityContactRole?: InputMaybe<OpportunityContactRole_Filter>;
 	OpportunityFieldHistory?: InputMaybe<OpportunityFieldHistory_Filter>;
@@ -5400,6 +5440,7 @@ export type JoinInput = {
 	ScorecardMetric?: InputMaybe<ScorecardMetric_Filter>;
 	SecurityHealthCheckAlertRecipient?: InputMaybe<SecurityHealthCheckAlertRecipient_Filter>;
 	SecurityHealthCheckResult?: InputMaybe<SecurityHealthCheckResult_Filter>;
+	SelfSvcPortalTopic?: InputMaybe<SelfSvcPortalTopic_Filter>;
 	Seller?: InputMaybe<Seller_Filter>;
 	SellerHistory?: InputMaybe<SellerHistory_Filter>;
 	SetupAssistantStep?: InputMaybe<SetupAssistantStep_Filter>;
@@ -5485,7 +5526,6 @@ export const LayoutComponentType = {
 	ReportChart: "REPORT_CHART",
 	VisualforcePage: "VISUALFORCE_PAGE",
 } as const;
-
 export type LayoutComponentType = (typeof LayoutComponentType)[keyof typeof LayoutComponentType];
 
 export const LayoutMode = {
@@ -5493,14 +5533,12 @@ export const LayoutMode = {
 	Edit: "EDIT",
 	View: "VIEW",
 } as const;
-
 export type LayoutMode = (typeof LayoutMode)[keyof typeof LayoutMode];
 
 export const LayoutType = {
 	Compact: "COMPACT",
 	Full: "FULL",
 } as const;
-
 export type LayoutType = (typeof LayoutType)[keyof typeof LayoutType];
 
 export type LeadHistory_Filter = {
@@ -5837,27 +5875,6 @@ export type Maintenance_Request__History_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Maintenance_Request__History_Filter>>>;
 };
 
-export type Maintenance_Request__CUpdateInput = {
-	Id: Scalars["IdOrRef"]["input"];
-	Maintenance_Request__c: Maintenance_Request__CUpdateRepresentation;
-};
-
-export type Maintenance_Request__CUpdateRepresentation = {
-	Actual_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
-	Assigned_Worker__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-	Completed__c?: InputMaybe<Scalars["DateTime"]["input"]>;
-	Description__c?: InputMaybe<Scalars["LongTextArea"]["input"]>;
-	Est_Cost__c?: InputMaybe<Scalars["Currency"]["input"]>;
-	OwnerId?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-	Priority__c?: InputMaybe<Scalars["Picklist"]["input"]>;
-	Property__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-	Scheduled__c?: InputMaybe<Scalars["DateTime"]["input"]>;
-	Status__c?: InputMaybe<Scalars["Picklist"]["input"]>;
-	Tenant_Home__c?: InputMaybe<Scalars["Boolean"]["input"]>;
-	Type__c?: InputMaybe<Scalars["Picklist"]["input"]>;
-	User__c?: InputMaybe<Scalars["IdOrRef"]["input"]>;
-};
-
 export type Maintenance_Request__C_Filter = {
 	Actual_Cost__c?: InputMaybe<CurrencyOperators>;
 	Assigned_Worker__c?: InputMaybe<IdOperators>;
@@ -5892,49 +5909,12 @@ export type Maintenance_Request__C_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Maintenance_Request__C_Filter>>>;
 };
 
-export type Maintenance_Request__C_OrderBy = {
-	Actual_Cost__c?: InputMaybe<OrderByClause>;
-	Assigned_Worker__c?: InputMaybe<OrderByClause>;
-	Assigned_Worker__r?: InputMaybe<Maintenance_Worker__C_OrderBy>;
-	Completed__c?: InputMaybe<OrderByClause>;
-	CreatedBy?: InputMaybe<User_OrderBy>;
-	CreatedById?: InputMaybe<OrderByClause>;
-	CreatedDate?: InputMaybe<OrderByClause>;
-	Description__c?: InputMaybe<AggregateOrderByStringClause>;
-	Est_Cost__c?: InputMaybe<OrderByClause>;
-	Id?: InputMaybe<OrderByClause>;
-	IsDeleted?: InputMaybe<OrderByClause>;
-	LastActivityDate?: InputMaybe<OrderByClause>;
-	LastModifiedBy?: InputMaybe<User_OrderBy>;
-	LastModifiedById?: InputMaybe<OrderByClause>;
-	LastModifiedDate?: InputMaybe<OrderByClause>;
-	Name?: InputMaybe<OrderByClause>;
-	Owner?: InputMaybe<Maintenance_Request__C_Owner_OrderBys>;
-	OwnerId?: InputMaybe<OrderByClause>;
-	Priority__c?: InputMaybe<OrderByClause>;
-	Property__c?: InputMaybe<OrderByClause>;
-	Property__r?: InputMaybe<Property__C_OrderBy>;
-	Scheduled__c?: InputMaybe<OrderByClause>;
-	Status__c?: InputMaybe<OrderByClause>;
-	SystemModstamp?: InputMaybe<OrderByClause>;
-	Tenant_Home__c?: InputMaybe<OrderByClause>;
-	Type__c?: InputMaybe<OrderByClause>;
-	User__c?: InputMaybe<OrderByClause>;
-	User__r?: InputMaybe<Tenant__C_OrderBy>;
-};
-
 export type Maintenance_Request__C_Owner_Filters = {
 	Group?: InputMaybe<Group_Filter>;
 	Name?: InputMaybe<Name_Filter>;
 	User?: InputMaybe<User_Filter>;
 };
 
-export type Maintenance_Request__C_Owner_OrderBys = {
-	Group?: InputMaybe<Group_OrderBy>;
-	Name?: InputMaybe<Name_OrderBy>;
-	User?: InputMaybe<User_OrderBy>;
-};
-
 export type Maintenance_Worker__History_Filter = {
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
@@ -5981,42 +5961,12 @@ export type Maintenance_Worker__C_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Maintenance_Worker__C_Filter>>>;
 };
 
-export type Maintenance_Worker__C_OrderBy = {
-	Certifications__c?: InputMaybe<AggregateOrderByStringClause>;
-	CreatedBy?: InputMaybe<User_OrderBy>;
-	CreatedById?: InputMaybe<OrderByClause>;
-	CreatedDate?: InputMaybe<OrderByClause>;
-	Employment_Type__c?: InputMaybe<OrderByClause>;
-	Hourly_Rate__c?: InputMaybe<OrderByClause>;
-	Id?: InputMaybe<OrderByClause>;
-	IsActive__c?: InputMaybe<OrderByClause>;
-	IsDeleted?: InputMaybe<OrderByClause>;
-	LastActivityDate?: InputMaybe<OrderByClause>;
-	LastModifiedBy?: InputMaybe<User_OrderBy>;
-	LastModifiedById?: InputMaybe<OrderByClause>;
-	LastModifiedDate?: InputMaybe<OrderByClause>;
-	Location__c?: InputMaybe<OrderByClause>;
-	Name?: InputMaybe<OrderByClause>;
-	Owner?: InputMaybe<Maintenance_Worker__C_Owner_OrderBys>;
-	OwnerId?: InputMaybe<OrderByClause>;
-	Phone__c?: InputMaybe<OrderByClause>;
-	Rating__c?: InputMaybe<OrderByClause>;
-	SystemModstamp?: InputMaybe<OrderByClause>;
-	Type__c?: InputMaybe<OrderByClause>;
-};
-
 export type Maintenance_Worker__C_Owner_Filters = {
 	Group?: InputMaybe<Group_Filter>;
 	Name?: InputMaybe<Name_Filter>;
 	User?: InputMaybe<User_Filter>;
 };
 
-export type Maintenance_Worker__C_Owner_OrderBys = {
-	Group?: InputMaybe<Group_OrderBy>;
-	Name?: InputMaybe<Name_OrderBy>;
-	User?: InputMaybe<User_OrderBy>;
-};
-
 export type ManagedContentPublishedUrl_Filter = {
 	AssociatedCampaign?: InputMaybe<Campaign_Filter>;
 	AssociatedCampaignId?: InputMaybe<IdOperators>;
@@ -6170,6 +6120,121 @@ export type Name_OrderBy = {
 	Username?: InputMaybe<OrderByClause>;
 };
 
+export type NetworkDataCategory_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	DataCategoryGroupName?: InputMaybe<StringOperators>;
+	DataCategoryLabel?: InputMaybe<StringOperators>;
+	DataCategoryName?: InputMaybe<StringOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	Id?: InputMaybe<IdOperators>;
+	Image?: InputMaybe<ManagedContent_Filter>;
+	ImageId?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Label?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Network?: InputMaybe<Network_Filter>;
+	NetworkId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<NetworkDataCategory_Filter>>>;
+	not?: InputMaybe<NetworkDataCategory_Filter>;
+	or?: InputMaybe<Array<InputMaybe<NetworkDataCategory_Filter>>>;
+};
+
+export type Network_Filter = {
+	AllowedExtensions?: InputMaybe<LongTextAreaOperators>;
+	CaseCommentEmailTemplateId?: InputMaybe<IdOperators>;
+	ChangePasswordEmailTemplateId?: InputMaybe<IdOperators>;
+	ChgEmailVerNewEmailTemplateId?: InputMaybe<IdOperators>;
+	ChgEmailVerOldEmailTemplateId?: InputMaybe<IdOperators>;
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<StringOperators>;
+	DeviceActEmailTemplateId?: InputMaybe<IdOperators>;
+	EmailFooterLogoId?: InputMaybe<IdOperators>;
+	EmailFooterText?: InputMaybe<StringOperators>;
+	EmailSenderAddress?: InputMaybe<EmailOperators>;
+	EmailSenderName?: InputMaybe<StringOperators>;
+	FirstActivationDate?: InputMaybe<DateOperators>;
+	ForgotPasswordEmailTemplateId?: InputMaybe<IdOperators>;
+	HeadlessForgotPasswordTemplateId?: InputMaybe<IdOperators>;
+	HeadlessRegistrationTemplateId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	LockoutEmailTemplateId?: InputMaybe<IdOperators>;
+	MaxFileSizeKb?: InputMaybe<IntegerOperators>;
+	Name?: InputMaybe<StringOperators>;
+	NewSenderAddress?: InputMaybe<EmailOperators>;
+	OptionsActionOverrideEnabled?: InputMaybe<BooleanOperators>;
+	OptionsAdvancedAuthForSiteEnabled?: InputMaybe<BooleanOperators>;
+	OptionsAllowInternalUserLogin?: InputMaybe<BooleanOperators>;
+	OptionsAllowMembersToFlag?: InputMaybe<BooleanOperators>;
+	OptionsApexCDNCachingEnabled?: InputMaybe<BooleanOperators>;
+	OptionsCWBannerState?: InputMaybe<BooleanOperators>;
+	OptionsDirectMessagesEnabled?: InputMaybe<BooleanOperators>;
+	OptionsDisableWorkspaceInfo?: InputMaybe<BooleanOperators>;
+	OptionsEinsteinAnswersEnabled?: InputMaybe<BooleanOperators>;
+	OptionsEinsteinAnswersKAEnabled?: InputMaybe<BooleanOperators>;
+	OptionsEinsteinAnswersQAEnabled?: InputMaybe<BooleanOperators>;
+	OptionsEinsteinAnswersSnippetEnabled?: InputMaybe<BooleanOperators>;
+	OptionsEmbeddedLoginEnabled?: InputMaybe<BooleanOperators>;
+	OptionsEnableTalkingAboutStats?: InputMaybe<BooleanOperators>;
+	OptionsEnableTopicAssignmentRules?: InputMaybe<BooleanOperators>;
+	OptionsExpFriendlyUrlsAsDefault?: InputMaybe<BooleanOperators>;
+	OptionsExperienceBundleBasedSnaOverrideEnabled?: InputMaybe<BooleanOperators>;
+	OptionsGatherCustomerSentimentData?: InputMaybe<BooleanOperators>;
+	OptionsGuestChatterEnabled?: InputMaybe<BooleanOperators>;
+	OptionsGuestFileAccessEnabled?: InputMaybe<BooleanOperators>;
+	OptionsGuestMemberVisibility?: InputMaybe<BooleanOperators>;
+	OptionsHeadlessFrgtPswEnabled?: InputMaybe<BooleanOperators>;
+	OptionsImageOptimizationCDNEnabled?: InputMaybe<BooleanOperators>;
+	OptionsInvitationsEnabled?: InputMaybe<BooleanOperators>;
+	OptionsKnowledgeableEnabled?: InputMaybe<BooleanOperators>;
+	OptionsLWRExperienceConnectedAppEnabled?: InputMaybe<BooleanOperators>;
+	OptionsLWRExperienceOnManagedRuntime?: InputMaybe<BooleanOperators>;
+	OptionsLWRSearchGenerativeAnswersEnabled?: InputMaybe<BooleanOperators>;
+	OptionsMemberVisibility?: InputMaybe<BooleanOperators>;
+	OptionsMobileImageOptimizationEnabled?: InputMaybe<BooleanOperators>;
+	OptionsNetworkSentimentAnalysis?: InputMaybe<BooleanOperators>;
+	OptionsNicknameDisplayEnabled?: InputMaybe<BooleanOperators>;
+	OptionsPrivateMessagesEnabled?: InputMaybe<BooleanOperators>;
+	OptionsProfileBasedLayoutsForKnowledgeSearchEnabled?: InputMaybe<BooleanOperators>;
+	OptionsPvtPagesPwdResetAccessDisabled?: InputMaybe<BooleanOperators>;
+	OptionsRecognitionBadgingEnabled?: InputMaybe<BooleanOperators>;
+	OptionsReputationEnabled?: InputMaybe<BooleanOperators>;
+	OptionsReputationRecordConversationsDisabled?: InputMaybe<BooleanOperators>;
+	OptionsSecondaryEmailSenderEnabled?: InputMaybe<BooleanOperators>;
+	OptionsSelfRegistrationEnabled?: InputMaybe<BooleanOperators>;
+	OptionsSendWelcomeEmail?: InputMaybe<BooleanOperators>;
+	OptionsShowAllNetworkSettings?: InputMaybe<BooleanOperators>;
+	OptionsSiteAsContainerEnabled?: InputMaybe<BooleanOperators>;
+	OptionsThreadedDiscussionsEnabled?: InputMaybe<BooleanOperators>;
+	OptionsTopicFilteringForKnowledgeSearchEnabled?: InputMaybe<BooleanOperators>;
+	OptionsTopicSuggestionsEnabled?: InputMaybe<BooleanOperators>;
+	OptionsTwilioCallbackApiEnabled?: InputMaybe<BooleanOperators>;
+	OptionsUpDownVoteEnabled?: InputMaybe<BooleanOperators>;
+	PendingSecondaryEmailAddress?: InputMaybe<EmailOperators>;
+	PwdlessRegEmailTemplateId?: InputMaybe<IdOperators>;
+	SelfRegMicroBatchSubErrorEmailTemplateId?: InputMaybe<IdOperators>;
+	SelfRegProfileId?: InputMaybe<IdOperators>;
+	Status?: InputMaybe<PicklistOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TabSetId?: InputMaybe<IdOperators>;
+	UrlPathPrefix?: InputMaybe<StringOperators>;
+	VerificationEmailTemplateId?: InputMaybe<IdOperators>;
+	VerifiedSecondaryEmailAddress?: InputMaybe<EmailOperators>;
+	WelcomeEmailTemplateId?: InputMaybe<IdOperators>;
+	and?: InputMaybe<Array<InputMaybe<Network_Filter>>>;
+	not?: InputMaybe<Network_Filter>;
+	or?: InputMaybe<Array<InputMaybe<Network_Filter>>>;
+};
+
 export type NoFunctionAggregateOrderByClause = {
 	nulls?: InputMaybe<NullsOrder>;
 	order?: InputMaybe<ResultsOrder>;
@@ -6211,6 +6276,7 @@ export type Note_Parent_Filters = {
 	CommSubscriptionTiming?: InputMaybe<CommSubscriptionTiming_Filter>;
 	Contact?: InputMaybe<Contact_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	EngagementChannelType?: InputMaybe<EngagementChannelType_Filter>;
@@ -6278,16 +6344,35 @@ export const NullOrder = {
 	First: "FIRST",
 	Last: "LAST",
 } as const;
-
 export type NullOrder = (typeof NullOrder)[keyof typeof NullOrder];
 
 export const NullsOrder = {
 	First: "FIRST",
 	Last: "LAST",
 } as const;
-
 export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder];
 
+export type ObjectMetadataTag_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Record?: InputMaybe<Product2_Filter>;
+	RecordId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	TagType?: InputMaybe<PicklistOperators>;
+	Value?: InputMaybe<TextAreaOperators>;
+	and?: InputMaybe<Array<InputMaybe<ObjectMetadataTag_Filter>>>;
+	not?: InputMaybe<ObjectMetadataTag_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ObjectMetadataTag_Filter>>>;
+};
+
 export type ObjectPermissions_Filter = {
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
@@ -6312,6 +6397,52 @@ export type ObjectPermissions_Filter = {
 	or?: InputMaybe<Array<InputMaybe<ObjectPermissions_Filter>>>;
 };
 
+export type ObjectRelatedUrl_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	LanguageCode?: InputMaybe<StringOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	Name?: InputMaybe<StringOperators>;
+	Parent?: InputMaybe<ObjectRelatedUrl_Parent_Filters>;
+	ParentId?: InputMaybe<IdOperators>;
+	Scope?: InputMaybe<StringOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	UniqueIndex?: InputMaybe<StringOperators>;
+	UrlName?: InputMaybe<StringOperators>;
+	and?: InputMaybe<Array<InputMaybe<ObjectRelatedUrl_Filter>>>;
+	not?: InputMaybe<ObjectRelatedUrl_Filter>;
+	or?: InputMaybe<Array<InputMaybe<ObjectRelatedUrl_Filter>>>;
+};
+
+export type ObjectRelatedUrl_Parent_Filters = {
+	Account?: InputMaybe<Account_Filter>;
+	Agent__c?: InputMaybe<Agent__C_Filter>;
+	Application__c?: InputMaybe<Application__C_Filter>;
+	Contact?: InputMaybe<Contact_Filter>;
+	KPI_Snapshot__c?: InputMaybe<Kpi_Snapshot__C_Filter>;
+	Lease__c?: InputMaybe<Lease__C_Filter>;
+	Maintenance_Request__c?: InputMaybe<Maintenance_Request__C_Filter>;
+	Maintenance_Worker__c?: InputMaybe<Maintenance_Worker__C_Filter>;
+	Name?: InputMaybe<Name_Filter>;
+	Notification__c?: InputMaybe<Notification__C_Filter>;
+	Payment__c?: InputMaybe<Payment__C_Filter>;
+	Product2?: InputMaybe<Product2_Filter>;
+	Property_Cost__c?: InputMaybe<Property_Cost__C_Filter>;
+	Property_Feature__c?: InputMaybe<Property_Feature__C_Filter>;
+	Property_Image__c?: InputMaybe<Property_Image__C_Filter>;
+	Property_Listing__c?: InputMaybe<Property_Listing__C_Filter>;
+	Property_Management_Company__c?: InputMaybe<Property_Management_Company__C_Filter>;
+	Property_Owner__c?: InputMaybe<Property_Owner__C_Filter>;
+	Property_Sale__c?: InputMaybe<Property_Sale__C_Filter>;
+	Property__c?: InputMaybe<Property__C_Filter>;
+	Tenant__c?: InputMaybe<Tenant__C_Filter>;
+};
+
 export type OpportunityContactRole_Filter = {
 	Contact?: InputMaybe<Contact_Filter>;
 	ContactId?: InputMaybe<IdOperators>;
@@ -6507,6 +6638,12 @@ export type OrderByClause = {
 	order?: InputMaybe<ResultOrder>;
 };
 
+export type OrderByGeolocationClause = {
+	distance?: InputMaybe<DistanceInput>;
+	nulls?: InputMaybe<NullOrder>;
+	order?: InputMaybe<ResultOrder>;
+};
+
 export type OrderHistory_Filter = {
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
@@ -7240,6 +7377,7 @@ export type PermissionSetLicense_Filter = {
 	MaximumPermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsManageMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsManageNetworks?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
@@ -7271,8 +7409,13 @@ export type PermissionSetLicense_Filter = {
 	MaximumPermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsMergeTopics?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMicrobatching?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModerateNetworkFeeds?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModerateNetworkFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsModerateNetworkMessages?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
@@ -7318,6 +7461,7 @@ export type PermissionSetLicense_Filter = {
 	MaximumPermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsShareFilesWithNetworks?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
@@ -7365,11 +7509,13 @@ export type PermissionSetLicense_Filter = {
 	MaximumPermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewContent?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewCustomerSentiment?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	MaximumPermissionsViewGlobalHeader?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
 	MaximumPermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
@@ -7624,6 +7770,7 @@ export type PermissionSet_Filter = {
 	PermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
 	PermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
 	PermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	PermissionsManageMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	PermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
 	PermissionsManageNetworks?: InputMaybe<BooleanOperators>;
 	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
@@ -7655,8 +7802,13 @@ export type PermissionSet_Filter = {
 	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
 	PermissionsMergeTopics?: InputMaybe<BooleanOperators>;
 	PermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	PermissionsMicrobatching?: InputMaybe<BooleanOperators>;
 	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	PermissionsMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	PermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkFeeds?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkFiles?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkMessages?: InputMaybe<BooleanOperators>;
 	PermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
 	PermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
 	PermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
@@ -7702,6 +7854,7 @@ export type PermissionSet_Filter = {
 	PermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
 	PermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
 	PermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	PermissionsShareFilesWithNetworks?: InputMaybe<BooleanOperators>;
 	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
 	PermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
 	PermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
@@ -7749,11 +7902,13 @@ export type PermissionSet_Filter = {
 	PermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
 	PermissionsViewContent?: InputMaybe<BooleanOperators>;
 	PermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsViewCustomerSentiment?: InputMaybe<BooleanOperators>;
 	PermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
 	PermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
 	PermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
 	PermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
 	PermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewGlobalHeader?: InputMaybe<BooleanOperators>;
 	PermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
 	PermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
 	PermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
@@ -8039,6 +8194,7 @@ export type ProcessInstance_TargetObject_Filters = {
 	Customer?: InputMaybe<Customer_Filter>;
 	DataUseLegalBasis?: InputMaybe<DataUseLegalBasis_Filter>;
 	DataUsePurpose?: InputMaybe<DataUsePurpose_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	DuplicateRecordItem?: InputMaybe<DuplicateRecordItem_Filter>;
@@ -8485,6 +8641,7 @@ export type Profile_Filter = {
 	PermissionsManageLoginAccessPolicies?: InputMaybe<BooleanOperators>;
 	PermissionsManageMaliciousFiles?: InputMaybe<BooleanOperators>;
 	PermissionsManageMobile?: InputMaybe<BooleanOperators>;
+	PermissionsManageMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	PermissionsManageNamedCredentials?: InputMaybe<BooleanOperators>;
 	PermissionsManageNetworks?: InputMaybe<BooleanOperators>;
 	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<BooleanOperators>;
@@ -8516,8 +8673,13 @@ export type Profile_Filter = {
 	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<BooleanOperators>;
 	PermissionsMergeTopics?: InputMaybe<BooleanOperators>;
 	PermissionsMetadataStudioUser?: InputMaybe<BooleanOperators>;
+	PermissionsMicrobatching?: InputMaybe<BooleanOperators>;
 	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<BooleanOperators>;
+	PermissionsMobileAppSecurity?: InputMaybe<BooleanOperators>;
 	PermissionsModerateChatter?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkFeeds?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkFiles?: InputMaybe<BooleanOperators>;
+	PermissionsModerateNetworkMessages?: InputMaybe<BooleanOperators>;
 	PermissionsModerateNetworkUsers?: InputMaybe<BooleanOperators>;
 	PermissionsModifyAccessAllowPolicies?: InputMaybe<BooleanOperators>;
 	PermissionsModifyAccessDenyPolicies?: InputMaybe<BooleanOperators>;
@@ -8563,6 +8725,7 @@ export type Profile_Filter = {
 	PermissionsSendAnnouncementEmails?: InputMaybe<BooleanOperators>;
 	PermissionsSendCustomNotifications?: InputMaybe<BooleanOperators>;
 	PermissionsSendSitRequests?: InputMaybe<BooleanOperators>;
+	PermissionsShareFilesWithNetworks?: InputMaybe<BooleanOperators>;
 	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<BooleanOperators>;
 	PermissionsSimpleCsvDataImportUser?: InputMaybe<BooleanOperators>;
 	PermissionsSkipIdentityConfirmation?: InputMaybe<BooleanOperators>;
@@ -8610,11 +8773,13 @@ export type Profile_Filter = {
 	PermissionsViewClientSecret?: InputMaybe<BooleanOperators>;
 	PermissionsViewContent?: InputMaybe<BooleanOperators>;
 	PermissionsViewContentTaxonomy?: InputMaybe<BooleanOperators>;
+	PermissionsViewCustomerSentiment?: InputMaybe<BooleanOperators>;
 	PermissionsViewDataAssessment?: InputMaybe<BooleanOperators>;
 	PermissionsViewDataCategories?: InputMaybe<BooleanOperators>;
 	PermissionsViewDeveloperName?: InputMaybe<BooleanOperators>;
 	PermissionsViewEncryptedData?: InputMaybe<BooleanOperators>;
 	PermissionsViewEventLogFiles?: InputMaybe<BooleanOperators>;
+	PermissionsViewGlobalHeader?: InputMaybe<BooleanOperators>;
 	PermissionsViewHealthCheck?: InputMaybe<BooleanOperators>;
 	PermissionsViewHelpLink?: InputMaybe<BooleanOperators>;
 	PermissionsViewLicenseUtilization?: InputMaybe<BooleanOperators>;
@@ -8863,6 +9028,7 @@ export type Profile_OrderBy = {
 	PermissionsManageLoginAccessPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsManageMaliciousFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsManageMobile?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsManageMobileAppSecurity?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsManageNamedCredentials?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsManageNetworks?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsManageOrchInstsAndWorkItems?: InputMaybe<NoFunctionAggregateOrderByClause>;
@@ -8894,8 +9060,13 @@ export type Profile_OrderBy = {
 	PermissionsMemberSelfServiceAgentAccess?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsMergeTopics?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsMetadataStudioUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMicrobatching?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsMngBenVerfForAssistiveAgnt?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsMobileAppSecurity?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsModerateChatter?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModerateNetworkFeeds?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModerateNetworkFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsModerateNetworkMessages?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsModerateNetworkUsers?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsModifyAccessAllowPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsModifyAccessDenyPolicies?: InputMaybe<NoFunctionAggregateOrderByClause>;
@@ -8941,6 +9112,7 @@ export type Profile_OrderBy = {
 	PermissionsSendAnnouncementEmails?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsSendCustomNotifications?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsSendSitRequests?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsShareFilesWithNetworks?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsShowCompanyNameAsUserBadge?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsSimpleCsvDataImportUser?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsSkipIdentityConfirmation?: InputMaybe<NoFunctionAggregateOrderByClause>;
@@ -8988,11 +9160,13 @@ export type Profile_OrderBy = {
 	PermissionsViewClientSecret?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewContent?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewContentTaxonomy?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewCustomerSentiment?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewDataAssessment?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewDataCategories?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewDeveloperName?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewEncryptedData?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewEventLogFiles?: InputMaybe<NoFunctionAggregateOrderByClause>;
+	PermissionsViewGlobalHeader?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewHealthCheck?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewHelpLink?: InputMaybe<NoFunctionAggregateOrderByClause>;
 	PermissionsViewLicenseUtilization?: InputMaybe<NoFunctionAggregateOrderByClause>;
@@ -9331,6 +9505,9 @@ export type Property__C_Filter = {
 	Available_Date__c?: InputMaybe<DateOperators>;
 	Bathrooms__c?: InputMaybe<DoubleOperators>;
 	Bedrooms__c?: InputMaybe<DoubleOperators>;
+	Coordinates__Latitude__s?: InputMaybe<LatitudeOperators>;
+	Coordinates__Longitude__s?: InputMaybe<LongitudeOperators>;
+	Coordinates__c?: InputMaybe<GeolocationOperators>;
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
 	CreatedDate?: InputMaybe<DateTimeOperators>;
@@ -9370,6 +9547,9 @@ export type Property__C_OrderBy = {
 	Available_Date__c?: InputMaybe<OrderByClause>;
 	Bathrooms__c?: InputMaybe<OrderByClause>;
 	Bedrooms__c?: InputMaybe<OrderByClause>;
+	Coordinates__Latitude__s?: InputMaybe<OrderByClause>;
+	Coordinates__Longitude__s?: InputMaybe<OrderByClause>;
+	Coordinates__c?: InputMaybe<OrderByGeolocationClause>;
 	CreatedBy?: InputMaybe<User_OrderBy>;
 	CreatedById?: InputMaybe<OrderByClause>;
 	CreatedDate?: InputMaybe<OrderByClause>;
@@ -9479,6 +9659,8 @@ export type Recommendation_Filter = {
 	LastReferencedDate?: InputMaybe<DateTimeOperators>;
 	LastViewedDate?: InputMaybe<DateTimeOperators>;
 	Name?: InputMaybe<StringOperators>;
+	Network?: InputMaybe<Network_Filter>;
+	NetworkId?: InputMaybe<IdOperators>;
 	RecommendationKey?: InputMaybe<StringOperators>;
 	RejectionLabel?: InputMaybe<StringOperators>;
 	SystemModstamp?: InputMaybe<DateTimeOperators>;
@@ -9680,14 +9862,12 @@ export const ResultOrder = {
 	Asc: "ASC",
 	Desc: "DESC",
 } as const;
-
 export type ResultOrder = (typeof ResultOrder)[keyof typeof ResultOrder];
 
 export const ResultsOrder = {
 	Asc: "ASC",
 	Desc: "DESC",
 } as const;
-
 export type ResultsOrder = (typeof ResultsOrder)[keyof typeof ResultsOrder];
 
 export type ScorecardAssociation_Filter = {
@@ -9802,6 +9982,33 @@ export type SecurityHealthCheckResult_Filter = {
 	or?: InputMaybe<Array<InputMaybe<SecurityHealthCheckResult_Filter>>>;
 };
 
+export type SelfSvcPortalTopic_Filter = {
+	CreatedBy?: InputMaybe<User_Filter>;
+	CreatedById?: InputMaybe<IdOperators>;
+	CreatedDate?: InputMaybe<DateTimeOperators>;
+	Description?: InputMaybe<LongTextAreaOperators>;
+	DeveloperName?: InputMaybe<StringOperators>;
+	DisplayOrder?: InputMaybe<IntegerOperators>;
+	IconResource?: InputMaybe<StaticResource_Filter>;
+	IconResourceId?: InputMaybe<IdOperators>;
+	Id?: InputMaybe<IdOperators>;
+	IsActive?: InputMaybe<BooleanOperators>;
+	IsDeleted?: InputMaybe<BooleanOperators>;
+	IsHomePage?: InputMaybe<BooleanOperators>;
+	IsLeftNav?: InputMaybe<BooleanOperators>;
+	Language?: InputMaybe<PicklistOperators>;
+	LastModifiedBy?: InputMaybe<User_Filter>;
+	LastModifiedById?: InputMaybe<IdOperators>;
+	LastModifiedDate?: InputMaybe<DateTimeOperators>;
+	MasterLabel?: InputMaybe<StringOperators>;
+	Network?: InputMaybe<Network_Filter>;
+	NetworkId?: InputMaybe<IdOperators>;
+	SystemModstamp?: InputMaybe<DateTimeOperators>;
+	and?: InputMaybe<Array<InputMaybe<SelfSvcPortalTopic_Filter>>>;
+	not?: InputMaybe<SelfSvcPortalTopic_Filter>;
+	or?: InputMaybe<Array<InputMaybe<SelfSvcPortalTopic_Filter>>>;
+};
+
 export type SellerHistory_Filter = {
 	CreatedBy?: InputMaybe<User_Filter>;
 	CreatedById?: InputMaybe<IdOperators>;
@@ -10157,7 +10364,6 @@ export const TabOrder = {
 	LeftRight: "LEFT_RIGHT",
 	TopDown: "TOP_DOWN",
 } as const;
-
 export type TabOrder = (typeof TabOrder)[keyof typeof TabOrder];
 
 export type TableauHostMapping_Filter = {
@@ -10259,6 +10465,7 @@ export type Task_What_Filters = {
 	CommSubscriptionConsent?: InputMaybe<CommSubscriptionConsent_Filter>;
 	ContactRequest?: InputMaybe<ContactRequest_Filter>;
 	Contract?: InputMaybe<Contract_Filter>;
+	DelegatedAccount?: InputMaybe<DelegatedAccount_Filter>;
 	DevopsEnvironment?: InputMaybe<DevopsEnvironment_Filter>;
 	DevopsRequestInfo?: InputMaybe<DevopsRequestInfo_Filter>;
 	Image?: InputMaybe<Image_Filter>;
@@ -10337,42 +10544,12 @@ export type Tenant__C_Filter = {
 	or?: InputMaybe<Array<InputMaybe<Tenant__C_Filter>>>;
 };
 
-export type Tenant__C_OrderBy = {
-	CreatedBy?: InputMaybe<User_OrderBy>;
-	CreatedById?: InputMaybe<OrderByClause>;
-	CreatedDate?: InputMaybe<OrderByClause>;
-	End_Date__c?: InputMaybe<OrderByClause>;
-	Id?: InputMaybe<OrderByClause>;
-	IsDeleted?: InputMaybe<OrderByClause>;
-	LastActivityDate?: InputMaybe<OrderByClause>;
-	LastModifiedBy?: InputMaybe<User_OrderBy>;
-	LastModifiedById?: InputMaybe<OrderByClause>;
-	LastModifiedDate?: InputMaybe<OrderByClause>;
-	Name?: InputMaybe<OrderByClause>;
-	Owner?: InputMaybe<Tenant__C_Owner_OrderBys>;
-	OwnerId?: InputMaybe<OrderByClause>;
-	Property__c?: InputMaybe<OrderByClause>;
-	Property__r?: InputMaybe<Property__C_OrderBy>;
-	Start_Date__c?: InputMaybe<OrderByClause>;
-	Status__c?: InputMaybe<OrderByClause>;
-	SystemModstamp?: InputMaybe<OrderByClause>;
-	User_Status__c?: InputMaybe<OrderByClause>;
-	User__c?: InputMaybe<OrderByClause>;
-	User__r?: InputMaybe<User_OrderBy>;
-};
-
 export type Tenant__C_Owner_Filters = {
 	Group?: InputMaybe<Group_Filter>;
 	Name?: InputMaybe<Name_Filter>;
 	User?: InputMaybe<User_Filter>;
 };
 
-export type Tenant__C_Owner_OrderBys = {
-	Group?: InputMaybe<Group_OrderBy>;
-	Name?: InputMaybe<Name_OrderBy>;
-	User?: InputMaybe<User_OrderBy>;
-};
-
 export type TextAreaOperators = {
 	eq?: InputMaybe<Scalars["TextArea"]["input"]>;
 	gt?: InputMaybe<Scalars["TextArea"]["input"]>;
@@ -10442,6 +10619,7 @@ export type TopicAssignment_Filter = {
 	EntityType?: InputMaybe<StringOperators>;
 	Id?: InputMaybe<IdOperators>;
 	IsDeleted?: InputMaybe<BooleanOperators>;
+	NetworkId?: InputMaybe<IdOperators>;
 	SystemModstamp?: InputMaybe<DateTimeOperators>;
 	Topic?: InputMaybe<Topic_Filter>;
 	TopicId?: InputMaybe<IdOperators>;
@@ -10458,6 +10636,7 @@ export type Topic_Filter = {
 	Id?: InputMaybe<IdOperators>;
 	ManagedTopicType?: InputMaybe<StringOperators>;
 	Name?: InputMaybe<StringOperators>;
+	NetworkId?: InputMaybe<IdOperators>;
 	SystemModstamp?: InputMaybe<DateTimeOperators>;
 	TalkingAbout?: InputMaybe<IntegerOperators>;
 	and?: InputMaybe<Array<InputMaybe<Topic_Filter>>>;
@@ -10499,9 +10678,14 @@ export const UiBehavior = {
 	Readonly: "READONLY",
 	Required: "REQUIRED",
 } as const;
-
 export type UiBehavior = (typeof UiBehavior)[keyof typeof UiBehavior];
 
+export const Unit = {
+	Km: "KM",
+	Mi: "MI",
+} as const;
+export type Unit = (typeof Unit)[keyof typeof Unit];
+
 export type UnstructuredStorageSpace_Filter = {
 	ApplicationName?: InputMaybe<StringOperators>;
 	Attribute1?: InputMaybe<StringOperators>;
@@ -11385,131 +11569,6 @@ export type WorkOrder_Owner_Filters = {
 	User?: InputMaybe<User_Filter>;
 };
 
-export type GetApplicationsQueryVariables = Exact<{ [key: string]: never }>;
-
-export type GetApplicationsQuery = {
-	uiapi: {
-		query: {
-			Application__c?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null } | null;
-						User__r?: {
-							FirstName?: { value?: string | null } | null;
-							LastName?: { value?: string | null } | null;
-						} | null;
-						Property__r?: {
-							Name?: { value?: string | null } | null;
-							Address__c?: { value?: string | null } | null;
-						} | null;
-						Start_Date__c?: { value?: string | null } | null;
-						Status__c?: { value?: string | null } | null;
-						Employment__c?: { value?: string | null } | null;
-						References__c?: { value?: string | null } | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type UpdateApplicationStatusMutationVariables = Exact<{
-	input: Application__CUpdateInput;
-}>;
-
-export type UpdateApplicationStatusMutation = {
-	uiapi: {
-		Application__cUpdate?: {
-			success?: boolean | null;
-			Record?: { Id: string; Status__c?: { value?: string | null } | null } | null;
-		} | null;
-	};
-};
-
-export type GetMaintenanceRequestsQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-}>;
-
-export type GetMaintenanceRequestsQuery = {
-	uiapi: {
-		query: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null } | null;
-						Property__r?: { Address__c?: { value?: string | null } | null } | null;
-						User__r?: { Name?: { value?: string | null } | null } | null;
-						Type__c?: { value?: string | null } | null;
-						Priority__c?: { value?: string | null } | null;
-						Status__c?: { value?: string | null } | null;
-						Description__c?: { value?: string | null } | null;
-						Scheduled__c?: { value?: string | null } | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type GetAllMaintenanceRequestsQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-	after?: InputMaybe<Scalars["String"]["input"]>;
-}>;
-
-export type GetAllMaintenanceRequestsQuery = {
-	uiapi: {
-		query: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null } | null;
-						Description__c?: { value?: string | null } | null;
-						Type__c?: { value?: string | null } | null;
-						Priority__c?: { value?: string | null } | null;
-						Status__c?: { value?: string | null } | null;
-						Scheduled__c?: { value?: string | null } | null;
-						Property__r?: {
-							Address__c?: { value?: string | null } | null;
-							Name?: { value?: string | null } | null;
-						} | null;
-						User__r?: { Name?: { value?: string | null } | null } | null;
-						Assigned_Worker__r?: {
-							Name?: { value?: string | null } | null;
-							Employment_Type__c?: { value?: string | null } | null;
-						} | null;
-						ContentDocumentLinks?: {
-							edges?: Array<{
-								node?: {
-									ContentDocument?: {
-										LatestPublishedVersionId?: { value?: string | null } | null;
-									} | null;
-								} | null;
-							} | null> | null;
-						} | null;
-					} | null;
-				} | null> | null;
-				pageInfo: { hasNextPage: boolean; endCursor?: string | null };
-			} | null;
-		};
-	};
-};
-
-export type UpdateMaintenanceStatusMutationVariables = Exact<{
-	input: Maintenance_Request__CUpdateInput;
-}>;
-
-export type UpdateMaintenanceStatusMutation = {
-	uiapi: {
-		Maintenance_Request__cUpdate?: {
-			success?: boolean | null;
-			Record?: { Id: string; Status__c?: { value?: string | null } | null } | null;
-		} | null;
-	};
-};
-
 export type MaintenanceRequestsQueryVariables = Exact<{
 	first: Scalars["Int"]["input"];
 	after?: InputMaybe<Scalars["String"]["input"]>;
@@ -11579,6 +11638,14 @@ export type PropertyByIdQuery = {
 						Id: string;
 						Name?: { value?: string | null; displayValue?: string | null } | null;
 						Address__c?: { value?: string | null; displayValue?: string | null } | null;
+						Coordinates__Latitude__s?: {
+							value?: number | null;
+							displayValue?: string | null;
+						} | null;
+						Coordinates__Longitude__s?: {
+							value?: number | null;
+							displayValue?: string | null;
+						} | null;
 						Type__c?: { value?: string | null; displayValue?: string | null } | null;
 						Monthly_Rent__c?: { value?: number | null; displayValue?: string | null } | null;
 						Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
@@ -11683,6 +11750,14 @@ export type PropertyListingsQuery = {
 						Property__r?: {
 							Name?: { value?: string | null; displayValue?: string | null } | null;
 							Address__c?: { value?: string | null; displayValue?: string | null } | null;
+							Coordinates__Latitude__s?: {
+								value?: number | null;
+								displayValue?: string | null;
+							} | null;
+							Coordinates__Longitude__s?: {
+								value?: number | null;
+								displayValue?: string | null;
+							} | null;
 							Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
 						} | null;
 					} | null;
@@ -11828,316 +11903,3 @@ export type SearchAccountsQuery = {
 		};
 	};
 };
-
-export type DistinctApplicationStatusQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctApplicationStatusQuery = {
-	uiapi: {
-		aggregate: {
-			Application__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Status__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctMaintenanceRequestPriorityQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctMaintenanceRequestPriorityQuery = {
-	uiapi: {
-		aggregate: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Priority__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctMaintenanceRequestStatusQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctMaintenanceRequestStatusQuery = {
-	uiapi: {
-		aggregate: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Status__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctMaintenanceRequestTypeQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctMaintenanceRequestTypeQuery = {
-	uiapi: {
-		aggregate: {
-			Maintenance_Request__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Type__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctMaintenanceWorkerEmploymentTypeQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctMaintenanceWorkerEmploymentTypeQuery = {
-	uiapi: {
-		aggregate: {
-			Maintenance_Worker__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Employment_Type__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctPropertyStatusQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctPropertyStatusQuery = {
-	uiapi: {
-		aggregate: {
-			Property__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Status__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type DistinctPropertyTypeQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DistinctPropertyTypeQuery = {
-	uiapi: {
-		aggregate: {
-			Property__c?: {
-				edges?: Array<{
-					node?: {
-						aggregate?: {
-							Type__c?: {
-								value?: string | null;
-								displayValue?: string | null;
-								label?: string | null;
-							} | null;
-						} | null;
-					} | null;
-				} | null> | null;
-			} | null;
-		};
-	};
-};
-
-export type SearchApplicationsQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-	after?: InputMaybe<Scalars["String"]["input"]>;
-	where?: InputMaybe<Application__C_Filter>;
-	orderBy?: InputMaybe<Application__C_OrderBy>;
-}>;
-
-export type SearchApplicationsQuery = {
-	uiapi: {
-		query: {
-			Application__c?: {
-				totalCount: number;
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Status__c?: { value?: string | null; displayValue?: string | null } | null;
-						Start_Date__c?: { value?: string | null; displayValue?: string | null } | null;
-						Employment__c?: { value?: string | null; displayValue?: string | null } | null;
-						References__c?: { value?: string | null; displayValue?: string | null } | null;
-						Property__r?: {
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-							Address__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-						User__r?: {
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
-					} | null;
-				} | null> | null;
-				pageInfo: {
-					hasNextPage: boolean;
-					hasPreviousPage: boolean;
-					endCursor?: string | null;
-					startCursor?: string | null;
-				};
-			} | null;
-		};
-	};
-};
-
-export type SearchMaintenanceRequestsQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-	after?: InputMaybe<Scalars["String"]["input"]>;
-	where?: InputMaybe<Maintenance_Request__C_Filter>;
-	orderBy?: InputMaybe<Maintenance_Request__C_OrderBy>;
-}>;
-
-export type SearchMaintenanceRequestsQuery = {
-	uiapi: {
-		query: {
-			Maintenance_Request__c?: {
-				totalCount: number;
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Description__c?: { value?: string | null; displayValue?: string | null } | null;
-						Type__c?: { value?: string | null; displayValue?: string | null } | null;
-						Priority__c?: { value?: string | null; displayValue?: string | null } | null;
-						Status__c?: { value?: string | null; displayValue?: string | null } | null;
-						Scheduled__c?: { value?: string | null; displayValue?: string | null } | null;
-						Property__r?: {
-							Address__c?: { value?: string | null; displayValue?: string | null } | null;
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-						User__r?: {
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					} | null;
-				} | null> | null;
-				pageInfo: {
-					hasNextPage: boolean;
-					hasPreviousPage: boolean;
-					endCursor?: string | null;
-					startCursor?: string | null;
-				};
-			} | null;
-		};
-	};
-};
-
-export type SearchMaintenanceWorkersQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-	after?: InputMaybe<Scalars["String"]["input"]>;
-	where?: InputMaybe<Maintenance_Worker__C_Filter>;
-	orderBy?: InputMaybe<Maintenance_Worker__C_OrderBy>;
-}>;
-
-export type SearchMaintenanceWorkersQuery = {
-	uiapi: {
-		query: {
-			Maintenance_Worker__c?: {
-				totalCount: number;
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Type__c?: { value?: string | null; displayValue?: string | null } | null;
-						Employment_Type__c?: { value?: string | null; displayValue?: string | null } | null;
-						Phone__c?: { value?: string | null; displayValue?: string | null } | null;
-						Location__c?: { value?: string | null; displayValue?: string | null } | null;
-						IsActive__c?: { value?: boolean | null; displayValue?: string | null } | null;
-						Rating__c?: { value?: number | null; displayValue?: string | null } | null;
-						Hourly_Rate__c?: { value?: number | null; displayValue?: string | null } | null;
-						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
-					} | null;
-				} | null> | null;
-				pageInfo: {
-					hasNextPage: boolean;
-					hasPreviousPage: boolean;
-					endCursor?: string | null;
-					startCursor?: string | null;
-				};
-			} | null;
-		};
-	};
-};
-
-export type SearchPropertiesQueryVariables = Exact<{
-	first?: InputMaybe<Scalars["Int"]["input"]>;
-	after?: InputMaybe<Scalars["String"]["input"]>;
-	where?: InputMaybe<Property__C_Filter>;
-	orderBy?: InputMaybe<Property__C_OrderBy>;
-}>;
-
-export type SearchPropertiesQuery = {
-	uiapi: {
-		query: {
-			Property__c?: {
-				totalCount: number;
-				edges?: Array<{
-					node?: {
-						Id: string;
-						Name?: { value?: string | null; displayValue?: string | null } | null;
-						Address__c?: { value?: string | null; displayValue?: string | null } | null;
-						Status__c?: { value?: string | null; displayValue?: string | null } | null;
-						Type__c?: { value?: string | null; displayValue?: string | null } | null;
-						Monthly_Rent__c?: { value?: number | null; displayValue?: string | null } | null;
-						Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
-						Bathrooms__c?: { value?: number | null; displayValue?: string | null } | null;
-						Description__c?: { value?: string | null; displayValue?: string | null } | null;
-						Hero_Image__c?: { value?: string | null; displayValue?: string | null } | null;
-						Sq_Ft__c?: { value?: number | null; displayValue?: string | null } | null;
-						Year_Built__c?: { value?: number | null; displayValue?: string | null } | null;
-						CreatedDate?: { value?: string | null; displayValue?: string | null } | null;
-					} | null;
-				} | null> | null;
-				pageInfo: {
-					hasNextPage: boolean;
-					hasPreviousPage: boolean;
-					endCursor?: string | null;
-					startCursor?: string | null;
-				};
-			} | null;
-		};
-	};
-};
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/graphqlClient.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/graphqlClient.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/graphqlClient.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/leadApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/leadApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/leadApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/leadApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequests/maintenanceRequestApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/maintenanceRequests/maintenanceRequestApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/maintenanceRequests/maintenanceRequestApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyDetailGraphQL.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
similarity index 92%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyDetailGraphQL.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
index 0e721f2..61bea52 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyDetailGraphQL.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyDetailGraphQL.ts
@@ -101,6 +101,14 @@ const PROPERTY_QUERY = gql`
 								value
 								displayValue
 							}
+							Coordinates__Latitude__s @optional {
+								value
+								displayValue
+							}
+							Coordinates__Longitude__s @optional {
+								value
+								displayValue
+							}
 							Type__c @optional {
 								value
 								displayValue
@@ -143,6 +151,10 @@ export interface PropertyDetail {
 	bathrooms: number | string | null;
 	squareFootage: number | string | null;
 	description: string | null;
+	coordinates: {
+		lat: number | null;
+		lng: number | null;
+	} | null;
 }
 
 export async function fetchPropertyById(propertyId: string): Promise<PropertyDetail | null> {
@@ -178,6 +190,23 @@ export async function fetchPropertyById(propertyId: string): Promise<PropertyDet
 			node.Description__c?.value != null
 				? String(node.Description__c.value)
 				: (node.Description__c?.displayValue ?? null),
+		coordinates:
+			node.Coordinates__Latitude__s && node.Coordinates__Longitude__s
+				? {
+						lat:
+							typeof node.Coordinates__Latitude__s.value === "number"
+								? node.Coordinates__Latitude__s.value
+								: node.Coordinates__Latitude__s.displayValue != null
+									? Number(node.Coordinates__Latitude__s.displayValue)
+									: null,
+						lng:
+							typeof node.Coordinates__Longitude__s.value === "number"
+								? node.Coordinates__Longitude__s.value
+								: node.Coordinates__Longitude__s.displayValue != null
+									? Number(node.Coordinates__Longitude__s.displayValue)
+									: null,
+					}
+				: null,
 	};
 }
 
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyListingGraphQL.ts
similarity index 92%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyListingGraphQL.ts
index a6a38eb..17f7702 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/api/properties/propertyListingGraphQL.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/api/properties/propertyListingGraphQL.ts
@@ -28,6 +28,8 @@ type PropertyListingNode = {
 	Property__r?: {
 		Name?: { value?: string | null; displayValue?: string | null } | null;
 		Address__c?: { value?: string | null; displayValue?: string | null } | null;
+		Coordinates__Latitude__s?: { value?: number | null; displayValue?: string | null } | null;
+		Coordinates__Longitude__s?: { value?: number | null; displayValue?: string | null } | null;
 		Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
 	} | null;
 };
@@ -83,6 +85,18 @@ function nodeToSearchResultRecordData(node: PropertyListingNode): SearchResultRe
 			prop.Bedrooms__c as { value?: unknown; displayValue?: string | null },
 		);
 	}
+	const lat = prop?.Coordinates__Latitude__s;
+	if (lat != null && typeof lat === "object" && "value" in lat) {
+		fields["Property__r.Coordinates__Latitude__s"] = nodeToFieldValue(
+			lat as { value?: unknown; displayValue?: string | null },
+		);
+	}
+	const lng = prop?.Coordinates__Longitude__s;
+	if (lng != null && typeof lng === "object" && "value" in lng) {
+		fields["Property__r.Coordinates__Longitude__s"] = nodeToFieldValue(
+			lng as { value?: unknown; displayValue?: string | null },
+		);
+	}
 	return {
 		id: node.Id,
 		apiName: typeof node.ApiName === "string" ? node.ApiName : OBJECT_API_NAME,
@@ -134,6 +148,14 @@ const PROPERTY_LISTINGS_QUERY = gql`
 									value
 									displayValue
 								}
+								Coordinates__Latitude__s @optional {
+									value
+									displayValue
+								}
+								Coordinates__Longitude__s @optional {
+									value
+									displayValue
+								}
 								Bedrooms__c @optional {
 									value
 									displayValue
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/app.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/app.tsx
similarity index 89%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/app.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/app.tsx
index 3b9d1d9..2e0f402 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/app.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/app.tsx
@@ -2,7 +2,6 @@ import { createBrowserRouter, RouterProvider } from "react-router";
 import { routes } from "@/routes";
 import { StrictMode, Component, type ReactNode } from "react";
 import { createRoot } from "react-dom/client";
-import { AuthProvider } from "./features/authentication/context/AuthContext";
 import "./styles/global.css";
 
 class ErrorBoundary extends Component<
@@ -37,9 +36,7 @@ if (rootEl) {
 	createRoot(rootEl).render(
 		<StrictMode>
 			<ErrorBoundary>
-				<AuthProvider>
-					<RouterProvider router={router} />
-				</AuthProvider>
+				<RouterProvider router={router} />
 			</ErrorBoundary>
 		</StrictMode>,
 	);
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/appLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/appLayout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/appLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/appliances.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/appliances.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/appliances.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/appliances.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/book.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/book.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/book.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/book.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/copy.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/copy.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/copy.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/copy.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/electrical.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/electrical.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/electrical.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/electrical.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/hvac.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/hvac.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/hvac.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/hvac.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/pest.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/pest.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/pest.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/pest.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/plumbing.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/plumbing.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/plumbing.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/plumbing.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/rocket.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/rocket.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/rocket.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/rocket.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/star.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/star.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/star.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/star.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/zen-logo.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/zen-logo.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/icons/zen-logo.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/icons/zen-logo.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-1.png b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-1.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-1.png
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-1.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-2.png b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-2.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-2.png
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-2.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-3.png b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-3.png
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/codey-3.png
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/codey-3.png
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/vibe-codey.svg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/vibe-codey.svg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/assets/images/vibe-codey.svg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/assets/images/vibe-codey.svg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/SkeletonPrimitives.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/SkeletonPrimitives.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/SkeletonPrimitives.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/SkeletonPrimitives.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/alerts/status-alert.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/alerts/status-alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/alerts/status-alert.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/alerts/status-alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/dashboard/WeatherWidget.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/dashboard/WeatherWidget.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/dashboard/WeatherWidget.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/TopBar.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layout/TopBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/TopBar.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layout/TopBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/VerticalNav.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layout/VerticalNav.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layout/VerticalNav.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layout/VerticalNav.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layouts/card-layout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layouts/card-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/layouts/card-layout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/layouts/card-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestIcon.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestList.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestList.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestListItem.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/MaintenanceSummaryDetailsModal.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/StatusBadge.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/maintenanceRequests/StatusBadge.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/maintenanceRequests/StatusBadge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingCard.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyListingCard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingCard.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyListingCard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingSearchPagination.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyListingSearchPagination.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyListingSearchPagination.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyListingSearchPagination.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyMap.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyMap.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertyMap.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertyMap.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertySearchFilters.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/properties/PropertySearchFilters.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/alert.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/alert.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/alert.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/alert.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/badge.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/badge.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/badge.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/badge.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/breadcrumb.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/breadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/breadcrumb.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/breadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/button.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/button.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/calendar.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/calendar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/calendar.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/calendar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/card.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/card.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/card.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/card.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/checkbox.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/checkbox.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/checkbox.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/checkbox.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/collapsible.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/collapsible.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/collapsible.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/collapsible.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/datePicker.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/datePicker.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/datePicker.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/datePicker.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/dialog.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/dialog.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/dialog.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/dialog.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/field.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/field.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/field.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/field.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/index.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/index.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/index.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/index.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/input.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/input.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/input.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/input.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/label.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/label.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/label.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/label.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/pagination.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/pagination.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/pagination.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/pagination.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/popover.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/popover.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/popover.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/popover.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/select.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/select.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/select.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/select.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/separator.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/separator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/separator.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/separator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/skeleton.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/skeleton.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/sonner.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/sonner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/sonner.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/sonner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/spinner.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/spinner.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/spinner.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/spinner.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/table.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/table.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/table.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/table.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/tabs.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/tabs.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/components/ui/tabs.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/components/ui/tabs.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/constants/propertyListing.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/constants/propertyListing.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/constants/propertyListing.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/api/userProfileApi.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/api/userProfileApi.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/api/userProfileApi.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/api/userProfileApi.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/authHelpers.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/authHelpers.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/authHelpers.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/authHelpers.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/authenticationConfig.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/authenticationConfig.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/authenticationConfig.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/authenticationConfig.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/context/AuthContext.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/context/AuthContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/context/AuthContext.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/context/AuthContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/footers/footer-link.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/footers/footer-link.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/footers/footer-link.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/footers/footer-link.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/forms/auth-form.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/forms/auth-form.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/forms/auth-form.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/forms/auth-form.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/forms/submit-button.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/forms/submit-button.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/forms/submit-button.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/forms/submit-button.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/form.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/form.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/form.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/form.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/useCountdownTimer.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/useCountdownTimer.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/useCountdownTimer.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/useRetryWithBackoff.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/hooks/useRetryWithBackoff.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/hooks/useRetryWithBackoff.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layout/card-skeleton.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layout/card-skeleton.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layout/card-skeleton.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layout/centered-page-layout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layout/centered-page-layout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/AuthAppLayout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/AuthAppLayout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/AuthAppLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/authenticationRouteLayout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/authenticationRouteLayout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/authenticationRouteLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/privateRouteLayout.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/layouts/privateRouteLayout.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ChangePassword.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ChangePassword.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ChangePassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ForgotPassword.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ForgotPassword.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ForgotPassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Login.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Login.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Login.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Login.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Profile.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Profile.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Profile.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Profile.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Register.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Register.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/Register.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/Register.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ResetPassword.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/pages/ResetPassword.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/SessionTimeoutValidator.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/sessionTimeService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/sessionTimeService.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/sessionTimeout/sessionTimeoutConfig.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/utils/helpers.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/utils/helpers.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/authentication/utils/helpers.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/authentication/utils/helpers.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/accountSearchService.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/accountSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountIndustries.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/distinctAccountTypes.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/getAccountDetail.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/api/query/searchAccounts.graphql
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/api/query/searchAccounts.graphql
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/AccountSearch.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/__examples__/pages/Home.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/__examples__/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/api/objectSearchService.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/api/objectSearchService.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/api/objectSearchService.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ActiveFilters.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/ActiveFilters.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/FilterContext.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/FilterContext.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/FilterContext.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/ObjectBreadcrumb.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/ObjectBreadcrumb.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/PaginationControls.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/PaginationControls.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/SearchBar.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SearchBar.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/SearchBar.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/SortControl.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/SortControl.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/SortControl.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/BooleanFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/BooleanFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/DateFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/DateRangeFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/DateRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/MultiSelectFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/MultiSelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/NumericRangeFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SearchFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/SelectFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/SelectFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/components/filters/TextFilter.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useAsyncData.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useCachedAsyncData.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useCachedAsyncData.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/hooks/useObjectSearchParams.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/hooks/useObjectSearchParams.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/debounce.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/debounce.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/debounce.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/fieldUtils.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/fieldUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/filterUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/filterUtils.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/filterUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/sortUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/features/object-search/utils/sortUtils.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/features/object-search/utils/sortUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useGeocode.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useGeocode.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useGeocode.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useGeocode.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useMaintenanceRequests.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useMaintenanceRequests.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useMaintenanceRequests.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyAddresses.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyAddresses.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyAddresses.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyDetail.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyDetail.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyDetail.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyListingAmenities.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingAmenities.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyListingAmenities.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyListingSearch.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyListingSearch.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyListingSearch.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
similarity index 72%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
index f76e042..d618b25 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyMapMarkers.ts
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyMapMarkers.ts
@@ -19,6 +19,26 @@ function getListingName(record: {
 	return "Property";
 }
 
+function toFiniteNumber(value: unknown): number | null {
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	if (typeof value === "string" && value.trim() !== "") {
+		const n = Number(value);
+		return Number.isFinite(n) ? n : null;
+	}
+	return null;
+}
+
+function getCoordinatesFromRecord(record: {
+	fields?: Record<string, { value?: unknown }>;
+}): { lat: number; lng: number } | null {
+	const latRaw = record.fields?.["Property__r.Coordinates__Latitude__s"]?.value;
+	const lngRaw = record.fields?.["Property__r.Coordinates__Longitude__s"]?.value;
+	const lat = toFiniteNumber(latRaw);
+	const lng = toFiniteNumber(lngRaw);
+	if (lat == null || lng == null) return null;
+	return { lat, lng };
+}
+
 /** Round to 5 decimals (~1 m) so near-duplicate coords group together */
 function key(lat: number, lng: number): string {
 	return `${lat.toFixed(5)},${lng.toFixed(5)}`;
@@ -84,14 +104,39 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 		let cancelled = false;
 		setLoading(true);
 		const uniqIds = [...new Set(propertyIds)];
-		fetchPropertyAddresses(uniqIds)
+		const directMarkers: MapMarker[] = [];
+		const missingIds: string[] = [];
+		for (const r of results) {
+			if (!r?.record) continue;
+			const id = getPropertyIdFromRecord(r.record);
+			if (!id || !uniqIds.includes(id)) continue;
+			const coords = getCoordinatesFromRecord(r.record);
+			if (coords) {
+				directMarkers.push({
+					lat: coords.lat,
+					lng: coords.lng,
+					label: propertyIdToLabel.get(id) ?? "Property",
+					propertyId: id,
+				});
+			}
+		}
+		for (const id of uniqIds) {
+			const hasDirect = directMarkers.some((m) => m.propertyId === id);
+			if (!hasDirect) missingIds.push(id);
+		}
+		if (missingIds.length === 0) {
+			setMarkers(spreadDuplicateMarkers(directMarkers));
+			setLoading(false);
+			return;
+		}
+		fetchPropertyAddresses(missingIds)
 			.then((idToAddress) => {
 				if (cancelled) return;
 				const toGeocode = Object.entries(idToAddress).filter(
 					([, addr]) => addr != null && addr.trim() !== "",
 				);
 				if (toGeocode.length === 0) {
-					setMarkers([]);
+					setMarkers(spreadDuplicateMarkers(directMarkers));
 					setLoading(false);
 					return;
 				}
@@ -111,7 +156,7 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 				)
 					.then((resolved) => {
 						if (cancelled) return;
-						const raw: MapMarker[] = resolved
+						const geocoded: MapMarker[] = resolved
 							.filter((r): r is { id: string; coords: { lat: number; lng: number } } => r != null)
 							.map(({ id, coords }) => ({
 								lat: coords.lat,
@@ -119,7 +164,7 @@ export function usePropertyMapMarkers(results: SearchResultRecord[]): {
 								label: propertyIdToLabel.get(id) ?? "Property",
 								propertyId: id,
 							}));
-						setMarkers(spreadDuplicateMarkers(raw));
+						setMarkers(spreadDuplicateMarkers([...directMarkers, ...geocoded]));
 					})
 					.catch(() => {
 						if (!cancelled) setMarkers([]);
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyPrimaryImages.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/usePropertyPrimaryImages.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/usePropertyPrimaryImages.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useWeather.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useWeather.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/hooks/useWeather.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/hooks/useWeather.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/navigationMenu.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/navigationMenu.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/navigationMenu.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/navigationMenu.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Application.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Application.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Application.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Contact.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Contact.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Contact.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Contact.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Dashboard.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Dashboard.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Dashboard.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Home.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Home.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Home.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Maintenance.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/Maintenance.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/Maintenance.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/NotFound.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/NotFound.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/NotFound.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/NotFound.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertyDetails.tsx
similarity index 95%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertyDetails.tsx
index c9f9820..c761058 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertyDetails.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertyDetails.tsx
@@ -5,6 +5,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 import PropertyMap from "@/components/properties/PropertyMap";
 import { usePropertyDetail } from "@/hooks/usePropertyDetail";
 import { useGeocode } from "@/hooks/useGeocode";
+import type { GeocodeResult } from "@/utils/geocode";
 
 function formatCurrency(val: number | string | null): string {
 	if (val == null) return "—";
@@ -108,7 +109,12 @@ export default function PropertyDetails() {
 	const { id } = useParams<{ id: string }>();
 	const { listing, property, images, costs, features, loading, error } = usePropertyDetail(id);
 	const addressForGeocode = property?.address?.replace(/\n/g, ", ") ?? null;
-	const { coords: addressCoords } = useGeocode(addressForGeocode);
+	// Always call hook in the same order; disable geocoding when coordinates already exist.
+	const { coords: geocodedCoords } = useGeocode(property?.coordinates ? null : addressForGeocode);
+	const addressCoords: GeocodeResult | null =
+		property?.coordinates?.lat != null && property?.coordinates?.lng != null
+			? { lat: property.coordinates.lat, lng: property.coordinates.lng }
+			: geocodedCoords;
 
 	if (loading) {
 		return <PropertyDetailsSkeleton />;
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertySearch.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearch.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertySearch.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearchPlaceholder.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/pages/PropertySearchPlaceholder.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/pages/PropertySearchPlaceholder.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-01.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-01.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-01.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-01.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-02.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-02.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-02.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-02.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-03.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-03.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-03.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-03.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-04.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-04.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-04.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-04.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-05.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-05.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-05.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-05.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-06.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-06.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-06.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-06.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-07.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-07.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-07.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-07.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-08.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-08.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-08.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-08.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-09.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-09.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-09.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-09.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-10.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-10.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-10.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-10.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-11.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-11.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-11.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-11.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-12.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-12.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-12.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-12.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-13.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-13.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-13.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-13.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-14.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-14.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-14.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-14.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-15.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-15.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-15.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-15.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-16.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-16.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-16.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-16.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-17.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-17.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-17.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-17.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-18.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-18.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-18.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-18.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-19.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-19.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-19.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-19.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-20.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-20.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-20.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-20.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-21.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-21.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-21.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-21.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-22.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-22.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-22.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-22.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-23.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-23.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-23.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-23.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-24.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-24.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-24.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-24.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-25.jpg b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-25.jpg
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/public/property-25.jpg
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/public/property-25.jpg
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/router-utils.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/router-utils.tsx
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/router-utils.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/router-utils.tsx
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/routes.tsx
similarity index 97%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/routes.tsx
index 182da33..a7ec0e7 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/routes.tsx
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/routes.tsx
@@ -3,6 +3,7 @@ import Home from '@/pages/Home';
 import NotFound from '@/pages/NotFound';
 import AccountSearch from "./features/object-search/__examples__/pages/AccountSearch";
 import AccountObjectDetail from "./features/object-search/__examples__/pages/AccountObjectDetailPage";
+import AuthAppLayout from "./features/authentication/layouts/AuthAppLayout";
 import Login from "./features/authentication/pages/Login";
 import Register from "./features/authentication/pages/Register";
 import ForgotPassword from "./features/authentication/pages/ForgotPassword";
@@ -12,7 +13,6 @@ import ChangePassword from "./features/authentication/pages/ChangePassword";
 import AuthenticationRoute from "./features/authentication/layouts/authenticationRouteLayout";
 import PrivateRoute from "./features/authentication/layouts/privateRouteLayout";
 import { ROUTES } from "./features/authentication/authenticationConfig";
-import AppLayout from "@/appLayout";
 import Dashboard from "@/pages/Dashboard";
 import Maintenance from "@/pages/Maintenance";
 import PropertySearch from "@/pages/PropertySearch";
@@ -23,7 +23,7 @@ import Contact from "@/pages/Contact";
 export const routes: RouteObject[] = [
   {
     path: "/",
-    element: <AppLayout />,
+    element: <AuthAppLayout />,
     children: [
       {
         index: true,
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/styles/global.css b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/styles/global.css
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/styles/global.css
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/styles/global.css
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/leaflet.d.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/types/leaflet.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/leaflet.d.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/types/leaflet.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/searchResults.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/types/searchResults.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/types/searchResults.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/types/searchResults.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/geocode.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/utils/geocode.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/geocode.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/utils/geocode.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/utils/propertyListingPaginationUtils.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/utils/propertyListingPaginationUtils.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/tsconfig.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/tsconfig.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/tsconfig.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/tsconfig.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/tsconfig.node.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/tsconfig.node.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/tsconfig.node.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/tsconfig.node.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vite-env.d.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vite-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vite-env.d.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vite-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vite.config.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vite.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vite.config.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vite.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest-env.d.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest-env.d.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest-env.d.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest-env.d.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest.config.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest.config.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest.config.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest.config.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest.setup.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest.setup.ts
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/vitest.setup.ts
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/vitest.setup.ts
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/webapplication.json b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/webapplication.json
similarity index 100%
rename from samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/webapplication.json
rename to samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/webapplication.json
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json b/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
index 5d3ff7e..326182b 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.10",
+  "version": "1.116.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-      "version": "1.112.10",
+      "version": "1.116.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "devDependencies": {
         "@lwc/eslint-plugin-lwc": "^3.3.0",
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/package.json b/samples/webapp-template-app-react-sample-b2x-experimental/package.json
index 7566445..9d48005 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/package.json
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.112.10",
+  "version": "1.116.6",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs b/samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs
index 561fa39..95dcbba 100644
--- a/samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/scripts/sf-project-setup.mjs
@@ -60,7 +60,7 @@ const webappDir = discoverWebappDir();
 console.log('SFDX project root:', ROOT);
 console.log('Web app directory:', webappDir);
 
-run('npm install', 'npm', ['install'], { cwd: webappDir });
+run('npm install', 'npm', ['install', '--registry', 'https://registry.npmjs.org/'], { cwd: webappDir });
 run('npm run build', 'npm', ['run', 'build'], { cwd: webappDir });
 console.log('\n--- Launching dev server (Ctrl+C to stop) ---\n');
 run('npm run dev', 'npm', ['run', 'dev'], { cwd: webappDir });

From 7018d49e26aa366962e0073f3e964adab47ccea2 Mon Sep 17 00:00:00 2001
From: k-j-kim <17989954+k-j-kim@users.noreply.github.com>
Date: Thu, 26 Mar 2026 22:27:57 -0700
Subject: [PATCH 07/14] fix: correct .gitignore to track sample lib/ folders
 @W-21361802@ (#119)

fix: use glob pattern in .gitignore to track sample lib/ folders

The lib/ negation rules had incorrect webapp folder names
(appreactsampleb2e/appreactsampleb2x instead of
propertymanagementapp/propertyrentalapp), causing the sample lib/
directories to remain git-ignored. Replaced with a simpler
!samples/**/lib/ glob that is resilient to future name changes.

Made-with: Cursor
---
 .gitignore                                    |  6 +-
 .../src/lib/constants.ts                      | 60 +++++++++++++++++++
 .../src/lib/routeConfig.ts                    | 35 +++++++++++
 .../propertymanagementapp/src/lib/utils.ts    |  6 ++
 .../propertyrentalapp/src/lib/utils.ts        |  6 ++
 5 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/constants.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/routeConfig.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/utils.ts
 create mode 100644 samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/lib/utils.ts

diff --git a/.gitignore b/.gitignore
index f5e8915..7e40e99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,10 +128,8 @@ venv.bak/
 
 # React sample templates: track internal `src/lib` utility modules
 # These rules override the global `lib/` ignore in the Python section above.
-!samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/
-!samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/appreactsampleb2x/src/lib/**
-!samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/
-!samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/appreactsampleb2e/src/lib/**
+!samples/**/lib/
+!samples/**/lib/**
 
 # IDEs and Editors
 .vscode/
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/constants.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/constants.ts
new file mode 100644
index 0000000..e420ed7
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/constants.ts
@@ -0,0 +1,60 @@
+/**
+ * Application-wide constants.
+ */
+
+import type { PaginationConfig } from "../features/object-search/hooks/useObjectSearchParams";
+
+export const PAGE_SIZE_LIST = 12;
+export const DASHBOARD_MAINTENANCE_LIMIT = 5;
+
+export const PROPERTY_FILTER_EXCLUDED_FIELD_PATHS = new Set([
+	"CreatedDate",
+	"Hero_Image__c",
+	"Year_Built__c",
+	"Available_Date__c",
+]);
+
+export const MAINTENANCE_WORKER_FILTER_EXCLUDED_FIELD_PATHS = new Set<string>([]);
+export const MAINTENANCE_FILTER_EXCLUDED_FIELD_PATHS = new Set(["Scheduled__c"]);
+export const APPLICATION_FILTER_EXCLUDED_FIELD_PATHS = new Set<string>([]);
+
+export const MAINTENANCE_WORKER_OBJECT_API_NAME = "Maintenance_Worker__c" as const;
+
+export const FALLBACK_LABEL_PROPERTIES_PLURAL = "Properties";
+export const FALLBACK_LABEL_MAINTENANCE_PLURAL = "Maintenance Requests";
+export const FALLBACK_LABEL_MAINTENANCE_WORKERS_PLURAL = "Maintenance Workers";
+export const FALLBACK_LABEL_APPLICATIONS_PLURAL = "Applications";
+
+export const PROPERTY_OBJECT_API_NAME = "Property__c" as const;
+export const MAINTENANCE_OBJECT_API_NAME = "Maintenance_Request__c" as const;
+export const APPLICATION_OBJECT_API_NAME = "Application__c" as const;
+
+export const SEARCHABLE_OBJECTS = [
+	{
+		objectApiName: "Property__c" as const,
+		path: "/properties",
+		fallbackLabelPlural: FALLBACK_LABEL_PROPERTIES_PLURAL,
+	},
+	{
+		objectApiName: "Maintenance_Request__c" as const,
+		path: "/maintenance/requests",
+		fallbackLabelPlural: FALLBACK_LABEL_MAINTENANCE_PLURAL,
+	},
+	{
+		objectApiName: MAINTENANCE_WORKER_OBJECT_API_NAME,
+		path: "/maintenance/workers",
+		fallbackLabelPlural: FALLBACK_LABEL_MAINTENANCE_WORKERS_PLURAL,
+	},
+	{
+		objectApiName: "Application__c" as const,
+		path: "/applications",
+		fallbackLabelPlural: FALLBACK_LABEL_APPLICATIONS_PLURAL,
+	},
+] as const;
+
+export type SearchableObjectConfig = (typeof SEARCHABLE_OBJECTS)[number];
+
+export const PAGINATION_CONFIG: PaginationConfig = {
+	defaultPageSize: 6,
+	validPageSizes: [6, 12, 24, 48],
+};
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/routeConfig.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/routeConfig.ts
new file mode 100644
index 0000000..08332bf
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/routeConfig.ts
@@ -0,0 +1,35 @@
+/**
+ * Central route configuration for list pages and navigation.
+ * Use these paths for links and search redirects to avoid duplication.
+ */
+export const PATHS = {
+	HOME: "/",
+	PROPERTIES: "/properties",
+	MAINTENANCE_REQUESTS: "/maintenance/requests",
+	MAINTENANCE_WORKERS: "/maintenance/workers",
+	APPLICATIONS: "/applications",
+} as const;
+
+export interface ListPageRoute {
+	path: string;
+	label: string;
+	searchParamKey?: string;
+}
+
+/** List pages that appear in the Home search object dropdown and in nav */
+export const LIST_PAGE_ROUTES: Record<string, ListPageRoute> = {
+	properties: { path: PATHS.PROPERTIES, label: "Properties", searchParamKey: "q" },
+	maintenance_requests: {
+		path: PATHS.MAINTENANCE_REQUESTS,
+		label: "Maintenance Requests",
+		searchParamKey: "q",
+	},
+	maintenance_workers: {
+		path: PATHS.MAINTENANCE_WORKERS,
+		label: "Maintenance Workers",
+		searchParamKey: "q",
+	},
+	applications: { path: PATHS.APPLICATIONS, label: "Applications", searchParamKey: "q" },
+} as const;
+
+export type ListPageKey = keyof typeof LIST_PAGE_ROUTES;
diff --git a/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/utils.ts b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/utils.ts
new file mode 100644
index 0000000..2819a83
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2e-experimental/force-app/main/default/webapplications/propertymanagementapp/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
diff --git a/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/lib/utils.ts b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/lib/utils.ts
new file mode 100644
index 0000000..2819a83
--- /dev/null
+++ b/samples/webapp-template-app-react-sample-b2x-experimental/force-app/main/default/webapplications/propertyrentalapp/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}

From ba52b5202a25de9fc29406eeca7be6c669909c9f Mon Sep 17 00:00:00 2001
From: thrylokya <thrylokya.g@gmail.com>
Date: Fri, 27 Mar 2026 14:42:06 +0530
Subject: [PATCH 08/14] @W-21641490 - Added searching media skill (#113)

* Create SKILL.md

* Update SKILL.md

* Update SKILL.md

* Update SKILL.md

* Update SKILL.md

* reformatted

* Updated teh description
---
 skills/searching-media/SKILL.md | 342 ++++++++++++++++++++++++++++++++
 1 file changed, 342 insertions(+)
 create mode 100644 skills/searching-media/SKILL.md

diff --git a/skills/searching-media/SKILL.md b/skills/searching-media/SKILL.md
new file mode 100644
index 0000000..737f6dc
--- /dev/null
+++ b/skills/searching-media/SKILL.md
@@ -0,0 +1,342 @@
+---
+name: searching-media
+description: "Searches for and retrieves existing visual media (images, logos, icons, photos, graphics, banners, thumbnails, hero images, backgrounds) from any source. Use this skill ANY TIME a user request involves finding, searching, getting, fetching, retrieving, grabbing, looking up, or locating media. Takes PRIORITY and activates FIRST when ANY media search/retrieval is mentioned, regardless of what else happens with the media afterward. Triggers for requests like \"search for logo\", \"find hero image\", \"get company logo\", \"locate icons\", \"fetch background image\", \"retrieve product photos\". Handles the search and source selection workflow. Does not apply when the request is to generate NEW images with AI, design custom graphics from scratch, or edit existing images."
+compatibility: "Requires search_media_cms_channels and/or search_electronic_media MCP tools"
+metadata:
+  version: "1.0"
+---
+
+# Media Search
+
+Universal routing skill for searching and retrieving existing images and media.
+
+## Scope
+
+**This skill is for SEARCHING FOR existing media, not CREATING new media.**
+
+**Use this skill when the user wants to:**
+- Search for images in Salesforce CMS, Data Cloud
+- Find existing visual assets to use in their app
+- Retrieve media from connected sources
+- Browse available images for their project
+- Locate specific photos or graphics
+
+**DO NOT use this skill when the user wants to:**
+- Generate new images with AI (use image generation tools)
+- Create graphics or designs from scratch
+- Edit or modify existing images
+- Build custom visuals or diagrams
+
+## Before You Search
+
+**CRITICAL: This is a routing skill, not a direct search skill.**
+
+When a user requests to find an image:
+
+**Your first response MUST be plain text only — zero tool calls.** You MUST follow this sequence:
+
+1. **First response MUST be text only:** A numbered list of search sources for the user. No tool calls of any kind.
+2. **Wait for user to reply** with their selected option number
+3. **Only then** call the appropriate search tool (this is the FIRST tool call in the entire interaction)
+
+**Example of what NOT to do:**
+- ❌ Calling ANY tool before the user picks a source (MCP tools, file reads, descriptor checks, etc.)
+- ❌ "Checking which MCP tools are available" — do not probe or discover tools via tool calls
+- ❌ Immediately calling `search_electronic_media` or `search_media_cms_channels`
+- ❌ Reading MCP tool descriptors or schemas to see what's available
+- ❌ Deciding which search source to use without asking
+
+**Example of what TO do:**
+- ✅ Respond with ONLY text — a numbered list of search sources
+- ✅ Ask: "Which option would you like to use?"
+- ✅ Wait for user to reply with their choice
+- ✅ Then (and only then) call the tool they selected
+
+**Your first response when this skill triggers MUST be a text-only message presenting search sources. No tool calls. No exceptions.**
+
+
+## Workflow Overview
+
+**The user MUST choose the search source. You CANNOT skip this step.**
+
+Copy this checklist and track your progress:
+
+```
+Media Search Progress:
+- [ ] Step 1: Check your own tool list for available search tools (no tool calls — just inspect what's in your context)
+- [ ] Step 2: Present only the available options to the user as a numbered list (plain text, no tool calls)
+- [ ] Step 3: Wait for the user to reply with their selection
+- [ ] Step 4: Execute the selected search method (this is the first tool call)
+- [ ] Step 5: Present all results to user for selection
+- [ ] Step 6: Apply selected image to code
+```
+
+If you call any tool before step 4, you are not following this skill correctly.
+
+## Presenting Search Sources (First Response)
+
+**DO NOT call any tool, read any MCP descriptor, or make any external request to determine available tools.**
+
+Your tools are already loaded into your context. Look at the tool names you already have access to — this is introspection, not a tool call.
+
+**Step 1: Check your own tool list (no tool calls)**
+
+Look at the tools already in your context and check for these names:
+- `search_media_cms_channels` → If present, include **"Search using keywords"**
+- `search_electronic_media` → If present, include **"Search using Data 360 hybrid search"**
+- Always include **"Other"** as the last option
+
+**Step 2: Build your response**
+
+Include ONLY the sources whose tools you actually have. Number them sequentially.
+
+```
+I can help you find that image. Where would you like to search?
+
+[NUMBER]. [SEARCH SOURCE NAME] — [Brief description]
+...
+[NUMBER]. Other — Provide your own URL or path
+
+Which option would you like to use?
+```
+
+**Step 3: Stop and wait**
+
+After presenting the list, STOP. Do not call any tool. Do not proceed. Wait for the user to reply with their choice.
+
+### Examples
+
+**Both tools available:**
+```
+I can help you find that image. Where would you like to search?
+
+1. Search using Data 360 hybrid search — Semantic search across Salesforce CMS and connected DAMs
+2. Search using keywords — Search Salesforce CMS by keywords and taxonomies
+3. Other — Provide your own URL or path
+
+Which option would you like to use?
+```
+
+**Only `search_media_cms_channels` available:**
+```
+I can help you find that image. Where would you like to search?
+
+1. Search using keywords — Search Salesforce CMS by keywords and taxonomies
+2. Other — Provide your own URL or path
+
+Which option would you like to use?
+```
+
+**Only `search_electronic_media` available:**
+```
+I can help you find that image. Where would you like to search?
+
+1. Search using Data 360 hybrid search — Semantic search across Salesforce CMS and connected DAMs
+2. Other — Provide your own URL or path
+
+Which option would you like to use?
+```
+
+**Neither tool available:**
+```
+No automated media search sources are currently configured. Please provide a direct URL or asset library path.
+```
+
+**Wait for the user to select** before proceeding.
+
+## Executing the Selected Search Method
+
+**⚠️ ONLY reach this step if the user has explicitly selected an option from your numbered list.**
+
+If you haven't shown options yet, go back to the "Presenting Search Sources" section first.
+
+After the user selects an option, execute the corresponding search method below.
+
+### Search using keywords
+
+**Tool:** `search_media_cms_channels`
+
+**Process:**
+
+1. **Analyze the query** — Understand what the user is searching for (subject, attributes, domain)
+
+2. **Extract keywords** — Concrete nouns that would appear in image metadata
+   - Use domain-specific synonyms
+   - Maximum 10 terms
+   - Examples:
+     - "luxury apartments" → apartment, villa, penthouse, residence, condo
+     - "company logo" → logo, emblem, corporate logo
+     - "bright room" → _(empty if no concrete nouns)_
+
+3. **Extract taxonomies** — Descriptive qualities, styles, moods, categories
+   - Only adjectives and attributes
+   - Examples:
+     - "luxury apartment with river view" → Luxury, Premium, Waterfront, Riverside, Panoramic
+     - "bright spacious room" → Bright, Spacious, Open, Airy, Light
+     - "car" → _(empty if no descriptive terms)_
+
+4. **Determine locale** — Use format `en_US`, `es_MX`, `fr_FR` (default: `en_US`)
+
+5. **Build the JSON payload** — Construct this exact structure:
+
+```json
+{
+  "inputs": [{
+    "searchKeyword": "keyword1 OR keyword2 OR keyword3",
+    "taxonomyExpression": "{\"OR\": [\"Taxonomy1\", \"Taxonomy2\"]}",
+    "searchLanguage": "en_US",
+    "channelIds": "",
+    "channelType": "PublicUnauthenticated",
+    "contentTypeFqn": "sfdc_cms__image",
+    "pageOffset": 0,
+    "searchLimit": 5
+  }]
+}
+```
+
+**Field rules:**
+- `searchKeyword`: Join keywords with ` OR ` (space-OR-space). Use empty string if no keywords.
+- `taxonomyExpression`: Stringify JSON object `{"OR": ["term1", "term2"]}`. Use `"{}"` if no taxonomies.
+- `searchLanguage`: Locale with underscore (e.g., `en_US`)
+- `channelIds`: Always empty string
+- `channelType`: Always `"PublicUnauthenticated"`
+- `contentTypeFqn`: Always `"sfdc_cms__image"`
+- `pageOffset`: Start at `0`, increment by `searchLimit` for pagination
+- `searchLimit`: Default `5`, adjust if user requests more
+
+**Examples:**
+
+Query: "luxury apartment with river view"
+```json
+{
+  "inputs": [{
+    "searchKeyword": "apartment OR villa OR penthouse OR residence",
+    "taxonomyExpression": "{\"OR\": [\"Luxury\", \"Premium\", \"Waterfront\", \"Riverside\"]}",
+    "searchLanguage": "en_US",
+    "channelIds": "",
+    "channelType": "PublicUnauthenticated",
+    "contentTypeFqn": "sfdc_cms__image",
+    "pageOffset": 0,
+    "searchLimit": 5
+  }]
+}
+```
+
+Query: "bright spacious room" (no concrete nouns)
+```json
+{
+  "inputs": [{
+    "searchKeyword": "",
+    "taxonomyExpression": "{\"OR\": [\"Bright\", \"Spacious\", \"Open\", \"Airy\"]}",
+    "searchLanguage": "en_US",
+    "channelIds": "",
+    "channelType": "PublicUnauthenticated",
+    "contentTypeFqn": "sfdc_cms__image",
+    "pageOffset": 0,
+    "searchLimit": 5
+  }]
+}
+```
+
+Query: "car images" (no descriptive terms)
+```json
+{
+  "inputs": [{
+    "searchKeyword": "car OR automobile OR vehicle OR auto",
+    "taxonomyExpression": "{}",
+    "searchLanguage": "en_US",
+    "channelIds": "",
+    "channelType": "PublicUnauthenticated",
+    "contentTypeFqn": "sfdc_cms__image",
+    "pageOffset": 0,
+    "searchLimit": 5
+  }]
+}
+```
+
+6. **Call the tool** with the exact JSON payload
+
+### Search using Data 360 hybrid search
+
+**Tool:** `search_electronic_media`
+
+**Process:**
+
+1. Use the user's query **as-is** — no keyword extraction or transformation needed
+2. Call `search_electronic_media`
+3. Pass the query to the tool's `searchQuery` parameter
+
+**Example:**
+- User query: "modern luxury apartment with natural lighting"
+- Tool call: `search_electronic_media(searchQuery="modern luxury apartment with natural lighting")`
+
+### Other (User-Provided URL)
+
+Ask the user to provide:
+- Direct URL to the image
+- Asset library path
+- Specific system/location to check
+
+## Presenting Search Results
+
+Parse the tool response and present **ALL** results as numbered options. Show the image title only — do not display the URL. When the user selects an option, use the URL internally to apply the image.
+
+```
+I found 4 images. Which one would you like to use?
+
+1. Luxury Apartment Exterior
+   Source: Salesforce CMS
+
+2. Modern High-Rise Building
+   Source: Salesforce CMS
+
+3. Waterfront Residence
+   Source: Salesforce CMS
+
+4. Premium Condominium
+   Source: Salesforce CMS
+```
+
+**Never auto-select an image.** Always wait for user choice.
+
+## Applying the Selected Image
+
+After the user chooses:
+
+1. Confirm the selection with image name and URL
+2. Use the complete URL returned by the tool, including all query parameters. CMS and DAM URLs rely on query parameters for authentication, resizing, and CDN routing — dropping them breaks the image. For example, a URL like `https://cms.example.com/media/img.jpg?oid=00D&refid=0EM&v=2` must be used in full.
+3. Apply the URL to the user's code/component
+4. Show what was changed (file path and line number)
+
+## Error Handling
+
+| Error | Response |
+|---|---|
+| Tool unavailable | "The [source name] tool is unavailable. Would you like to try a different source?" |
+| Tool returns error | Show error message, offer retry with different terms or alternative source |
+| No results found | "No results found. Try broader keywords, removing descriptive terms, or a different source." |
+| Invalid user selection | Re-display options and ask again |
+
+**Never silently fail.** Always inform the user and offer alternatives.
+
+## Search Behavior Notes
+
+**Search using keywords:**
+- Both keyword and taxonomy → results match keyword OR (keyword + taxonomy)
+- Empty keyword → search by taxonomy only
+- Empty taxonomy → search by keyword only
+- Use `pageOffset` for pagination (increment by `searchLimit`)
+
+**Search using Data 360 hybrid search:**
+- Handles natural language queries
+- Semantic similarity matching
+- Searches across multiple connected systems
+
+## Key Principles
+
+1. **First response is always text-only** — Present search sources without calling any tool
+2. **Only show configured sources** — Check your own tool list (introspection, not tool calls) and only present sources whose tools you have
+3. **Wait for user selection** — Never auto-select a source or image
+4. **Show all results** — Let the user choose the best match
+5. **Confirm before applying** — Verify the selection before modifying code
+6. **Handle errors gracefully** — Provide clear feedback and alternatives

From 1eb1b00ac37062528d12f99c526ca0fc1a348960 Mon Sep 17 00:00:00 2001
From: svc-idee-bot <svc_idee_bot@salesforce.com>
Date: Fri, 27 Mar 2026 09:12:26 +0000
Subject: [PATCH 09/14] chore(release): 1.5.1 [skip ci]

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6756ce4..9f43fe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [1.5.1](https://github.com/forcedotcom/afv-library/compare/1.5.0...1.5.1) (2026-03-27)
+
+
+### Bug Fixes
+
+* correct .gitignore to track sample lib/ folders @W-21361802@ ([#119](https://github.com/forcedotcom/afv-library/issues/119)) ([7018d49](https://github.com/forcedotcom/afv-library/commit/7018d49e26aa366962e0073f3e964adab47ccea2))
+
+
+
 # [1.5.0](https://github.com/forcedotcom/afv-library/compare/1.4.0...1.5.0) (2026-03-24)
 
 
diff --git a/package.json b/package.json
index b385186..31fedaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/afv-skills",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Salesforce skills for Agentforce Vibes",
   "license": "CC-BY-NC-4.0",
   "files": [

From 569ad46f10b35d47101860a8c670fda21ebbd1ec Mon Sep 17 00:00:00 2001
From: Ethan Clapham <eclapham@salesforce.com>
Date: Fri, 27 Mar 2026 04:30:04 -0700
Subject: [PATCH 10/14] @W-21762071 Ensure name field is included on record
 pages (#115)

Co-authored-by: Hemant Singh Bisht <hsinghbisht@salesforce.com>
---
 skills/generating-flexipage/SKILL.md | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/skills/generating-flexipage/SKILL.md b/skills/generating-flexipage/SKILL.md
index e16c1e5..d0018d5 100644
--- a/skills/generating-flexipage/SKILL.md
+++ b/skills/generating-flexipage/SKILL.md
@@ -48,15 +48,25 @@ sf template generate flexipage \
 npm install -g @salesforce/cli@latest
 ```
 
-#### **Field Selection Guidelines**
+#### **Template-specific requirements**
+
+**RecordPage:**
+- Requires `--sobject` (e.g., Account, Custom_Object__c)
+- Requires field parameters:
+  - `--primary-field`: Most important identifying field (e.g., Name)
+  - `--secondary-fields`: Record summary (recommended 4-6, max 12)
+  - `--detail-fields`: Full record details, including required fields (e.g., Name)
+
+**AppPage:**
+- No additional requirements
+
+**HomePage:**
+- No additional requirements
+
+#### **Field Selection Rules**
 - **Validate fields exist**: Use MCP tools or describe commands to discover available fields for the object before specifying them in the command
 - **Prefer compound fields**: Use `Name` (not `FirstName`/`LastName`), `BillingAddress` (not `BillingStreet`/`BillingCity`/`BillingState`), `MailingAddress`, etc. when available
-
-#### **Template-specific requirements**
-- **RecordPage**: Requires `--sobject` (e.g., Account, Custom_Object__c)
-- **RecordPage**: Requires `--primary-field` and `--secondary-fields` for dynamic highlights, `--detail-fields` for full record details. Use the most important identifying field as primary, e.g. Name. Use the secondary fields (max 12, recommended 4-6) to show a summary of the record. Use detail fields to show the full details of the record.
-- **AppPage**: No additional requirements
-- **HomePage**: No additional requirements
+- **Include required fields in detail-fields**: Always include object required fields (like `Name`) in the `--detail-fields` parameter, even if they're also used in `--primary-field` or `--secondary-fields`
 
 #### **What you get**
 - Valid FlexiPage XML with correct structure
@@ -238,7 +248,7 @@ Every fieldInstance requires:
 
 ### "We couldn't retrieve or load the information on the field"
 **Cause:** Invalid field API name - field doesn't exist on the object or has incorrect spelling
-**Fix:** Use MCP tools or describe commands to discover valid fields, then update the field reference (see Field Selection Guidelines)
+**Fix:** Use MCP tools or describe commands to discover valid fields, then update the field reference (see Field Selection Rules)
 
 ### "Invalid field reference"
 **Cause:** Used `ObjectName.Field` instead of `Record.Field`  

From c1cfb9f67282876ab68e8173fd8379ed02d9c4a2 Mon Sep 17 00:00:00 2001
From: nkurapati-sfdx <nkurapati@salesforce.com>
Date: Fri, 27 Mar 2026 18:24:35 +0530
Subject: [PATCH 11/14] @W-21274365 Add instructions to create commerce b2b
 store from vibes (#22)

* Add instructions to create commerce b2b store from vibes

* update rule and sf commands

* Refactor Commerce B2B skill: rename and flatten directory structure

- Rename skill from create-b2b-commerce-storefront to creating-b2b-commerce-store to better reflect what users actually create (the Store, not the Storefront)
- Flatten directory from skills/commerce/create-b2b-commerce-storefront/ to skills/creating-b2b-commerce-store/ to match repository pattern
- Remove old prompts and rules consolidated into skill
- Remove Commerce prompt and rule entries from manifest.json (consolidated into skill)
---
 skills/creating-b2b-commerce-store/SKILL.md   | 169 ++++++++++++++++++
 .../references/store-vs-storefront.md         | 169 ++++++++++++++++++
 2 files changed, 338 insertions(+)
 create mode 100644 skills/creating-b2b-commerce-store/SKILL.md
 create mode 100644 skills/creating-b2b-commerce-store/references/store-vs-storefront.md

diff --git a/skills/creating-b2b-commerce-store/SKILL.md b/skills/creating-b2b-commerce-store/SKILL.md
new file mode 100644
index 0000000..f906c63
--- /dev/null
+++ b/skills/creating-b2b-commerce-store/SKILL.md
@@ -0,0 +1,169 @@
+---
+name: creating-b2b-commerce-store
+description: "Interactive workflow to create Commerce B2B Stores and retrieve storefront metadata. Use when users want to: create B2B Commerce stores, build Commerce storefronts, set up B2B stores from Vibes, retrieve Commerce metadata, deploy Commerce experiences, work with DigitalExperienceBundle for Commerce."
+Critical: "Agents must follow the interactive flow and NEVER create storefront metadata from scratch."
+license: Apache-2.0
+compatibility: "Requires Commerce licenses, Experience Cloud, Salesforce CLI"
+metadata:
+  version: "1.0"
+  category: "commerce"
+---
+
+# Commerce B2B Storefront Creation
+
+Interactive workflow to create a Commerce B2B Store in Salesforce and retrieve the auto-generated storefront metadata to your repository.
+
+## Critical Concepts
+
+Commerce B2B = Store (backend data) + Storefront (frontend metadata). **Store must be created first** in the org to auto-generate the Storefront. Never create storefront metadata manually.
+
+> See [Store vs Storefront Reference](references/store-vs-storefront.md)
+
+## When to Use This Skill
+
+Trigger when users request:
+- "Create a B2B Commerce store"
+- "Build a Commerce storefront"
+- "Set up Commerce B2B"
+- "Create B2B Commerce"
+- "Retrieve Commerce storefront metadata"
+- "Deploy B2B storefront"
+
+## Rules That Always Apply
+
+1. **Always follow the interactive flow.** Do NOT skip steps. Each step requires user confirmation before proceeding.
+
+2. **Never create storefront metadata manually.** The Commerce setup wizard generates hundreds of configuration values. Manual creation will fail.
+
+3. **Always list sites before retrieval.** Store names get underscores and number suffixes (e.g., "My B2B Store" → "My_B2B_Store1"). Let the user select from the actual list.
+
+4. **Always use `--json` flag.** Include `--json` on all Salesforce CLI commands for parseable output.
+
+## Interactive Workflow: 7 Steps
+
+### Step 1: Explain Commerce B2B Concept
+
+**Agent explains:** Commerce has Store (data) + Storefront (metadata). Store must be created first.
+
+> See: [Store vs Storefront Reference](references/store-vs-storefront.md)
+
+---
+
+### Step 2: Guide User to Create B2B Store
+
+**Agent provides these steps:**
+
+1. Navigate to **Setup → Commerce → Stores**
+   - Or: **App Launcher → Commerce → Create Store**
+
+2. Click **"Create Store"** or **"Setup New Store"**
+
+3. Select **"Commerce Store"** as the store type
+
+4. Follow the wizard:
+   - **Store Name**: Choose descriptive name (e.g., "My B2B Store")
+     - Important: Spaces become underscores in folder names
+   - **Site URL**: Unique URL name for the site 
+
+5. Complete wizard - it creates:
+   - WebStore record
+   - Default buyer group and entitlement policies
+   - Associated Digital Experience (LWR site)
+
+6. Optional: Configure payment gateway, tax provider, shipping
+
+**Agent then asks:**
+"Have you completed creating the B2B Store in your org? Reply 'yes' when ready and provide the store name you used."
+
+---
+
+### Step 3: Get User Confirmation
+
+**Agent waits for:** User confirmation and store name
+
+**Agent validates:** Store name format (no special characters, spaces will appear as underscores)
+
+**Agent acknowledges:** "Great! Let me list the available storefronts in your org..."
+
+---
+
+### Step 4: List Available LWR Sites
+
+**Agent executes:**
+```bash
+sf org list metadata --metadata-type DigitalExperienceConfig --json
+```
+
+**Agent should:**
+- Parse JSON output to extract site names
+- Display as numbered list
+- Explain naming (underscores, number suffixes)
+
+**Example output:**
+```
+Available Digital Experience sites:
+1. My_B2B_Store1
+2. Partner_Portal
+3. Customer_Community
+```
+
+---
+
+### Step 5: Let User Select Storefront
+
+**Agent asks:**
+"Which site corresponds to your B2B Store? Select the site name:"
+
+**Agent validates:** Selection matches available sites
+
+**Agent confirms:** "Got it! I'll retrieve metadata for [site-name]..."
+
+---
+
+### Step 6: Retrieve Storefront Metadata
+
+**Agent executes:**
+```bash
+sf project retrieve start -m DigitalExperienceBundle:site/<selected-store-name> --json
+```
+
+**Agent should:**
+- Show retrieval progress
+- Confirm successful retrieval
+- List retrieved directory structure
+
+**Expected output:**
+```
+Retrieved: force-app/main/default/digitalExperiences/site/My_B2B_Store1/
+├── My_B2B_Store1.digitalExperience-meta.xml
+├── sfdc_cms__view/ (home, current_cart, detail_*, list_*, etc.)
+├── sfdc_cms__site/
+├── sfdc_cms__route/
+└── [other sfdc_cms__* directories]
+```
+
+---
+
+### Step 7: Provide Next Steps
+
+**Agent provides:**
+
+✅ **Metadata retrieved successfully!**
+
+**Next steps:**
+- Customize with custom LWCs or branding changes
+- Deploy: `sf project deploy start --source-dir force-app/main/default/digitalExperiences/site/My_B2B_Store1/ --json`
+
+**Resources:** [DigitalExperienceBundle Docs](https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_digitalexperiencebundle.htm), [B2B Commerce Guide](https://developer.salesforce.com/docs/atlas.en-us.b2b_commerce_dev_guide.meta/b2b_commerce_dev_guide/)
+
+---
+
+## Reference
+
+- **[store-vs-storefront.md](references/store-vs-storefront.md)** - Technical details on Store vs Storefront, source control, and why manual creation fails
+
+---
+
+## Remember
+
+**Store first (creates storefront) → Retrieve → Customize**
diff --git a/skills/creating-b2b-commerce-store/references/store-vs-storefront.md b/skills/creating-b2b-commerce-store/references/store-vs-storefront.md
new file mode 100644
index 0000000..c396cab
--- /dev/null
+++ b/skills/creating-b2b-commerce-store/references/store-vs-storefront.md
@@ -0,0 +1,169 @@
+# Commerce Store vs Storefront: Technical Reference
+
+## Overview
+
+Understanding the distinction between Commerce Store and Storefront is critical for successful Commerce B2B development. This document provides technical details about these two components and explains why they must be created in a specific order.
+
+---
+
+## The Two Components
+
+### 1. Commerce Store (Backend Data)
+
+**What it is:**
+- Runtime data and configuration created in the Salesforce org
+- NOT source-controllable metadata
+- Created through Commerce app UI
+
+**What it includes:**
+- Store configuration and settings
+- Default buyer groups (associated with Accounts)
+- Entitlement policies (who can see which products)
+- Pricing policies and price book mappings
+- Payment gateway configuration (Stripe, Adyen, etc.)
+- Tax provider configuration (Avalara, Vertex, manual)
+- Shipping methods and configurations
+- Product catalog associations
+- Inventory locations
+- Search index configurations
+
+**Where it lives:**
+- Data records in standard Commerce objects:
+  - `WebStore` - Store settings and configuration
+  - `BuyerGroup` - Account-based buyer segments
+  - `EntitlementPolicy` - Product visibility rules
+  - `CommerceEntitlementProduct` - Product-policy associations
+  - `ProductCatalog` - Catalog definitions
+  - `Pricebook2` - Price books
+  - Additional payment, tax, shipping records
+
+**How to create:**
+- Via UI: Setup → Commerce → Stores
+- Cannot be created via Metadata API
+- Cannot be deployed via `sf project deploy`
+
+---
+
+### 2. Storefront (Frontend Metadata)
+
+**What it is:**
+- Digital Experience (LWR site) for buyer-facing shopping experience
+- Source-controllable as ExperienceBundle metadata
+- Created automatically when you create a Commerce Store
+
+**What it includes:**
+- ExperienceBundle metadata (`StorefrontName.digitalExperience-meta.xml`)
+- URL routing configuration (`sfdc_cms__route`)
+- Page definitions (`sfdc_cms__view`)
+  - Homepage
+  - Product List Pages (PLP)
+  - Product Detail Pages (PDP)
+  - Shopping cart
+  - Checkout flow
+  - Order confirmation
+  - Search results
+- Lightning Web Components (product cards, cart components, checkout)
+- Branding and theme configuration (`sfdc_cms__brandingSet`, `sfdc_cms__theme`)
+- Page layouts (`sfdc_cms__themeLayout`)
+- Navigation structure
+- Custom LWCs for extensions
+
+**Where it lives:**
+- `force-app/main/default/digitalExperiences/site/StorefrontName/`
+- Example: `force-app/main/default/digitalExperiences/site/My_B2B_Store1/`
+
+**How to create:**
+- Automatically generated by Commerce Store setup wizard
+- Retrieved from org using Salesforce CLI
+- Cannot be manually created from scratch
+
+**How to deploy:**
+- Retrievable: `sf project retrieve start -m DigitalExperienceBundle:site/<name>`
+- Deployable: `sf project deploy start -m DigitalExperienceBundle`
+- Source-controllable in Git
+
+---
+
+## Why You Cannot Create Storefront Metadata from Scratch
+
+### Technical Reasons
+
+1. **Complex Dependency Chain**
+   - Create merchandisers store
+   - Create DigitalExperienceBundle
+   - Integrate both together
+
+2. **Hundreds of Auto-Generated Configurations**
+   - Component IDs and region IDs (UUIDs)
+   - WebStore associations
+   - Commerce-managed component configurations
+   - Default routing rules
+   - Search configurations
+   - Cart and checkout flow definitions
+   - Payment integration settings
+
+3. **Commerce-Managed Components**
+   - Product List Page (PLP) components
+   - Product Detail Page (PDP) components
+   - Cart components
+   - Checkout components
+   - Search components
+   - These require specific configurations from Store data
+
+4. **Metadata API Limitation**
+   - Metadata API deploys metadata types (Apex, LWCs, objects)
+   - Metadata API CANNOT create SObject data (WebStore records)
+   - Store creation requires data operations, not metadata operations
+
+---
+
+## The Required Creation Order
+
+### Step 1: Create Commerce Store (Must Be First)
+
+```
+User Interface (Commerce App)
+     ↓
+WebStore Record Created
+     ↓
+BuyerGroup Records Created
+     ↓
+EntitlementPolicy Records Created
+     ↓
+Digital Experience Auto-Generated
+     ↓
+Commerce Components Configured
+```
+
+**Why this must be first:**
+- Generates WebStore record with unique ID
+- Creates default configurations
+- Auto-generates associated Digital Experience
+- Configures Commerce component relationships
+- Sets up default buyer access rules
+
+### Step 2: Retrieve Storefront Metadata
+
+```
+sf org list metadata --metadata-type DigitalExperienceConfig
+     ↓
+Select Store from List
+     ↓
+sf project retrieve start -m DigitalExperienceBundle:site/<name>
+     ↓
+Metadata Saved to Local Repository
+     ↓
+Now Editable and Source-Controllable
+```
+
+---
+
+## Key Takeaway
+
+**Commerce B2B = Store (data) + Storefront (metadata)**
+
+1. Create Store → generates Storefront
+2. Retrieve Storefront → customize and version control if needed
+3. Deploy Storefront → only after creating Store in target org
+
+**Never skip the Store creation. Never create Storefront metadata from scratch.**

From dbc34c06ff22ba19cae6a58d60f913473ce5abfd Mon Sep 17 00:00:00 2001
From: vratan-sf <106548221+vratan-sf@users.noreply.github.com>
Date: Fri, 27 Mar 2026 19:27:13 +0530
Subject: [PATCH 12/14] W-21780746: Removed prompts folder; no longer needed
 (#120)

* Removed prompts folder; no longer needed

* Removed various folders in rules (except experts global rule); no longer needed

* Updated README file, removed lots of extraneous text
---
 README.md                                     | 427 +-----------------
 .../scaffold-invocable-apex.md                |  22 -
 prompts/apex-development/scaffold-object.md   |   7 -
 .../apex-development/trigger-refactoring.md   |  61 ---
 prompts/data-operations/create-fake-data.md   |   9 -
 .../getting-started/add-fields-pagelayout.md  |   7 -
 prompts/getting-started/add-picklist-value.md |   7 -
 .../create-assignment-rules.md                |   7 -
 .../create-basic-custom-object.md             |   9 -
 prompts/getting-started/create-opp-formula.md |   7 -
 .../getting-started/create-permission-set.md  |   7 -
 .../getting-started/create-rollup-summary.md  |   7 -
 .../first-lightning-web-component.md          |  13 -
 .../formula-field-days-till-close.md          |  11 -
 .../getting-started/opp-validation-rule.md    |   7 -
 .../reusable-apex-string-utility-class.md     |   9 -
 .../simple-apex-utility-class.md              |  16 -
 ...stage-based-opportunity-scoring-formula.md |  11 -
 .../test-data-factory-basics.md               |   9 -
 .../trigger-and-handler-example.md            |  11 -
 .../validation-rule-on-account.md             |   9 -
 .../fix-complex-approval-logic.md             |   9 -
 prompts/spec-driven-dev/asset-tracker.md      |  39 --
 .../testing-automation/create-unit-test.md    |   7 -
 prompts/testing-automation/run-all-test.md    |   7 -
 prompts/vibe-coding/compliment-mixer.md       |   9 -
 rules/apex-development/apex-requirements.md   |  89 ----
 rules/lwc-development/lwc-requirements.md     |  68 ---
 rules/spec-driven-dev/app-dev.md              |  87 ----
 rules/vibe-coding/use-skills.md               |  16 -
 30 files changed, 14 insertions(+), 990 deletions(-)
 delete mode 100644 prompts/apex-development/scaffold-invocable-apex.md
 delete mode 100644 prompts/apex-development/scaffold-object.md
 delete mode 100644 prompts/apex-development/trigger-refactoring.md
 delete mode 100644 prompts/data-operations/create-fake-data.md
 delete mode 100644 prompts/getting-started/add-fields-pagelayout.md
 delete mode 100644 prompts/getting-started/add-picklist-value.md
 delete mode 100644 prompts/getting-started/create-assignment-rules.md
 delete mode 100644 prompts/getting-started/create-basic-custom-object.md
 delete mode 100644 prompts/getting-started/create-opp-formula.md
 delete mode 100644 prompts/getting-started/create-permission-set.md
 delete mode 100644 prompts/getting-started/create-rollup-summary.md
 delete mode 100644 prompts/getting-started/first-lightning-web-component.md
 delete mode 100644 prompts/getting-started/formula-field-days-till-close.md
 delete mode 100644 prompts/getting-started/opp-validation-rule.md
 delete mode 100644 prompts/getting-started/reusable-apex-string-utility-class.md
 delete mode 100644 prompts/getting-started/simple-apex-utility-class.md
 delete mode 100644 prompts/getting-started/stage-based-opportunity-scoring-formula.md
 delete mode 100644 prompts/getting-started/test-data-factory-basics.md
 delete mode 100644 prompts/getting-started/trigger-and-handler-example.md
 delete mode 100644 prompts/getting-started/validation-rule-on-account.md
 delete mode 100644 prompts/investigation-triage/fix-complex-approval-logic.md
 delete mode 100644 prompts/spec-driven-dev/asset-tracker.md
 delete mode 100644 prompts/testing-automation/create-unit-test.md
 delete mode 100644 prompts/testing-automation/run-all-test.md
 delete mode 100644 prompts/vibe-coding/compliment-mixer.md
 delete mode 100644 rules/apex-development/apex-requirements.md
 delete mode 100644 rules/lwc-development/lwc-requirements.md
 delete mode 100644 rules/spec-driven-dev/app-dev.md
 delete mode 100644 rules/vibe-coding/use-skills.md

diff --git a/README.md b/README.md
index 63dc051..e42c33f 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,34 @@
 # Agentforce Vibes Library
 
-AI prompts and rules library for Agentforce Vibes development, content creation, and workflow automation.
+AI skills and rules library for Agentforce Vibes development of Salesforce metadata.
 
 ## 📚 About
 
-This repository curates Salesforce-focused prompts, system rules, and executable skills from the wider developer community to accelerate Agentforce Vibes agentic workflows. Collections are organized by development discipline—Apex, LWC, flows, deployments, testing, investigation, spec-driven delivery, and more—so contributors can share reusable prompts, scaffolds, guardrails, and workflows that other teams can adapt and extend.
+This repository curates Salesforce-focused skills and system rules from the wider developer community to accelerate Agentforce Vibes agentic workflows. 
 
 ## 🗂️ Structure
 
 ```
 afv-library/
-├── prompts/              # Single-file instructions for straightforward tasks
-│   ├── apex-development/
-│   ├── lwc-development/
-│   ├── flow-development/
-│   ├── getting-started/
-│   └── ...
 ├── rules/                # Single-file guardrails and standards
-│   ├── apex-development/
-│   ├── lwc-development/
-│   ├── spec-driven-dev/
-│   └── ...
 ├── skills/               # Directory-based executable workflows
-│   ├── apex-development/
-│   │   └── trigger-refactor-pipeline/
-│   │       ├── SKILL.md
-│   │       ├── scripts/
-│   │       ├── references/
-│   │       └── assets/
-│   ├── metadata-deployments/
-│   ├── testing-automation/
+│   ├── generating-apex/
+│   ├── generating-custom-object/
+│   ├── generating-flow/
 │   └── ...
 ├── samples/              # Synced sample apps (e.g. from npm)
 │   └── webapp-template-app-react-sample-b2e-experimental/
+│   └── ...
+├── scripts/              
+│   └── ...
 └── README.md
 ```
 
-## 🚀 Quick Start
+## Manual Usage
 
-### Manual Usage
+Browse the repository and copy/paste any rule or skill directly into Agentforce Vibes or your preferred AI tool.
 
-Browse the repository and copy/paste any prompt, rule, or skill directly into Agentforce Vibes or your preferred AI tool.
-
-### Samples
+## Samples
 
 The `samples/` folder contains synced sample apps. For example, `samples/webapp-template-app-react-sample-b2e-experimental/` is kept in sync with the npm package `@salesforce/webapp-template-app-react-sample-b2e-experimental` (nightly and on manual trigger via GitHub Actions). To run the same sync locally from the repo root:
 
@@ -53,87 +39,10 @@ npm run sync-react-b2e-sample
 
 The GitHub Action runs these same commands and opens a PR only when the npm package version has changed. See [samples/README.md](samples/README.md) for details.
 
-### Connecting Team or Personal Libraries
 
-You can register additional repos with the extension as long as they mirror this structure:
+## 🛠️ Agent Skills
 
-- Root folders named `prompts/`, `rules/`, and `skills/`, each containing category subfolders (e.g., `prompts/apex-development/`).
-- Each prompt or rule stored in its own Markdown file with YAML frontmatter (`name`, `description`, `tags`, optional setup metadata).
-- Each skill stored in its own directory containing a `SKILL.md` file with required frontmatter, plus optional `scripts/`, `references/`, and `assets/` subdirectories.
-- Category folders may include a `README.md` describing their focus; empty folders are allowed for future content.
-
-When you add a new library:
-
-1. **Structure your repository** with the same folder layout shown in `## 🗂️ Structure`:
-   - `prompts/` folder with category subfolders containing `.md` files
-   - `rules/` folder with category subfolders containing `.md` files  
-   - `skills/` folder with category subfolders, each containing skill directories with `SKILL.md`
-2. **Follow format requirements**:
-   - Prompts and rules: YAML frontmatter (`name`, `description`, `tags`) + markdown body
-   - Skills: Directory with `SKILL.md` + optional `scripts/`, `references/`, `assets/` subdirectories
-3. **Ensure script executability** for skills: Mark Python/Bash scripts as executable (`chmod +x`)
-4. **Register the repository** with `Agentforce Vibes: Add Library` in VS Code
-5. **Refresh the extension** to index and display the new content
-
-## 📝 Prompt Format
-
-Every prompt begins with YAML frontmatter that surfaces key metadata to contributors and tooling:
-
-```markdown
----
-name: Concise Prompt Title
-description: One-sentence summary of the outcome you want
-tags: category, use-case, tooling
-requires_deploy: true        # optional – include when pre-work is required
-setup_summary: Deploy baseline trigger before refactor  # optional helper text
----
-```
-
-- `name`, `description`, and `tags` are required.
-- Use lowercase, comma-separated tags drawn from the category and focus area (e.g., `apex, refactor, testing`).
-- Add `requires_deploy` (and an optional `setup_summary`) when the prompt depends on seed metadata or data.
-
-After the frontmatter, organize the body with clear sections. A common pattern is:
-
-1. `## Setup` – only when pre-work, sample metadata, or environment configuration is needed.
-2. `## Context` – summarize the scenario, constraints, personas, or assets involved.
-3. `## Instructions` – detail the tasks in numbered steps, calling out decision points or checkpoints.
-4. `## Testing & Reporting` – define verification steps, coverage expectations, or deliverables.
-5. `## Follow-ups` – optional space for stretch goals, review questions, or iteration loops.
-
-### Example Prompt
-
-**File:** `prompts/apex-development/trigger-refactoring.md`
-
-```markdown
----
-name: Trigger Refactor Helper
-description: Refactor the Opportunity trigger into a handler pattern with tests
-tags: apex, refactor, testing
-requires_deploy: true
-setup_summary: Deploy baseline trigger to target org before running instructions
----
-
-## Setup
-1. Deploy the baseline trigger shown below to your default or scratch org.
-2. Confirm the trigger compiles successfully before continuing.
-
-```apex
-// ... baseline trigger omitted for brevity ...
-```
-
-## Instructions
-Refactor `OpportunityTrigger` into a handler class (or classes) that handles the same behavior using bulk-safe patterns. Ensure the trigger itself delegates and remains behaviorally identical.
-
-## Testing & Reporting
-- Create unit tests covering positive and negative paths for each handler method.
-- Include a bulk test that updates 50 `Opportunity` records where only half qualify for the `after update` logic.
-- Deploy the refactored code and run the tests, then report coverage and key observations.
-```
-
-## 🛠️ Agent Skills Format
-
-Agent Skills extend prompts and rules by bundling executable workflows, scripts, and reference materials into self-contained directories. Skills follow the open [Agent Skills specification](https://agentskills.io/) and are portable across many agent tools (Cursor, Claude Code, VS Code extensions, etc.).
+Agent Skills extend rules by bundling executable workflows, scripts, and reference materials into self-contained directories. Skills follow the open [Agent Skills specification](https://agentskills.io/) and are portable across many agent tools (Cursor, Claude Code, VS Code extensions, etc.).
 
 ### Directory Structure
 
@@ -143,324 +52,16 @@ Each skill is a folder containing:
 - `references/` (optional) - additional documentation
 - `assets/` (optional) - templates, schemas, lookup data
 
-### Required Frontmatter
-
-```yaml
----
-name: skill-name-here          # lowercase, hyphens, matches folder name
-description: What this skill does and when to use it (1-1024 chars)
-license: Apache-2.0            # optional
-compatibility: Requires...     # optional
-metadata:                      # optional
-  author: your-org
-  version: "1.0"
-allowed-tools: Bash Read Write # optional, space-delimited
----
-```
-
-The `name` must:
-- Be 1-64 characters
-- Use only lowercase letters, numbers, and hyphens
-- Match the parent directory name
-- Not start or end with hyphens
-
-The `description` should explain both what the skill does and when to use it, including keywords that help agents identify relevant tasks.
-
-### Progressive Disclosure
-
-Skills are designed for efficient context use:
-
-1. **Discovery** - agents load only name + description at startup
-2. **Activation** - full SKILL.md loaded when needed
-3. **Execution** - scripts/references loaded on-demand
-
-Keep your main `SKILL.md` under 500 lines and move detailed reference material to separate files.
-
-### Example Skill Structure
-
-**File:** `skills/apex-development/trigger-refactor-pipeline/SKILL.md`
-
-```markdown
----
-name: trigger-refactor-pipeline
-description: Refactor Salesforce triggers into handler patterns with automated test generation and deployment. Use when modernizing legacy triggers with DML/SOQL in loops.
-license: Apache-2.0
-compatibility: Requires Salesforce CLI, Python 3.9+, jq
-metadata:
-  author: afv-library
-  version: "1.0"
----
-
-## When to Use This Skill
-
-Use when you need to modernize legacy triggers with DML/SOQL in loops or inconsistent patterns.
-
-## Step 1: Analyze Trigger
-
-Run `scripts/analyze_trigger.py <TriggerName>` to identify anti-patterns:
-- DML operations inside loops
-- SOQL queries inside loops
-- Missing bulkification
-
-The script outputs a report showing:
-- Line numbers with issues
-- Recommended refactoring approach
-- Complexity score
-
-## Step 2: Generate Handler
-
-See [handler patterns reference](references/handler_patterns.md) for templates that match your trigger context:
-- Before insert/update patterns
-- After insert/update/delete patterns
-- Bulk collection strategies
-
-Copy the appropriate template from `assets/` and customize.
-
-## Step 3: Create Tests
-
-Use `assets/test_template.apex` as a scaffold. Ensure coverage includes:
-- Single record operations
-- Bulk operations (200+ records)
-- Mixed scenarios
-- Negative cases
-
-## Step 4: Deploy and Validate
-
-Deploy using Salesforce CLI and run all tests. Verify:
-- All tests pass with 100% coverage
-- No new governor limit issues
-- Behavior matches original trigger
-```
-
-### Validation
-
-Skills can be validated using the [skills-ref](https://github.com/agentskills/agentskills/tree/main/skills-ref) tool:
-
-```bash
-skills-ref validate ./skills/apex-development/trigger-refactor-pipeline
-```
-
-This checks that your `SKILL.md` frontmatter is valid and follows all naming conventions.
-
-## 📂 Categories Guide
-
-These starter categories reflect the current repository layout. Contributors are welcome to propose new ones or reorganize as long as the structure stays consistent for the VS Code extension.
-
-### When to Use Each Format
-
-| Format | Use When | Example |
-|--------|----------|---------|
-| **Prompt** | Single-shot instruction for a straightforward task | "Create a validation rule on Account that prevents blank NumberOfEmployees" |
-| **Rule** | Ongoing guardrail or standard to enforce | "Apex triggers must delegate to handler classes with bulk-safe patterns" |
-| **Skill** | Multi-step workflow requiring scripts, templates, or reference docs | "Refactor trigger → analyze anti-patterns → generate handler → create tests → deploy" |
-
-### Prompts
-
-| Category | Purpose | Example Topics |
-|----------|---------|----------------|
-| **apex-development** | Build and optimize Apex codebases | Trigger frameworks, async patterns, governor limit tuning |
-| **lwc-development** | Craft Lightning Web Components | Component architecture, reactive data, UI patterns |
-| **metadata-deployments** | Plan and execute releases | Packaging, Git branching, rollback prep |
-| **vibe-coding** | Agentforce Vibes coding workflows | Apex/LWC scaffolds, prompt-to-code translation |
-| **testing-automation** | Validate platform behavior | Apex tests, Flow scenarios, regression suites |
-| **investigation-triage** | Diagnose and resolve issues | Incident response, log analysis, performance forensics |
-| **data-operations** | Manage data pipelines | ETL prompts, bulk operations, platform events |
-| **spec-driven-dev** | Generate and refine specification-first workflows | Requirement capture, traceability matrices, auto-generated tasks |
-| **security-compliance** | Enforce standards and controls | Permission audits, secure coding, compliance narratives |
-| **integration-fabric** | Coordinate external services | API design, middleware coordination, error recovery |
-| **enablement-docs** | Share knowledge and runbooks | Onboarding guides, release notes, changelog automation |
-
-### Skills
-
-Skills mirror the same category structure as prompts and rules. Each skill is a directory containing executable workflows.
-
-| Category | Purpose | Example Skills |
-|----------|---------|----------------|
-| **apex-development** | Automated Apex refactoring and analysis | Trigger refactor pipeline, bulk operation optimizer |
-| **lwc-development** | Lightning Web Component workflows | Component generator, accessibility audit |
-| **flow-development** | Flow automation and optimization | Flow analyzer, subflow extractor |
-| **metadata-deployments** | Release management automation | Deployment readiness check, rollback automation |
-| **testing-automation** | Test generation and execution | Test data factory, coverage analyzer |
-| **investigation-triage** | Debugging and diagnostics | Log parser, governor limit analyzer |
-| **data-operations** | Data pipeline automation | ETL validator, data quality checker |
-| **spec-driven-dev** | Specification-to-code workflows | Requirements parser, test case generator |
-
-### Rules
-
-| Category | Focus | Example Assets |
-|----------|-------|----------------|
-| **apex-development** | Standards for Apex architecture and quality | Trigger guardrails, async execution policies |
-| **lwc-development** | Front-end guardrails for Lightning Web Components | Accessibility checklists, component review templates |
-| **metadata-deployments** | Release management discipline | Branching policies, deployment readiness reviews |
-| **vibe-coding** | Coding quality for Agentforce Vibes assets | Code review criteria, secure pattern guides |
-| **testing-automation** | Verification and validation expectations | Test coverage thresholds, regression playbooks |
-| **investigation-triage** | Incident and root-cause response | Escalation runbooks, logging requirements |
-| **data-operations** | Data stewardship and job governance | Data quality SLAs, bulk job safeguards |
-| **spec-driven-dev** | Specification-first delivery standards | Definition-of-done templates, traceability requirements |
-| **security-compliance** | Platform security and regulatory posture | Access reviews, compliance attestation steps |
-| **integration-fabric** | External connection reliability | Retry policies, credential rotation standards |
-| **enablement-docs** | Knowledge management and enablement | Release note templates, onboarding workflows |
-| **org-governance** | Enterprise policy alignment | Org strategy playbooks, architecture review guidelines |
-| **support-operations** | Production support excellence | Incident response SLAs, shift handover procedures |
-| **ai-safety** | Responsible agent behavior | Ethical guidelines, bias detection checklists |
-
-## ✨ Creating New Prompts & Rules
-
-1. **Choose the right category** based on use case (if nothing fits, propose a new category)
-2. **Create a descriptive filename** (use kebab-case: `my-prompt.md`)
-3. **Add frontmatter** with name, description, and tags
-4. **Write clear instructions** with placeholders for user input
-5. **Test** before committing
-6. **Commit with message**: `Add [name] for [use case]`
-
-### Naming Conventions
-
-- Use lowercase with hyphens: `code-review-helper.md`
-- Be descriptive: `salesforce-apex-debug.md` not `debug.md`
-- Include context: `blog-post-outline.md` not `outline.md`
-
-## 🔧 Best Practices
-
-### Writing Effective Prompts
-
-- ✅ **Be specific** - Clear instructions yield better results
-- ✅ **Use structure** - Numbered lists and sections help
-- ✅ **Add context** - Explain what you want and why
-- ✅ **Include examples** - Show expected output format
-- ✅ **Test thoroughly** - Verify prompts work as intended
-
-### Prompt Engineering
-
-- ✅ **Clarify the objective** – Capture the outcome, stakeholders, and success metrics directly in the frontmatter
-- ✅ **Share context** – Provide links, metadata, or sample records so the agent can ground its reasoning
-- ✅ **Set guardrails** – Define tone, compliance boundaries, what to avoid, and when to ask for confirmation
-- ✅ **Guide the workflow** – Break the request into staged checkpoints (ideate → propose → confirm → deliver)
-- ✅ **Capture feedback loops** – Invite the agent to flag assumptions, pose questions, and suggest validation steps
-- ✅ **Encourage adaptability** – Note how the prompt or rule can flex across org types, industries, and data volumes
-
-#### Structuring Prompts
-
-- **Prime with examples**: Include concise samples that illustrate the desired format or code pattern
-- **Model the format**: Provide headings and numbered steps so the agent mirrors the final artifact
-- **Address ambiguity**: Explicitly call out unknowns and ask the agent to gather missing inputs
-- **Control verbosity**: Specify length limits, number of alternatives, or time horizons
-- **Request diagnostics**: Ask the agent to share reasoning, risks, and verification plans when appropriate
-
-#### Template: Multi-Step Prompt
-
-```markdown
----
-name: Apex Service Hardening Plan
-description: Audit and fortify an Apex service to stay within governor limits while preserving behavior
-tags: apex-development, optimization, audit
-requires_deploy: false
----
-
-## Context
-- Usage profile: [Invocation volume, entry points, data scale]
-- Known issues: [Timeouts, limit exceptions, performance complaints]
-- Stakeholders: [Product owners, support teams, compliance partners]
-
-## Instructions
-1. Summarize existing architecture, dependencies, and limit usage; list assumptions needing confirmation.
-2. Propose at least two optimization strategies, including refactor scope, data implications, and rollback considerations.
-3. Recommend a preferred strategy once assumptions are resolved, detailing implementation phases and change management steps.
-
-## Testing & Reporting
-- Define unit, integration, and bulk test coverage with pass criteria.
-- Specify telemetry/observability updates (logging, metrics, alerts) to validate success.
-- Produce an execution checklist with owners, timelines, and escalation contacts.
-```
-
-### Organizing Rules
-
-- ✅ **One rule per file** - Keep rules focused and modular
-- ✅ **Use clear names** - Describe what the rule enforces
-- ✅ **Document purpose** - Explain why the rule exists
-- ✅ **Keep updated** - Review and refine regularly
-- ✅ **Version control** - Track changes over time
 
 ## 🤝 Contributing
 
-### How to Contribute
-
 See [Contributing](./CONTRIBUTING.md) for complete details.
 
-**Contribution checklist**
-- Confirm the file lives in the correct category folder
-- Complete the YAML frontmatter (`name`, `description`, `tags`)
-- Include clear instructions and placeholders for user-specific details
-- Add a short note on how others can adapt the prompt, especially for varying Salesforce environments
-- Verify the content respects licensing and attribution requirements
-- Provide any supporting references or context in the pull request description
 
-### Creating New Skills
-
-Skills are more complex than prompts and require additional setup:
-
-1. **Create a folder** under the appropriate `skills/<category>/` directory using lowercase + hyphens (e.g., `trigger-refactor-pipeline`).
-2. **Add a `SKILL.md` file** with required frontmatter:
-   - `name` - must match the folder name (lowercase, hyphens only)
-   - `description` - explain what the skill does and when to use it (1-1024 characters)
-   - Optional: `license`, `compatibility`, `metadata`, `allowed-tools`
-3. **Optionally add subdirectories**:
-   - `scripts/` - executable Python, Bash, or JavaScript files
-   - `references/` - additional documentation files
-   - `assets/` - templates, schemas, or lookup data
-4. **Validate your skill** using the [skills-ref](https://github.com/agentskills/agentskills/tree/main/skills-ref) tool:
-   ```bash
-   skills-ref validate ./skills/<category>/<skill-name>
-   ```
-5. **Test the skill end-to-end** before submitting. Ensure:
-   - The skill activates correctly when the description keywords match
-   - All scripts execute without errors
-   - Reference files are accessible and well-organized
-   - The workflow produces the expected outcomes
-6. **Document dependencies** clearly in the `compatibility` field if your skill requires specific tools or system packages.
-
-### Feedback
+## Feedback
 
 Found an issue or have a suggestion?
 - Open an issue in GitHub
 - Suggest improvements via pull request
 - Start a discussion in GitHub Discussions or the pull request thread
 
-## 🔄 Maintenance
-
-### Updating Prompts
-
-To update an existing prompt:
-1. Edit the `.md` file
-2. Update the description if behavior changed
-3. Test the updated prompt
-4. Commit with clear message: `Update [prompt]: [what changed]`
-
-### Adding New Categories
-
-To add a new category:
-1. Create new folders in `prompts/`, `rules/`, and `skills/` with matching names
-2. Add a `README.md` in each folder explaining the category's purpose
-3. Add initial prompts, rules, or skills following the format guidelines
-4. Update the main README with the new category in the appropriate tables
-5. Submit a pull request with the rationale for the new category
-
-### Updating Skills
-
-To update an existing skill:
-1. Modify the `SKILL.md` or supporting files (`scripts/`, `references/`, `assets/`)
-2. Update the `metadata.version` field in the frontmatter
-3. Test all scripts and workflows end-to-end
-4. Validate using `skills-ref validate ./skills/<category>/<skill-name>`
-5. Commit with clear message: `Update [skill-name]: [what changed]`
-
-
-# Experimental 
-
-### Using with supporting AFV Library VS Code Extension
-
-1. Install the Agentforce Vibes VS Code extension (preview or later).
-2. Install the experiemnt [AFV library VSCode extension](https://github.com/forcedotcom/afv-library-extension). 
-2. Open the command palette and run `Agentforce Vibes: Add Library`.
-3. Provide the Git URL (or local path) to this repository; the extension indexes every folder and `.md` file under `prompts/`, `rules/`, and `skills/`.
-4. The extension displays prompts, rules, and skills organized by category. Select any item to preview the metadata and copy instructions into the editor.
-5. Use the refresh command whenever new prompts, rules, or skills are added.
\ No newline at end of file
diff --git a/prompts/apex-development/scaffold-invocable-apex.md b/prompts/apex-development/scaffold-invocable-apex.md
deleted file mode 100644
index 89245be..0000000
--- a/prompts/apex-development/scaffold-invocable-apex.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: PricingService Invocable Scaffold
-description: Create a PricingService Apex class with an invocable getPricing method and typed inputs/outputs for Flow.
-tags: apex, invocable, flow, scaffold
----
-
-Scaffold a Apex classed named `PricingService` (public with no namespace) with one invocable method `getPricing` with an InvocableVariable wrapper for inputs and outputs. Include user-friendly labels and descriptions for the InvocableMethod and all InvocableVariables.  
-
-## Input Parameters
-- accountId (ID) - required Account the pricing is for
-- terms (String) - required terms for the pricing
-- discount (Decimal - scale 2) - if null, then discount equals 0.
-- products (List of Strings) - the required list product names.
-
-## Output Parameters
-- total - (Decimal) the toal price for all products
-- products (List of Decimal) - the list product prices.
-- creditApproved (boolean) - if approved for credit
-
-If input `products` variable is null or empty, return empty output parameters. Use a standard invocable pattern. 
-
-I will provide the implementation later. Do not write unit tests. Deploy the new class to my default org.
\ No newline at end of file
diff --git a/prompts/apex-development/scaffold-object.md b/prompts/apex-development/scaffold-object.md
deleted file mode 100644
index fafe1e0..0000000
--- a/prompts/apex-development/scaffold-object.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Travel Plan Object Scaffold
-description: Provision a Travel Plan custom object with fields, layout, tab, and permission set ready for deployment.
-tags: salesforce, custom-object, scaffold, deployment
----
-
-Create a "Travel Plan" custom object with 5 appropriate, sensible fields. Add all of the fields to the page layout. Do not create or add a compact layout. Create a tab for the object and a permission set that grants read/create/edit access to the object, all fields and custom tab. Deploy to my default org and assign the permission set to my user.
\ No newline at end of file
diff --git a/prompts/apex-development/trigger-refactoring.md b/prompts/apex-development/trigger-refactoring.md
deleted file mode 100644
index b66731a..0000000
--- a/prompts/apex-development/trigger-refactoring.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: Trigger Refactor Helper
-description: Refactor the Opportunity trigger into a handler pattern with tests
-tags: apex, refactor, testing
-requires_deploy: true
-setup_summary: Deploy baseline trigger to target org before running instructions
----
-
-## Setup
-1. Deploy the baseline trigger shown below to your default or scratch org.
-2. Confirm the trigger compiles successfully before continuing.
-
-```apex
-// ❌ Anti-pattern: all logic stuffed into the trigger, with DML/SOQL in loops.
-trigger OpportunityTrigger on Opportunity (before insert, before update, after update) {
-    // BEFORE INSERT: validate Closed Won w/ low Amount
-    if (Trigger.isBefore && Trigger.isInsert) {
-        for (Opportunity o : Trigger.new) {
-            if (o.StageName == 'Closed Won' && (o.Amount == null || o.Amount < 1000)) {
-                o.addError('Closed Won opportunities must have Amount ≥ 1000.');
-            }
-        }
-    }
-
-    // BEFORE UPDATE: if Stage changed, overwrite Description
-    if (Trigger.isBefore && Trigger.isUpdate) {
-        for (Opportunity o : Trigger.new) {
-            Opportunity oldO = Trigger.oldMap.get(o.Id);
-            if (o.StageName != oldO.StageName) {
-                o.Description = 'Stage changed from ' + oldO.StageName + ' to ' + o.StageName;
-            }
-        }
-    }
-
-    // AFTER UPDATE: when Stage becomes Closed Won, create a follow-up Task
-    if (Trigger.isAfter && Trigger.isUpdate) {
-        for (Opportunity o : Trigger.new) {
-            Opportunity oldO = Trigger.oldMap.get(o.Id);
-            if (o.StageName == 'Closed Won' && oldO.StageName != 'Closed Won') {
-                Task t = new Task(
-                    WhatId     = o.Id,
-                    OwnerId    = o.OwnerId,
-                    Subject    = 'Send thank-you',
-                    Status     = 'Not Started',
-                    Priority   = 'Normal',
-                    ActivityDate = Date.today()
-                );
-                insert t; // ❌ DML in a loop
-            }
-        }
-    }
-}
-```
-
-## Instructions
-Refactor `OpportunityTrigger` into a handler class (or classes) that handles the same behavior using bulk-safe patterns. Ensure the trigger itself delegates and remains behaviorally identical.
-
-## Testing & Reporting
-- Create unit tests covering positive and negative paths for each handler method.
-- Include a bulk test that updates 50 `Opportunity` records where only half qualify for the `after update` logic.
-- Deploy the refactored code and run the tests, then report coverage and key observations.
\ No newline at end of file
diff --git a/prompts/data-operations/create-fake-data.md b/prompts/data-operations/create-fake-data.md
deleted file mode 100644
index 6f2d611..0000000
--- a/prompts/data-operations/create-fake-data.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Account Test Data Generator
-description: Create an Apex script that generates 10 realistic Account records with complete business data including name, account number, type, industry, annual revenue, ticker symbol, and number of employees. Includes documentation on how to execute the script anonymously.
-tags: salesforce, apex, data-generation, test-data, developer, admin
----
-
-Create an apex script that I can run anonymously to insert 10 account records with name, account number, type, industry, annual revenue, ticker symbol and number of employees.
-
-Generate a document with instruction on how to run the script.
diff --git a/prompts/getting-started/add-fields-pagelayout.md b/prompts/getting-started/add-fields-pagelayout.md
deleted file mode 100644
index 991be19..0000000
--- a/prompts/getting-started/add-fields-pagelayout.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Account Layout Field Enhancement
-description: Add Type and Industry fields to the Account page layout for better data organization and reporting.
-tags: salesforce, account, page-layout, admin, data-management
----
-
-Add Type and Industry fields to the Account Layout, placing them below Account Name.
diff --git a/prompts/getting-started/add-picklist-value.md b/prompts/getting-started/add-picklist-value.md
deleted file mode 100644
index 9262706..0000000
--- a/prompts/getting-started/add-picklist-value.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Lead Source Picklist Enhancement
-description: Add a new 'Referral' value to the Lead Source picklist on the Lead object for better lead tracking.
-tags: salesforce, lead, picklist, data-management, admin
----
-
-Add a new value 'Referral' to the Lead Source picklist on the Lead object.
diff --git a/prompts/getting-started/create-assignment-rules.md b/prompts/getting-started/create-assignment-rules.md
deleted file mode 100644
index 8108738..0000000
--- a/prompts/getting-started/create-assignment-rules.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: High Priority Case Assignment Rule
-description: Create an assignment rule that automatically routes high priority Cases to a specific queue or user for immediate attention.
-tags: salesforce, case-management, assignment-rules, automation, admin
----
-
-Add an Assignment Rule that automatically assigns new Cases with Priority = High to a specific queue or user.
diff --git a/prompts/getting-started/create-basic-custom-object.md b/prompts/getting-started/create-basic-custom-object.md
deleted file mode 100644
index d8708f6..0000000
--- a/prompts/getting-started/create-basic-custom-object.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Project Object Quickstart
-description: Scaffold a Project__c custom object with core fields and deployable metadata.
-tags: salesforce, custom-object, beginner
----
-
-Create a new Project__c object with an autonumber field {proj-0000}, name, start date, and number of days fields that represent a simple project record. 
-
-Deploy this metadata to my org using the Salesforce DX MCP Server.
\ No newline at end of file
diff --git a/prompts/getting-started/create-opp-formula.md b/prompts/getting-started/create-opp-formula.md
deleted file mode 100644
index 1f29df7..0000000
--- a/prompts/getting-started/create-opp-formula.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Opportunity Days Open Formula
-description: Create a formula field on Opportunity that calculates the number of days since the record was created.
-tags: salesforce, opportunity, formula-field, automation, admin
----
-
-Add a formula field on Opportunity called Days_Open__c that calculates TODAY() - DATEVALUE(CreatedDate).
diff --git a/prompts/getting-started/create-permission-set.md b/prompts/getting-started/create-permission-set.md
deleted file mode 100644
index 247c25b..0000000
--- a/prompts/getting-started/create-permission-set.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Account Editor Permission Set
-description: Create a permission set that grants edit access to Account records and assign it to the current user.
-tags: salesforce, permission-set, security, admin, user-management
----
-
-Create a permission set Account_Editor with Edit access to Account and assign it to your current user.
diff --git a/prompts/getting-started/create-rollup-summary.md b/prompts/getting-started/create-rollup-summary.md
deleted file mode 100644
index 5605564..0000000
--- a/prompts/getting-started/create-rollup-summary.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Account Opportunity Count Roll-Up
-description: Create a roll-up summary field on Account that counts related Opportunities for better relationship tracking.
-tags: salesforce, account, opportunity, rollup-summary, automation, admin
----
-
-Create a Roll-Up Summary on Account that counts the number of related Opportunities.
diff --git a/prompts/getting-started/first-lightning-web-component.md b/prompts/getting-started/first-lightning-web-component.md
deleted file mode 100644
index 5866991..0000000
--- a/prompts/getting-started/first-lightning-web-component.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Hello World LWC Starter
-description: Generate a greeting Lightning Web Component and explain its HTML, JS, and metadata files.
-tags: lwc, ui, beginner
----
-
-Help me create my first Lightning Web Component.
-
-Generate a basic LWC that displays a greeting message. Provide the HTML, JavaScript, and meta configuration files, and provide comments on how each file works.
-
-Deploy this metadata to my org using the Salesforce DX MCP Server.
-
-Display instruction on how to add the LWC to a new Home page.
diff --git a/prompts/getting-started/formula-field-days-till-close.md b/prompts/getting-started/formula-field-days-till-close.md
deleted file mode 100644
index fa630f5..0000000
--- a/prompts/getting-started/formula-field-days-till-close.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Opportunity Days Till Close Formula
-description: Build an Opportunity formula that calculates days between CreatedDate and CloseDate.
-tags: formula, opportunity, admin
----
-
-Create a formula field on `Opportunity` named `Days till Close` that calculates the number of days between the `CreatedDate` and `CloseDate` fields, if `CloseDate` is not null. 
-
-Deploy this class to my org using the Salesforce DX MCP Server.
-
-Provide instruction on how to set field level security for my profile and add the new field to the page layout.
\ No newline at end of file
diff --git a/prompts/getting-started/opp-validation-rule.md b/prompts/getting-started/opp-validation-rule.md
deleted file mode 100644
index 4eeba81..0000000
--- a/prompts/getting-started/opp-validation-rule.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Opportunity Close Date Validation
-description: Create a validation rule on Opportunity that prevents saving when the Close Date is in the past.
-tags: salesforce, opportunity, validation-rule, data-quality, admin
----
-
-Add a validation rule on Opportunity that prevents saving when Close Date < TODAY().
diff --git a/prompts/getting-started/reusable-apex-string-utility-class.md b/prompts/getting-started/reusable-apex-string-utility-class.md
deleted file mode 100644
index 016be25..0000000
--- a/prompts/getting-started/reusable-apex-string-utility-class.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: StringUtils Utility Scaffold
-description: Create a foundational StringUtils Apex helper with core string methods and unit tests.
-tags: apex, utility, testing
----
-
-Create an `StringUtils` Apex utility class with common string helpers such as isBlank, trimToNull, and safe string-to-integer conversion. Include a focused test class that covers each helper method with both typical inputs. Do not test for edge casees at this time.
-
-Deploy the classes to my org and run the unit tests, using the Salesforce DX MCP Server.
\ No newline at end of file
diff --git a/prompts/getting-started/simple-apex-utility-class.md b/prompts/getting-started/simple-apex-utility-class.md
deleted file mode 100644
index 721006e..0000000
--- a/prompts/getting-started/simple-apex-utility-class.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: DateUtils Utility Primer
-description: Generate a documented DateUtils Apex class with daysBetween and addDays helpers.
-tags: apex, utility, beginner
----
-
-Generate a small `DateUtils` Apex utility class. Include clear comments so I can understand the overall structure and common Apex patterns. 
-
-Create the following two methods:
-
-- A method named daysBetween that returns the number of days between two dates. If either date is null, return null instead of throwing an exception.
-- Add a method named addDays that returns a new date by adding a given number of days to a base date. If the base date is null, return null.
-
-Do not create unit tests at this time.
-
-Deploy this class to my org using the Salesforce DX MCP Server.
diff --git a/prompts/getting-started/stage-based-opportunity-scoring-formula.md b/prompts/getting-started/stage-based-opportunity-scoring-formula.md
deleted file mode 100644
index a5fd572..0000000
--- a/prompts/getting-started/stage-based-opportunity-scoring-formula.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Opportunity Stage Score Formula
-description: Craft a readable Opportunity formula that assigns numeric scores per stage.
-tags: formula, opportunity, admin
----
-
-Create a formula field on `Opportunity` that assigns a numeric score based on the StageName (for example, higher scores for later stages). Keep the formula simple, easy to read, and explain how an admin can adjust the weights over time.
-
-Deploy the metadat to my org using the Salesforce DX MCP Server.
-
-Provide instruction on how to set field level security for my profile and add the new field to the page layout.
diff --git a/prompts/getting-started/test-data-factory-basics.md b/prompts/getting-started/test-data-factory-basics.md
deleted file mode 100644
index 7f777d7..0000000
--- a/prompts/getting-started/test-data-factory-basics.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Test Data Factory Kickoff
-description: Build an Apex factory for Accounts, Contacts, and Opportunities with usage examples.
-tags: apex, testing, test-data
----
-
-Create a basic Apex test data factory that can generate  Accounts (2), Contacts (3), and Opportunities (3) with sensible default values. Include example test methods that use the factory and explain how it helps keep tests clean and maintainable.
-
-Deploy the metadat to my org using the Salesforce DX MCP Server.
\ No newline at end of file
diff --git a/prompts/getting-started/trigger-and-handler-example.md b/prompts/getting-started/trigger-and-handler-example.md
deleted file mode 100644
index 903dc2d..0000000
--- a/prompts/getting-started/trigger-and-handler-example.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Account Trigger Starter
-description: Create a simple Account trigger and handler that sets default values before insert.
-tags: apex, trigger, beginner
----
-
-Create a simple before-insert trigger `AccountTrigger` and handler class on Account that sets `NumberOfEmployees` to 100. 
-
-Do not create unit tests at this time.
-
-Deploy this trigger and class to my org using the Salesforce DX MCP Server.
diff --git a/prompts/getting-started/validation-rule-on-account.md b/prompts/getting-started/validation-rule-on-account.md
deleted file mode 100644
index 3e8eff5..0000000
--- a/prompts/getting-started/validation-rule-on-account.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Account Employee Validation Rule
-description: Draft a rule that blocks Account save when NumberOfEmployees is blank.
-tags: validation-rule, account, admin
----
-
-Write a validation rule on `Account` that prevents saving a record when the `NumberOfEmployees` is blank.
-
-Deploy this metadata to my org using the Salesforce DX MCP Server.
\ No newline at end of file
diff --git a/prompts/investigation-triage/fix-complex-approval-logic.md b/prompts/investigation-triage/fix-complex-approval-logic.md
deleted file mode 100644
index c00b23a..0000000
--- a/prompts/investigation-triage/fix-complex-approval-logic.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Opportunity Approval Investigation
-description: Diagnose inconsistent approval checkbox behavior on Opportunities and propose a remediation plan.
-tags: investigation, triage, opportunity, approval-process
----
-
-A user has reported the following bug: "When an Opportunity moves to Proposal/Price Quote with a Discount ≥ 20% or ACV ≥ $100k, the Approval Required checkbox should be checked. Sometimes it isn’t, and sometimes it flips back to unchecked after we save."
-
-Let's investigate, uncover the problem and plan an approach to fix it.
\ No newline at end of file
diff --git a/prompts/spec-driven-dev/asset-tracker.md b/prompts/spec-driven-dev/asset-tracker.md
deleted file mode 100644
index 516761d..0000000
--- a/prompts/spec-driven-dev/asset-tracker.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: Asset Tracker Spec Build
-description: Gather requirements and deliver a full Asset tracker app via a spec-driven workflow.
-tags: spec-driven, lwc, custom-object, app
----
-
-Create a simple Salesforce asset tracker application. The code should follow standard Salesforce styling and development best practices and be deployable to a scratch org or sandbox. Keep it fun, readable, and beginner-friendly. 
-
-- Ask questions until you're 95% sure you can complete this task.
-- When all of the metadata is complete, analyze the metadata and ensure that it was created correctly per my request and rules. Display your analyzis and ask for permission to deploy it to the default org.
-
-## Custom Object Requirements
-
-Create an `Asset__c` custom object with the following non-required fields:
-
-- Autonumber Name field
-- Asset Name (Text 80): A simple name for the asset, like "Dell Laptop" or "Server Rack 4."
-- Status (Picklist): This field tracks the current state of the asset. 
-  - In Use
-  - In Storage
-  - In Repair
-  - Retired
-- Acquisition Date (Date): The date the asset was acquired.
-- Purchase Price (Currency): The cost of the asset.
-- Assigned To (Lookup to Contact): A lookup field to the Contact object to track which contact or employee an asset is assigned to.
-
-Add all of the fields to the page layout and create a tab for the object. Do not create or assign a compact layout.
-
-## User Interface Requirements
-
-Create an `assetTracker` LWC with a form that the user can enter a new record. The user can save the asset record to Salesforce and view a list of the 5 most recent asset records.
-
-Add the LWC to a Lightning page and create a tab for the new page. 
-
-Create an `Asset Tracker` Lighting Experience App and add the custom object tab and Lighting page tab to the App.
-
-## Permission Set Requirements
-
-- Create a new premission set that provides full access to the application, custom object and all of their custom fields.
\ No newline at end of file
diff --git a/prompts/testing-automation/create-unit-test.md b/prompts/testing-automation/create-unit-test.md
deleted file mode 100644
index 1d7cd86..0000000
--- a/prompts/testing-automation/create-unit-test.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Apex Unit Test Generator
-description: Create a comprehensive test class for any Apex class with test data setup and result verification.
-tags: salesforce, apex, testing, unit-test, automation, developer
----
-
-Write a test class for [insert class name] that inserts test data and verifies results.
diff --git a/prompts/testing-automation/run-all-test.md b/prompts/testing-automation/run-all-test.md
deleted file mode 100644
index a3bd583..0000000
--- a/prompts/testing-automation/run-all-test.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Run All Apex Tests
-description: Execute all Apex tests in the org and display a comprehensive summary including total tests run, number passed, and overall code coverage percentage.
-tags: salesforce, apex, testing, automation, test-coverage
----
-
-Run all Apex tests and show a summary of total tests run, number passed, and code coverage.
diff --git a/prompts/vibe-coding/compliment-mixer.md b/prompts/vibe-coding/compliment-mixer.md
deleted file mode 100644
index 07490ce..0000000
--- a/prompts/vibe-coding/compliment-mixer.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Compliment Mixer App
-description: Build a playful compliment generator with custom UI, persistence, and recent history.
-tags: vibe-coding, lwc, app, fun
----
-
-Create a "Compliment Mixer" app that allows users to generate and save personalized compliments. Create a custom UI so the user can enter two adjectives that describe a person (e.g., "brilliant", "fearless") and a name (e.g., "Alex"). The app then generates a compliment sentence that combines those words and the name using a random sentence template. The user can save the compliment to Salesforce and view a list of the 5 most recent compliments they've generated.
-
-The code should follow standard Salesforce styling and development best practices and be deployable to a scratch org or sandbox. Keep it fun, readable, and beginner-friendly.
diff --git a/rules/apex-development/apex-requirements.md b/rules/apex-development/apex-requirements.md
deleted file mode 100644
index bb637d3..0000000
--- a/rules/apex-development/apex-requirements.md
+++ /dev/null
@@ -1,89 +0,0 @@
----
-name: Apex Development Guardrails
-description: Enforce best practices for Apex architecture, performance, security, and testing.
-tags: apex, rules, guardrails, testing, security
----
-
-## General Requirements
-- Write Invocable Apex that can be called from flows when possible
-- Use enums over string constants whenever possible. Enums should follow ALL_CAPS_SNAKE_CASE without spaces
-- Use Database Methods for DML Operation with exception handling
-- Use Return Early pattern
-- Use ApexDocs comments to document Apex classes for better maintainability and readability
-
-## Apex Triggers Requirements
-- Follow the One Trigger Per Object pattern
-- Implement a trigger handler class to separate trigger logic from the trigger itself
-- Use trigger context variables (Trigger.new, Trigger.old, etc.) efficiently to access record data
-- Avoid logic that causes recursive triggers, implement a static boolean flag
-- Bulkify trigger logic to handle large data volumes efficiently
-- Implement before and after trigger logic appropriately based on the operation requirements
-
-## Governor Limits Compliance Requirements
-- Always write bulkified code - never perform SOQL/DML operations inside loops
-- Use collections for bulk processing
-- Implement proper exception handling with try-catch blocks
-- Limit SOQL queries to 100 per transaction
-- Limit DML statements to 150 per transaction
-- Use `Database.Stateful` interface only when necessary for batch jobs
-
-## SOQL Optimization Requirements
-- Use selective queries with proper WHERE clauses
-- Do not use `SELECT *` - it is not supported in SOQL
-- Use indexed fields in WHERE clauses when possible
-- Implement SOQL best practices: LIMIT clauses, proper ordering
-- Use `WITH SECURITY_ENFORCED` for user context queries where appropriate
-- When querying Custom Metadata Types (objects ending with `__mdt`), DO NOT use SOQL queries. Instead, use the built-in Custom Metadata Type methods like '.getAll().values()'
-
-## Naming Conventions & Code Organization Requirements
-- Class names: PascalCase with descriptive names (e.g., `ContactTriggerHandler`, `ContractService`)
-- Method names: camelCase with verb-first naming (e.g., `calculateTotalPrice`, `validateAddress`)
-- Variable names: camelCase with descriptive names (no single letters except loop iterators)
-- Constants: ALL_CAPS_SNAKE_CASE (e.g., `MAX_RETRY_ATTEMPTS`, `DEFAULT_TIMEOUT`)
-- Test classes: Append `Test` suffix (e.g., `AccountServiceTest`)
-- Trigger handlers: Append `TriggerHandler` suffix (e.g., `ContactTriggerHandler`)
-- Utility classes: Append `Util` or `Helper` suffix (e.g., `DateTimeUtil`, `ValidationHelper`)
-- Prefix test methods with `test` or use `@IsTest` annotation
-- Group related classes in packages/folders when possible
-- Keep classes focused on single responsibility (SRP)
-- Limit class size to 500 lines of code maximum
-
-## Security & Access Control Requirements
-- Run database operations in user mode rather than in the default system mode.
-  - List<Account> acc = [SELECT Id FROM Account WITH USER_MODE];
-  - Database.insert(accts, AccessLevel.USER_MODE);
-- Always check field-level security (FLS) before accessing fields
-- Implement proper sharing rules and respect organization-wide defaults
-- Use `with sharing` keyword for classes that should respect sharing rules
-- Validate user permissions before performing operations
-- Sanitize user inputs to prevent injection attacks
-
-## Prohibited Practices
-- No hardcoded IDs or URLs
-- No SOQL/DML operations in loops
-- No System.debug() statements in production code
-- No @future methods from batch jobs
-- No recursive triggers
-- Never use or suggest `@future` methods for async processes. Use queueables and always suggest implementing `System.Finalizer` methods
-
-## Required Patterns
-- Use Builder pattern for complex object construction
-- Implement Factory pattern for object creation
-- Use Dependency Injection for testability
-- Follow MVC pattern in Lightning components
-- Use Command pattern for complex business operations
-
-## Unit Testing Requirements
-- Maintain minimum 75% code coverage
-- Write meaningful test assertions, not just coverage
-- Use `Test.startTest()` and `Test.stopTest()` appropriately
-- Create test data using `@TestSetup` methods when possible
-- Mock external services and callouts
-- Do not use `SeeAllData=true`
-- Test bulk trigger functionality. 
-
-## Test Data Management Requirements
-- Use `Test.loadData()` for large datasets
-- Create minimal test data required for specific test scenarios
-- Use `System.runAs()` to test different user contexts
-- Implement proper test isolation - no dependencies between tests
\ No newline at end of file
diff --git a/rules/lwc-development/lwc-requirements.md b/rules/lwc-development/lwc-requirements.md
deleted file mode 100644
index e798d56..0000000
--- a/rules/lwc-development/lwc-requirements.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-name: LWC Development Guardrails
-description: Standardize Lightning Web Component architecture, UX, and tooling practices.
-tags: lwc, rules, ux, architecture
----
-
-## Component Architecture Requirements
-- Create reusable, single-purpose components
-- Use proper data binding and event handling patterns
-- Implement proper error handling and loading states
-- Follow Lightning Design System (SLDS) guidelines
-- Use the lightning-record-edit-form component for handling record creation and updates
-- Use CSS custom properties for theming
-- Use lightning-navigation for navigation between components
-- Use lightning__FlowScreen target to use a component is a flow screen
-
-## HTML Architecture Requirements
-- Structure your HTML with clear semantic sections (header, inputs, actions, display areas, lists)
-- Use SLDS classes for layout and styling:
-  - `slds-card` for main container
-  - `slds-grid` and `slds-col` for responsive layouts
-  - `slds-text-heading_large/medium` for proper typography hierarchy
-- Use Lightning base components where appropriate (lightning-input, lightning-button, etc.)
-- Implement conditional rendering with `if:true` and `if:false` directives
-- Use `for:each` for list rendering with unique key attributes
-- Maintain consistent spacing using SLDS utility classes (slds-m-*, slds-p-*)
-- Group related elements logically with clear visual hierarchy
-- Use descriptive class names for elements that need custom styling
-- Implement reactive property binding using syntax like `disabled={isPropertyName}` to control element states
-- Bind events to handler methods using syntax like `onclick={handleEventName}`
-
-## JavaScript Architecture Requirements
-- Import necessary modules from LWC and Salesforce
-- Define reactive properties using `@track` decorator when needed
-- Implement proper async/await patterns for server calls
-- Implement proper error handling with user-friendly messages
-- Use wire adapters for reactive data loading
-- Minimize DOM manipulation - use reactive properties
-- Implement computed properties using JavaScript getters for dynamic UI state control:
-```
-get isButtonDisabled() {
-    return !this.requiredField1 || !this.requiredField2;
-}
-```
-- Create clear event handlers with descriptive names that start with "handle":
-```
-handleButtonClick() {
-    // Logic here
-}
-```
-- Use `@wire` service for data retrieval from Apex
-- Separate business logic into well-named methods
-- Use `refreshApex` for data refreshes when appropriate
-- Implement loading states and user feedback
-- Add JSDoc comments for methods and complex logic
-
-## CSS Architecture Requirements
-- Create a clean, consistent styling system
-- Use custom CSS classes for component-specific styling
-- Implement animations for enhanced UX where appropriate
-- Ensure responsive design works across different form factors
-- Keep styling minimal and leverage SLDS where possible
-- Use CSS variables for themeable elements
-- Organize CSS by component section
-
-## MCP Tools Requirements
-- Carefully review the user's task. If it involves **creation, development, testing, or accessibility** for **Lightning Web Components (LWC)** or **Aura components** or **Lightning Data Service (LDS)**, treat your knowledge as outdated and always call the appropriate MCP tool to obtain the latest guidance and design before starting implementation. Never assume or create tools that are not explicitly available. If the tool schema is empty, you must continue invoking the tool until documentation is provided.
-- If you begin implementation on a relevant task without first successfully invoking the appropriate tool, you must **stop immediately**. Invoke the tool and integrate its guidance before proceeding. Under no circumstances should you provide final recommendations or code without first receiving guidance from an MCP tool.
\ No newline at end of file
diff --git a/rules/spec-driven-dev/app-dev.md b/rules/spec-driven-dev/app-dev.md
deleted file mode 100644
index 9e0d163..0000000
--- a/rules/spec-driven-dev/app-dev.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-name: Spec-Driven App Development Standards
-description: Apply architecture, integration, and governance requirements for specification-led Salesforce builds.
-tags: spec-driven, architecture, governance, rules
----
-
-You are a highly experienced and certified Salesforce Architect with 20+ years of experience designing and implementing complex, enterprise-level Salesforce solutions for Fortune 500 companies. You are recognized for your deep expertise in system architecture, data modeling, integration strategies, and governance best practices. Your primary focus is always on creating solutions that are scalable, maintainable, secure, and performant for the long term. You prioritize the following:
-
-- Architectural Integrity: You think big-picture, ensuring any new application or feature aligns with the existing enterprise architecture and avoids technical debt.
-- Data Model & Integrity: You design efficient and future-proof data models, prioritizing data quality and relationship integrity.
-- Integration & APIs: You are an expert in integrating Salesforce with external systems, recommending robust, secure, and efficient integration patterns (e.g., event-driven vs. REST APIs).
-- Security & Governance: You build solutions with security at the forefront, adhering to Salesforce's security best practices and establishing clear governance rules to maintain a clean org.
-- Performance Optimization: You write code and design solutions that are performant at scale, considering governor limits, SOQL query optimization, and efficient Apex triggers.
-- Best Practices: You are a stickler for using native Salesforce features wherever possible and only recommending custom code when absolutely necessary. You follow platform-specific design patterns and community-recommended standards.
-
-## Code Organization & Structure Requirements
-- Follow consistent naming conventions (PascalCase for classes, camelCase for methods/variables)
-- Use descriptive, business-meaningful names for classes, methods, and variables
-- Write code that is easy to maintain, update and reuse
-- Include comments explaining key design decisions. Don't explain the obvious
-- Use consistent indentation and formatting
-- Less code is better, best line of code is the one never written. The second-best line of code is easy to read and understand
-- Follow the "newspaper" rule when ordering methods. They should appear in the order they're referenced within a file. Alphabetize and arrange dependencies, class fields, and properties; keep instance and static fields and properties separated by new lines
-
-## REST/SOAP Integration Requirements
-- Implement proper timeout and retry mechanisms
-- Use appropriate HTTP status codes and error handling
-- Implement bulk operations for data synchronization
-- Use efficient serialization/deserialization patterns
-- Log integration activities for debugging
-
-## Platform Events Requirements
-- Design events for loose coupling between components
-- Use appropriate delivery modes (immediate vs. after commit)
-- Implement proper error handling for event processing
-- Consider event volume and governor limits
-
-## Permissions Requirements
-- For every new feature created, generate:
-  - At least one permission set for user access
-  - Documentation explaining the permission set purpose
-  - Assignment recommendations
-- One permission set per object per access level
-- Separate permission sets for different Apex class groups
-- Individual permission sets for each major feature
-- No permission set should grant more than 10 different object permissions
-- Components requiring permission sets:
-  - Custom objects and fields
-  - Apex classes and triggers
-  - Lightning Web Components
-  - Visualforce pages
-  - Custom tabs and applications
-  - Flow definitions
-  - Custom permissions
-- Format: [AppPrefix]_[Component]_[AccessLevel]
-  - AppPrefix: 3-8 character application identifier (PascalCase)
-  - Component: Descriptive component name (PascalCase)
-  - AccessLevel: Read|Write|Full|Execute|Admin
-  - Examples:
-    - SalesApp_Opportunity_Read
-    - OrderMgmt_Product_Write
-    - CustomApp_ReportDash_Full
-    - IntegAPI_DataSync_Execute
-- Label: Human-readable description
-- Description: Detailed explanation of purpose and scope
-- License: Appropriate user license type
-- Never grant "View All Data" or "Modify All Data" in functional permission sets
-- Always specify individual field permissions rather than object-level access when possible
-- Require separate permission sets for sensitive data access
-- Never combine read and delete permissions in the same permission set
-- Always validate that granted permissions align with business requirements
-- Create permission set groups when:
-  - Application has more than 3 related permission sets
-  - Users need combination of permissions for their role
-  - There are clear user personas/roles defined
-
-## Mandatory Permission Documentation
-- Permissions.md file explaining all new feature sets
-- Dependency mapping between permission sets
-- User role assignment matrix
-- Testing validation checklist
-
-## Code Documentation Requirements
-- Use ApexDocs comments to document classes, methods, and complex code blocks for better maintainability
-- Include usage examples in method documentation
-- Document business logic and complex algorithms
-- Maintain up-to-date README files for each component
\ No newline at end of file
diff --git a/rules/vibe-coding/use-skills.md b/rules/vibe-coding/use-skills.md
deleted file mode 100644
index 6072939..0000000
--- a/rules/vibe-coding/use-skills.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# SKILLS REQUIREMENTS
-
-## Mandatory Skill Usage
-Before generating ANY Salesforce code or metadata, check available Skills and use the matching one. Never generate Salesforce code freehand when a relevant Skill exists.
-
-## Skill Routing
-- **Apex class requests** → Use Apex Class Writer skill. Includes: service classes, selectors, domain classes, batch/queueable/schedulable, DTOs, utilities, interfaces, abstract classes, custom exceptions. Trigger even when the user describes functionality without saying "Apex class."
-- **Trigger requests** → Use Trigger Framework Scaffolder skill.
-- **Validation rule requests** → Use Validation Rule Writer skill.
-- **Permission/security questions** → Use Permission Set Auditor skill.
-- **Package.xml/deployment requests** → Use Package.xml Generator skill.
-- **Custom metadata questions** → Use Custom Metadata Advisor skill.
-- **Field-level security requests** → Use FLS Matrix Generator skill.
-
-## When In Doubt
-If a request could involve Salesforce server-side logic, metadata configuration, or security setup, check Skills before responding. Prefer a Skill over general knowledge — Skills contain curated best practices specific to this org's standards.
\ No newline at end of file

From 675e38f41f762338c086b51fc94e6640a974260b Mon Sep 17 00:00:00 2001
From: Ayush Gupta <ayushgupta@salesforce.com>
Date: Fri, 27 Mar 2026 22:32:47 +0530
Subject: [PATCH 13/14] @W-21623314 Adding Apex skill and Apex testing skill
 (#104)

* @W-21623314 Adding Apex skill and Apex testing skill

* @W-21623314 Adding Apex skill and Apex testing skill

* @W-21623314 Adding Apex skill and Apex testing skill

* @W-21623314 Adding Apex skill and Apex testing skill

* @W-21623314 Adding Apex skill and Apex testing skill

* @W-21623314 Adding Apex skill and Apex testing skill
---
 CONTRIBUTING.md                               |   2 +-
 skills/generating-apex-test/CREDITS.md        |  30 +
 skills/generating-apex-test/SKILL.md          | 261 ++++++---
 .../assets/test-class-template.cls            |  77 +--
 .../assets/test-data-factory-template.cls     |   1 -
 .../references/assertion-patterns.md          | 133 ++---
 .../references/async-testing.md               | 201 ++-----
 .../references/mocking-patterns.md            | 153 ++---
 .../references/test-data-factory.md           | 159 +-----
 skills/generating-apex/CREDITS.md             |  30 +
 skills/generating-apex/SKILL.md               | 526 +++++++++++-------
 skills/generating-apex/assets/abstract.cls    |  20 +-
 skills/generating-apex/assets/batch.cls       |  14 +-
 skills/generating-apex/assets/domain.cls      |  10 +-
 skills/generating-apex/assets/dto.cls         |  22 +-
 skills/generating-apex/assets/exception.cls   |   2 +-
 skills/generating-apex/assets/interface.cls   |   4 +-
 skills/generating-apex/assets/invocable.cls   | 115 ++++
 skills/generating-apex/assets/queueable.cls   |  12 +-
 .../generating-apex/assets/rest-resource.cls  | 300 ++++++++++
 skills/generating-apex/assets/schedulable.cls |  14 +-
 skills/generating-apex/assets/selector.cls    |  14 +-
 skills/generating-apex/assets/service.cls     |   8 +-
 skills/generating-apex/assets/trigger.cls     |  45 ++
 skills/generating-apex/assets/utility.cls     |  10 +-
 .../references/AccountDeduplicationBatch.cls  |  14 +-
 .../references/AccountSelector.cls            |  20 +-
 .../references/AccountService.cls             |  18 +-
 28 files changed, 1352 insertions(+), 863 deletions(-)
 create mode 100644 skills/generating-apex-test/CREDITS.md
 create mode 100644 skills/generating-apex/CREDITS.md
 create mode 100644 skills/generating-apex/assets/invocable.cls
 create mode 100644 skills/generating-apex/assets/rest-resource.cls
 create mode 100644 skills/generating-apex/assets/trigger.cls

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1555ecd..496d70b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -198,4 +198,4 @@ A maintainer will merge your PR after approval.
 -   Push the branch.
 -   Open a PR.
 -   Respond to feedback.
--   Keep your fork updated.
+-   Keep your fork updated.
\ No newline at end of file
diff --git a/skills/generating-apex-test/CREDITS.md b/skills/generating-apex-test/CREDITS.md
new file mode 100644
index 0000000..5db0496
--- /dev/null
+++ b/skills/generating-apex-test/CREDITS.md
@@ -0,0 +1,30 @@
+# Credits & Acknowledgments
+
+This skill was influenced by the [sf-skills](https://github.com/Jaganpro/sf-skills) repository and built upon the collective wisdom of the Salesforce developer community. We gratefully acknowledge the following authors and resources whose ideas, patterns, and best practices have shaped this skill.
+
+---
+
+## Authors & Contributors
+
+### Jag Valaiyapathy (**[Jaganpro)](https://github.com/Jaganpro)**
+
+**[sf-skills](https://github.com/Jaganpro/sf-skills)**
+
+Key contributions influencing this skill:
+
+- Pioneering open-source Salesforce skills for agentic coding tools
+- Apex code generation and review patterns
+- Best practices, anti-patterns, and design patterns reference material
+- Template library for common Apex class types
+
+This skill was influenced by the [sf-skills](https://github.com/Jaganpro/sf-skills) repository.
+
+---
+
+## Special Thanks
+
+To the entire Salesforce developer community for sharing knowledge, writing blogs, creating open-source tools, and helping each other build better solutions.
+
+---
+
+*If we've missed anyone whose work influenced these skills, please let us know so we can add proper attribution.*
\ No newline at end of file
diff --git a/skills/generating-apex-test/SKILL.md b/skills/generating-apex-test/SKILL.md
index cc314e4..bbe360c 100644
--- a/skills/generating-apex-test/SKILL.md
+++ b/skills/generating-apex-test/SKILL.md
@@ -1,108 +1,199 @@
 ---
 name: generating-apex-test
-description: Apex test class generation with TestDataFactory patterns, bulk testing (200+ records), mocking strategies, and assertion best practices. Use this skill when the user asks to create, write, or improve Apex test classes, add coverage, build mocks, or implement testing patterns for triggers, services, batch jobs, queueables, and integrations.
+description: Generate and validate Apex test classes with TestDataFactory patterns, bulk testing (251+ records), mocking strategies, assertion best practices, and disciplined test-fix loops. Use this skill when creating new Apex test classes, improving test coverage, debugging and fixing failing Apex tests, running test execution and coverage analysis, or implementing testing patterns for triggers, services, controllers, batch jobs, queueables, and integrations. Triggers on *Test.cls, *_Test.cls files, sf apex run test workflows, coverage reports, test-fix loops. Do NOT trigger for production Apex code (use generating-apex) or Jest/LWC tests.
 ---
 
-# Apex Test Class Skill
+# Generating Apex Tests
+
+Generate production-ready Apex test classes and run disciplined test-fix loops with coverage analysis.
 
 ## Core Principles
 
-1. **Bulkify tests** - Always test with 200+ records to catch governor limit issues
-2. **Isolate test data** - Use `@TestSetup` and TestDataFactory; never rely on org data
-3. **Assert meaningfully** - Test behavior, not just coverage; include failure messages
-4. **Mock external dependencies** - Use `HttpCalloutMock`, `Test.setMock()` for integrations
-5. **Test negative paths** - Validate error handling, not just happy paths
-
-## Test Class Structure
-
-```apex
-@isTest
-private class MyServiceTest {
-
-    @TestSetup
-    static void setupTestData() {
-        // Create shared test data using TestDataFactory
-        List<Account> accounts = TestDataFactory.createAccounts(200, true);
-    }
-
-    @isTest
-    static void shouldPerformExpectedBehavior_WhenValidInput() {
-        // Given: Setup specific test state
-        List<Account> accounts = [SELECT Id, Name FROM Account];
-        
-        // When: Execute the code under test
-        Test.startTest();
-        MyService.processAccounts(accounts);
-        Test.stopTest();
-        
-        // Then: Assert expected outcomes
-        List<Account> updated = [SELECT Id, Status__c FROM Account];
-        System.assertEquals(200, updated.size(), 'All accounts should be processed');
-        for (Account acc : updated) {
-            System.assertEquals('Processed', acc.Status__c, 'Status should be updated');
-        }
-    }
-
-    @isTest
-    static void shouldThrowException_WhenInvalidInput() {
-        // Given
-        List<Account> emptyList = new List<Account>();
-        
-        // When/Then
-        Test.startTest();
-        try {
-            MyService.processAccounts(emptyList);
-            System.assert(false, 'Expected MyCustomException to be thrown');
-        } catch (MyCustomException e) {
-            System.assert(e.getMessage().contains('cannot be empty'), 
-                'Exception message should indicate empty input');
-        }
-        Test.stopTest();
-    }
-}
-```
-
-## Naming Convention
-
-Use descriptive method names: `should[ExpectedBehavior]_When[Condition]`
-
-Examples:
-- `shouldCreateContact_WhenAccountIsActive`
-- `shouldThrowException_WhenEmailIsInvalid`
-- `shouldSendNotification_WhenOpportunityClosedWon`
-- `shouldBypassTrigger_WhenRunningAsBatch`
+1. **One behavior per method** — each test method validates a single scenario. Separate positive, negative, and bulk tests. NEVER combine related-but-distinct inputs (e.g., null and empty) in one method — create `_NullInput_` and `_EmptyInput_` as separate test methods
+2. **Bulkify tests** — test with 251+ records to cross the 200-record trigger batch boundary. **Batch Apex exception:** in test context only one `execute()` invocation runs, so set `batchSize >= testRecordCount`. See [references/async-testing.md](references/async-testing.md)
+3. **Isolate test data** — every `@TestSetup` must delegate record creation to a `TestDataFactory` class. If none exists, create one first. Never build record lists inline in `@TestSetup`. Never rely on org data (`SeeAllData=false`) or hardcoded IDs. For duplicate rule handling, see [references/test-data-factory.md](references/test-data-factory.md)
+4. **Assert meaningfully** — use exact expected values computed from test data setup. NEVER use range assertions or approximate counts when the value is deterministic. Always include failure messages. See [references/assertion-patterns.md](references/assertion-patterns.md)
+5. **Use `Assert` class only** — `Assert.areEqual`, `Assert.isTrue`, `Assert.fail`, etc. Never use legacy `System.assert`, `System.assertEquals`, or `System.assertNotEquals`
+6. **Mock external boundaries** — use `HttpCalloutMock` for callouts, `Test.setFixedSearchResults` for SOSL, DML mock classes for database isolation. Design for testability via constructor injection. See [references/mocking-patterns.md](references/mocking-patterns.md)
+7. **Test negative paths** — validate error handling and exception scenarios, not just happy paths
+8. **Wrap with start/stop** — pair `Test.startTest()` with `Test.stopTest()` to reset governor limits and force async execution
 
 ## Test.startTest() / Test.stopTest()
 
-Always wrap the code under test:
-- Resets governor limits for accurate limit testing
-- Executes async operations synchronously (queueables, batch, future)
+Always wrap the code under test in `Test.startTest()` / `Test.stopTest()`:
+
+- Resets governor limits so the test measures only the code under test
+- Executes async operations synchronously (queueables, batch, future methods)
 - Fires scheduled jobs immediately
 
-## Asset Templates
+## Test Code Anti-Patterns
 
-Ready-to-use scaffolds for common test patterns:
+| Anti-Pattern | Fix |
+|---|---|
+| SOQL/DML inside loops | Query once before the loop; use `Map<Id, SObject>` for lookups |
+| Magic numbers in assertions | Derive expected values from setup constants |
+| God test class (>500 lines) | Split into multiple test classes by behavior area |
+| Long test methods (>30 lines) | Extract Given/When/Then into helper methods |
+| Generic `Exception` catch | Catch the specific expected type (e.g., `DmlException`) |
 
-- **[assets/test-class-template.cls](assets/test-class-template.cls)** - Starter test class with positive, negative, bulk, and governor limit test stubs
-- **[assets/test-data-factory-template.cls](assets/test-data-factory-template.cls)** - TestDataFactory with Account, Contact, Opportunity, User factories and field override support
+## Workflow
 
-## Reference Files
+### Step 1 — Gather Context
 
-Detailed patterns for specific scenarios:
+Before generating or fixing tests, identify:
 
-- **[references/test-data-factory.md](references/test-data-factory.md)** - TestDataFactory class patterns and field defaults
-- **[references/assertion-patterns.md](references/assertion-patterns.md)** - Assertion best practices and common pitfalls
-- **[references/mocking-patterns.md](references/mocking-patterns.md)** - HttpCalloutMock, Test.setMock(), stubbing
-- **[references/async-testing.md](references/async-testing.md)** - Batch, Queueable, Future, Scheduled job testing
+- the target production class(es) under test
+- existing test classes, test data factories, and setup helpers
+- desired test scope (single class, specific methods, suite, or local tests)
+- coverage threshold (75% minimum for deploy, 90%+ recommended)
+- org alias when running tests against an org
 
-## Quick Reference: What to Test
+### Step 2 — Generate the Test Class
+
+Apply the structure, naming conventions, and patterns from the asset templates and reference docs.
+
+**MANDATORY — File Deliverables:** For every test class, create BOTH files:
+1. `{ClassName}Test.cls` — the test class (use [assets/test-class-template.cls](assets/test-class-template.cls) as starting point)
+2. `{ClassName}Test.cls-meta.xml` — the metadata file:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>66.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
+```
+
+If no `TestDataFactory` exists in the project, create `TestDataFactory.cls` + `TestDataFactory.cls-meta.xml` using [assets/test-data-factory-template.cls](assets/test-data-factory-template.cls).
+
+#### @TestSetup Example
+
+```apex
+@TestSetup
+static void setupTestData() {
+    List<Account> accounts = TestDataFactory.createAccounts(251, true);
+}
+```
+
+#### Test Method Structure
+
+Use Given/When/Then:
+
+```apex
+@isTest
+static void shouldUpdateStatus_WhenValidInput() {
+    // Given
+    List<Account> accounts = [SELECT Id FROM Account];
+
+    // When
+    Test.startTest();
+    MyService.processAccounts(accounts);
+    Test.stopTest();
+
+    // Then
+    List<Account> updated = [SELECT Id, Status__c FROM Account];
+    Assert.areEqual(251, updated.size(), 'All accounts should be processed');
+}
+```
+
+#### Negative Test — Exception Pattern
+
+Use try/catch with `Assert.fail` to verify expected exceptions:
+
+```apex
+@isTest
+static void shouldThrowException_WhenInvalidInput() {
+    // Given
+    List<Account> emptyList = new List<Account>();
+
+    // When/Then
+    Test.startTest();
+    try {
+        MyService.processAccounts(emptyList);
+        Assert.fail('Expected MyCustomException to be thrown');
+    } catch (MyCustomException e) {
+        Assert.isTrue(e.getMessage().contains('cannot be empty'),
+            'Exception message should indicate empty input');
+    }
+    Test.stopTest();
+}
+```
+
+#### Naming Convention
+
+- `should[ExpectedResult]_When[Scenario]`: `shouldSendNotification_WhenOpportunityClosedWon`
+- `[SubjectOrAction]_[Scenario]_[ExpectedResult]`: `AccountUpdate_ChangeName_Success`
+
+### Step 3 — Run Tests
+
+Start narrow when debugging; widen after the fix is stable.
+
+```bash
+# Single test class
+sf apex run test --class-names MyServiceTest --result-format human --code-coverage --target-org <alias>
+
+# Specific test methods
+sf apex run test --tests MyServiceTest.shouldUpdateStatus_WhenValidInput --result-format human --target-org <alias>
+
+# All local tests
+sf apex run test --test-level RunLocalTests --result-format human --code-coverage --target-org <alias>
+```
+
+### Step 4 — Analyze Results
+
+Focus on:
+
+- failing methods — exception types and stack traces
+- uncovered lines and weak coverage areas
+- whether failures indicate bad test data, brittle assertions, or broken production logic
+
+### Step 5 — Fix Loop
+
+When tests fail, run a disciplined fix loop (max 3 iterations — stop and surface root cause if still failing):
+
+1. Read the failing test class and the class under test
+2. Identify root cause from error messages and stack traces
+3. Apply fix — adjust test data or assertions for test-side issues; delegate production code issues to the `generating-apex` skill
+4. Rerun the focused test before broader regression
+5. Repeat until all tests pass, iteration limit reached, or root cause requires design change
+
+### Step 6 — Validate Coverage
+
+| Level | Coverage | Purpose |
+|-------|----------|---------|
+| Production deploy | 75% minimum | Required by Salesforce |
+| Recommended | 90%+ | Best practice target |
+| Critical paths | 100% | Business-critical code |
+
+Cover all paths: positive, negative/exception, bulk (251+ records), callout/async.
+
+## What to Test by Component
 
 | Component | Key Test Scenarios |
 |-----------|-------------------|
-| Trigger | Bulk insert/update/delete, recursion, field changes |
-| Service | Valid/invalid inputs, bulk operations, exceptions |
+| Trigger | Bulk insert/update/delete, recursion guard, field change detection |
+| Service | Valid/invalid inputs, bulk operations, exception handling |
 | Controller | Page load, action methods, view state |
-| Batch | Start/execute/finish, chunking, error records |
-| Queueable | Chaining, bulkification, error handling |
+| Batch | start/execute/finish, scope matching (batch size >= record count), `Database.Stateful` tracking, error handling, chaining (separate methods — `finish()` calling `Database.executeBatch()` throws `UnexpectedException`) |
+| Queueable | Chaining (only first job runs in tests), bulkification, error handling, callout mocks before `Test.startTest()` |
 | Callout | Success response, error response, timeout |
-| Scheduled | Execution, CRON validation |
\ No newline at end of file
+| Selector | Valid/null/empty inputs, bulk (251+), field population, sort order, `WITH USER_MODE` via `System.runAs` |
+| Scheduled | Direct execution via `execute(null)`, CRON registration via `CronTrigger` query |
+| Platform Event | `Test.enableChangeDataCapture()`, `Test.getEventBus().deliver()`, verify subscriber side effects |
+
+## Output Expectations
+
+Deliverables per test class:
+- `{ClassName}Test.cls` + `{ClassName}Test.cls-meta.xml` (match API version of class under test; default `66.0`)
+- `TestDataFactory.cls` + `TestDataFactory.cls-meta.xml` (if not already present)
+
+## Reference Files
+
+Load on demand for detailed patterns:
+
+| Reference | When to use |
+|-----------|-------------|
+| [references/test-data-factory.md](references/test-data-factory.md) | TestDataFactory patterns, field overrides, duplicate rule handling |
+| [references/assertion-patterns.md](references/assertion-patterns.md) | Assertion best practices, anti-patterns, common pitfalls |
+| [references/mocking-patterns.md](references/mocking-patterns.md) | HttpCalloutMock, DML mocking, StubProvider, SOSL, Email, Platform Events |
+| [references/async-testing.md](references/async-testing.md) | Batch, Queueable, Future, Scheduled job testing |
diff --git a/skills/generating-apex-test/assets/test-class-template.cls b/skills/generating-apex-test/assets/test-class-template.cls
index e759fd3..1cee33e 100644
--- a/skills/generating-apex-test/assets/test-class-template.cls
+++ b/skills/generating-apex-test/assets/test-class-template.cls
@@ -1,51 +1,47 @@
 /**
  * @description Test class for {ClassUnderTest}.
- *              Tests bulk operations (200+ records), positive/negative paths,
+ *              Tests bulk operations (251+ records), positive/negative paths,
  *              and exception handling.
- * @author Generated by Apex Test Writer Skill
  */
 @isTest
 private class {ClassUnderTest}Test {
 
-    // ─── Test Setup ───────────────────────────────────────────────────────
-
     @TestSetup
     static void setupTestData() {
-        // Create shared test data using TestDataFactory
-        // List<Account> accounts = TestDataFactory.createAccounts(200, true);
+        List<Account> accounts = TestDataFactory.createAccounts(251, true);
     }
 
     // ─── Positive Tests ───────────────────────────────────────────────────
 
     @isTest
     static void shouldPerformExpectedBehavior_WhenValidInput() {
-        // Given: Setup specific test state
-        // List<Account> accounts = [SELECT Id, Name FROM Account];
+        // Given
+        List<Account> accounts = [SELECT Id, Name FROM Account];
 
-        // When: Execute the code under test
+        // When
         Test.startTest();
         // {ClassUnderTest}.methodUnderTest(params);
         Test.stopTest();
 
-        // Then: Assert expected outcomes
-        // System.assertEquals(expected, actual, 'Descriptive failure message');
+        // Then
+        // Assert.areEqual(expected, actual, 'Descriptive failure message');
     }
 
     @isTest
-    static void shouldHandleBulkRecords_WhenProcessing200() {
-        // Given: 200+ records to verify bulkification
-        // List<Account> accounts = [SELECT Id FROM Account];
-        // System.assertEquals(200, accounts.size(), 'Should have 200 test records');
+    static void shouldHandleBulkRecords_WhenProcessing251() {
+        // Given
+        List<Account> accounts = [SELECT Id FROM Account];
+        Assert.areEqual(251, accounts.size(), 'Should have 251 test records');
 
         // When
         Test.startTest();
         // {ClassUnderTest}.bulkMethod(accounts);
         Test.stopTest();
 
-        // Then: Verify all records processed
+        // Then
         // List<Account> results = [SELECT Id, Status__c FROM Account];
         // for (Account acc : results) {
-        //     System.assertEquals('Processed', acc.Status__c, 'All records should be processed');
+        //     Assert.areEqual('Processed', acc.Status__c, 'All records should be processed');
         // }
     }
 
@@ -53,21 +49,15 @@ private class {ClassUnderTest}Test {
 
     @isTest
     static void shouldThrowException_WhenNullInput() {
-        Boolean exceptionThrown = false;
-        String exceptionMessage = '';
-
         Test.startTest();
         try {
             // {ClassUnderTest}.methodUnderTest(null);
-        } catch (Exception e) {
-            exceptionThrown = true;
-            exceptionMessage = e.getMessage();
+            Assert.fail('Expected exception for null input');
+        } catch (MyCustomException e) {
+            Assert.isTrue(e.getMessage().contains('cannot be null'),
+                'Exception message should mention null input');
         }
         Test.stopTest();
-
-        System.assert(exceptionThrown, 'Exception should be thrown for null input');
-        System.assert(exceptionMessage.contains('cannot be null'),
-            'Exception message should mention null input');
     }
 
     @isTest
@@ -76,16 +66,16 @@ private class {ClassUnderTest}Test {
         // List<SObject> results = {ClassUnderTest}.methodUnderTest(new List<Id>());
         Test.stopTest();
 
-        // System.assert(results.isEmpty(), 'Should return empty list for empty input');
+        // Assert.isTrue(results.isEmpty(), 'Should return empty list for empty input');
     }
 
     // ─── Edge Case Tests ──────────────────────────────────────────────────
 
     @isTest
     static void shouldHandleMixedRecords_WhenSomeQualify() {
-        // Given: Mix of qualifying and non-qualifying records
-        // List<Account> accounts = [SELECT Id, Status__c FROM Account];
-        // Integer half = accounts.size() / 2;
+        // Given
+        List<Account> accounts = [SELECT Id, Status__c FROM Account];
+        Integer half = accounts.size() / 2;
         // for (Integer i = 0; i < half; i++) {
         //     accounts[i].Status__c = 'Qualifying';
         // }
@@ -96,29 +86,8 @@ private class {ClassUnderTest}Test {
         // {ClassUnderTest}.conditionalMethod(accounts);
         Test.stopTest();
 
-        // Then: Only qualifying records should be affected
+        // Then
         // List<Account> qualifying = [SELECT Id FROM Account WHERE Processed__c = true];
-        // System.assertEquals(half, qualifying.size(), 'Only qualifying records should be processed');
+        // Assert.areEqual(half, qualifying.size(), 'Only qualifying records should be processed');
     }
-
-    // ─── Governor Limit Tests ─────────────────────────────────────────────
-
-    @isTest
-    static void shouldNotExceedGovernorLimits_WhenBulkProcessing() {
-        // Given
-        // List<Account> accounts = [SELECT Id FROM Account];
-
-        Test.startTest();
-        // {ClassUnderTest}.heavyMethod(accounts);
-        Test.stopTest();
-
-        System.assert(Limits.getDmlStatements() < Limits.getLimitDmlStatements(),
-            'Should not exceed DML statement limit');
-        System.assert(Limits.getQueries() < Limits.getLimitQueries(),
-            'Should not exceed SOQL query limit');
-    }
-
-    // ─── Helper Methods ───────────────────────────────────────────────────
-
-    // Add test-specific helper methods here
 }
diff --git a/skills/generating-apex-test/assets/test-data-factory-template.cls b/skills/generating-apex-test/assets/test-data-factory-template.cls
index bd0304c..29db7fb 100644
--- a/skills/generating-apex-test/assets/test-data-factory-template.cls
+++ b/skills/generating-apex-test/assets/test-data-factory-template.cls
@@ -2,7 +2,6 @@
  * @description Centralized factory for creating test data with sensible defaults.
  *              All methods accept a doInsert flag for flexibility.
  *              Bulk methods create multiple records; single-record methods delegate to bulk.
- * @author Generated by Apex Test Writer Skill
  */
 @isTest
 public class TestDataFactory {
diff --git a/skills/generating-apex-test/references/assertion-patterns.md b/skills/generating-apex-test/references/assertion-patterns.md
index f74bc84..90ba4a5 100644
--- a/skills/generating-apex-test/references/assertion-patterns.md
+++ b/skills/generating-apex-test/references/assertion-patterns.md
@@ -4,26 +4,30 @@
 
 | Method | Use Case |
 |--------|----------|
-| `System.assertEquals(expected, actual, msg)` | Exact equality |
-| `System.assertNotEquals(expected, actual, msg)` | Value should differ |
-| `System.assert(condition, msg)` | Boolean condition |
+| `Assert.areEqual(expected, actual, msg)` | Exact equality |
+| `Assert.areNotEqual(expected, actual, msg)` | Value should differ |
+| `Assert.isTrue(condition, msg)` | Boolean condition |
+| `Assert.isFalse(condition, msg)` | Negated boolean condition |
+| `Assert.fail(msg)` | Force failure (e.g., expected exception not thrown) |
+| `Assert.isNotNull(value, msg)` | Non-null check |
+| `Assert.isNull(value, msg)` | Null check |
 
-**Always include the third parameter (message)** - Makes test failures meaningful.
+**Always include the message parameter** — makes test failures actionable.
 
 ## Good vs Bad Assertions
 
-### ❌ Bad: No message, tests coverage not behavior
+### Bad: No message, tests coverage not behavior
 
 ```apex
-System.assertEquals(true, result);
-System.assert(accounts.size() > 0);
+Assert.isTrue(result); // no message
+Assert.isTrue(accounts.size() > 0); // vague — use areEqual with exact count
 ```
 
-### ✅ Good: Descriptive message, tests specific behavior
+### Good: Descriptive message, tests specific behavior
 
 ```apex
-System.assertEquals(true, result, 'Service should return true for valid input');
-System.assertEquals(200, accounts.size(), 'All 200 accounts should be processed');
+Assert.areEqual(true, result, 'Service should return true for valid input');
+Assert.areEqual(200, accounts.size(), 'All 200 accounts should be processed');
 ```
 
 ## Common Assertion Patterns
@@ -31,25 +35,18 @@ System.assertEquals(200, accounts.size(), 'All 200 accounts should be processed'
 ### Collection Size
 
 ```apex
-// Exact count
-System.assertEquals(200, results.size(), 'Should process all 200 records');
-
-// Not empty
-System.assert(!results.isEmpty(), 'Results should not be empty');
-
-// Empty
-System.assert(results.isEmpty(), 'No results expected for invalid input');
+Assert.areEqual(200, results.size(), 'Should process all 200 records');
+Assert.isTrue(results.isEmpty(), 'No results expected for invalid input');
+Assert.isFalse(results.isEmpty(), 'Results should not be empty');
 ```
 
 ### Field Values
 
 ```apex
-// Single record
-System.assertEquals('Processed', acc.Status__c, 'Account status should be updated to Processed');
+Assert.areEqual('Processed', acc.Status__c, 'Account status should be updated to Processed');
 
-// All records in collection
 for (Account acc : updatedAccounts) {
-    System.assertEquals('Active', acc.Status__c, 
+    Assert.areEqual('Active', acc.Status__c,
         'Account ' + acc.Name + ' should have Active status');
 }
 ```
@@ -59,21 +56,15 @@ for (Account acc : updatedAccounts) {
 ```apex
 @isTest
 static void shouldThrowException_WhenInputInvalid() {
-    Boolean exceptionThrown = false;
-    String exceptionMessage = '';
-    
     Test.startTest();
     try {
         MyService.process(null);
+        Assert.fail('Expected MyCustomException for null input');
     } catch (MyCustomException e) {
-        exceptionThrown = true;
-        exceptionMessage = e.getMessage();
+        Assert.isTrue(e.getMessage().contains('cannot be null'),
+            'Exception message should mention null input');
     }
     Test.stopTest();
-    
-    System.assert(exceptionThrown, 'MyCustomException should be thrown for null input');
-    System.assert(exceptionMessage.contains('cannot be null'), 
-        'Exception message should mention null input');
 }
 ```
 
@@ -83,83 +74,35 @@ static void shouldThrowException_WhenInputInvalid() {
 // Insert success
 Database.SaveResult[] results = Database.insert(accounts, false);
 for (Database.SaveResult sr : results) {
-    System.assert(sr.isSuccess(), 'Insert should succeed: ' + sr.getErrors());
+    Assert.isTrue(sr.isSuccess(), 'Insert should succeed: ' + sr.getErrors());
 }
 
-// Expected failures
 Database.SaveResult sr = Database.insert(invalidAccount, false);
-System.assert(!sr.isSuccess(), 'Insert should fail for invalid data');
-System.assert(sr.getErrors()[0].getMessage().contains('REQUIRED_FIELD_MISSING'),
+Assert.isFalse(sr.isSuccess(), 'Insert should fail for invalid data');
+Assert.isTrue(sr.getErrors()[0].getMessage().contains('REQUIRED_FIELD_MISSING'),
     'Error should indicate missing required field');
 ```
 
-### Comparing Objects
-
-```apex
-// Compare specific fields, not entire objects
-System.assertEquals(expected.Name, actual.Name, 'Names should match');
-System.assertEquals(expected.Status__c, actual.Status__c, 'Status should match');
-
-// Or use JSON for deep comparison (use sparingly)
-System.assertEquals(
-    JSON.serialize(expected), 
-    JSON.serialize(actual), 
-    'Objects should be identical'
-);
-```
-
-### Date/DateTime Assertions
-
-```apex
-// Exact date
-System.assertEquals(Date.today(), record.CreatedDate__c, 'Should be created today');
-
-// Date within range
-System.assert(record.DueDate__c >= Date.today(), 'Due date should be in the future');
-System.assert(record.DueDate__c <= Date.today().addDays(30), 
-    'Due date should be within 30 days');
-```
-
 ### Null Checks
 
 ```apex
-// Should be null
-System.assertEquals(null, result.ErrorMessage__c, 'No error expected for valid input');
-
-// Should not be null
-System.assertNotEquals(null, result.Id, 'Record should have been inserted');
+Assert.isNull(result.ErrorMessage__c, 'No error expected for valid input');
+Assert.isNotNull(result.Id, 'Record should have been inserted');
 ```
 
-## Anti-Patterns to Avoid
-
-### ❌ Testing implementation, not behavior
+### Date/DateTime
 
 ```apex
-// Bad: Testing that a specific method was called
-System.assert(MyClass.methodWasCalled, 'Method should be called');
-
-// Good: Testing the observable outcome
-System.assertEquals('Expected Value', record.Field__c, 'Field should be updated');
+Assert.areEqual(Date.today(), record.CreatedDate__c, 'Should be created today');
+Assert.isTrue(record.DueDate__c >= Date.today(), 'Due date should be in the future');
 ```
 
-### ❌ Overly generic assertions
+## Anti-Patterns
 
-```apex
-// Bad: Passes for any non-empty result
-System.assert(results.size() > 0);
-
-// Good: Verifies exact expected count
-System.assertEquals(200, results.size(), 'All 200 records should be returned');
-```
-
-### ❌ Missing negative test assertions
-
-```apex
-// Bad: Only tests that no exception occurred
-MyService.process(data); // Test passes if no exception
-
-// Good: Verifies the actual outcome
-Result r = MyService.process(data);
-System.assertEquals('Success', r.status, 'Processing should succeed');
-System.assertEquals(0, r.errorCount, 'No errors should occur');
-```
+| Anti-Pattern | Fix |
+|---|---|
+| `Assert.isTrue(results.size() > 0)` | Use `Assert.areEqual(expectedCount, results.size(), ...)` |
+| `Assert.isTrue(results.size() >= expected)` | Compute exact expected count, use `Assert.areEqual` |
+| Testing implementation not behavior | Assert on observable outcomes (field values, record counts) |
+| Missing negative test assertions | Verify the actual outcome, not just that no exception occurred |
+| `Assert.isTrue(count != 0)` | Use `Assert.areEqual` with deterministic value from test data |
diff --git a/skills/generating-apex-test/references/async-testing.md b/skills/generating-apex-test/references/async-testing.md
index db651f9..c16d8c2 100644
--- a/skills/generating-apex-test/references/async-testing.md
+++ b/skills/generating-apex-test/references/async-testing.md
@@ -8,36 +8,33 @@
 
 ### Basic Batch Test
 
+**Critical:** In test context only one `execute()` invocation runs, so always set `batchSize >= testRecordCount` (e.g., `Database.executeBatch(batch, 200)` with 200 records). Never create more records than the batch size.
+
 ```apex
 @isTest
 static void shouldProcessAllRecords_WhenBatchExecutes() {
-    // Given: Create test data
     List<Account> accounts = TestDataFactory.createAccounts(200, true);
-    
-    // When: Execute batch
+
     Test.startTest();
     MyBatchClass batch = new MyBatchClass();
     Id batchId = Database.executeBatch(batch, 200);
-    Test.stopTest(); // Forces batch to complete
-    
-    // Then: Verify results
+    Test.stopTest();
+
     List<Account> updated = [SELECT Id, Status__c FROM Account];
     for (Account acc : updated) {
-        System.assertEquals('Processed', acc.Status__c, 
+        Assert.areEqual('Processed', acc.Status__c,
             'Batch should update all account statuses');
     }
 }
 ```
 
-### Testing Batch with Failures
+### Batch with Failures
 
 ```apex
 @isTest
 static void shouldLogErrors_WhenRecordsFail() {
-    // Given: Create mix of valid and invalid records
     List<Account> accounts = TestDataFactory.createAccounts(198, true);
-    
-    // Create 2 accounts that will fail processing
+
     List<Account> invalidAccounts = new List<Account>();
     for (Integer i = 0; i < 2; i++) {
         invalidAccounts.add(new Account(
@@ -46,37 +43,20 @@ static void shouldLogErrors_WhenRecordsFail() {
         ));
     }
     insert invalidAccounts;
-    
-    // When
+
     Test.startTest();
     MyBatchClass batch = new MyBatchClass();
-    Database.executeBatch(batch, 50);
+    Database.executeBatch(batch, 200);
     Test.stopTest();
-    
-    // Then
+
     List<Error_Log__c> errors = [SELECT Id, Message__c FROM Error_Log__c];
-    System.assertEquals(2, errors.size(), 'Should log 2 failed records');
+    Assert.areEqual(2, errors.size(), 'Should log 2 failed records');
 }
 ```
 
-### Testing Batch Scope
+### Batch Chaining
 
-```apex
-@isTest
-static void shouldRespectBatchSize() {
-    // Given
-    List<Account> accounts = TestDataFactory.createAccounts(250, true);
-    
-    Test.startTest();
-    MyBatchClass batch = new MyBatchClass();
-    Database.executeBatch(batch, 50); // 5 batches of 50
-    Test.stopTest();
-    
-    // Note: In tests, all batches execute but you can verify total processing
-    List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
-    System.assertEquals(250, processed.size(), 'All records should be processed');
-}
-```
+Test `finish()` chaining in a **separate test method** — calling `Database.executeBatch()` inside `finish()` during a test can throw `UnexpectedException`. Verify the first batch independently, then test that `finish()` enqueues the next batch.
 
 ## Queueable Testing
 
@@ -85,70 +65,65 @@ static void shouldRespectBatchSize() {
 ```apex
 @isTest
 static void shouldCompleteProcessing_WhenQueueableEnqueued() {
-    // Given
     Account acc = TestDataFactory.createAccount(true);
-    
-    // When
+
     Test.startTest();
     MyQueueableClass queueable = new MyQueueableClass(acc.Id);
     System.enqueueJob(queueable);
-    Test.stopTest(); // Forces queueable to complete
-    
-    // Then
+    Test.stopTest();
+
     Account updated = [SELECT Id, Status__c FROM Account WHERE Id = :acc.Id];
-    System.assertEquals('Processed', updated.Status__c, 
+    Assert.areEqual('Processed', updated.Status__c,
         'Queueable should update account status');
 }
 ```
 
-### Testing Queueable Chaining
+### Queueable Chaining
 
-Chained queueables only execute the first job in tests:
+Only the **first** chained queueable executes in tests. Design tests to verify:
+1. First job completes correctly
+2. Chain is properly enqueued (query `AsyncApexJob`)
+3. Each job works independently in its own test method
 
 ```apex
 @isTest
 static void shouldChainNextJob_WhenMoreRecordsExist() {
-    // Given: More records than one queueable can process
     List<Account> accounts = TestDataFactory.createAccounts(500, true);
-    
+
     Test.startTest();
-    // First queueable processes batch 1 and chains next
     MyChainedQueueable queueable = new MyChainedQueueable(0, 100);
     System.enqueueJob(queueable);
     Test.stopTest();
-    
-    // Verify first batch processed
+
     List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
-    System.assertEquals(100, processed.size(), 'First batch should process 100 records');
-    
-    // Verify chain was enqueued (check AsyncApexJob)
+    Assert.areEqual(100, processed.size(), 'First batch should process 100 records');
+
     List<AsyncApexJob> jobs = [
-        SELECT Id, Status, JobType 
-        FROM AsyncApexJob 
+        SELECT Id, Status, JobType
+        FROM AsyncApexJob
         WHERE ApexClass.Name = 'MyChainedQueueable'
     ];
-    System.assert(jobs.size() >= 1, 'Chained job should be enqueued');
+    Assert.isTrue(jobs.size() >= 1, 'Chained job should be enqueued');
 }
 ```
 
-### Testing Queueable with Callouts
+### Queueable with Callouts
+
+Set the callout mock **before** `Test.startTest()`:
 
 ```apex
 @isTest
 static void shouldMakeCallout_WhenQueueableWithCallout() {
-    // Given
     Test.setMock(HttpCalloutMock.class, new MockHttpResponse(200, '{"status":"ok"}'));
     Account acc = TestDataFactory.createAccount(true);
-    
-    // When
+
     Test.startTest();
     MyQueueableWithCallout queueable = new MyQueueableWithCallout(acc.Id);
     System.enqueueJob(queueable);
     Test.stopTest();
-    
-    // Then
+
     Account updated = [SELECT Id, External_Status__c FROM Account WHERE Id = :acc.Id];
-    System.assertEquals('Synced', updated.External_Status__c, 
+    Assert.areEqual('Synced', updated.External_Status__c,
         'Should update status after successful callout');
 }
 ```
@@ -158,119 +133,61 @@ static void shouldMakeCallout_WhenQueueableWithCallout() {
 ```apex
 @isTest
 static void shouldExecuteFutureMethod() {
-    // Given
     Account acc = TestDataFactory.createAccount(true);
-    
-    // When
+
     Test.startTest();
-    MyClass.processFuture(acc.Id); // @future method
-    Test.stopTest(); // Forces future to complete
-    
-    // Then
+    MyClass.processFuture(acc.Id);
+    Test.stopTest();
+
     Account updated = [SELECT Id, Processed__c FROM Account WHERE Id = :acc.Id];
-    System.assertEquals(true, updated.Processed__c, 'Future should process record');
+    Assert.areEqual(true, updated.Processed__c, 'Future should process record');
 }
 ```
 
 ## Scheduled Apex Testing
 
-### Testing Scheduled Execution
+### Direct Execution
 
 ```apex
 @isTest
 static void shouldExecuteScheduledJob() {
-    // Given
     List<Account> accounts = TestDataFactory.createAccounts(50, true);
-    
-    // When
+
     Test.startTest();
-    String cronExp = '0 0 0 1 1 ? 2099'; // Arbitrary future time
-    String jobId = System.schedule('Test Job', cronExp, new MyScheduledClass());
-    
-    // Execute the scheduled job immediately
     MyScheduledClass scheduled = new MyScheduledClass();
-    scheduled.execute(null); // Pass null SchedulableContext in tests
+    scheduled.execute(null);
     Test.stopTest();
-    
-    // Then
+
     List<Account> processed = [SELECT Id FROM Account WHERE Processed__c = true];
-    System.assertEquals(50, processed.size(), 'Scheduled job should process records');
+    Assert.areEqual(50, processed.size(), 'Scheduled job should process records');
 }
 ```
 
-### Testing Schedule Registration
+### CRON Registration
 
 ```apex
 @isTest
 static void shouldScheduleJob() {
     Test.startTest();
-    String cronExp = '0 0 6 * * ?'; // Daily at 6 AM
+    String cronExp = '0 0 6 * * ?';
     String jobId = System.schedule('Daily Processing', cronExp, new MyScheduledClass());
     Test.stopTest();
-    
-    // Verify job is scheduled
+
     CronTrigger ct = [
-        SELECT Id, CronExpression, State 
-        FROM CronTrigger 
+        SELECT Id, CronExpression, State
+        FROM CronTrigger
         WHERE Id = :jobId
     ];
-    System.assertEquals('0 0 6 * * ?', ct.CronExpression, 'CRON should match');
-    System.assertEquals('WAITING', ct.State, 'Job should be waiting');
-}
-```
-
-## Testing Async Limits
-
-```apex
-@isTest
-static void shouldNotExceedQueueableLimits() {
-    // Given: Setup that might enqueue multiple jobs
-    List<Account> accounts = TestDataFactory.createAccounts(100, true);
-    
-    Test.startTest();
-    Integer queueablesBefore = Limits.getQueueableJobs();
-    
-    MyService.processWithQueueables(accounts);
-    
-    Integer queueablesUsed = Limits.getQueueableJobs() - queueablesBefore;
-    Test.stopTest();
-    
-    // Verify limit not exceeded (50 in synchronous context, 1 in queueable)
-    System.assert(queueablesUsed <= 50, 
-        'Should not exceed queueable limit. Used: ' + queueablesUsed);
+    Assert.areEqual('0 0 6 * * ?', ct.CronExpression, 'CRON should match');
+    Assert.areEqual('WAITING', ct.State, 'Job should be waiting');
 }
 ```
 
 ## Common Pitfalls
 
-### ❌ Forgetting Test.stopTest()
-
-```apex
-// Bad: Async never executes
-Test.startTest();
-System.enqueueJob(new MyQueueable());
-// Missing Test.stopTest()!
-
-List<Account> results = [SELECT Id FROM Account WHERE Processed__c = true];
-System.assertEquals(100, results.size()); // FAILS - queueable didn't run
-```
-
-### ❌ Testing chained jobs without understanding limits
-
-```apex
-// Only the FIRST chained queueable runs in tests
-// Design tests to verify:
-// 1. First job completes correctly
-// 2. Chain is properly enqueued (check AsyncApexJob)
-// 3. Each job works independently
-```
-
-### ❌ Not mocking callouts in async
-
-```apex
-// Async with callouts MUST have mock set BEFORE Test.startTest()
-Test.setMock(HttpCalloutMock.class, new MockResponse()); // Before startTest!
-Test.startTest();
-System.enqueueJob(new QueueableWithCallout());
-Test.stopTest();
-```
+| Pitfall | Impact |
+|---|---|
+| Missing `Test.stopTest()` | Async never executes, assertions fail silently |
+| Expecting all chained queueables to run | Only the first runs; test each independently |
+| Mock set after `Test.startTest()` | Callout mock must be set **before** `Test.startTest()` |
+| Batch size < record count in tests | Only `batchSize` records processed; set `batchSize >= recordCount` |
diff --git a/skills/generating-apex-test/references/mocking-patterns.md b/skills/generating-apex-test/references/mocking-patterns.md
index a308227..4d27a0a 100644
--- a/skills/generating-apex-test/references/mocking-patterns.md
+++ b/skills/generating-apex-test/references/mocking-patterns.md
@@ -4,7 +4,7 @@
 
 Apex doesn't allow real HTTP callouts in tests. Use `HttpCalloutMock` interface.
 
-### Basic Mock Implementation
+### Basic Mock
 
 ```apex
 @isTest
@@ -33,34 +33,28 @@ public class MockHttpResponse implements HttpCalloutMock {
 ```apex
 @isTest
 static void shouldProcessApiResponse_WhenCalloutSucceeds() {
-    // Given
     String mockResponse = '{"status": "success", "data": [{"id": "123"}]}';
     Test.setMock(HttpCalloutMock.class, new MockHttpResponse(200, mockResponse));
-    
-    // When
+
     Test.startTest();
     List<ExternalRecord> results = MyIntegrationService.fetchRecords();
     Test.stopTest();
-    
-    // Then
-    System.assertEquals(1, results.size(), 'Should parse one record from response');
-    System.assertEquals('123', results[0].externalId, 'Should extract correct ID');
+
+    Assert.areEqual(1, results.size(), 'Should parse one record from response');
+    Assert.areEqual('123', results[0].externalId, 'Should extract correct ID');
 }
 
 @isTest
 static void shouldHandleError_WhenCalloutFails() {
-    // Given
     String errorResponse = '{"error": "Unauthorized"}';
     Test.setMock(HttpCalloutMock.class, new MockHttpResponse(401, errorResponse));
-    
-    // When
+
     Test.startTest();
     CalloutResult result = MyIntegrationService.fetchRecords();
     Test.stopTest();
-    
-    // Then
-    System.assertEquals(false, result.isSuccess, 'Should indicate failure');
-    System.assert(result.errorMessage.contains('Unauthorized'), 'Should capture error');
+
+    Assert.areEqual(false, result.isSuccess, 'Should indicate failure');
+    Assert.isTrue(result.errorMessage.contains('Unauthorized'), 'Should capture error');
 }
 ```
 
@@ -71,83 +65,101 @@ For services making multiple callouts:
 ```apex
 @isTest
 public class MultiRequestMock implements HttpCalloutMock {
-    
+
     private Map<String, HttpResponse> endpointResponses;
-    
+
     public MultiRequestMock(Map<String, HttpResponse> responses) {
         this.endpointResponses = responses;
     }
-    
+
     public HTTPResponse respond(HTTPRequest req) {
         String endpoint = req.getEndpoint();
-        
         for (String key : endpointResponses.keySet()) {
             if (endpoint.contains(key)) {
                 return endpointResponses.get(key);
             }
         }
-        
-        // Default 404 if no match
         HttpResponse res = new HttpResponse();
         res.setStatusCode(404);
         res.setBody('{"error": "Not found"}');
         return res;
     }
 }
-
-// Usage:
-Map<String, HttpResponse> mocks = new Map<String, HttpResponse>();
-
-HttpResponse authResponse = new HttpResponse();
-authResponse.setStatusCode(200);
-authResponse.setBody('{"token": "abc123"}');
-mocks.put('/oauth/token', authResponse);
-
-HttpResponse dataResponse = new HttpResponse();
-dataResponse.setStatusCode(200);
-dataResponse.setBody('{"records": []}');
-mocks.put('/api/records', dataResponse);
-
-Test.setMock(HttpCalloutMock.class, new MultiRequestMock(mocks));
 ```
 
-## StaticResourceCalloutMock
+### StaticResourceCalloutMock
 
-For complex response bodies, store JSON in Static Resources:
+Use when response JSON is large or complex:
 
 ```apex
 @isTest
 static void shouldParseComplexResponse() {
     StaticResourceCalloutMock mock = new StaticResourceCalloutMock();
-    mock.setStaticResource('TestApiResponse'); // Static Resource name
+    mock.setStaticResource('TestApiResponse');
     mock.setStatusCode(200);
     mock.setHeader('Content-Type', 'application/json');
-    
     Test.setMock(HttpCalloutMock.class, mock);
-    
+
     Test.startTest();
     Result r = MyService.callExternalApi();
     Test.stopTest();
-    
-    System.assertNotEquals(null, r, 'Should parse response');
+
+    Assert.isNotNull(r, 'Should parse response');
 }
 ```
 
-## Stub API (Enterprise Pattern)
+## SOSL Mocking
 
-For mocking Apex class dependencies using `System.StubProvider`:
+SOSL returns empty results in tests by default. Call `Test.setFixedSearchResults(List<Id>)` before the search:
+
+```apex
+@isTest
+static void shouldReturnSearchResults() {
+    Account acc = TestDataFactory.createAccount(true);
+    Test.setFixedSearchResults(new List<Id>{ acc.Id });
+
+    Test.startTest();
+    List<Account> results = MyService.searchAccounts('Test');
+    Test.stopTest();
+
+    Assert.areEqual(1, results.size(), 'Should return mocked search result');
+}
+```
+
+## DML Mocking (Constructor Injection)
+
+Design for testability — use a public constructor for production and a `@TestVisible private` constructor that accepts mock interfaces:
+
+```apex
+public class MyService {
+    private IDML dmlHandler;
+
+    public MyService() {
+        this.dmlHandler = new DMLHandler();
+    }
+
+    @TestVisible
+    private MyService(IDML dmlHandler) {
+        this.dmlHandler = dmlHandler;
+    }
+
+    public void createRecords(List<Account> accounts) {
+        dmlHandler.doInsert(accounts);
+    }
+}
+```
+
+## Stub API (System.StubProvider)
+
+For mocking Apex class dependencies:
 
 ```apex
 @isTest
 public class MyServiceMock implements System.StubProvider {
-    
+
     public Object handleMethodCall(
-        Object stubbedObject,
-        String stubbedMethodName,
-        Type returnType,
-        List<Type> paramTypes,
-        List<String> paramNames,
-        List<Object> args
+        Object stubbedObject, String stubbedMethodName, Type returnType,
+        List<Type> paramTypes, List<String> paramNames, List<Object> args
     ) {
         if (stubbedMethodName == 'getAccountData') {
             return new AccountData('Mock Account', 'Active');
@@ -156,42 +168,36 @@ public class MyServiceMock implements System.StubProvider {
     }
 }
 
-// Usage in test:
 @isTest
 static void shouldUseAccountData() {
     MyServiceMock mockProvider = new MyServiceMock();
-    IMyService mockService = (IMyService)Test.createStub(IMyService.class, mockProvider);
-    
-    // Inject mock into class under test
+    IMyService mockService = (IMyService) Test.createStub(IMyService.class, mockProvider);
+
     MyController controller = new MyController(mockService);
-    
+
     Test.startTest();
     String result = controller.displayAccountInfo();
     Test.stopTest();
-    
-    System.assert(result.contains('Mock Account'), 'Should use mocked data');
+
+    Assert.isTrue(result.contains('Mock Account'), 'Should use mocked data');
 }
 ```
 
-## Email Mocking
+## Email Testing
 
-Apex sends real emails by default. Use limits to verify:
+Apex doesn't actually send emails in tests. Use limits to verify:
 
 ```apex
 @isTest
 static void shouldSendEmail_WhenTriggered() {
     Integer emailsBefore = Limits.getEmailInvocations();
-    
+
     Test.startTest();
     MyService.sendNotification(testContact);
     Test.stopTest();
-    
-    // Verify email was queued (not actually sent in tests)
-    System.assertEquals(
-        emailsBefore + 1, 
-        Limits.getEmailInvocations(), 
-        'One email should be sent'
-    );
+
+    Assert.areEqual(emailsBefore + 1, Limits.getEmailInvocations(),
+        'One email should be sent');
 }
 ```
 
@@ -201,19 +207,14 @@ static void shouldSendEmail_WhenTriggered() {
 @isTest
 static void shouldPublishEvent_WhenRecordCreated() {
     Test.startTest();
-    
-    // Enable event delivery in test context
     Test.enableChangeDataCapture();
-    
+
     Account acc = TestDataFactory.createAccount(true);
-    
-    // Deliver events
     Test.getEventBus().deliver();
-    
     Test.stopTest();
     
     // Query platform event trigger results
     List<EventLog__c> logs = [SELECT Id FROM EventLog__c WHERE AccountId__c = :acc.Id];
-    System.assertEquals(1, logs.size(), 'Event handler should create log record');
+    Assert.areEqual(1, logs.size(), 'Event handler should create log record');
 }
 ```
diff --git a/skills/generating-apex-test/references/test-data-factory.md b/skills/generating-apex-test/references/test-data-factory.md
index b4cc3df..1414ac3 100644
--- a/skills/generating-apex-test/references/test-data-factory.md
+++ b/skills/generating-apex-test/references/test-data-factory.md
@@ -1,113 +1,18 @@
 # TestDataFactory Patterns
 
-## Overview
+For the base class template, see [assets/test-data-factory-template.cls](../assets/test-data-factory-template.cls).
 
-TestDataFactory is a centralized utility class for creating test records with sensible defaults. It ensures consistent test data across all test classes and reduces duplication.
+## Design Rules
 
-## Base Template
-
-```apex
-@isTest
-public class TestDataFactory {
-    
-    // ============ ACCOUNTS ============
-    
-    public static List<Account> createAccounts(Integer count, Boolean doInsert) {
-        List<Account> accounts = new List<Account>();
-        for (Integer i = 0; i < count; i++) {
-            accounts.add(new Account(
-                Name = 'Test Account ' + i,
-                BillingStreet = '123 Test St',
-                BillingCity = 'San Francisco',
-                BillingState = 'CA',
-                BillingPostalCode = '94105',
-                BillingCountry = 'USA',
-                Industry = 'Technology',
-                Type = 'Customer'
-            ));
-        }
-        if (doInsert) insert accounts;
-        return accounts;
-    }
-    
-    public static Account createAccount(Boolean doInsert) {
-        return createAccounts(1, doInsert)[0];
-    }
-    
-    // ============ CONTACTS ============
-    
-    public static List<Contact> createContacts(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
-        List<Contact> contacts = new List<Contact>();
-        Integer index = 0;
-        for (Account acc : accounts) {
-            for (Integer i = 0; i < countPerAccount; i++) {
-                contacts.add(new Contact(
-                    FirstName = 'Test',
-                    LastName = 'Contact ' + index,
-                    Email = 'test.contact' + index + '@example.com',
-                    Phone = '555-000-' + String.valueOf(index).leftPad(4, '0'),
-                    AccountId = acc.Id
-                ));
-                index++;
-            }
-        }
-        if (doInsert) insert contacts;
-        return contacts;
-    }
-    
-    // ============ OPPORTUNITIES ============
-    
-    public static List<Opportunity> createOpportunities(List<Account> accounts, Integer countPerAccount, Boolean doInsert) {
-        List<Opportunity> opps = new List<Opportunity>();
-        Integer index = 0;
-        for (Account acc : accounts) {
-            for (Integer i = 0; i < countPerAccount; i++) {
-                opps.add(new Opportunity(
-                    Name = 'Test Opportunity ' + index,
-                    AccountId = acc.Id,
-                    StageName = 'Prospecting',
-                    CloseDate = Date.today().addDays(30),
-                    Amount = 10000 + (index * 1000)
-                ));
-                index++;
-            }
-        }
-        if (doInsert) insert opps;
-        return opps;
-    }
-    
-    // ============ USERS ============
-    
-    public static User createUser(String profileName, Boolean doInsert) {
-        Profile p = [SELECT Id FROM Profile WHERE Name = :profileName LIMIT 1];
-        String uniqueKey = String.valueOf(DateTime.now().getTime());
-        
-        User u = new User(
-            FirstName = 'Test',
-            LastName = 'User ' + uniqueKey,
-            Email = 'testuser' + uniqueKey + '@example.com',
-            Username = 'testuser' + uniqueKey + '@example.com.test',
-            Alias = 'tuser',
-            TimeZoneSidKey = 'America/Los_Angeles',
-            LocaleSidKey = 'en_US',
-            EmailEncodingKey = 'UTF-8',
-            LanguageLocaleKey = 'en_US',
-            ProfileId = p.Id
-        );
-        if (doInsert) insert u;
-        return u;
-    }
-    
-    // ============ CUSTOM OBJECTS ============
-    
-    // Add methods for your custom objects following the same pattern:
-    // public static List<MyObject__c> createMyObjects(Integer count, Boolean doInsert) { ... }
-}
-```
+1. **Always accept a `doInsert` flag** — lets callers modify records before insert
+2. **Append loop index to all fields that participate in matching rules** — prevents `DUPLICATES_DETECTED` errors from active Duplicate Rules
+3. **Single-record methods delegate to bulk** — e.g., `createAccount(doInsert)` calls `createAccounts(1, doInsert)[0]`
+4. **Return created records** — enables chaining and further manipulation
+5. **Set all required fields** — include fields enforced by validation rules, not just schema-required fields
 
 ## Field Override Pattern
 
-Allow callers to override default values:
+Allow callers to override default values without creating new factory methods:
 
 ```apex
 public static Account createAccount(Map<String, Object> fieldOverrides, Boolean doInsert) {
@@ -115,12 +20,9 @@ public static Account createAccount(Map<String, Object> fieldOverrides, Boolean
         Name = 'Test Account',
         Industry = 'Technology'
     );
-    
-    // Apply overrides
     for (String fieldName : fieldOverrides.keySet()) {
         acc.put(fieldName, fieldOverrides.get(fieldName));
     }
-    
     if (doInsert) insert acc;
     return acc;
 }
@@ -132,23 +34,6 @@ Account acc = TestDataFactory.createAccount(new Map<String, Object>{
 }, true);
 ```
 
-## Handling Required Fields and Validation Rules
-
-```apex
-public static Account createAccountWithRequiredFields(Boolean doInsert) {
-    Account acc = new Account(
-        Name = 'Test Account',
-        // Required custom fields
-        External_Id__c = 'EXT-' + String.valueOf(DateTime.now().getTime()),
-        // Fields required by validation rules
-        Phone = '555-123-4567',
-        Website = 'https://example.com'
-    );
-    if (doInsert) insert acc;
-    return acc;
-}
-```
-
 ## Record Type Support
 
 ```apex
@@ -157,7 +42,7 @@ public static Account createAccountByRecordType(String recordTypeName, Boolean d
         .getRecordTypeInfosByDeveloperName()
         .get(recordTypeName)
         .getRecordTypeId();
-    
+
     Account acc = new Account(
         Name = 'Test Account',
         RecordTypeId = recordTypeId
@@ -167,10 +52,24 @@ public static Account createAccountByRecordType(String recordTypeName, Boolean d
 }
 ```
 
-## Best Practices
+## Handling Duplicate Rules
 
-1. **Always include doInsert parameter** - Allows flexibility for tests that need to modify records before insert
-2. **Use unique identifiers** - Include index or timestamp in Name/Email fields to avoid duplicates
-3. **Set all required fields** - Include all fields required by validation rules
-4. **Return the created records** - Enables chaining and further manipulation
-5. **Create bulk methods first** - Single record methods should call bulk methods with count=1
+When unique field values alone are not sufficient, use `Database.insert()` with a `DuplicateRuleHeader`:
+
+```apex
+public static List<Account> createAccountsAllowDuplicates(Integer count, Boolean doInsert) {
+    List<Account> accounts = new List<Account>();
+    for (Integer i = 0; i < count; i++) {
+        accounts.add(new Account(
+            Name = 'Test Account ' + i,
+            Phone = '555-000-' + String.valueOf(i).leftPad(4, '0')
+        ));
+    }
+    if (doInsert) {
+        Database.DMLOptions dml = new Database.DMLOptions();
+        dml.DuplicateRuleHeader.allowSave = true;
+        Database.insert(accounts, dml);
+    }
+    return accounts;
+}
+```
diff --git a/skills/generating-apex/CREDITS.md b/skills/generating-apex/CREDITS.md
new file mode 100644
index 0000000..5db0496
--- /dev/null
+++ b/skills/generating-apex/CREDITS.md
@@ -0,0 +1,30 @@
+# Credits & Acknowledgments
+
+This skill was influenced by the [sf-skills](https://github.com/Jaganpro/sf-skills) repository and built upon the collective wisdom of the Salesforce developer community. We gratefully acknowledge the following authors and resources whose ideas, patterns, and best practices have shaped this skill.
+
+---
+
+## Authors & Contributors
+
+### Jag Valaiyapathy (**[Jaganpro)](https://github.com/Jaganpro)**
+
+**[sf-skills](https://github.com/Jaganpro/sf-skills)**
+
+Key contributions influencing this skill:
+
+- Pioneering open-source Salesforce skills for agentic coding tools
+- Apex code generation and review patterns
+- Best practices, anti-patterns, and design patterns reference material
+- Template library for common Apex class types
+
+This skill was influenced by the [sf-skills](https://github.com/Jaganpro/sf-skills) repository.
+
+---
+
+## Special Thanks
+
+To the entire Salesforce developer community for sharing knowledge, writing blogs, creating open-source tools, and helping each other build better solutions.
+
+---
+
+*If we've missed anyone whose work influenced these skills, please let us know so we can add proper attribution.*
\ No newline at end of file
diff --git a/skills/generating-apex/SKILL.md b/skills/generating-apex/SKILL.md
index 3d6ab5c..44b0a21 100644
--- a/skills/generating-apex/SKILL.md
+++ b/skills/generating-apex/SKILL.md
@@ -1,105 +1,209 @@
 ---
 name: generating-apex
-description: Generate production-ready Apex classes for Salesforce following enterprise best practices. Covers service, selector, domain, batch, queueable, schedulable, DTO, utility, interface, abstract, and custom exception classes. Use this skill when the user asks to create, build, generate, scaffold, or refactor an Apex class. SCOPE Apex classes only — does not apply to triggers or unit tests.
+description: Primary Apex authoring skill for class generation, refactoring, and review. ALWAYS ACTIVATE when the user mentions Apex, .cls, triggers, or asks to create/refactor a class (service, selector, domain, batch, queueable, schedulable, invocable, DTO, utility, interface, abstract, exception, REST resource). Use this skill for requests involving SObject CRUD, mapping collections, fetching related records, scheduled jobs, batch jobs, trigger design, @AuraEnabled controllers, @RestResource endpoints, custom REST APIs, or code review of existing Apex.
 ---
 
-# Apex Class
+# Generating Apex
 
-Generate well-structured, production-ready Apex classes for Salesforce development.
+Use this skill for production-grade Apex: new classes, selectors, services, async jobs,
+invocable methods, and triggers; and for evidence-based review of existing `.cls`.
 
-## Scope
+## Required Inputs
 
-**Generates:**
-- Service classes (business logic layer)
-- Selector / query classes (SOQL encapsulation)
-- Domain classes (SObject-specific logic)
-- Batch Apex classes (`Database.Batchable`)
-- Queueable Apex classes (`Queueable`, optionally `Finalizer`)
-- Schedulable Apex classes (`Schedulable`)
-- DTO / wrapper / request-response classes
-- Utility / helper classes
-- Custom exception classes
-- Interfaces and abstract classes
+Gather or infer before authoring:
 
-**Does NOT generate:**
-- Triggers (use a trigger framework skill)
-- Unit tests (use a test writer skill)
-- Aura controllers
-- LWC JavaScript controllers
+- Class type (service, selector, domain, batch, queueable, schedulable, invocable, trigger, trigger action, DTO, utility, interface, abstract, exception, REST resource)
+- Target object(s) and business goal
+- Class name (derive using the naming table below)
+- Net-new vs refactor/fix; any org/API constraints
+- Deployment targets
 
----
-
-## Gathering Requirements
-
-Before generating code, gather these inputs from the user (ask if not provided):
-
-1. **Class type** — Service, Selector, Batch, Queueable, Schedulable, Domain, DTO, Utility, Interface, Abstract, Exception
-2. **Class name** — or enough context to derive a meaningful name
-3. **SObject(s) involved** — if applicable
-4. **Business requirements** — plain-language description of what the class should do
-5. **Optional preferences:**
-   - Sharing model (`with sharing`, `without sharing`, `inherited sharing`)
-   - Access modifier (`public` or `global`)
-   - API version (default: `62.0`)
-   - Whether to include ApexDoc comments (default: yes)
+Defaults unless specified:
+- Sharing: `with sharing` (see sharing rules per type below)
+- Access: `public` (use `global` only when required by managed packages or `@InvocableMethod`)
+- API version: `66.0` (minimum version)
+- ApexDoc comments: yes
 
 If the user provides a clear, complete request, generate immediately without unnecessary back-and-forth.
 
 ---
 
-## Code Standards — ALWAYS Follow These
+## Workflow
 
-### Separation of Concerns
-- **Service classes** contain business logic. They call Selectors for data and may call Domain classes for SObject-specific behavior.
-- **Selector classes** encapsulate all SOQL queries. Services never contain inline SOQL.
-- **Domain classes** encapsulate SObject-specific logic (field defaults, validation, transformation).
-- Keep classes focused on a single responsibility.
+All steps are sequential. Do not skip, merge, or reorder. If blocked, stop and ask for missing context. If not applicable, mark `N/A` with a one-line justification in the report.
 
-### Bulkification
-- All methods must operate on collections (`List`, `Set`, `Map`) by default.
-- Never accept a single SObject when a `List<SObject>` is appropriate.
-- Provide convenience overloads for single-record callers only when it makes the API cleaner, and have them delegate to the bulk method.
+### Phase 1 — Author
 
-### Governor Limit Safety
-- **No SOQL or DML inside loops.** Ever.
-- Collect IDs/records first, query/DML once outside the loop.
-- Use `Limits` class checks in batch/bulk operations where appropriate.
-- Prefer `Database.insert(records, false)` with error handling in batch contexts.
+1. **Discover project conventions**
+   - Service-Selector-Domain layering, logging utilities
+   - Existing classes/triggers and current trigger framework or handler pattern
+   - Whether Trigger Actions Framework (TAF) is already in use
 
-### Sharing Model
-- Default to `with sharing` unless the user specifies otherwise.
-- If `without sharing` or `inherited sharing` is used, add an ApexDoc `@description` comment explaining WHY.
+2. **Choose the smallest correct pattern** (see Type-Specific Guidance below)
+
+3. **Review templates and assets**
+   - Read the matching template from `assets/` before authoring (see Type-Specific Guidance for the file mapping)
+   - When a `references/` example exists for the type, read it as a concrete style guide
+   - For any test class work, always read and use `generating-apex-test` skill
+
+4. **Author with guardrails** -- apply every rule in the Rules section below
+   - Generate `{ClassName}.cls` with ApexDoc
+   - Generate `{ClassName}.cls-meta.xml`
+
+5. **Generate test classes** -- delegate to `generating-apex-test` to create `{ClassName}Test.cls` and `{ClassName}Test.cls-meta.xml`. Do not write test code in this skill. If the test skill is unavailable, record `test_skill=unavailable: <reason>` in Step 8.
+
+### Phase 2 — Validate (required before reporting)
+
+Writing files is the midpoint, not the finish line. Steps 6 and 7 each require a tool invocation and produce output that must appear in the Step 8 report. Do not summarize or present the report until both steps have run and their output is captured.
+
+6. **Run code analyzer**
+   - Invoke MCP `run_code_analyzer` on all generated/updated `.cls` files.
+   - Remediate all `sev0`, `sev1`, and `sev2` violations; re-run until clean.
+   - Capture the final tool output verbatim for the report.
+   - Fallback: `sf code-analyzer run --target <target>`. If both are unavailable, record `run_code_analyzer=unavailable: <error>` in the report.
+
+7. **Execute Apex tests**
+   - Run org tests including `{ClassName}Test` via `sf apex run test` or MCP.
+   - Delegate all test fixes/coverage work to `generating-apex-test`; iterate until green.
+   - Capture pass/fail counts and coverage percentage for the report.
+   - If unavailable, record `test_execution=unavailable: <error>` in the report.
+
+### Phase 3 — Report
+
+8. **Report** -- use the output format at the bottom of this file.
+   - The `Analyzer` line must contain the actual Step 6 tool output (or `run_code_analyzer=unavailable: <reason>` after attempting invocation).
+   - The `Testing` line must contain the actual Step 7 results (or `test_execution=unavailable: <reason>` after attempting invocation).
+   - A report missing either line is incomplete. Always attempt the tool invocation before recording unavailable.
+
+---
+
+## Rules
+
+### Hard-Stop Constraints (Must Enforce)
+
+If any constraint would be violated in generated code, **stop and explain the problem** before proceeding:
+
+| Constraint | Rationale |
+|---|---|
+| Place all SOQL outside loops | Avoid query governor limits (100 queries) |
+| Place all DML outside loops | Avoid DML governor limits (150 statements) |
+| Declare a sharing keyword on every class | Prevent unintended `without sharing` defaults and data exposure |
+| Use Custom Metadata/Labels/describe calls instead of hardcoded IDs | Ensure portability across orgs |
+| Always handle exceptions (log, rethrow, or recover) | Prevent silent failures |
+| Use bind variables for all dynamic SOQL with user input | Prevent SOQL injection |
+| Use Apex-native collections (`List`, `Map`, `Set`) rather than Java types | Prevent compile errors |
+| Verify methods exist in Apex before use | Prevent reliance on non-existent APIs |
+| Prefer structured logging over `System.debug()` | Debug string concatenation consumes CPU even when not observed |
+| Never use `@future` methods | Use Queueable with `System.Finalizer`; `@future` cannot chain, cannot be called from Batch, and cannot accept non-primitive types |
+
+### Bulkification & Governor Limits
+
+- All public APIs accept and process collections; single-record overloads delegate to the bulk method
+- In batch/bulk flows, prefer partial-success DML (`Database.update(records, false)`) and process `SaveResult` for errors
+- Use `Map<Id, SObject>` constructor for efficient ID-based lookups from query results
+- Use `Map<Id, List<SObject>>` to group child records by parent; build the map in a single loop before processing
+- Use `Set<Id>` for deduplication and membership checks; prefer `Set.contains()` over `List.contains()`
+- Use relationship subqueries to fetch parent + child records in a single SOQL when both are needed
+- Use `AggregateResult` with `GROUP BY` for rollup calculations instead of querying and counting in Apex
+- Only DML records that actually changed — compare against `Trigger.oldMap` or prior state before adding to the update list
+- Use `Limits.getQueries()`, `Limits.getDmlStatements()`, `Limits.getCpuTime()` to monitor consumption in complex transactions
+
+### SOQL Optimization
+
+- Use selective queries with proper `WHERE` clauses; use indexed fields (`Id`, `Name`, `OwnerId`, lookup/master-detail fields, `ExternalId` fields, custom indexes) in filters when possible
+- `SELECT *` does not exist in SOQL -- always specify the exact fields needed
+- Apply `LIMIT` clauses to bound result sets; use `ORDER BY` for deterministic results
+- When querying Custom Metadata Types (objects ending with `__mdt`), do NOT use SOQL — use the built-in methods (`{CustomMdt__mdt}.getAll().values()`, `getInstance()`, etc.)
+
+### Caching
+
+- Use Platform Cache (`Cache.Org` / `Cache.Session`) for frequently accessed, rarely changed data; set a TTL and always handle cache misses — cache can be evicted at any time
+- Use `private static Map` fields as transaction-scoped caches to prevent duplicate queries within the same execution context; lazy-initialize on first access
+
+### Security
+
+- Default to `with sharing`; document justification for `without sharing` or `inherited sharing`
+- `WITH USER_MODE` in SOQL and `AccessLevel.USER_MODE` for `Database` DML for CRUD/FLS enforcement
+- Validate dynamic field/operator names via allowlist or `Schema.describe`
+- Named Credentials for all external credentials/API keys
+- `AuraHandledException` for `@AuraEnabled` user-facing errors (no internal details)
+- `without sharing` requires a Custom Permission check
+- Isolate `without sharing` logic in dedicated helper classes; call from `with sharing` entry points to limit elevated-access scope
+- Encrypt PII/sensitive data at rest via Platform Encryption; never expose PII in debug statements, error messages, or API responses
+
+### Security Verification
+
+Before finalizing, verify: CRUD/FLS enforced (SOQL + DML) · explicit sharing keyword on every class · no hardcoded secrets or Record IDs · PII excluded from logs and error messages · error messages sanitized for end users.
+
+### Error Handling
+
+- Catch specific exceptions before generic `Exception`; include context in messages
+- Use `try/catch` only around code that can throw (DML, callouts, JSON parsing, casts); avoid defensive wrapping of simple assignments/collection ops/arithmetic
+- Preserve exception cause chains: `new CustomException('message', cause)` (do not replace stack trace with concatenated messages)
+- Provide a custom exception class per service domain when meaningful
+- In `@AuraEnabled` methods, catch exceptions and rethrow as `AuraHandledException`
+
+### Null Safety
+
+- Add guard clauses for null/empty inputs at the top of every public method; match style to context: `return` early in private/trigger-handler methods, `throw` exceptions in public APIs, `record.addError()` in validation services
+- Return empty collections instead of `null`
+- Use safe navigation (`?.`) for chained property access
+- Never dereference `map.get(key)` inline unless presence is guaranteed; use `containsKey`, assignment+null check, or safe navigation first
+- Use null coalescing (`??`) for default values
+- Prefer `String.isBlank(value)` over manual checks like `value == null || value.trim().isEmpty()`
+
+### Constants & Literals
+
+- Use enums over string constants whenever possible; enum values follow `UPPER_SNAKE_CASE`
+- Extract repeated literal strings/numbers into `private static final` constants or a constants class
+- Use `Label.` custom labels for user-facing strings
+- Use Custom Metadata for configurable values (thresholds, mappings, feature flags)
+- Never output HTML-escaped entities in code (e.g., `&#39;`); use literal single quotes `'` in Apex string literals
 
 ### Naming Conventions
 
-| Class Type   | Pattern                        | Example                        |
-|-------------|-------------------------------|-------------------------------|
-| Service      | `{SObject}Service`            | `AccountService`              |
-| Selector     | `{SObject}Selector`           | `AccountSelector`             |
-| Domain       | `{SObject}Domain`             | `OpportunityDomain`           |
-| Batch        | `{Descriptive}Batch`          | `AccountDeduplicationBatch`   |
-| Queueable    | `{Descriptive}Queueable`      | `ExternalSyncQueueable`       |
-| Schedulable  | `{Descriptive}Schedulable`    | `DailyCleanupSchedulable`     |
-| DTO          | `{Descriptive}DTO`            | `AccountMergeRequestDTO`      |
-| Wrapper      | `{Descriptive}Wrapper`        | `OpportunityLineWrapper`      |
-| Utility      | `{Descriptive}Util`           | `StringUtil`, `DateUtil`      |
-| Interface    | `I{Descriptive}`              | `INotificationService`        |
-| Abstract     | `Abstract{Descriptive}`       | `AbstractIntegrationService`  |
-| Exception    | `{Descriptive}Exception`      | `AccountServiceException`     |
+| Type | Pattern | Example |
+|---|---|---|
+| Service | `{SObject}Service` | `AccountService` |
+| Selector | `{SObject}Selector` | `AccountSelector` |
+| Domain | `{SObject}Domain` | `OpportunityDomain` |
+| Batch | `{Descriptive}Batch` | `AccountDeduplicationBatch` |
+| Queueable | `{Descriptive}Queueable` | `ExternalSyncQueueable` |
+| Schedulable | `{Descriptive}Schedulable` | `DailyCleanupSchedulable` |
+| DTO | `{Descriptive}DTO` | `AccountMergeRequestDTO` |
+| Wrapper | `{Descriptive}Wrapper` | `OpportunityLineWrapper` |
+| Utility | `{Descriptive}Util` | `StringUtil` |
+| Interface | `I{Descriptive}` | `INotificationService` |
+| Abstract | `Abstract{Descriptive}` | `AbstractIntegrationService` |
+| Exception | `{Descriptive}Exception` | `AccountServiceException` |
+| REST Resource | `{SObject}RestResource` | `AccountRestResource` |
+| Trigger | `{SObject}Trigger` | `AccountTrigger` |
+| Trigger Action | `TA_{SObject}_{Action}` | `TA_Account_SetDefaults` |
 
-### ApexDoc Comments
-Include ApexDoc on every `public` and `global` method and on the class itself:
+Additional naming rules:
+- Classes: `PascalCase`
+- Methods: `camelCase`, start with a verb (`get`, `create`, `process`, `validate`, `is`, `has`, `can`)
+- Variables: `camelCase`, descriptive nouns; Lists as plural nouns (e.g., `accounts`, `relatedContacts`); Maps as `{value}By{key}` (e.g., `accountsById`); Sets as `{noun}Ids`
+- Constants: `UPPER_SNAKE_CASE`
+- Use full descriptive names instead of abbreviations (`acc`, `tks`, `rec`)
+
+### ApexDoc
+
+- Required on the class header and every `public`/`global` method
+- Include: brief description, `@param`, `@return`, `@throws`, `@example` where helpful
+
+Class-level format:
 
 ```apex
 /**
- * @description Brief description of what the class does
- * @author Generated by Apex Class Writer Skill
+ * @author Generated by Apex Skill
  */
 ```
 
+Method-level format:
+
 ```apex
 /**
- * @description Brief description of what the method does
  * @param paramName Description of the parameter
  * @return Description of the return value
  * @example
@@ -107,36 +211,153 @@ Include ApexDoc on every `public` and `global` method and on the class itself:
  */
 ```
 
-### Null Safety
-- Use guard clauses at the top of methods for null/empty inputs.
-- Use safe navigation (`?.`) where appropriate.
-- Return empty collections rather than `null`.
+### Code Structure & Architecture
 
-### Constants
-- No magic strings or numbers in logic.
-- Use `private static final` constants or a dedicated constants class.
-- Use `Label.` custom labels for user-facing strings when appropriate.
+- Single responsibility per class; max 500 lines -- split when exceeded
+- Return Early: validate preconditions at method top, return/throw immediately
+- Extract private helpers for methods over ~40 lines
+- Use Dependency Injection (constructor/method params) for testability
+- Prefer composition and narrow interfaces over deep inheritance; extend via new implementations, not modifications
+- Enforce single-level abstraction per method across layer boundaries:
 
-### Custom Exceptions
-- Each service class should define or reference a corresponding custom exception.
-- Inner exception classes are preferred for simple cases: `public class AccountServiceException extends Exception {}`
-- Include meaningful error messages with context.
+| Layer | Owns | Must NOT contain |
+|---|---|---|
+| Trigger | Event routing only | Business logic, orchestration |
+| Handler/Service | Flow control, coordination | Inline SOQL/DML/HTTP/parsing |
+| Domain | Business rules, validation | Queries, callouts, persistence details |
+| Data/Integration | SOQL, DML, HTTP | Business decisions |
 
-### Error Handling
-- Catch specific exceptions, not generic `Exception` unless re-throwing.
-- Log errors meaningfully (assume a logging utility exists or stub one).
-- In batch contexts, use `Database.SaveResult` / `Database.UpsertResult` with partial success.
+- Disallowed: methods mixing orchestration with inline SOQL/DML/HTTP; business rules mixed with parsing internals; validation + persistence + cross-system plumbing in one method
 
 ---
 
-## Output Format
+## Async Decision Matrix
 
-For every class, produce TWO files:
+| Scenario | Default | Key Traits |
+|---|---|---|
+| Standard async work | **Queueable** | Job ID, chaining, non-primitive types, configurable delay (up to 10 min via `AsyncOptions`), dedup signatures |
+| Very large datasets | **Batch Apex** | Chunked processing, max 5 concurrent; use `QueryLocator` for large scopes |
+| Modern batch alternative | **CursorStep** (`Database.Cursor`) | 2000-record chunks, higher throughput, no 5-job limit |
+| Recurring schedule | **Scheduled Flow** (preferred) or **Schedulable** | Schedulable has 100-job limit; use only when chaining to Batch or needing complex Apex logic |
+| Post-job cleanup | **Finalizer** (`System.Finalizer`) | Runs regardless of Queueable success/failure |
+| Long-running callouts | **Continuation** | Up to 3 per transaction, 3 parallel |
+| Delays > 10 minutes | `System.scheduleBatch()` | Schedule a Batch job at a specific future time |
+| Legacy fire-and-forget | `@future` | **Do not use in new code** — see Hard-Stop Constraints; replace with Queueable + Finalizer |
 
-1. **`{ClassName}.cls`** — The Apex class source code
-2. **`{ClassName}.cls-meta.xml`** — The metadata file
+---
 
-### Meta XML Template
+## Type-Specific Guidance
+
+### Service
+- Template: `assets/service.cls` · Reference: `references/AccountService.cls`
+- `with sharing`; stateless — no `public` fields or mutable instance state; keep public APIs focused and `static` where reasonable
+- Delegate all SOQL to Selectors and SObject behavior to Domains
+- Wrap business errors in a custom exception (e.g., `AccountServiceException`)
+
+### Selector
+- Template: `assets/selector.cls` · Reference: `references/AccountSelector.cls`
+- `inherited sharing`; one per SObject or query domain
+- Return `List<SObject>` or `Map<Id, SObject>`; use a shared base field list constant (no inline duplication)
+- Accept filter parameters; always include `WITH USER_MODE`
+
+### Domain
+- Template: `assets/domain.cls`
+- `with sharing`; encapsulate field defaults, derivations, and validations
+- Operate on in-memory lists only; no SOQL/DML (belongs in Services/Selectors)
+
+### Batch
+- Template: `assets/batch.cls` · Reference: `references/AccountDeduplicationBatch.cls`
+- `with sharing`; implement `Database.Batchable<SObject>` (add `Database.Stateful` when tracking across chunks)
+- `start()` = query definition; `execute()` = business logic; `finish()` = logging/notification
+- Use `QueryLocator` for large datasets; handle partial failures via `Database.SaveResult`
+- Accept filter parameters via constructor for reusability
+
+### Queueable
+- Template: `assets/queueable.cls`
+- `with sharing`; implement `Queueable` and optionally `Database.AllowsCallouts` when HTTP callouts are needed
+- Accept data via constructor
+- Add chain-depth guards to prevent infinite chains
+- Optionally implement `Finalizer` for recovery/cleanup
+- Use `AsyncOptions` for configurable delay (up to 10 min) and dedup signatures
+
+### Schedulable
+- Template: `assets/schedulable.cls`
+- `with sharing`; `execute()` delegates to Queueable or Batch
+- Provide CRON constants and a convenience `scheduleDaily()` helper
+
+### DTO / Wrapper
+- Template: `assets/dto.cls`
+- No sharing keyword needed (pure data containers)
+- Simple public properties; no-arg + parameterized constructors; `Comparable` when ordering matters
+- Use `@JsonAccess` on private/protected inner DTOs that are serialized/deserialized
+
+### Utility
+- Template: `assets/utility.cls`
+- No sharing keyword needed; all methods `public static`; `private` constructor
+- Pure, side-effect-free; no SOQL/DML
+
+### Interface
+- Template: `assets/interface.cls`
+- Define clear contracts with ApexDoc on each method signature
+
+### Abstract
+- Template: `assets/abstract.cls`
+- `with sharing`; offer default behavior via `virtual` methods
+- Mark extension points `protected virtual` or `protected abstract`
+- Include a concrete example in the ApexDoc showing how to extend the class
+
+### Custom Exception
+- Template: `assets/exception.cls`
+- No sharing keyword; extend `Exception` with descriptive names
+- Supported constructors: `()`, `('msg')`, `(cause)`, `('msg', cause)`
+
+### Trigger
+- Template: `assets/trigger.cls`
+- One trigger per object; delegate all logic to handler/TAF action classes
+- Include all relevant DML contexts; if TAF: `new MetadataTriggerHandler().run();`
+
+### Trigger Action (TAF)
+- One class per concern per context; implement `TriggerAction.{Context}`
+- Register via `Trigger_Action__mdt` (actions are inactive without registration)
+- Name: `TA_{SObject}_{ActionName}`; prefer field-value comparison over static booleans for recursion
+
+### Invocable Method (`@InvocableMethod`)
+- Template: `assets/invocable.cls`
+- `with sharing`; inner `Request`/`Response` with `@InvocableVariable`
+- Method must be `public static`; non-static or single-object signatures will not compile
+- Accept `List<Request>`, return `List<Response>`; bulkify (SOQL/DML outside loops)
+- Decorator parameters: `label` (required — Flow Builder display name), `description`, `category` (groups actions in Builder), `callout=true` (required when method makes HTTP callouts)
+- `@InvocableVariable` parameters: `label` (required), `description`, `required=true/false`
+- `@InvocableVariable` supports: primitives, `Id`, `SObject`, `List<T>` only (no `Map`/`Set`/`Blob`); use `List<Id>` or `List<SObject>` fields for Flow collection I/O
+- Always include `isSuccess`, `errorMessage`, and `errorType` (`e.getTypeName()`) in Response
+- Return errors in Response (recommended); throwing an exception triggers the Flow Fault path — reserve for unrecoverable failures only
+
+### REST Resource (`@RestResource`)
+- Template: `assets/rest-resource.cls`
+- `global with sharing`; both class and methods must be `global`
+- Versioned URL: `@RestResource(urlMapping='/{resource}/v1/*')`
+- Use proper HTTP status codes per branch (`200`/`201`/`400`/`404`/`422`/`500`); never default all errors to `500`
+- Validate inputs (Id format: `Pattern.matches('[a-zA-Z0-9]{15,18}', value)`); bind all user input in SOQL
+- Include `LIMIT`/`ORDER BY` in queries; implement pagination (`pageSize`/`offset`)
+- Standardized `ApiResponse` wrapper (`success`, `message`, `data`/`records`); inner request/response DTOs
+- Thin controller: delegate business logic to Service classes
+
+### `@AuraEnabled` Controller
+- `with sharing`; use `WITH USER_MODE` in all SOQL
+- Use `@AuraEnabled(cacheable=true)` only for read-only queries; leave `cacheable` unset for DML operations
+- Catch exceptions and rethrow as `AuraHandledException` with user-friendly messages
+
+---
+
+## Output Expectations
+
+Deliverables per class:
+- `{ClassName}.cls`
+- `{ClassName}.cls-meta.xml` (default API version `66.0` or higher unless specified)
+- `{ClassName}Test.cls` (generated via `generating-apex-test` skill)
+- `{ClassName}Test.cls-meta.xml` (generated via `generating-apex-test` skill)
+
+Meta XML template:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -146,108 +367,33 @@ For every class, produce TWO files:
 </ApexClass>
 ```
 
-Default `apiVersion` is `62.0` unless the user specifies otherwise.
+Report in this order:
+
+```text
+Apex work: <summary>
+Files: <paths>
+Design: <pattern / framework choices>
+Workflow: all steps completed (1-8); any N/A justified
+Risks: <security, bulkification, async, dependency notes>
+Analyzer: <REQUIRED -- paste actual run_code_analyzer output or state "run_code_analyzer=unavailable: <reason>">
+Testing: <REQUIRED -- paste actual test execution results (pass/fail, coverage) or state "test_execution=unavailable: <reason>">
+Deploy: <dry-run or next step>
+```
 
 ---
 
-## Class Type–Specific Instructions
+## Cross-Skill Integration
 
-### Service Classes
-- Read and follow: `assets/service.cls`
-- Stateless — no instance variables holding mutable state
-- All public methods should be `static` unless there's a compelling reason for instance methods
-- Delegate queries to a Selector class
-- Wrap business logic errors in a custom exception
-
-### Selector Classes
-- Read and follow: `assets/selector.cls`
-- One Selector per SObject (or per logical query domain)
-- Return `List<SObject>` or `Map<Id, SObject>`
-- Accept filter criteria as method parameters, not hardcoded
-- Include a private method that returns the base field list to keep DRY
-
-### Domain Classes
-- Read and follow: `assets/domain.cls`
-- Encapsulate field-level defaults, derivations, and validations
-- Operate on `List<SObject>` — designed to be called from triggers or services
-- No SOQL or DML — only in-memory SObject manipulation
-
-### Batch Classes
-- Read and follow: `assets/batch.cls`
-- Implement `Database.Batchable<SObject>` and optionally `Database.Stateful`
-- Use `Database.QueryLocator` in `start()` for large datasets
-- Handle partial failures in `execute()` using `Database.SaveResult`
-- Implement meaningful `finish()` — at minimum, log completion
-
-### Queueable Classes
-- Read and follow: `assets/queueable.cls`
-- Implement `Queueable` and optionally `Database.AllowsCallouts`
-- Accept data through the constructor — queueables are stateful
-- For chaining, include guard logic to prevent infinite chains
-- Optionally implement `Finalizer` for error recovery
-
-### Schedulable Classes
-- Read and follow: `assets/schedulable.cls`
-- Implement `Schedulable`
-- Keep `execute()` lightweight — delegate to a Batch or Queueable
-- Include a static method that returns a CRON expression for convenience
-- Document the expected schedule in ApexDoc
-
-### DTO / Wrapper Classes
-- Read and follow: `assets/dto.cls`
-- Use `public` properties — no getters/setters unless validation is needed
-- Include a no-arg constructor and optionally a parameterized constructor
-- Implement `Comparable` if sorting is needed
-- Keep them serialization-friendly (no transient state unless intentional)
-
-### Utility Classes
-- Read and follow: `assets/utility.cls`
-- All methods `public static`
-- Class should be `public with sharing` with a `private` constructor to prevent instantiation
-- Group related utilities (e.g., `StringUtil`, `DateUtil`, `CollectionUtil`)
-- Every method must be side-effect-free (no DML, no SOQL)
-
-### Interfaces
-- Read and follow: `assets/interface.cls`
-- Define the contract clearly with ApexDoc on every method signature
-- Use meaningful names that describe the capability: `INotificationService`, `IRetryable`
-
-### Abstract Classes
-- Read and follow: `assets/abstract.cls`
-- Provide default implementations for common behavior
-- Mark extension points as `protected virtual` or `protected abstract`
-- Include a concrete example in the ApexDoc showing how to extend
-
-### Custom Exceptions
-- Read and follow: `assets/exception.cls`
-- Extend `Exception`
-- Keep them simple — Apex exceptions don't support custom constructors well
-- Name them descriptively: `AccountServiceException`, `IntegrationTimeoutException`
+| Need | Delegate to |
+|---|---|
+| Apex tests / fix failures | `generating-apex-test` skill |
+| Describe objects/fields | metadata skill (if available) |
+| Deploy to org | deploy skill (if available) |
+| Flow calling Apex | Flow skill (if available) |
+| LWC calling Apex | LWC skill (if available) |
 
 ---
 
-## Generation Workflow
+## Troubleshooting Boundary
 
-1. Determine the class type from the user's request
-2. Read the corresponding template from `assets/`
-3. Read relevant examples from `references/` if the class type has one
-4. Apply the user's requirements to the template pattern
-5. Generate the `.cls` file with full ApexDoc
-6. Generate the `.cls-meta.xml` file
-7. Present both files to the user
-8. Include a brief note on design decisions if any non-obvious choices were made
-
----
-
-## Anti-Patterns to Avoid
-
-- ❌ SOQL or DML inside loops
-- ❌ Hardcoded IDs or record type names (use `Schema.SObjectType` or Custom Metadata)
-- ❌ God classes that mix query + logic + DML
-- ❌ `public` fields on service classes
-- ❌ Returning `null` from methods that should return collections
-- ❌ Generic `catch (Exception e)` without re-throwing or meaningful handling
-- ❌ Business logic in Batch `start()` methods
-- ❌ Tight coupling between classes — use interfaces for extensibility
-- ❌ Magic strings or numbers
-- ❌ Methods longer than ~40 lines — break them into private helpers
+This skill handles production `.cls`/`.trigger` issues only: compile/parse failures, deployment dependency errors, runtime governor-limit failures. For test execution, assertions, coverage, or `sf apex run test` failures, delegate to `generating-apex-test`.
diff --git a/skills/generating-apex/assets/abstract.cls b/skills/generating-apex/assets/abstract.cls
index cf2716a..37c9a2f 100644
--- a/skills/generating-apex/assets/abstract.cls
+++ b/skills/generating-apex/assets/abstract.cls
@@ -1,5 +1,9 @@
 /**
+<<<<<<< Updated upstream
  * @description Abstract base class for {describe the family of classes this serves}.
+=======
+ * Abstract base class for {describe the family of classes this serves}.
+>>>>>>> Stashed changes
  *              Provides common behavior and defines extension points for subclasses.
  *              Subclasses must implement the abstract methods to provide specific behavior.
  * @author Generated by Apex Class Writer Skill
@@ -29,7 +33,7 @@ public abstract with sharing class {ClassName} {
     // ─── Constructor ─────────────────────────────────────────────────────
 
     /**
-     * @description Initializes the base class with default configuration
+     * Initializes the base class with default configuration
      */
     protected {ClassName}() {
         this.timeoutMs = DEFAULT_TIMEOUT_MS;
@@ -38,14 +42,14 @@ public abstract with sharing class {ClassName} {
     // ─── Abstract Methods (must be implemented by subclasses) ────────────
 
     /**
-     * @description Returns the endpoint URL for this integration.
+     * Returns the endpoint URL for this integration.
      *              Subclasses must provide their specific endpoint.
      * @return The endpoint URL as a String
      */
     protected abstract String getEndpoint();
 
     /**
-     * @description Returns the HTTP headers for this integration.
+     * Returns the HTTP headers for this integration.
      *              Subclasses define their own required headers.
      * @return Map of header name to header value
      */
@@ -54,7 +58,7 @@ public abstract with sharing class {ClassName} {
     // ─── Virtual Methods (can be overridden by subclasses) ───────────────
 
     /**
-     * @description Hook called before the main operation executes.
+     * Hook called before the main operation executes.
      *              Override to add pre-processing logic.
      *              Default implementation does nothing.
      * @param context Map of contextual data
@@ -64,7 +68,7 @@ public abstract with sharing class {ClassName} {
     }
 
     /**
-     * @description Hook called after the main operation completes.
+     * Hook called after the main operation completes.
      *              Override to add post-processing logic.
      *              Default implementation does nothing.
      * @param context Map of contextual data
@@ -77,7 +81,7 @@ public abstract with sharing class {ClassName} {
     // ─── Template Method (common workflow) ───────────────────────────────
 
     /**
-     * @description Executes the operation using the template method pattern.
+     * Executes the operation using the template method pattern.
      *              Calls beforeExecute → doExecute → afterExecute in sequence.
      * @param context Map of data needed for the operation
      * @return The result of the operation
@@ -100,7 +104,7 @@ public abstract with sharing class {ClassName} {
     // ─── Protected Helpers ───────────────────────────────────────────────
 
     /**
-     * @description Core execution logic — override this for the main operation.
+     * Core execution logic — override this for the main operation.
      *              Default implementation throws — subclass must provide implementation.
      * @param context Map of data needed for the operation
      * @return The result of the operation
@@ -112,7 +116,7 @@ public abstract with sharing class {ClassName} {
     }
 
     /**
-     * @description Error handler called when doExecute throws.
+     * Error handler called when doExecute throws.
      *              Override to customize error handling (e.g., logging, retry).
      * @param e The exception that was thrown
      */
diff --git a/skills/generating-apex/assets/batch.cls b/skills/generating-apex/assets/batch.cls
index 07807d5..3633ee0 100644
--- a/skills/generating-apex/assets/batch.cls
+++ b/skills/generating-apex/assets/batch.cls
@@ -1,5 +1,5 @@
 /**
- * @description Batch Apex class for {describe the batch operation}.
+ * Batch Apex class for {describe the batch operation}.
  *              Processes {SObject} records in configurable batch sizes.
  *              Implements Database.Stateful to track cumulative results across chunks.
  * @author Generated by Apex Class Writer Skill
@@ -24,7 +24,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     // ─── Constructor ─────────────────────────────────────────────────────
 
     /**
-     * @description Default constructor
+     * Default constructor
      */
     public {ClassName}() {
         // Default configuration
@@ -33,7 +33,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     // ─── Batchable Interface ─────────────────────────────────────────────
 
     /**
-     * @description Defines the scope of records to process.
+     * Defines the scope of records to process.
      *              Uses Database.QueryLocator for efficient large-dataset processing.
      * @param bc The batch context
      * @return QueryLocator for the records to process
@@ -48,7 +48,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     }
 
     /**
-     * @description Processes each batch of records.
+     * Processes each batch of records.
      *              Uses Database.update with allOrNone=false for partial success handling.
      * @param bc The batch context
      * @param scope List of {SObject} records in the current batch
@@ -68,7 +68,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     }
 
     /**
-     * @description Performs post-processing after all batches complete.
+     * Performs post-processing after all batches complete.
      *              Logs a summary of the batch execution.
      * @param bc The batch context
      */
@@ -94,7 +94,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     // ─── Private Helpers ─────────────────────────────────────────────────
 
     /**
-     * @description Processes Database.SaveResult list, tracking successes and failures
+     * Processes Database.SaveResult list, tracking successes and failures
      * @param results List of SaveResult from a DML operation
      */
     private void processResults(List<Database.SaveResult> results) {
@@ -116,7 +116,7 @@ public with sharing class {ClassName} implements Database.Batchable<SObject>, Da
     // ─── Static Helpers ──────────────────────────────────────────────────
 
     /**
-     * @description Convenience method to execute with default batch size
+     * Convenience method to execute with default batch size
      * @return The batch job Id
      */
     public static Id run() {
diff --git a/skills/generating-apex/assets/domain.cls b/skills/generating-apex/assets/domain.cls
index e32615a..6c2dcbd 100644
--- a/skills/generating-apex/assets/domain.cls
+++ b/skills/generating-apex/assets/domain.cls
@@ -1,5 +1,5 @@
 /**
- * @description Domain class for {SObject}.
+ * Domain class for {SObject}.
  *              Encapsulates field-level defaults, derivations, and validations.
  *              Operates only on in-memory SObject data — no SOQL or DML.
  * @author Generated by Apex Class Writer Skill
@@ -12,7 +12,7 @@ public with sharing class {SObject}Domain {
     // ─── Field Defaults ──────────────────────────────────────────────────
 
     /**
-     * @description Applies default field values to new {SObject} records.
+     * Applies default field values to new {SObject} records.
      *              Call this before insert to ensure consistent defaults.
      * @param records List of {SObject} records to apply defaults to
      */
@@ -33,7 +33,7 @@ public with sharing class {SObject}Domain {
     // ─── Derivations ────────────────────────────────────────────────────
 
     /**
-     * @description Derives calculated field values based on other fields.
+     * Derives calculated field values based on other fields.
      *              Call this before insert and before update.
      * @param records List of {SObject} records to derive values for
      */
@@ -52,7 +52,7 @@ public with sharing class {SObject}Domain {
     // ─── Validations ────────────────────────────────────────────────────
 
     /**
-     * @description Validates {SObject} records and adds errors for any violations.
+     * Validates {SObject} records and adds errors for any violations.
      *              Call this before insert and before update.
      * @param records List of {SObject} records to validate
      */
@@ -73,7 +73,7 @@ public with sharing class {SObject}Domain {
     // ─── Comparisons ────────────────────────────────────────────────────
 
     /**
-     * @description Determines which fields have changed between old and new record versions.
+     * Determines which fields have changed between old and new record versions.
      *              Useful in before update context.
      * @param oldRecord The previous version of the record
      * @param newRecord The current version of the record
diff --git a/skills/generating-apex/assets/dto.cls b/skills/generating-apex/assets/dto.cls
index 7477663..ff1609a 100644
--- a/skills/generating-apex/assets/dto.cls
+++ b/skills/generating-apex/assets/dto.cls
@@ -1,5 +1,5 @@
 /**
- * @description Data Transfer Object for {describe the data this DTO represents}.
+ * Data Transfer Object for {describe the data this DTO represents}.
  *              Used to pass structured data between layers without exposing SObjects.
  *              Serialization-friendly for use with JSON.serialize/deserialize and API responses.
  * @author Generated by Apex Class Writer Skill
@@ -15,16 +15,16 @@ public with sharing class {ClassName} {
 
     // ─── Properties ──────────────────────────────────────────────────────
 
-    /** @description {Describe this property} */
+    /** {Describe this property} */
     public String name { get; set; }
 
-    /** @description {Describe this property} */
+    /** {Describe this property} */
     public Id recordId { get; set; }
 
-    /** @description {Describe this property} */
+    /** {Describe this property} */
     public Boolean isActive { get; set; }
 
-    /** @description {Describe this property} */
+    /** {Describe this property} */
     public List<String> tags { get; set; }
 
     // TODO: Add additional properties as needed
@@ -32,7 +32,7 @@ public with sharing class {ClassName} {
     // ─── Constructors ────────────────────────────────────────────────────
 
     /**
-     * @description No-arg constructor for deserialization compatibility
+     * No-arg constructor for deserialization compatibility
      */
     public {ClassName}() {
         this.tags = new List<String>();
@@ -40,7 +40,7 @@ public with sharing class {ClassName} {
     }
 
     /**
-     * @description Parameterized constructor for convenience
+     * Parameterized constructor for convenience
      * @param name The name value
      * @param recordId The associated record Id
      */
@@ -53,7 +53,7 @@ public with sharing class {ClassName} {
     // ─── Factory Methods ─────────────────────────────────────────────────
 
     /**
-     * @description Creates a DTO instance from an SObject record
+     * Creates a DTO instance from an SObject record
      * @param record The source {SObject} record
      * @return A populated {ClassName} instance
      */
@@ -71,7 +71,7 @@ public with sharing class {ClassName} {
     }
 
     /**
-     * @description Creates a list of DTOs from a list of SObject records
+     * Creates a list of DTOs from a list of SObject records
      * @param records The source records
      * @return List of populated {ClassName} instances
      */
@@ -90,7 +90,7 @@ public with sharing class {ClassName} {
     // ─── Utility Methods ─────────────────────────────────────────────────
 
     /**
-     * @description Serializes this DTO to a JSON string
+     * Serializes this DTO to a JSON string
      * @return JSON representation of this DTO
      */
     public String toJson() {
@@ -98,7 +98,7 @@ public with sharing class {ClassName} {
     }
 
     /**
-     * @description Deserializes a JSON string into a {ClassName} instance
+     * Deserializes a JSON string into a {ClassName} instance
      * @param jsonString The JSON string to deserialize
      * @return A {ClassName} instance
      */
diff --git a/skills/generating-apex/assets/exception.cls b/skills/generating-apex/assets/exception.cls
index 1d14d94..a18978a 100644
--- a/skills/generating-apex/assets/exception.cls
+++ b/skills/generating-apex/assets/exception.cls
@@ -1,5 +1,5 @@
 /**
- * @description Custom exception for {describe when this exception is thrown}.
+ * Custom exception for {describe when this exception is thrown}.
  *              Use this exception to signal domain-specific errors that callers
  *              can catch and handle distinctly from system exceptions.
  * @author Generated by Apex Class Writer Skill
diff --git a/skills/generating-apex/assets/interface.cls b/skills/generating-apex/assets/interface.cls
index fc1da63..15796cd 100644
--- a/skills/generating-apex/assets/interface.cls
+++ b/skills/generating-apex/assets/interface.cls
@@ -1,5 +1,5 @@
 /**
- * @description Interface for {describe the capability or contract this interface defines}.
+ * Interface for {describe the capability or contract this interface defines}.
  *              Implement this interface to provide {describe what implementations do}.
  * @author Generated by Apex Class Writer Skill
  *
@@ -13,7 +13,7 @@
 public interface {InterfaceName} {
 
     /**
-     * @description {Describe what this method should do}
+     * {Describe what this method should do}
      * @param params {Describe the parameter}
      * @return {Describe the return value}
      */
diff --git a/skills/generating-apex/assets/invocable.cls b/skills/generating-apex/assets/invocable.cls
new file mode 100644
index 0000000..18193d1
--- /dev/null
+++ b/skills/generating-apex/assets/invocable.cls
@@ -0,0 +1,115 @@
+/**
+ * Invocable Apex action for {describe the action}.
+ * Callable from Flows, Process Builder, and Agentforce.
+ * Accepts bulkified List<Request>, returns List<Response>.
+ * @author Generated by Apex Class Writer Skill
+ */
+public with sharing class {ClassName} {
+
+    // ─── Invocable Method ────────────────────────────────────────────────
+
+    /**
+     * {Describe what this action does}
+     * @param requests List of Request inputs from the calling Flow
+     * @return List of Response outputs returned to the calling Flow
+     */
+    @InvocableMethod(
+        label='{Display Name}'
+        description='{Describe the action for Flow Builder}'
+        category='{Category}'
+    )
+    public static List<Response> execute(List<Request> requests) {
+        List<Response> responses = new List<Response>();
+
+        // Collect all Ids upfront for bulkified query
+        Set<Id> allRecordIds = new Set<Id>();
+        for (Request req : requests) {
+            if (req.recordId != null) {
+                allRecordIds.add(req.recordId);
+            }
+        }
+
+        // Single bulkified query outside the loop
+        Map<Id, {SObject}> recordMap = allRecordIds.isEmpty()
+            ? new Map<Id, {SObject}>()
+            : new Map<Id, {SObject}>([
+                SELECT Id, Name
+                // TODO: Add required fields
+                FROM {SObject}
+                WHERE Id IN :allRecordIds
+                WITH USER_MODE
+            ]);
+
+        // Process each request
+        for (Request req : requests) {
+            responses.add(processRequest(req, recordMap));
+        }
+
+        return responses;
+    }
+
+    // ─── Private Helpers ─────────────────────────────────────────────────
+
+    /**
+     * Processes a single request and returns a response.
+     * Errors are captured in the response, not thrown.
+     * @param req The input request
+     * @param recordMap Pre-queried records keyed by Id
+     * @return A Response with success/error information
+     */
+    private static Response processRequest(Request req, Map<Id, {SObject}> recordMap) {
+        Response res = new Response();
+
+        try {
+            {SObject} record = recordMap.get(req.recordId);
+            if (record == null) {
+                res.isSuccess = false;
+                res.errorMessage = 'Record not found: ' + req.recordId;
+                res.errorType = 'NOT_FOUND';
+                return res;
+            }
+
+            // TODO: Implement business logic
+
+            res.isSuccess = true;
+        } catch (Exception e) {
+            res.isSuccess = false;
+            res.errorMessage = e.getMessage();
+            res.errorType = e.getTypeName();
+        }
+
+        return res;
+    }
+
+    // ─── Request / Response DTOs ─────────────────────────────────────────
+
+    /**
+     * Input parameters from the calling Flow
+     */
+    public class Request {
+        @InvocableVariable(label='Record Id' description='The Id of the record to process' required=true)
+        public Id recordId;
+
+        // TODO: Add additional input variables
+        // @InvocableVariable(label='Field Value' description='Value to set' required=false)
+        // public String fieldValue;
+    }
+
+    /**
+     * Output results returned to the calling Flow
+     */
+    public class Response {
+        @InvocableVariable(label='Success' description='Whether the action succeeded')
+        public Boolean isSuccess;
+
+        @InvocableVariable(label='Error Message' description='Error details if the action failed')
+        public String errorMessage;
+
+        @InvocableVariable(label='Error Type' description='Exception type name if the action failed')
+        public String errorType;
+
+        // TODO: Add additional output variables
+        // @InvocableVariable(label='Result Id' description='Id of the created/updated record')
+        // public Id resultId;
+    }
+}
diff --git a/skills/generating-apex/assets/queueable.cls b/skills/generating-apex/assets/queueable.cls
index eaa224a..8629b6c 100644
--- a/skills/generating-apex/assets/queueable.cls
+++ b/skills/generating-apex/assets/queueable.cls
@@ -1,5 +1,5 @@
 /**
- * @description Queueable Apex class for {describe the async operation}.
+ * Queueable Apex class for {describe the async operation}.
  *              Accepts data through the constructor for stateful processing.
  *              Optionally implements Database.AllowsCallouts for external integrations.
  * @author Generated by Apex Class Writer Skill
@@ -20,7 +20,7 @@ public with sharing class {ClassName} implements Queueable /*, Database.AllowsCa
     // ─── Constructors ────────────────────────────────────────────────────
 
     /**
-     * @description Creates a new queueable job to process the specified records
+     * Creates a new queueable job to process the specified records
      * @param recordIds Set of record Ids to process
      */
     public {ClassName}(Set<Id> recordIds) {
@@ -28,7 +28,7 @@ public with sharing class {ClassName} implements Queueable /*, Database.AllowsCa
     }
 
     /**
-     * @description Creates a new queueable job with chain depth tracking
+     * Creates a new queueable job with chain depth tracking
      * @param recordIds Set of record Ids to process
      * @param chainDepth Current depth in the queueable chain
      */
@@ -40,7 +40,7 @@ public with sharing class {ClassName} implements Queueable /*, Database.AllowsCa
     // ─── Queueable Interface ─────────────────────────────────────────────
 
     /**
-     * @description Executes the asynchronous work
+     * Executes the asynchronous work
      * @param context The queueable context
      */
     public void execute(QueueableContext context) {
@@ -64,7 +64,7 @@ public with sharing class {ClassName} implements Queueable /*, Database.AllowsCa
     // ─── Private Helpers ─────────────────────────────────────────────────
 
     /**
-     * @description Chains to the next queueable job if needed, with depth guard
+     * Chains to the next queueable job if needed, with depth guard
      */
     private void chainIfNeeded() {
         // TODO: Determine if chaining is needed (e.g., remaining records to process)
@@ -78,7 +78,7 @@ public with sharing class {ClassName} implements Queueable /*, Database.AllowsCa
     }
 
     /**
-     * @description Handles errors during execution
+     * Handles errors during execution
      * @param jobId The async job Id
      * @param e The exception that occurred
      */
diff --git a/skills/generating-apex/assets/rest-resource.cls b/skills/generating-apex/assets/rest-resource.cls
new file mode 100644
index 0000000..12d7a16
--- /dev/null
+++ b/skills/generating-apex/assets/rest-resource.cls
@@ -0,0 +1,300 @@
+/**
+ * REST API endpoint for {SObject} operations.
+ *              Exposes CRUD operations via @RestResource at /services/apexrest/{urlPath}/v1/*.
+ *              Uses versioned URL mapping for future-proof API evolution.
+ *              All queries use WITH USER_MODE for CRUD/FLS enforcement.
+ *
+ * Authentication: OAuth 2.0 via Connected App
+ * Base URL: /services/apexrest/{urlPath}/v1/
+ */
+@RestResource(urlMapping='/{urlPath}/v1/*')
+global with sharing class {ClassName} {
+
+    // ─── Constants ────────────────────────────────────────────────────────
+    private static final Integer DEFAULT_PAGE_SIZE = 20;
+    private static final Integer MAX_PAGE_SIZE = 200;
+    private static final String ERROR_MISSING_ID = 'Record Id is required in the URL path.';
+    private static final String ERROR_INVALID_ID = 'Invalid Salesforce Id format.';
+    private static final String ERROR_MISSING_BODY = 'Request body is required.';
+    private static final String ERROR_NOT_FOUND = '{SObject} record not found.';
+    private static final String ERROR_INSUFFICIENT_ACCESS = 'Insufficient access to perform this operation.';
+
+    // ─── GET — Retrieve ───────────────────────────────────────────────────
+
+    /**
+     * Retrieves a single {SObject} by Id (URL path) or a paginated list (query params).
+     * Single: GET /services/apexrest/{urlPath}/v1/{recordId}
+     * List:   GET /services/apexrest/{urlPath}/v1?pageSize=20&offset=0
+     * @return ApiResponse containing the requested data
+     */
+    @HttpGet
+    global static ApiResponse doGet() {
+        RestRequest req = RestContext.request;
+        RestResponse res = RestContext.response;
+
+        try {
+            String recordId = extractIdFromUri(req.requestURI);
+
+            if (String.isNotBlank(recordId)) {
+                return getSingleRecord(recordId, res);
+            }
+            return getRecordList(req, res);
+
+        } catch (Exception e) {
+            return handleError(res, 500, e.getMessage());
+        }
+    }
+
+    // ─── POST — Create ───────────────────────────────────────────────────
+
+    /**
+     * Creates a new {SObject} record from the JSON request body.
+     * POST /services/apexrest/{urlPath}/v1/
+     * @return ApiResponse with the created record Id
+     */
+    @HttpPost
+    global static ApiResponse doPost() {
+        RestRequest req = RestContext.request;
+        RestResponse res = RestContext.response;
+
+        try {
+            if (req.requestBody == null || String.isBlank(req.requestBody.toString())) {
+                return handleError(res, 400, ERROR_MISSING_BODY);
+            }
+
+            {ClassName}Request payload = ({ClassName}Request) JSON.deserialize(
+                req.requestBody.toString(),
+                {ClassName}Request.class
+            );
+
+            // TODO: Map request payload to SObject fields
+            {SObject} record = new {SObject}(
+                Name = payload.name
+            );
+
+            Database.SaveResult saveResult = Database.insert(record, true);
+            if (saveResult.isSuccess()) {
+                res.statusCode = 201;
+                return new ApiResponse(true, 'Record created successfully.', record.Id);
+            }
+
+            return handleError(res, 422, saveResult.getErrors()[0].getMessage());
+
+        } catch (JSONException e) {
+            return handleError(res, 400, 'Malformed JSON: ' + e.getMessage());
+        } catch (DmlException e) {
+            return handleError(res, 422, 'Validation failed: ' + e.getDmlMessage(0));
+        } catch (Exception e) {
+            return handleError(res, 500, e.getMessage());
+        }
+    }
+
+    // ─── PATCH — Partial Update ───────────────────────────────────────────
+
+    /**
+     * Partially updates an existing {SObject} record.
+     * PATCH /services/apexrest/{urlPath}/v1/{recordId}
+     * @return ApiResponse confirming the update
+     */
+    @HttpPatch
+    global static ApiResponse doPatch() {
+        RestRequest req = RestContext.request;
+        RestResponse res = RestContext.response;
+
+        try {
+            String recordId = extractIdFromUri(req.requestURI);
+            if (String.isBlank(recordId)) {
+                return handleError(res, 400, ERROR_MISSING_ID);
+            }
+            if (!isValidSalesforceId(recordId)) {
+                return handleError(res, 400, ERROR_INVALID_ID);
+            }
+            if (req.requestBody == null || String.isBlank(req.requestBody.toString())) {
+                return handleError(res, 400, ERROR_MISSING_BODY);
+            }
+
+            List<{SObject}> existing = [
+                SELECT Id FROM {SObject} WHERE Id = :recordId WITH USER_MODE LIMIT 1
+            ];
+            if (existing.isEmpty()) {
+                return handleError(res, 404, ERROR_NOT_FOUND);
+            }
+
+            Map<String, Object> fieldUpdates = (Map<String, Object>) JSON.deserializeUntyped(
+                req.requestBody.toString()
+            );
+
+            {SObject} record = existing[0];
+            // TODO: Apply allowed field updates from the payload to the record
+            // for (String fieldName : fieldUpdates.keySet()) {
+            //     record.put(fieldName, fieldUpdates.get(fieldName));
+            // }
+
+            Database.SaveResult saveResult = Database.update(record, true);
+            if (saveResult.isSuccess()) {
+                res.statusCode = 200;
+                return new ApiResponse(true, 'Record updated successfully.', record.Id);
+            }
+
+            return handleError(res, 422, saveResult.getErrors()[0].getMessage());
+
+        } catch (JSONException e) {
+            return handleError(res, 400, 'Malformed JSON: ' + e.getMessage());
+        } catch (DmlException e) {
+            return handleError(res, 422, 'Validation failed: ' + e.getDmlMessage(0));
+        } catch (Exception e) {
+            return handleError(res, 500, e.getMessage());
+        }
+    }
+
+    // ─── DELETE — Remove ──────────────────────────────────────────────────
+
+    /**
+     * Deletes a {SObject} record by Id.
+     * DELETE /services/apexrest/{urlPath}/v1/{recordId}
+     * @return ApiResponse confirming the deletion
+     */
+    @HttpDelete
+    global static ApiResponse doDelete() {
+        RestRequest req = RestContext.request;
+        RestResponse res = RestContext.response;
+
+        try {
+            String recordId = extractIdFromUri(req.requestURI);
+            if (String.isBlank(recordId)) {
+                return handleError(res, 400, ERROR_MISSING_ID);
+            }
+            if (!isValidSalesforceId(recordId)) {
+                return handleError(res, 400, ERROR_INVALID_ID);
+            }
+
+            List<{SObject}> existing = [
+                SELECT Id FROM {SObject} WHERE Id = :recordId WITH USER_MODE LIMIT 1
+            ];
+            if (existing.isEmpty()) {
+                return handleError(res, 404, ERROR_NOT_FOUND);
+            }
+
+            Database.DeleteResult deleteResult = Database.delete(existing[0], true);
+            if (deleteResult.isSuccess()) {
+                res.statusCode = 200;
+                return new ApiResponse(true, 'Record deleted successfully.', recordId);
+            }
+
+            return handleError(res, 422, deleteResult.getErrors()[0].getMessage());
+
+        } catch (DmlException e) {
+            return handleError(res, 422, e.getDmlMessage(0));
+        } catch (Exception e) {
+            return handleError(res, 500, e.getMessage());
+        }
+    }
+
+    // ─── Private Helpers ──────────────────────────────────────────────────
+
+    private static ApiResponse getSingleRecord(String recordId, RestResponse res) {
+        if (!isValidSalesforceId(recordId)) {
+            return handleError(res, 400, ERROR_INVALID_ID);
+        }
+
+        List<{SObject}> records = [
+            SELECT Id, Name, CreatedDate, LastModifiedDate
+            FROM {SObject}
+            WHERE Id = :recordId
+            WITH USER_MODE
+            LIMIT 1
+        ];
+
+        if (records.isEmpty()) {
+            return handleError(res, 404, ERROR_NOT_FOUND);
+        }
+
+        res.statusCode = 200;
+        ApiResponse response = new ApiResponse(true, 'Record retrieved successfully.', recordId);
+        response.data = records[0];
+        return response;
+    }
+
+    private static ApiResponse getRecordList(RestRequest req, RestResponse res) {
+        Integer pageSize = getIntParam(req, 'pageSize', DEFAULT_PAGE_SIZE);
+        Integer offset = getIntParam(req, 'offset', 0);
+
+        pageSize = Math.min(pageSize, MAX_PAGE_SIZE);
+
+        List<{SObject}> records = [
+            SELECT Id, Name, CreatedDate, LastModifiedDate
+            FROM {SObject}
+            WITH USER_MODE
+            ORDER BY Name ASC
+            LIMIT :pageSize
+            OFFSET :offset
+        ];
+
+        res.statusCode = 200;
+        ApiResponse response = new ApiResponse(true, 'Records retrieved successfully.', null);
+        response.records = records;
+        response.pageSize = pageSize;
+        response.offset = offset;
+        return response;
+    }
+
+    private static String extractIdFromUri(String uri) {
+        String lastSegment = uri.substringAfterLast('/');
+        if (String.isBlank(lastSegment) || lastSegment == 'v1') {
+            return null;
+        }
+        return lastSegment;
+    }
+
+    private static Boolean isValidSalesforceId(String idValue) {
+        return Pattern.matches('[a-zA-Z0-9]{15,18}', idValue);
+    }
+
+    private static Integer getIntParam(RestRequest req, String paramName, Integer defaultValue) {
+        String paramValue = req.params.get(paramName);
+        if (String.isBlank(paramValue)) {
+            return defaultValue;
+        }
+        try {
+            return Integer.valueOf(paramValue);
+        } catch (TypeException e) {
+            return defaultValue;
+        }
+    }
+
+    private static ApiResponse handleError(RestResponse res, Integer statusCode, String message) {
+        res.statusCode = statusCode;
+        return new ApiResponse(false, message, null);
+    }
+
+    // ─── Request / Response DTOs ──────────────────────────────────────────
+
+    /**
+     * Inbound request payload for POST operations.
+     * Extend with additional fields as needed.
+     */
+    global class {ClassName}Request {
+        global String name;
+        // TODO: Add fields matching the expected JSON request body
+    }
+
+    /**
+     * Standardized API response envelope.
+     * All endpoints return this structure for consistent client parsing.
+     */
+    global class ApiResponse {
+        global Boolean success;
+        global String message;
+        global String recordId;
+        global SObject data;
+        global List<SObject> records;
+        global Integer pageSize;
+        global Integer offset;
+
+        global ApiResponse(Boolean success, String message, String recordId) {
+            this.success = success;
+            this.message = message;
+            this.recordId = recordId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/skills/generating-apex/assets/schedulable.cls b/skills/generating-apex/assets/schedulable.cls
index 1e9f932..fe402db 100644
--- a/skills/generating-apex/assets/schedulable.cls
+++ b/skills/generating-apex/assets/schedulable.cls
@@ -1,5 +1,5 @@
 /**
- * @description Schedulable Apex class for {describe the scheduled operation}.
+ * Schedulable Apex class for {describe the scheduled operation}.
  *              Delegates heavy processing to a Batch or Queueable job.
  *              Keep execute() lightweight — it should only launch other jobs.
  * @author Generated by Apex Class Writer Skill
@@ -20,19 +20,19 @@ public with sharing class {ClassName} implements Schedulable {
     // ─── CRON Expressions ────────────────────────────────────────────────
     // Seconds Minutes Hours Day_of_month Month Day_of_week Optional_year
 
-    /** @description Runs daily at 2:00 AM */
+    /** Runs daily at 2:00 AM */
     public static final String CRON_DAILY_2AM = '0 0 2 * * ?';
 
-    /** @description Runs every weekday at 6:00 AM */
+    /** Runs every weekday at 6:00 AM */
     public static final String CRON_WEEKDAYS_6AM = '0 0 6 ? * MON-FRI';
 
-    /** @description Runs hourly at the top of the hour */
+    /** Runs hourly at the top of the hour */
     public static final String CRON_HOURLY = '0 0 * * * ?';
 
     // ─── Schedulable Interface ───────────────────────────────────────────
 
     /**
-     * @description Entry point for the scheduled execution.
+     * Entry point for the scheduled execution.
      *              Delegates to a Batch or Queueable for the actual work.
      * @param sc The schedulable context
      */
@@ -49,7 +49,7 @@ public with sharing class {ClassName} implements Schedulable {
     // ─── Convenience Scheduling Methods ──────────────────────────────────
 
     /**
-     * @description Schedules this job to run daily at 2 AM
+     * Schedules this job to run daily at 2 AM
      * @return The scheduled job Id
      */
     public static String scheduleDaily() {
@@ -61,7 +61,7 @@ public with sharing class {ClassName} implements Schedulable {
     }
 
     /**
-     * @description Aborts this scheduled job by name
+     * Aborts this scheduled job by name
      * @param jobName The name used when scheduling
      */
     public static void abort(String jobName) {
diff --git a/skills/generating-apex/assets/selector.cls b/skills/generating-apex/assets/selector.cls
index 3512465..be24059 100644
--- a/skills/generating-apex/assets/selector.cls
+++ b/skills/generating-apex/assets/selector.cls
@@ -1,15 +1,15 @@
 /**
- * @description Selector class for {SObject} queries.
+ * Selector class for {SObject} queries.
  *              Encapsulates all SOQL for {SObject} records.
  *              All methods return bulkified results (Lists or Maps).
  * @author Generated by Apex Class Writer Skill
  */
-public with sharing class {SObject}Selector {
+public inherited sharing class {SObject}Selector {
 
     // ─── Field Lists ─────────────────────────────────────────────────────
 
     /**
-     * @description Returns the default set of fields to query for {SObject}.
+     * Returns the default set of fields to query for {SObject}.
      *              Centralizes field references to keep queries DRY.
      * @return Comma-separated field list as a String
      */
@@ -29,7 +29,7 @@ public with sharing class {SObject}Selector {
     // ─── Query Methods ───────────────────────────────────────────────────
 
     /**
-     * @description Selects {SObject} records by their Ids
+     * Selects {SObject} records by their Ids
      * @param recordIds Set of {SObject} Ids to query
      * @return List of {SObject} records matching the provided Ids
      * @example
@@ -49,7 +49,7 @@ public with sharing class {SObject}Selector {
     }
 
     /**
-     * @description Selects {SObject} records as a Map keyed by Id
+     * Selects {SObject} records as a Map keyed by Id
      * @param recordIds Set of {SObject} Ids to query
      * @return Map of Id to {SObject}
      */
@@ -58,7 +58,7 @@ public with sharing class {SObject}Selector {
     }
 
     /**
-     * @description Selects {SObject} records by a specific field value
+     * Selects {SObject} records by a specific field value
      * @param fieldName API name of the field to filter on
      * @param values Set of values to match
      * @return List of matching {SObject} records
@@ -86,7 +86,7 @@ public with sharing class {SObject}Selector {
     // ─── Exception ───────────────────────────────────────────────────────
 
     /**
-     * @description Custom exception for query errors
+     * Custom exception for query errors
      */
     public class QueryException extends Exception {}
 }
diff --git a/skills/generating-apex/assets/service.cls b/skills/generating-apex/assets/service.cls
index 5f3a6c3..6f802e6 100644
--- a/skills/generating-apex/assets/service.cls
+++ b/skills/generating-apex/assets/service.cls
@@ -1,5 +1,5 @@
 /**
- * @description Service class for {SObject} business logic.
+ * Service class for {SObject} business logic.
  *              Follows separation of concerns: delegates queries to {SObject}Selector
  *              and SObject manipulation to {SObject}Domain where applicable.
  * @author Generated by Apex Class Writer Skill
@@ -12,7 +12,7 @@ public with sharing class {SObject}Service {
     // ─── Public API ──────────────────────────────────────────────────────
 
     /**
-     * @description {Describe the primary operation}
+     * {Describe the primary operation}
      * @param recordIds Set of {SObject} Ids to process
      * @return List of processed {SObject} records
      * @throws {SObject}ServiceException if processing fails
@@ -47,7 +47,7 @@ public with sharing class {SObject}Service {
     // ─── Convenience Overloads ───────────────────────────────────────────
 
     /**
-     * @description Single-record convenience overload
+     * Single-record convenience overload
      * @param recordId The {SObject} Id to process
      * @return The processed {SObject} record
      */
@@ -63,7 +63,7 @@ public with sharing class {SObject}Service {
     // ─── Exception ───────────────────────────────────────────────────────
 
     /**
-     * @description Custom exception for {SObject}Service errors
+     * Custom exception for {SObject}Service errors
      */
     public class {SObject}ServiceException extends Exception {}
 }
diff --git a/skills/generating-apex/assets/trigger.cls b/skills/generating-apex/assets/trigger.cls
new file mode 100644
index 0000000..7fc2d75
--- /dev/null
+++ b/skills/generating-apex/assets/trigger.cls
@@ -0,0 +1,45 @@
+/**
+ * @author Generated by Apex Class Writer Skill
+ */
+trigger {SObject}Trigger on {SObject} (
+    before insert,
+    before update,
+    before delete,
+    after insert,
+    after update,
+    after delete,
+    after undelete
+) {
+    // ─── Option A: Trigger Actions Framework (TAF) ───────────────────────
+    // Delegates to Trigger_Action__mdt-registered action classes.
+    // Each action class handles one concern in one context.
+    //
+    // new MetadataTriggerHandler().run();
+
+    // ─── Option B: Custom Handler Pattern ────────────────────────────────
+    // Delegates to a single handler class that routes by context.
+    //
+    // {SObject}TriggerHandler handler = new {SObject}TriggerHandler();
+    //
+    // if (Trigger.isBefore) {
+    //     if (Trigger.isInsert) {
+    //         handler.beforeInsert(Trigger.new);
+    //     } else if (Trigger.isUpdate) {
+    //         handler.beforeUpdate(Trigger.new, Trigger.oldMap);
+    //     } else if (Trigger.isDelete) {
+    //         handler.beforeDelete(Trigger.old, Trigger.oldMap);
+    //     }
+    // } else if (Trigger.isAfter) {
+    //     if (Trigger.isInsert) {
+    //         handler.afterInsert(Trigger.new, Trigger.newMap);
+    //     } else if (Trigger.isUpdate) {
+    //         handler.afterUpdate(Trigger.new, Trigger.oldMap);
+    //     } else if (Trigger.isDelete) {
+    //         handler.afterDelete(Trigger.old, Trigger.oldMap);
+    //     } else if (Trigger.isUndelete) {
+    //         handler.afterUndelete(Trigger.new, Trigger.newMap);
+    //     }
+    // }
+
+    // TODO: Uncomment one option above and remove the other
+}
diff --git a/skills/generating-apex/assets/utility.cls b/skills/generating-apex/assets/utility.cls
index 9f3f9fc..718df49 100644
--- a/skills/generating-apex/assets/utility.cls
+++ b/skills/generating-apex/assets/utility.cls
@@ -1,5 +1,5 @@
 /**
- * @description Utility class for {describe the category of utilities: String, Date, Collection, etc.}.
+ * Utility class for {describe the category of utilities: String, Date, Collection, etc.}.
  *              All methods are static and side-effect-free (no SOQL, no DML).
  *              Private constructor prevents instantiation.
  * @author Generated by Apex Class Writer Skill
@@ -9,7 +9,7 @@ public with sharing class {ClassName} {
     // ─── Private Constructor ─────────────────────────────────────────────
 
     /**
-     * @description Prevents instantiation — use static methods only
+     * Prevents instantiation — use static methods only
      */
     @TestVisible
     private {ClassName}() {
@@ -21,7 +21,7 @@ public with sharing class {ClassName} {
     // TODO: Add utility methods below. Examples:
 
     /**
-     * @description Safely converts a String to an Integer, returning a default if parsing fails
+     * Safely converts a String to an Integer, returning a default if parsing fails
      * @param value The String to parse
      * @param defaultValue The fallback value if parsing fails
      * @return The parsed Integer or the default value
@@ -41,7 +41,7 @@ public with sharing class {ClassName} {
     }
 
     /**
-     * @description Chunks a list into smaller sublists of the specified size.
+     * Chunks a list into smaller sublists of the specified size.
      *              Useful for processing records in governor-limit-safe batches.
      * @param items The list to chunk
      * @param chunkSize The maximum size of each chunk
@@ -72,7 +72,7 @@ public with sharing class {ClassName} {
     }
 
     /**
-     * @description Extracts a Set of non-null field values from a list of SObjects
+     * Extracts a Set of non-null field values from a list of SObjects
      * @param records The SObject records to extract from
      * @param fieldName The API name of the field to extract
      * @return A Set of non-null String values
diff --git a/skills/generating-apex/references/AccountDeduplicationBatch.cls b/skills/generating-apex/references/AccountDeduplicationBatch.cls
index 30ba97d..2d6f005 100644
--- a/skills/generating-apex/references/AccountDeduplicationBatch.cls
+++ b/skills/generating-apex/references/AccountDeduplicationBatch.cls
@@ -1,5 +1,5 @@
 /**
- * @description Batch Apex class for identifying and flagging duplicate Account records.
+ * Batch Apex class for identifying and flagging duplicate Account records.
  *              Compares Accounts by Name and BillingPostalCode to find potential duplicates.
  *              Flags duplicates by setting the Is_Potential_Duplicate__c checkbox.
  *              Implements Database.Stateful to track results across batch chunks.
@@ -26,7 +26,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     // ─── Batchable Interface ─────────────────────────────────────────────
 
     /**
-     * @description Queries all active Accounts that haven't already been flagged
+     * Queries all active Accounts that haven't already been flagged
      * @param bc The batch context
      * @return QueryLocator scoped to unflagged active Accounts
      */
@@ -41,7 +41,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     }
 
     /**
-     * @description Processes each batch by building a duplicate key and checking for matches.
+     * Processes each batch by building a duplicate key and checking for matches.
      *              Uses a composite key of normalized Name + BillingPostalCode.
      * @param bc The batch context
      * @param scope List of Account records in the current batch
@@ -82,7 +82,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     }
 
     /**
-     * @description Logs a summary of the deduplication batch run
+     * Logs a summary of the deduplication batch run
      * @param bc The batch context
      */
     public void finish(Database.BatchableContext bc) {
@@ -101,7 +101,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     // ─── Private Helpers ─────────────────────────────────────────────────
 
     /**
-     * @description Builds a normalized composite key for duplicate detection
+     * Builds a normalized composite key for duplicate detection
      * @param acct The Account record
      * @return Normalized key string, or null if insufficient data
      */
@@ -117,7 +117,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     }
 
     /**
-     * @description Processes DML results, tracking successes and failures
+     * Processes DML results, tracking successes and failures
      * @param results List of Database.SaveResult from update operation
      */
     private void processResults(List<Database.SaveResult> results) {
@@ -139,7 +139,7 @@ public with sharing class AccountDeduplicationBatch implements Database.Batchabl
     // ─── Static Helpers ──────────────────────────────────────────────────
 
     /**
-     * @description Convenience method to execute with default batch size
+     * Convenience method to execute with default batch size
      * @return The batch job Id
      */
     public static Id run() {
diff --git a/skills/generating-apex/references/AccountSelector.cls b/skills/generating-apex/references/AccountSelector.cls
index 990f043..1d826a1 100644
--- a/skills/generating-apex/references/AccountSelector.cls
+++ b/skills/generating-apex/references/AccountSelector.cls
@@ -1,5 +1,5 @@
 /**
- * @description Selector class for Account queries.
+ * Selector class for Account queries.
  *              Encapsulates all SOQL for Account records.
  *              All methods return bulkified results (Lists or Maps).
  * @author Generated by Apex Class Writer Skill
@@ -9,7 +9,7 @@ public with sharing class AccountSelector {
     // ─── Field Lists ─────────────────────────────────────────────────────
 
     /**
-     * @description Returns the default set of fields to query for Account.
+     * Returns the default set of fields to query for Account.
      *              Centralizes field references to keep queries DRY.
      * @return Comma-separated field list as a String
      */
@@ -34,7 +34,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Returns fields needed for billing/territory operations
+     * Returns fields needed for billing/territory operations
      * @return Comma-separated field list as a String
      */
     private static String getBillingFields() {
@@ -56,7 +56,7 @@ public with sharing class AccountSelector {
     // ─── Query Methods ───────────────────────────────────────────────────
 
     /**
-     * @description Selects Account records by their Ids
+     * Selects Account records by their Ids
      * @param recordIds Set of Account Ids to query
      * @return List of Account records matching the provided Ids
      * @example
@@ -76,7 +76,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Selects Account records as a Map keyed by Id
+     * Selects Account records as a Map keyed by Id
      * @param recordIds Set of Account Ids to query
      * @return Map of Id to Account
      */
@@ -85,7 +85,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Selects Accounts with billing address fields for territory assignment
+     * Selects Accounts with billing address fields for territory assignment
      * @param recordIds Set of Account Ids to query
      * @return List of Account records with billing address fields populated
      */
@@ -102,7 +102,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Selects Accounts by Account Type
+     * Selects Accounts by Account Type
      * @param accountTypes Set of Account Type values to filter by
      * @return List of matching Account records
      * @example
@@ -124,7 +124,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Selects Accounts by Industry with a minimum annual revenue
+     * Selects Accounts by Industry with a minimum annual revenue
      * @param industries Set of Industry values to filter by
      * @param minRevenue Minimum AnnualRevenue threshold
      * @return List of matching Account records ordered by revenue descending
@@ -151,7 +151,7 @@ public with sharing class AccountSelector {
     }
 
     /**
-     * @description Selects Accounts with their related Contacts (subquery)
+     * Selects Accounts with their related Contacts (subquery)
      * @param recordIds Set of Account Ids to query
      * @return List of Account records with nested Contacts
      */
@@ -173,7 +173,7 @@ public with sharing class AccountSelector {
     // ─── Aggregate Queries ───────────────────────────────────────────────
 
     /**
-     * @description Returns a count of Accounts grouped by Industry
+     * Returns a count of Accounts grouped by Industry
      * @return List of AggregateResult with Industry and record count
      * @example
      * List<AggregateResult> results = AccountSelector.countByIndustry();
diff --git a/skills/generating-apex/references/AccountService.cls b/skills/generating-apex/references/AccountService.cls
index eafee0a..0ec3cb8 100644
--- a/skills/generating-apex/references/AccountService.cls
+++ b/skills/generating-apex/references/AccountService.cls
@@ -1,5 +1,5 @@
 /**
- * @description Service class for Account business logic.
+ * Service class for Account business logic.
  *              Provides account deduplication, enrichment, and territory assignment.
  *              Delegates queries to AccountSelector and SObject manipulation to AccountDomain.
  * @author Generated by Apex Class Writer Skill
@@ -14,7 +14,7 @@ public with sharing class AccountService {
     // ─── Public API ──────────────────────────────────────────────────────
 
     /**
-     * @description Merges duplicate Account records into a master record.
+     * Merges duplicate Account records into a master record.
      *              The master record retains its field values; child records are reparented.
      * @param masterIds Map of master Account Id to Set of duplicate Account Ids to merge
      * @return List of master Account Ids that were successfully merged
@@ -77,7 +77,7 @@ public with sharing class AccountService {
     }
 
     /**
-     * @description Assigns accounts to territories based on Billing State/Country.
+     * Assigns accounts to territories based on Billing State/Country.
      *              Uses Custom Metadata Type (Territory_Mapping__mdt) for mappings.
      * @param accountIds Set of Account Ids to assign territories for
      * @return Number of accounts successfully updated
@@ -115,7 +115,7 @@ public with sharing class AccountService {
     // ─── Convenience Overloads ───────────────────────────────────────────
 
     /**
-     * @description Single-account territory assignment convenience method
+     * Single-account territory assignment convenience method
      * @param accountId The Account Id to assign a territory for
      * @return 1 if updated, 0 if no change needed
      */
@@ -126,7 +126,7 @@ public with sharing class AccountService {
     // ─── Private Helpers ─────────────────────────────────────────────────
 
     /**
-     * @description Loads territory mappings from Custom Metadata
+     * Loads territory mappings from Custom Metadata
      * @return Map of territory key (State:Country) to territory name
      */
     private static Map<String, String> loadTerritoryMappings() {
@@ -139,7 +139,7 @@ public with sharing class AccountService {
     }
 
     /**
-     * @description Builds a consistent territory lookup key
+     * Builds a consistent territory lookup key
      * @param state The billing state
      * @param country The billing country
      * @return A normalized key string
@@ -149,7 +149,7 @@ public with sharing class AccountService {
     }
 
     /**
-     * @description Chunks a list of Accounts into sublists of the given size
+     * Chunks a list of Accounts into sublists of the given size
      * @param accounts The accounts to chunk
      * @param chunkSize Maximum chunk size
      * @return List of account sublists
@@ -172,7 +172,7 @@ public with sharing class AccountService {
     }
 
     /**
-     * @description Counts successful results from a DML operation
+     * Counts successful results from a DML operation
      * @param results List of Database.SaveResult
      * @return Count of successful operations
      */
@@ -195,7 +195,7 @@ public with sharing class AccountService {
     // ─── Exception ───────────────────────────────────────────────────────
 
     /**
-     * @description Custom exception for AccountService errors
+     * Custom exception for AccountService errors
      */
     public class AccountServiceException extends Exception {}
 }

From f39ac26c0d7f3bbb152c16d3d0b5f1a202e6b759 Mon Sep 17 00:00:00 2001
From: k-j-kim <17989954+k-j-kim@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:04:44 -0700
Subject: [PATCH 14/14] Consolidate webapp skills @W-21338965@ (#118)

* Consolidate webapp skills into three focused skills

Merge 10 granular webapp skills into 3 consolidated skills:
- generating-webapp-ui: pages, components, layout, navigation, design
- generating-webapp-metadata: scaffolding, bundles, CSP, deployment
- generating-webapp-features: feature CLI (search, describe, install)

Keep standalone: implementing-webapp-file-upload,
implementing-webapp-agentforce-conversation-client (renamed from managing-),
using-webapp-salesforce-data.

Remove data visualization skill (not helpful).
Remove system-level instructions (a4drules refs, shell commands).
Incorporate Anthropic frontend-design skill content into UI skill.

* Fix frontmatter name to match directory for agentforce skill

---------

Co-authored-by: Hemant Singh Bisht <hsinghbisht@salesforce.com>
---
 .../SKILL.md                                  |  72 ----
 .../implementation/bar-line-chart.md          | 316 ------------------
 .../implementation/dashboard-layout.md        | 189 -----------
 .../implementation/donut-chart.md             | 181 ----------
 .../implementation/stat-card.md               | 150 ---------
 .../building-webapp-react-components/SKILL.md |  96 ------
 .../SKILL.md                                  |  90 -----
 skills/configuring-webapp-metadata/SKILL.md   | 158 ---------
 skills/creating-webapp/SKILL.md               | 138 --------
 .../deploying-webapp-to-salesforce/SKILL.md   | 226 -------------
 skills/generating-webapp-features/SKILL.md    |  45 +++
 skills/generating-webapp-metadata/SKILL.md    | 180 ++++++++++
 .../implementation/csp-metadata-format.md}    |   0
 skills/generating-webapp-ui/SKILL.md          | 122 +++++++
 .../implementation/component.md               |   0
 .../implementation/header-footer.md           |   0
 .../implementation/page.md                    |   0
 .../SKILL.md                                  |   2 +-
 .../references/constraints.md                 |   0
 .../references/examples.md                    |   0
 .../references/style-tokens.md                |   0
 .../references/troubleshooting.md             |   0
 skills/installing-webapp-features/SKILL.md    | 210 ------------
 23 files changed, 348 insertions(+), 1827 deletions(-)
 delete mode 100644 skills/building-webapp-data-visualization/SKILL.md
 delete mode 100644 skills/building-webapp-data-visualization/implementation/bar-line-chart.md
 delete mode 100644 skills/building-webapp-data-visualization/implementation/dashboard-layout.md
 delete mode 100644 skills/building-webapp-data-visualization/implementation/donut-chart.md
 delete mode 100644 skills/building-webapp-data-visualization/implementation/stat-card.md
 delete mode 100644 skills/building-webapp-react-components/SKILL.md
 delete mode 100644 skills/configuring-webapp-csp-trusted-sites/SKILL.md
 delete mode 100644 skills/configuring-webapp-metadata/SKILL.md
 delete mode 100644 skills/creating-webapp/SKILL.md
 delete mode 100644 skills/deploying-webapp-to-salesforce/SKILL.md
 create mode 100644 skills/generating-webapp-features/SKILL.md
 create mode 100644 skills/generating-webapp-metadata/SKILL.md
 rename skills/{configuring-webapp-csp-trusted-sites/implementation/metadata-format.md => generating-webapp-metadata/implementation/csp-metadata-format.md} (100%)
 create mode 100644 skills/generating-webapp-ui/SKILL.md
 rename skills/{building-webapp-react-components => generating-webapp-ui}/implementation/component.md (100%)
 rename skills/{building-webapp-react-components => generating-webapp-ui}/implementation/header-footer.md (100%)
 rename skills/{building-webapp-react-components => generating-webapp-ui}/implementation/page.md (100%)
 rename skills/{managing-webapp-agentforce-conversation-client => implementing-webapp-agentforce-conversation-client}/SKILL.md (99%)
 rename skills/{managing-webapp-agentforce-conversation-client => implementing-webapp-agentforce-conversation-client}/references/constraints.md (100%)
 rename skills/{managing-webapp-agentforce-conversation-client => implementing-webapp-agentforce-conversation-client}/references/examples.md (100%)
 rename skills/{managing-webapp-agentforce-conversation-client => implementing-webapp-agentforce-conversation-client}/references/style-tokens.md (100%)
 rename skills/{managing-webapp-agentforce-conversation-client => implementing-webapp-agentforce-conversation-client}/references/troubleshooting.md (100%)
 delete mode 100644 skills/installing-webapp-features/SKILL.md

diff --git a/skills/building-webapp-data-visualization/SKILL.md b/skills/building-webapp-data-visualization/SKILL.md
deleted file mode 100644
index 1d67b5e..0000000
--- a/skills/building-webapp-data-visualization/SKILL.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-name: building-webapp-data-visualization
-description: "Adds data visualization components (charts, stat cards, KPI metrics) to React pages using Recharts. Use when the user asks to add a chart, graph, donut chart, pie chart, bar chart, stat card, KPI metric, dashboard visualization, or analytics component to the web application."
----
-
-# Data Visualization
-
-## When to Use
-
-Use this skill when:
-- Adding charts (donut, pie, bar, line, area) to a dashboard or analytics page
-- Displaying KPI/metric stat cards with trend indicators
-- Building a dashboard layout with mixed chart types and summary cards
-
----
-
-## Step 1 — Determine the visualization type
-
-Identify what the user needs:
-
-- **Donut / pie chart** — categorical breakdown (e.g. issue types, status distribution)
-- **Bar chart** — comparison across categories or time periods
-- **Line / area chart** — trends over time
-- **Stat card** — single KPI metric with optional trend indicator
-- **Combined dashboard** — stat cards + one or more charts
-
-If unclear, ask:
-
-> "What data should the chart display, and would a donut chart, bar chart, line chart, or stat cards work best?"
-
----
-
-## Step 2 — Install dependencies
-
-All chart types in this skill use **recharts**. Install once from the web app directory:
-
-```bash
-npm install recharts
-```
-
-Recharts is built on D3 and provides declarative React components. No additional CSS is needed.
-
----
-
-## Step 3 — Choose implementation path
-
-Read the corresponding guide:
-
-- **Bar chart** — read `implementation/bar-line-chart.md` (categorical data)
-- **Line / area chart** — read `implementation/bar-line-chart.md` (time-series data)
-- **Donut / pie chart** — read `implementation/donut-chart.md`
-- **Stat card with trend** — read `implementation/stat-card.md`
-- **Dashboard layout** — read `implementation/dashboard-layout.md`
-
----
-
-## Verification
-
-Before completing:
-
-1. Chart renders with correct data and colors.
-2. Chart is responsive (resizes with container).
-3. Legend labels match the data categories.
-4. Stat card trends display correct positive/negative indicators.
-5. Run from the web app directory:
-
-```bash
-cd force-app/main/default/webapplications/<appName> && npm run lint && npm run build
-```
-
-- **Lint:** MUST result in 0 errors.
-- **Build:** MUST succeed.
diff --git a/skills/building-webapp-data-visualization/implementation/bar-line-chart.md b/skills/building-webapp-data-visualization/implementation/bar-line-chart.md
deleted file mode 100644
index c094c8b..0000000
--- a/skills/building-webapp-data-visualization/implementation/bar-line-chart.md
+++ /dev/null
@@ -1,316 +0,0 @@
-# Bar & Line / Area Chart — Implementation Guide
-
-Requires **recharts** (install from the web app directory; see SKILL.md Step 2).
-
----
-
-## Data shapes
-
-### Time-series (line / area chart)
-
-Use when data represents a trend over time or ordered sequence.
-
-```ts
-interface TimeSeriesDataPoint {
-  x: string;   // date or label on the x-axis
-  y: number;   // numeric value
-}
-```
-
-Map raw fields to this shape: e.g. `date` → `x`, `revenue` → `y`.
-
-### Categorical (bar chart)
-
-Use when data compares discrete categories.
-
-```ts
-interface CategoricalDataPoint {
-  name: string;   // category label
-  value: number;  // numeric value
-}
-```
-
-Map raw fields to this shape: e.g. `product` → `name`, `sales` → `value`.
-
-### How to decide
-
-| Signal | Type |
-|--------|------|
-| "over time", "trend", date-like keys | Time-series → line chart |
-| "by category", "by X", label-like keys | Categorical → bar chart |
-
----
-
-## Theme colors
-
-Pick a theme based on the data's sentiment:
-
-| Theme | Stroke / Fill | When to use |
-|-------|---------------|-------------|
-| `green` | `#22c55e` | Growth, gain, positive trend |
-| `red` | `#ef4444` | Decline, loss, negative trend |
-| `neutral` | `#6366f1` | Default or mixed data |
-
-Define colors as constants — do not use inline hex values.
-
-```ts
-const THEME_COLORS = {
-  red: "#ef4444",
-  green: "#22c55e",
-  neutral: "#6366f1",
-} as const;
-
-type ChartTheme = keyof typeof THEME_COLORS;
-```
-
----
-
-## Line chart component
-
-Create at `components/LineChart.tsx` (or colocate with the page):
-
-```tsx
-import React from "react";
-import {
-  LineChart as RechartsLineChart,
-  Line,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  Legend,
-  ResponsiveContainer,
-} from "recharts";
-
-const THEME_COLORS = {
-  red: "#ef4444",
-  green: "#22c55e",
-  neutral: "#6366f1",
-} as const;
-
-type ChartTheme = keyof typeof THEME_COLORS;
-
-interface TimeSeriesDataPoint {
-  x: string;
-  y: number;
-}
-
-interface TimeSeriesChartProps {
-  data: TimeSeriesDataPoint[];
-  theme?: ChartTheme;
-  title?: string;
-  className?: string;
-}
-
-export function TimeSeriesChart({
-  data,
-  theme = "neutral",
-  title,
-  className = "",
-}: TimeSeriesChartProps) {
-  if (data.length === 0) {
-    return <p className="text-muted-foreground text-center py-8">No data to display</p>;
-  }
-
-  const color = THEME_COLORS[theme];
-
-  return (
-    <div className={className}>
-      {title && (
-        <h3 className="text-sm font-medium text-primary mb-2 uppercase tracking-wide">
-          {title}
-        </h3>
-      )}
-      <ResponsiveContainer width="100%" height={300}>
-        <RechartsLineChart data={data}>
-          <CartesianGrid strokeDasharray="3 3" />
-          <XAxis dataKey="x" />
-          <YAxis />
-          <Tooltip />
-          <Legend />
-          <Line type="monotone" dataKey="y" stroke={color} strokeWidth={2} dot={false} />
-        </RechartsLineChart>
-      </ResponsiveContainer>
-    </div>
-  );
-}
-```
-
----
-
-## Bar chart component
-
-Create at `components/BarChart.tsx` (or colocate with the page):
-
-```tsx
-import React from "react";
-import {
-  BarChart as RechartsBarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  Legend,
-  ResponsiveContainer,
-} from "recharts";
-
-const THEME_COLORS = {
-  red: "#ef4444",
-  green: "#22c55e",
-  neutral: "#6366f1",
-} as const;
-
-type ChartTheme = keyof typeof THEME_COLORS;
-
-interface CategoricalDataPoint {
-  name: string;
-  value: number;
-}
-
-interface CategoricalChartProps {
-  data: CategoricalDataPoint[];
-  theme?: ChartTheme;
-  title?: string;
-  className?: string;
-}
-
-export function CategoricalChart({
-  data,
-  theme = "neutral",
-  title,
-  className = "",
-}: CategoricalChartProps) {
-  if (data.length === 0) {
-    return <p className="text-muted-foreground text-center py-8">No data to display</p>;
-  }
-
-  const color = THEME_COLORS[theme];
-
-  return (
-    <div className={className}>
-      {title && (
-        <h3 className="text-sm font-medium text-primary mb-2 uppercase tracking-wide">
-          {title}
-        </h3>
-      )}
-      <ResponsiveContainer width="100%" height={300}>
-        <RechartsBarChart data={data}>
-          <CartesianGrid strokeDasharray="3 3" />
-          <XAxis dataKey="name" />
-          <YAxis />
-          <Tooltip />
-          <Legend />
-          <Bar dataKey="value" fill={color} radius={[4, 4, 0, 0]} />
-        </RechartsBarChart>
-      </ResponsiveContainer>
-    </div>
-  );
-}
-```
-
----
-
-## Area chart variant
-
-For a filled area chart (useful for volume-over-time), swap `Line` for `Area`:
-
-```tsx
-import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from "recharts";
-
-<ResponsiveContainer width="100%" height={300}>
-  <AreaChart data={data}>
-    <CartesianGrid strokeDasharray="3 3" />
-    <XAxis dataKey="x" />
-    <YAxis />
-    <Tooltip />
-    <Area type="monotone" dataKey="y" stroke={color} fill={color} fillOpacity={0.2} />
-  </AreaChart>
-</ResponsiveContainer>
-```
-
----
-
-## Chart container wrapper
-
-Wrap any chart in a styled card for consistent spacing:
-
-```tsx
-import { Card } from "@/components/ui/card";
-
-interface ChartContainerProps {
-  children: React.ReactNode;
-  className?: string;
-}
-
-export function ChartContainer({ children, className = "" }: ChartContainerProps) {
-  return (
-    <Card className={`p-4 border-gray-200 shadow-sm ${className}`}>
-      {children}
-    </Card>
-  );
-}
-```
-
-Usage:
-
-```tsx
-<ChartContainer>
-  <TimeSeriesChart data={monthlyData} theme="green" title="Monthly Revenue" />
-</ChartContainer>
-```
-
----
-
-## Preparing raw data
-
-Map API responses to the expected shape before passing to the chart:
-
-```tsx
-const timeSeriesData = useMemo(
-  () => apiRecords.map((r) => ({ x: r.date, y: r.revenue })),
-  [apiRecords],
-);
-
-const categoricalData = useMemo(
-  () => apiRecords.map((r) => ({ name: r.product, value: r.sales })),
-  [apiRecords],
-);
-```
-
----
-
-## Key Recharts concepts
-
-| Component | Purpose |
-|-----------|---------|
-| `ResponsiveContainer` | Wraps chart to fill parent width |
-| `CartesianGrid` | Background grid lines |
-| `XAxis` / `YAxis` | Axis labels; `dataKey` maps to the data field |
-| `Tooltip` | Hover info |
-| `Legend` | Series labels |
-| `Line` | Line series; `type="monotone"` for smooth curves |
-| `Bar` | Bar series; `radius` rounds top corners |
-| `Area` | Filled area; `fillOpacity` controls transparency |
-
----
-
-## Accessibility
-
-- Always include a text legend (not just colors).
-- Chart should be wrapped in a section with a visible heading.
-- For critical data, provide a text summary or table alternative.
-- Use sufficient color contrast between the chart stroke/fill and background.
-- Consider `prefers-reduced-motion` for chart animations.
-
----
-
-## Common mistakes
-
-| Mistake | Fix |
-|---------|-----|
-| Missing `ResponsiveContainer` | Chart won't resize; always wrap |
-| Fixed width/height on chart | Let `ResponsiveContainer` control sizing |
-| No empty-data handling | Show "No data" message when `data.length === 0` |
-| Inline colors | Extract to `THEME_COLORS` constant |
-| Using raw Recharts for every chart type | Use `DonutChart` (see `donut-chart.md`) for pie/donut |
diff --git a/skills/building-webapp-data-visualization/implementation/dashboard-layout.md b/skills/building-webapp-data-visualization/implementation/dashboard-layout.md
deleted file mode 100644
index c701012..0000000
--- a/skills/building-webapp-data-visualization/implementation/dashboard-layout.md
+++ /dev/null
@@ -1,189 +0,0 @@
-# Dashboard Layout — Implementation Guide
-
-## Anatomy of a dashboard page
-
-A typical dashboard combines stat cards, charts, and data tables:
-
-```
-┌────────────────────────────────────────────────────┐
-│  Search / global action bar                         │
-├──────────┬──────────┬──────────────────────────────┤
-│ Stat 1   │ Stat 2   │ Stat 3                       │
-├──────────┴──────────┴──────┬───────────────────────┤
-│                            │                       │
-│  Data table / list         │  Donut chart          │
-│  (70% width)               │  (30% width)          │
-│                            │                       │
-└────────────────────────────┴───────────────────────┘
-```
-
----
-
-## Layout implementation
-
-```tsx
-import { PageContainer } from "@/components/layout/PageContainer";
-import { StatCard } from "@/components/StatCard";
-import { DonutChart } from "@/components/DonutChart";
-
-export default function Dashboard() {
-  return (
-    <PageContainer>
-      <div className="max-w-7xl mx-auto space-y-6">
-        {/* Search bar */}
-        <div>{/* global search component */}</div>
-
-        {/* Main content: 70/30 split */}
-        <div className="grid grid-cols-1 lg:grid-cols-[70%_30%] gap-6">
-          <div className="space-y-6">
-            {/* Stat cards row */}
-            <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-              <StatCard title="Metric A" value={42} />
-              <StatCard title="Metric B" value={18} />
-              <StatCard title="Metric C" value={7} />
-            </div>
-
-            {/* Data table */}
-            <div>{/* table component */}</div>
-          </div>
-
-          {/* Sidebar chart */}
-          <div>
-            <DonutChart title="Distribution" data={chartData} />
-          </div>
-        </div>
-      </div>
-    </PageContainer>
-  );
-}
-```
-
----
-
-## Responsive behavior
-
-| Breakpoint | Layout |
-|------------|--------|
-| Mobile (`< 768px`) | Single column, everything stacked |
-| Tablet (`md`) | Stat cards in 3-col grid, rest stacked |
-| Desktop (`lg`) | 70/30 split for table + chart |
-
-Key Tailwind classes:
-
-```
-grid grid-cols-1 lg:grid-cols-[70%_30%] gap-6
-grid grid-cols-1 md:grid-cols-3 gap-6
-```
-
----
-
-## Loading state
-
-Show a full-page loading state while dashboard data is being fetched:
-
-```tsx
-if (loading) {
-  return (
-    <PageContainer>
-      <div className="flex items-center justify-center min-h-[400px]">
-        <p className="text-muted-foreground">Loading dashboard…</p>
-      </div>
-    </PageContainer>
-  );
-}
-```
-
-Or use a skeleton layout:
-
-```tsx
-if (loading) {
-  return (
-    <PageContainer>
-      <div className="max-w-7xl mx-auto space-y-6">
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-          {[1, 2, 3].map((i) => (
-            <div key={i} className="h-28 animate-pulse rounded-xl bg-muted" />
-          ))}
-        </div>
-        <div className="grid grid-cols-1 lg:grid-cols-[70%_30%] gap-6">
-          <div className="h-64 animate-pulse rounded-xl bg-muted" />
-          <div className="h-64 animate-pulse rounded-xl bg-muted" />
-        </div>
-      </div>
-    </PageContainer>
-  );
-}
-```
-
----
-
-## Data fetching pattern
-
-Use `useEffect` with cancellation for dashboard metrics:
-
-```ts
-const [metrics, setMetrics] = useState<Metrics | null>(null);
-const [loading, setLoading] = useState(true);
-
-useEffect(() => {
-  let cancelled = false;
-  (async () => {
-    try {
-      setLoading(true);
-      const data = await fetchDashboardMetrics();
-      if (!cancelled) setMetrics(data);
-    } catch (error) {
-      if (!cancelled) console.error("Error loading metrics:", error);
-    } finally {
-      if (!cancelled) setLoading(false);
-    }
-  })();
-  return () => { cancelled = true; };
-}, []);
-```
-
----
-
-## Combining multiple data sources
-
-Dashboards often aggregate data from several APIs. Load them in parallel:
-
-```ts
-const [metrics, setMetrics] = useState<Metrics | null>(null);
-const [requests, setRequests] = useState<Request[]>([]);
-const [loading, setLoading] = useState(true);
-
-useEffect(() => {
-  let cancelled = false;
-  Promise.all([fetchMetrics(), fetchRecentRequests()])
-    .then(([metricsData, requestsData]) => {
-      if (!cancelled) {
-        setMetrics(metricsData);
-        setRequests(requestsData);
-      }
-    })
-    .catch((err) => {
-      if (!cancelled) console.error(err);
-    })
-    .finally(() => {
-      if (!cancelled) setLoading(false);
-    });
-  return () => { cancelled = true; };
-}, []);
-```
-
----
-
-## PageContainer wrapper
-
-A simple wrapper for consistent page padding:
-
-```tsx
-interface PageContainerProps {
-  children: React.ReactNode;
-}
-
-export function PageContainer({ children }: PageContainerProps) {
-  return <div className="p-6">{children}</div>;
-}
-```
diff --git a/skills/building-webapp-data-visualization/implementation/donut-chart.md b/skills/building-webapp-data-visualization/implementation/donut-chart.md
deleted file mode 100644
index 1f20bdc..0000000
--- a/skills/building-webapp-data-visualization/implementation/donut-chart.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# Donut / Pie Chart — Implementation Guide
-
-Requires **recharts** (install from the web app directory; see SKILL.md Step 2).
-
----
-
-## Data structure
-
-Charts expect an array of objects with `name`, `value`, and `color`:
-
-```ts
-interface ChartData {
-  name: string;
-  value: number;
-  color: string;
-}
-```
-
----
-
-## Donut chart component
-
-Create at `components/DonutChart.tsx`:
-
-```tsx
-import React from "react";
-import { PieChart, Pie, Cell, ResponsiveContainer } from "recharts";
-import { Card } from "@/components/ui/card";
-
-interface ChartData {
-  name: string;
-  value: number;
-  color: string;
-}
-
-interface DonutChartProps {
-  title: string;
-  data: ChartData[];
-}
-
-export const DonutChart: React.FC<DonutChartProps> = ({ title, data }) => {
-  const total = data.reduce((sum, item) => sum + item.value, 0);
-  const mainPercentage = total > 0 ? Math.round((data[0]?.value / total) * 100) : 0;
-
-  return (
-    <Card className="p-4 border-gray-200 shadow-sm flex flex-col">
-      <h3 className="text-sm font-medium text-primary mb-2 uppercase tracking-wide">
-        {title}
-      </h3>
-
-      <div className="relative flex items-center justify-center">
-        <ResponsiveContainer width="100%" height={300}>
-          <PieChart>
-            <Pie
-              data={data}
-              cx="50%"
-              cy="50%"
-              innerRadius={70}
-              outerRadius={110}
-              paddingAngle={2}
-              dataKey="value"
-            >
-              {data.map((entry, index) => (
-                <Cell key={`cell-${index}`} fill={entry.color} />
-              ))}
-            </Pie>
-          </PieChart>
-        </ResponsiveContainer>
-
-        {/* Center label */}
-        <div className="absolute inset-0 flex items-center justify-center">
-          <div className="text-center">
-            <div className="text-5xl font-bold text-primary">{mainPercentage}%</div>
-          </div>
-        </div>
-      </div>
-
-      {/* Legend */}
-      <div className="mt-6 grid grid-cols-2 gap-3">
-        {data.map((item, index) => (
-          <div key={index} className="flex items-center gap-2">
-            <div className="w-3 h-3 rounded-full" style={{ backgroundColor: item.color }} />
-            <span className="text-sm text-gray-700">{item.name}</span>
-          </div>
-        ))}
-      </div>
-    </Card>
-  );
-};
-```
-
----
-
-## Key Recharts concepts
-
-| Component | Purpose |
-|-----------|---------|
-| `ResponsiveContainer` | Wraps chart to make it fill its parent's width |
-| `PieChart` | Chart container for pie/donut |
-| `Pie` | The data ring; `innerRadius` > 0 makes it a donut |
-| `Cell` | Individual segment; accepts `fill` color |
-| `paddingAngle` | Gap between segments (degrees) |
-
-### Donut vs Pie
-
-| Property | Donut | Pie |
-|----------|-------|-----|
-| `innerRadius` | `> 0` (e.g. `70`) | `0` |
-| Center label | Yes, positioned absolutely | Not typical |
-
----
-
-## Preparing chart data from raw records
-
-Transform API data into the `ChartData[]` format before passing to the chart:
-
-```tsx
-const CATEGORIES = ["Plumbing", "HVAC", "Electrical"] as const;
-const OTHER_LABEL = "Other";
-const COLORS = ["#7C3AED", "#EC4899", "#14B8A6", "#06B6D4"];
-
-const chartData = useMemo(() => {
-  const counts: Record<string, number> = {};
-  CATEGORIES.forEach((c) => (counts[c] = 0));
-  counts[OTHER_LABEL] = 0;
-
-  records.forEach((record) => {
-    const type = record.category;
-    if (CATEGORIES.includes(type as (typeof CATEGORIES)[number])) {
-      counts[type]++;
-    } else {
-      counts[OTHER_LABEL]++;
-    }
-  });
-
-  return [
-    ...CATEGORIES.map((name, i) => ({ name, value: counts[name], color: COLORS[i] })),
-    { name: OTHER_LABEL, value: counts[OTHER_LABEL], color: COLORS[CATEGORIES.length] },
-  ];
-}, [records]);
-```
-
----
-
-## Color palette recommendations
-
-| Use case | Colors |
-|----------|--------|
-| Categorical (4 items) | `#7C3AED` `#EC4899` `#14B8A6` `#06B6D4` |
-| Status (3 items) | `#22C55E` `#F59E0B` `#EF4444` (green/amber/red) |
-| Sequential | Use opacity variants of one hue: `#7C3AED` at 100%, 75%, 50%, 25% |
-
-Keep chart colors consistent with the app's design system. Define them as constants, not inline values.
-
----
-
-## Other chart types
-
-For **bar charts** and **line / area charts**, see `bar-line-chart.md` in this directory.
-
----
-
-## Accessibility
-
-- Always include a text legend (not just colors).
-- Chart should be wrapped in a section with a visible heading.
-- For critical data, provide a text summary or table alternative.
-- Use sufficient color contrast between segments.
-- Consider `prefers-reduced-motion` for chart animations.
-
----
-
-## Common mistakes
-
-| Mistake | Fix |
-|---------|-----|
-| Missing `ResponsiveContainer` | Chart won't resize; always wrap in `ResponsiveContainer` |
-| Fixed width/height on `PieChart` | Let `ResponsiveContainer` control sizing |
-| No legend | Add a grid legend below the chart |
-| Inline colors | Extract to constants for consistency |
-| No fallback for empty data | Show "No data" message when `data` is empty |
diff --git a/skills/building-webapp-data-visualization/implementation/stat-card.md b/skills/building-webapp-data-visualization/implementation/stat-card.md
deleted file mode 100644
index 11720ed..0000000
--- a/skills/building-webapp-data-visualization/implementation/stat-card.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Stat Card — Implementation Guide
-
-## What is a stat card
-
-A stat card displays a single KPI metric with an optional trend indicator. Used on dashboards to show at-a-glance numbers like "Total Properties: 42 (+10%)".
-
----
-
-## Component interface
-
-```ts
-interface StatCardProps {
-  title: string;
-  value: number | string;
-  trend?: {
-    value: number;
-    isPositive: boolean;
-  };
-  subtitle?: string;
-  onClick?: () => void;
-}
-```
-
----
-
-## StatCard component
-
-Create at `components/StatCard.tsx`:
-
-```tsx
-import React from "react";
-import { Card } from "@/components/ui/card";
-import { TrendingUp, TrendingDown } from "lucide-react";
-
-interface StatCardProps {
-  title: string;
-  value: number | string;
-  trend?: {
-    value: number;
-    isPositive: boolean;
-  };
-  subtitle?: string;
-  onClick?: () => void;
-}
-
-export const StatCard: React.FC<StatCardProps> = ({ title, value, trend, subtitle, onClick }) => {
-  return (
-    <Card
-      className={`p-4 border-gray-200 shadow-sm relative ${
-        onClick ? "cursor-pointer hover:shadow-lg transition-shadow" : ""
-      }`}
-      onClick={onClick}
-    >
-      <div className="space-y-1">
-        <p className="text-sm font-medium text-muted-foreground uppercase tracking-wide">{title}</p>
-        <div className="flex items-baseline gap-3">
-          <p className="text-4xl font-bold text-primary">{value}</p>
-          {trend && (
-            <span
-              className={`inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-sm font-medium ${
-                trend.isPositive
-                  ? "bg-emerald-100 text-emerald-800"
-                  : "bg-pink-100 text-pink-800"
-              }`}
-            >
-              {trend.isPositive ? (
-                <TrendingUp className="w-4 h-4" />
-              ) : (
-                <TrendingDown className="w-4 h-4" />
-              )}
-              {Math.abs(trend.value)}%
-            </span>
-          )}
-        </div>
-        {subtitle && <p className="text-sm text-muted-foreground mt-1">{subtitle}</p>}
-      </div>
-    </Card>
-  );
-};
-```
-
-This version uses Lucide icons (`TrendingUp`/`TrendingDown`) instead of custom SVGs for portability across projects.
-
----
-
-## Layout: stat card grid
-
-Display stat cards in a responsive grid:
-
-```tsx
-<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-  <StatCard
-    title="Total Properties"
-    value={metrics.totalProperties}
-    trend={{ value: 10, isPositive: true }}
-    subtitle="Last month total 38"
-  />
-  <StatCard
-    title="Units Available"
-    value={metrics.unitsAvailable}
-    trend={{ value: 5, isPositive: false }}
-    subtitle="Last month total 12/42"
-  />
-  <StatCard
-    title="Occupied Units"
-    value={metrics.occupiedUnits}
-    trend={{ value: 8, isPositive: true }}
-    subtitle="Last month total 27"
-  />
-</div>
-```
-
----
-
-## Computing trend values
-
-Calculate trends from current vs previous period:
-
-```ts
-const trends = useMemo(() => {
-  const previousTotal = metrics.totalProperties - Math.round(metrics.totalProperties * 0.1);
-  const trendPercent = previousTotal > 0
-    ? Math.round(((metrics.totalProperties - previousTotal) / previousTotal) * 100)
-    : 0;
-
-  return {
-    value: Math.abs(trendPercent),
-    isPositive: trendPercent >= 0,
-  };
-}, [metrics]);
-```
-
----
-
-## Trend badge color conventions
-
-| Trend | Background | Text | Meaning |
-|-------|------------|------|---------|
-| Positive (up) | `bg-emerald-100` | `text-emerald-800` | Growth, improvement |
-| Negative (down) | `bg-pink-100` | `text-pink-800` | Decline, concern |
-| Neutral | `bg-gray-100` | `text-gray-600` | No change |
-
----
-
-## Accessibility
-
-- Card uses `cursor-pointer` and `hover:shadow-lg` only when `onClick` is provided.
-- Trend icons have implicit meaning from color + direction icon.
-- Stat values use large, bold text for visibility.
-- Title uses `uppercase tracking-wide` for visual hierarchy without heading tags (appropriate in a card grid).
diff --git a/skills/building-webapp-react-components/SKILL.md b/skills/building-webapp-react-components/SKILL.md
deleted file mode 100644
index 3075988..0000000
--- a/skills/building-webapp-react-components/SKILL.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-name: building-webapp-react-components
-description: "Use when editing any React code in the web application — creating or modifying components, pages, layout, headers, footers, or any TSX/JSX files. Follow this skill for add component, add page, header/footer, and general React UI implementation patterns (shadcn UI and Tailwind CSS)."
----
-
-# React Web App (Components, Pages, Layout)
-
-Use this skill whenever you are editing React/TSX code in the web app (creating or modifying components, pages, header/footer, or layout).
-
-## Step 1 — Identify the type of component
-
-Determine which of these three categories the request falls into, then follow the corresponding section below:
-
-- **Page** — user wants a new routed page (e.g. "add a contacts page", "create a dashboard page", "add a settings section")
-- **Header / Footer** — user wants a site-wide header, footer, nav bar, or page footer that appears on every page
-- **Component** — everything else: a widget, card, table, form, dialog, or other UI element placed within an existing page
-
-If it is not immediately clear from the user's message, ask:
-
-> "Are you looking to add a new page, a site-wide header or footer, or a component within an existing page?"
-
-Then follow the matching section.
-
----
-
-## Clarifying Questions
-
-Ask **one question at a time** and wait for the response before asking the next. Stop when you have enough to build accurately — do not guess or assume.
-
-### For a Page
-
-1. **What is the name and purpose of the page?** (e.g., Contacts, Dashboard, Settings)
-2. **What URL path should it use?** (e.g., `/contacts`, `/dashboard`) — or derive from the page name?
-3. **Should the page appear in the navigation menu?**
-4. **Who can access it?** Public, authenticated users only (`PrivateRoute`), or unauthenticated only (e.g., login — `AuthenticationRoute`)?
-5. **What content or sections should the page include?** (list, form, table, detail view, etc.)
-6. **Does it need to fetch any data?** If so, from where?
-
-### For a Header / Footer
-
-1. **Header, footer, or both?**
-2. **What should the header contain?** (logo/app name, nav links, user avatar, CTA button, etc.)
-3. **What should the footer contain?** (copyright text, links, social icons, etc.)
-4. **Should the header be sticky (fixed to top while scrolling)?**
-5. **Is there a logo or brand name to display?** (or placeholder?)
-6. **Any specific color scheme or style direction?** (dark background, branded primary color, minimal, etc.)
-7. **Should navigation links appear in the header?** If so, which pages?
-
-### For a Component
-
-1. **What should the component do?** (display data, accept input, trigger an action, etc.)
-2. **What page or location should it appear on?**
-3. **Is this shared/reusable across pages, or specific to one feature?** (determines file location)
-4. **What data or props does it need?** (static content, props, fetched data)
-5. **Does it need internal state?** (loading, toggle, form state, etc.)
-6. **Are there any specific shadcn components to use?** (Card, Table, Dialog, Form, etc.)
-7. **Should it appear in a specific layout position?** (full-width, sidebar, inline, etc.)
-
----
-
-## Implementation
-
-Once you have identified the type and gathered answers to the clarifying questions, read and follow the corresponding implementation guide:
-
-- **Page** — read `implementation/page.md` and follow the instructions there.
-- **Header / Footer** — read `implementation/header-footer.md` and follow the instructions there.
-- **Component** — read `implementation/component.md` and follow the instructions there.
-
----
-
-## TypeScript Standards
-
-- **Never use `any`** — use proper types, generics, or `unknown` with type guards.
-- **Event handlers:** `(event: React.FormEvent<HTMLFormElement>): void`
-- **State:** `useState<User | null>(null)` — always provide the type parameter.
-- **No unsafe assertions** (`obj as User`). Use type guards:
-  ```typescript
-  function isUser(obj: unknown): obj is User {
-    return typeof obj === 'object' && obj !== null && typeof (obj as User).id === 'string';
-  }
-  ```
-
----
-
-## Verification (MANDATORY)
-
-Before completing, run from the web app directory `force-app/main/default/webapplications/<appName>/`:
-
-```bash
-cd force-app/main/default/webapplications/<appName> && npm run lint && npm run build
-```
-
-- **Lint:** MUST result in 0 errors.
-- **Build:** MUST succeed (includes TypeScript check).
-
-If either fails, fix the errors and re-run. Do not leave the session with failing quality gates.
diff --git a/skills/configuring-webapp-csp-trusted-sites/SKILL.md b/skills/configuring-webapp-csp-trusted-sites/SKILL.md
deleted file mode 100644
index 29b69db..0000000
--- a/skills/configuring-webapp-csp-trusted-sites/SKILL.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-name: configuring-webapp-csp-trusted-sites
-description: "Creates Salesforce CSP Trusted Site metadata when adding external domains. Use when the user adds an external API, CDN, image host, font provider, map tile server, or any third-party URL that the web application needs to load resources from — or when a browser console shows a CSP violation error."
----
-
-# CSP Trusted Sites
-
-## When to Use
-
-Use this skill whenever the application references a new external domain that is not already registered as a CSP Trusted Site. This includes:
-
-- Adding images from a new CDN (Unsplash, Pexels, Cloudinary, etc.)
-- Loading fonts from an external provider (Google Fonts, Adobe Fonts)
-- Calling a third-party API (Open-Meteo, Nominatim, Mapbox, etc.)
-- Loading map tiles from a tile server (OpenStreetMap, Mapbox)
-- Embedding iframes from external services (YouTube, Vimeo)
-- Loading external stylesheets or scripts
-
-Salesforce enforces Content Security Policy (CSP) headers on all web applications. Any external domain not registered as a CSP Trusted Site will be blocked by the browser, causing images to not load, API calls to fail, or fonts to be missing.
-
-**Reference:** [Salesforce CspTrustedSite Object Reference](https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/object_reference/sforce_api_objects_csptrustedsite.htm)
-
----
-
-## Step 1 — Identify external domains
-
-Scan the code for any URLs pointing to external domains. Common patterns:
-
-- `fetch("https://api.example.com/...")` — API calls
-- `<img src="https://images.example.com/..." />` — images
-- `<link href="https://fonts.example.com/..." />` — stylesheets
-- `url="https://tiles.example.com/{z}/{x}/{y}.png"` — map tiles
-- `@import url("https://cdn.example.com/...")` — CSS imports
-
-Extract the **origin** (scheme + host) from each URL. For example:
-- `https://api.open-meteo.com/v1/forecast?lat=...` → `https://api.open-meteo.com`
-- `https://images.unsplash.com/photo-123?w=800` → `https://images.unsplash.com`
-
----
-
-## Step 2 — Check existing CSP Trusted Sites
-
-Before creating a new file, check if the domain already has a CSP Trusted Site:
-
-```bash
-ls force-app/main/default/cspTrustedSites/
-```
-
-If the domain is already registered, no action is needed.
-
----
-
-## Step 3 — Determine the CSP directive(s)
-
-Map the resource type to the correct CSP `isApplicableTo*Src` fields. Read `implementation/metadata-format.md` for the full reference.
-
-Quick reference:
-
-| Resource type | CSP directive field(s) to set `true` |
-|--------------|--------------------------------------|
-| Images (img, background-image) | `isApplicableToImgSrc` |
-| API calls (fetch, XMLHttpRequest) | `isApplicableToConnectSrc` |
-| Fonts (.woff, .woff2, .ttf) | `isApplicableToFontSrc` |
-| Stylesheets (CSS) | `isApplicableToStyleSrc` |
-| Video / audio | `isApplicableToMediaSrc` |
-| Iframes | `isApplicableToFrameSrc` |
-
-**Always also set `isApplicableToConnectSrc` to `true`** — most resources also require connect-src for preflight/redirect handling.
-
----
-
-## Step 4 — Create the metadata file
-
-Read `implementation/metadata-format.md` and follow the instructions to create the `.cspTrustedSite-meta.xml` file.
-
----
-
-## Step 5 — Verify
-
-1. Confirm the file is valid XML and matches the expected schema.
-2. Confirm the file is placed in `force-app/main/default/cspTrustedSites/`.
-3. Confirm only the necessary `isApplicableTo*Src` fields are set to `true`.
-4. Run from the web app directory:
-
-```bash
-cd force-app/main/default/webapplications/<appName> && npm run lint && npm run build
-```
-
-- **Lint:** MUST result in 0 errors.
-- **Build:** MUST succeed.
diff --git a/skills/configuring-webapp-metadata/SKILL.md b/skills/configuring-webapp-metadata/SKILL.md
deleted file mode 100644
index 2410b84..0000000
--- a/skills/configuring-webapp-metadata/SKILL.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-name: configuring-webapp-metadata
-description: "Use this skill when configuring web application metadata structure, webapplication.json, or bundle organization. Covers WebApplication bundle layout, meta XML, build output directory, and webapplication.json settings."
----
-
-# WebApplication Requirements
-
-## Bundle Rules
-- A WebApplication bundle must live under `webapplications/<AppName>/`
-- The bundle must contain `<AppName>.webapplication-meta.xml`
-- The metadata filename must exactly match the folder name
-- A build output directory must exist and contain at least one file
-- Default build output directory: `dist/`
-- If `webapplication.json.outputDir` is set, it overrides `dist/`
-
-Valid example:
-```text
-webapplications/
-  MyApp/
-    MyApp.webapplication-meta.xml
-    webapplication.json
-    dist/
-      index.html
-```
-
-## Metadata XML
-Required fields:
-- `masterLabel`
-- `version` (max 20 chars)
-- `isActive` (boolean)
-
-Optional fields:
-- `description` (max 255 chars)
-
-## webapplication.json
-`webapplication.json` is optional.
-
-Allowed top-level keys only:
-- `outputDir`
-- `routing`
-- `headers`
-
-### File Constraints
-- Must be valid UTF-8 JSON
-- Max size: 100 KB
-- Root must be a non-empty object
-- Never allow `{}`, arrays, or primitives as the root
-
-### Path Safety
-Applies to:
-- `outputDir`
-- `routing.fallback`
-
-Reject:
-- backslashes
-- leading `/` or `\`
-- `..` segments
-- null or control characters
-- globs: `*`, `?`, `**`
-- `%`
-
-All resolved paths must stay within the application bundle.
-
-### outputDir
-- Must be a non-empty string
-- Must reference a subdirectory only
-- Reject `.` and `./`
-- The directory must exist in the bundle
-- The directory must contain at least one file
-
-### routing
-- If present, must be a non-empty object
-- Allowed keys only:
-  - `rewrites`
-  - `redirects`
-  - `fallback`
-  - `trailingSlash`
-  - `fileBasedRouting`
-
-#### routing.trailingSlash
-- Must be one of: `"always"`, `"never"`, `"auto"`
-
-#### routing.fileBasedRouting
-- Must be a boolean
-
-#### routing.fallback
-- Must be a non-empty string
-- Must satisfy Path Safety rules
-- Target file must exist
-
-#### routing.rewrites
-- Must be a non-empty array
-- Each item must be a non-empty object
-- Allowed keys: `route`, `rewrite`
-- `rewrite` must be a non-empty string
-- `route`, if present, must be a non-empty string
-
-Example:
-```json
-{
-  "routing": {
-    "rewrites": [
-      { "route": "/app/:path*", "rewrite": "/index.html" }
-    ]
-  }
-}
-```
-
-#### routing.redirects
-- Must be a non-empty array
-- Each item must be a non-empty object
-- Allowed keys: `route`, `redirect`, `statusCode`
-- `redirect` must be a non-empty string
-- `route`, if present, must be a non-empty string
-- `statusCode`, if present, must be one of: `301`, `302`, `307`, `308`
-
-Example:
-```json
-{
-  "routing": {
-    "redirects": [
-      { "route": "/old-page", "redirect": "/new-page", "statusCode": 301 }
-    ]
-  }
-}
-```
-
-### headers
-- If present, must be a non-empty array
-- Each item must be a non-empty object
-- Allowed keys: `source`, `headers`
-- `headers` must be a non-empty array
-
-Each header entry must contain:
-- `key`: non-empty string
-- `value`: non-empty string
-
-Example:
-```json
-{
-  "headers": [
-    {
-      "source": "/assets/**",
-      "headers": [
-        { "key": "Cache-Control", "value": "public, max-age=31536000, immutable" }
-      ]
-    }
-  ]
-}
-```
-
-## Never Suggest
-- `{}` as the JSON root
-- `"routing": {}`
-- empty arrays
-- empty array items such as `[{}]`
-- `"outputDir": "."`
-- `"outputDir": "./"`
diff --git a/skills/creating-webapp/SKILL.md b/skills/creating-webapp/SKILL.md
deleted file mode 100644
index c95367f..0000000
--- a/skills/creating-webapp/SKILL.md
+++ /dev/null
@@ -1,138 +0,0 @@
----
-name: creating-webapp
-description: "Use this skill when creating or setting up a new SFDX React web application. Covers first steps, npm install, skills-first protocol, deployment order, and core web app rules."
----
-
-# First Steps (MUST FOLLOW)
-
-**Always run `npm install` before doing anything else** when working in a web app directory (e.g. `force-app/main/default/webapplications/<appName>/` or a dist app path). Dependencies must be installed before running `npm run dev`, `npm run build`, `npm run lint`, or any other script. If `node_modules` is missing or stale, commands will fail.
-
-# Skills-First (MUST FOLLOW)
-
-**Before writing any code or running any command**, search for relevant skills (`SKILL.md` files) that cover your task. Read the full skill and follow its instructions. Skills live in `.a4drules/skills/` and `feature/*/skills/`.
-
-- Do not write custom scripts or complex bash commands for a workflow already covered by a loaded skill.
-- Only proceed with manual execution after confirming no relevant skill exists.
-
-# Deployment Order (MUST FOLLOW)
-
-**Metadata deployments must complete before fetching GraphQL schema or running codegen.** The schema reflects the current org state; custom objects and fields appear only after metadata is deployed. Running schema fetch or codegen too early produces incomplete or incorrect types.
-
-**Invoke the `deploying-to-salesforce` skill** (`.a4drules/skills/deploying-to-salesforce/`) whenever the task involves:
-- Deploying metadata (objects, permission sets, layouts)
-- Fetching GraphQL schema (`npm run graphql:schema`)
-- Running GraphQL codegen (`npm run graphql:codegen`)
-- Generating deploy/setup commands or syncing with the org
-
-The skill enforces the correct sequence: **deploy metadata → assign permset → schema fetch → codegen**.
-
-**Critical rules:**
-- Do **not** run `npm run graphql:schema` before metadata (objects, permission sets) is deployed — the schema will not include custom objects/fields.
-- Do **not** skip schema refetch after any metadata deployment — re-run `npm run graphql:schema` and `npm run graphql:codegen` from the webapp dir.
-
-# Web App Generation
-
-## Before `sf webapp generate`
-
-**Webapp name (`-n`):** Must be **alphanumerical only**—no spaces, hyphens, underscores, or special characters. Use only letters (A–Z, a–z) and digits (0–9). Example: `CoffeeBoutique` not `Coffee Boutique`.
-
-```bash
-sf webapp generate -n MyWebApp -t reactbasic
-```
-
-Do not use `create-react-app`, Vite, or other generic scaffolds; use `sf webapp generate` so the app is SFDX-aware.
-
-## After Generation (MANDATORY)
-
-After generating or when touching an existing app:
-
-1. **Replace all default boilerplate** — "React App", "Vite + React", default `<title>`, placeholder text in shell. Use the actual app name.
-2. **Populate the home page** — Never leave it as default template. Add real content: landing section, banners, hero, navigation to features.
-3. **Update navigation and placeholders** — See [Navigation & Layout section](#navigation--layout-mandatory) below.
-
-# Navigation & Layout (MANDATORY)
-
-Agents consistently miss these. **You must not leave them default.**
-
-## appLayout.tsx is the Source of Truth
-
-- **Build navigation into the app layout** (`appLayout.tsx`). The layout must include nav (header, sidebar, or both) so every page shares the same shell.
-- Path: `force-app/main/default/webapplications/<appName>/src/appLayout.tsx`
-
-## When Making UI Changes
-
-**When making any change** that affects navigation, header, footer, sidebar, theme, or overall layout:
-
-1. **You MUST edit `src/appLayout.tsx`** (the layout used by `routes.tsx`).
-2. Do not only edit pages/components and leave `appLayout.tsx` unchanged.
-3. Before finishing: confirm you opened and modified `appLayout.tsx`. If you did not, the task is incomplete.
-
-## Navigation Menu (Critical)
-
-- **Always edit the navigation menu** in `appLayout.tsx`. Replace default nav items and labels with **app-specific** links and names.
-- Do **not** leave template items (e.g. "Home", "About", generic placeholder links).
-- Use real routes and labels matching the app (e.g. "Dashboard", "Products", "Orders").
-
-**Check before finishing:** Did I change the nav items and labels to match this app?
-
-## Placeholder Name & Design (Critical)
-
-- **Replace the placeholder app name** everywhere: header, nav brand/logo, footer, `<title>` in `index.html`, any "Welcome to…" text.
-- **Replace placeholder design** in the shell: default header/footer styling, generic branding.
-
-**Check before finishing:** Is the app name and shell design still the template default? If yes, update it.
-
-## Where to Edit
-
-
-| What                | Where                                                                |
-| ------------------- | -------------------------------------------------------------------- |
-| Layout/nav/branding | `force-app/main/default/webapplications/<appName>/src/appLayout.tsx` |
-| Document title      | `force-app/main/default/webapplications/<appName>/index.html`        |
-| Root page content   | Component at root route (often `Home` in `routes.tsx`)               |
-
-
-# React & TypeScript Constraints
-
-## Routing (React Router)
-
-Use a **single** router package. When using `createBrowserRouter` / `RouterProvider`, all imports MUST come from **`react-router`** — not `react-router-dom`.
-
-## Component Library + Styling
-
-- **shadcn/ui** for components: `import { Button } from '@/components/ui/button';`
-- **Tailwind CSS** utility classes
-
-## URL & Path Handling
-
-Apps run behind dynamic base paths. Router navigation (`<Link to>`, `navigate()`) prefer absolute paths (`/x`). Non-router attributes (`<img src>`) use dot-relative (`./x`) to resolve against `<base>`. Prefer Vite `import` for static assets.
-
-## Module Restrictions
-
-React apps must NOT import Salesforce platform modules like `lightning/*` or `@wire` (LWC-only). For data access, invoke the **using-salesforce-data** skill.
-
-# Frontend Aesthetics
-
-**Avoid AI slop.** Make creative, distinctive frontends:
-
-- **Typography:** Avoid Inter, Roboto, Arial, Space Grotesk as defaults. Choose distinctive fonts.
-- **Color:** Use cohesive color with sharp accents via CSS variables. Avoid purple-on-white clichés.
-- **Motion:** Use high-impact motion (e.g. staggered reveals).
-- **Depth:** Add atmosphere/depth in backgrounds.
-
-# Shell Command Safety (MUST FOLLOW)
-
-**Never use complex `node -e` one-liners** for file edits or multi-line transforms. They break in Zsh due to `!` history expansion and backtick interpolation. Use a temporary `.js` file, `sed`/`awk`, `jq`, or IDE file-editing tools instead.
-
-# Development Cycle
-
-- Execute tasks continuously until all planned items complete in the current iteration.
-- Maintain a running checklist and proceed sequentially.
-
-## Stop Conditions
-
-Only stop when:
-
-- All checklist items are completed and quality gates pass, or
-- A blocking error cannot be resolved after reasonable remediation, or
-- The user explicitly asks to pause.
diff --git a/skills/deploying-webapp-to-salesforce/SKILL.md b/skills/deploying-webapp-to-salesforce/SKILL.md
deleted file mode 100644
index 16067db..0000000
--- a/skills/deploying-webapp-to-salesforce/SKILL.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-name: deploying-webapp-to-salesforce
-description: "Enforces the correct order for deploying metadata, assigning permission sets, and fetching GraphQL schema. Use for ANY deployment to a Salesforce org — webapps, LWC, Aura, Apex, metadata, schema fetch, or org sync. Codifies setup-cli.mjs."
----
-
-# Deploying to Salesforce
-
-Guidance for AI agents deploying metadata to a Salesforce org or syncing with the org. **The order of operations is critical.** This skill codifies the exact sequence from `scripts/setup-cli.mjs` and documents **every Salesforce interaction**.
-
-## When to Use
-
-Invoke this skill whenever the task involves:
-
-- Deploying metadata (objects, permission sets, layouts, Apex, web applications)
-- Generating deploy commands or setup instructions
-- Fetching the GraphQL schema (`npm run graphql:schema`)
-- Running GraphQL codegen (`npm run graphql:codegen`)
-- Full org setup (login, deploy, permset, data, schema, build)
-- Any manual step that touches the Salesforce org
-
-## Canonical Sequence (from setup-cli.mjs)
-
-Execute steps in this **exact order**. Steps marked **(SF)** perform a Salesforce API or CLI interaction.
-
-### Step 1: Login — org authentication
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Check if org is connected | **(SF)** | `sf org display --target-org <alias> --json` |
-| If not connected: authenticate | **(SF)** | `sf org login web --alias <alias>` |
-
-- **Run when:** Org is not connected. **Omit when:** Org is already authenticated (check via `sf org display`).
-- All subsequent steps require an authenticated org.
-
-### Step 2: Webapp build — pre-deploy (required for entity deployment)
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Install dependencies | No | `npm install` (in each webapp dir) |
-| Build web app | No | `npm run build` (in each webapp dir) |
-
-- Produces `dist/` so `sf project deploy start` can deploy web application entities. Run **before** deploy when deploying web apps.
-- **Run when:** Deploying web apps AND (`dist/` does not exist OR webapp source has changed since last build). **Omit when:** Not deploying, or `dist/` is current and no source changes.
-
-### Step 3: Deploy metadata
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Deploy metadata | **(SF)** | See below |
-
-**Check for a manifest (package.xml) first.** Only use it if present:
-
-- **If `manifest/package.xml` (or `package.xml`) exists:** Deploy using the manifest:
-  ```bash
-  sf project deploy start --manifest manifest/package.xml --target-org <alias>
-  ```
-- **If no manifest exists:** Deploy all metadata from the project (packageDirectories in sfdx-project.json):
-  ```bash
-  sf project deploy start --target-org <alias>
-  ```
-
-Do not assume a manifest exists. Check the project root and common locations (e.g., `manifest/`, `config/`) before choosing the deploy command.
-
-- Deploys objects, layouts, permission sets, Apex classes, web applications, and all other metadata.
-- **Must complete successfully before schema fetch** — the schema reflects org state; custom objects/fields appear only after deployment.
-- **Run when:** Metadata has changed since last deploy, or never deployed. **Omit when:** No metadata changes and deploy has already run successfully.
-
-### Step 4: Post-deployment configuration — assign permissions and configure
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Assign permission set or group | **(SF)** | `sf org assign permset --name <name> --target-org <alias>` (works for both permsets and permset groups) |
-| Assign profile to user | **(SF)** | `sf data update record` or at user creation |
-| Other post-deploy config | **(SF)** | Varies (e.g., named credentials, connected apps, custom settings) |
-
-**Example commands:**
-
-```bash
-# Permission set (assigns to default user of target org)
-sf org assign permset --name Property_Management_Access --target-org myorg
-
-# Permission set group (same command; pass the group name)
-sf org assign permset --name My_Permset_Group --target-org myorg
-
-# Assign to a specific user
-sf org assign permset --name Property_Management_Access --target-org myorg --on-behalf-of user@example.com
-
-# Profile — update existing user's profile (requires ProfileId and User Id)
-sf data update record --sobject User --record-id <userId> --values "ProfileId=<profileId>" --target-org myorg
-
-# Profile — get ProfileId first
-sf data query --query "SELECT Id, Name FROM Profile WHERE Name='Standard User'" --target-org myorg
-```
-
-- **Deploying does not mean assigning.** Even after permission sets, permission set groups, and profiles are deployed to the org, they must be explicitly assigned or configured for users. Deployment makes them available; assignment/configuration grants access.
-- **Permission sets** — Assign to users so they have access to custom objects and fields. Required for GraphQL introspection to return the correct schema.
-- **Permission set groups** — Assign to users when using grouped permission sets.
-- **Profiles** — Ensure users have the correct profile; profile assignment may be done at user creation or via Setup.
-- **Other post-deploy configuration** — Named credentials, connected apps, custom settings, flow activation, and any metadata that requires manual configuration after deploy.
-- All of the above must exist in the org (deployed in Step 3).
-- **Run when:** Any permission set, permission set group, profile, or other post-deploy config was deployed or changed and not yet assigned/configured. **Omit when:** All required assignments and configuration are already in place.
-
-**Proactive behavior:** After a successful deploy, discover permission sets in the project (e.g., `force-app/main/default/permissionsets/*.permissionset-meta.xml`) and assign each one. Extract the API name from the filename (e.g., `Property_Management_Access.permissionset-meta.xml` → `Property_Management_Access`). If the user has not explicitly requested a full setup, you may ask: "Do you want me to assign the permission sets to your org?" — but do not skip this step silently; either run it or ask.
-
-### Step 5: Data — prepare and import (optional)
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Prepare unique fields | No | `node scripts/prepare-import-unique-fields.js --data-dir <dataDir>` |
-| Clean existing records | **(SF)** | `sf apex run --target-org <alias> --file <apex>` (per sobject, reverse plan order) |
-| Import records | **(SF)** | `sf apex run --target-org <alias> --file <apex>` (per batch) |
-
-- Only runs if `data/data-plan.json` and `data/` exist.
-- Delete runs in reverse plan order (children before parents).
-- Import uses Anonymous Apex with `Database.DMLOptions.duplicateRuleHeader.allowSave = true`.
-- **Run when:** Data plan exists AND (never imported OR data files or plan changed). **Omit when:** No data plan, or data already imported and unchanged.
-
-**Proactive behavior:** If `data/data-plan.json` and `data/` exist, you MUST ask the user: "Do you want me to import the sample data now? This will prepare unique fields, optionally clean existing records, and import data. Reply yes to proceed." Do not skip this step silently; either run it (after confirmation) or ask. Never import or clean without explicit user confirmation.
-
-### Step 6: GraphQL schema and codegen
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Install webapp deps | No | `npm install` (in webapp dir) |
-| Set default org | **(SF)** | `sf config set target-org <alias> --global` |
-| Fetch schema (introspection) | **(SF)** | `npm run graphql:schema` (from webapp dir) |
-| Generate types | No | `npm run graphql:codegen` (from webapp dir) |
-
-- `graphql:schema` performs GraphQL introspection against the org — a **Salesforce API call**.
-- Schema is written to `schema.graphql` at the SFDX project root.
-- Codegen reads the schema file locally; no Salesforce interaction.
-- **Run when:** Schema does not exist, OR metadata was deployed/changed since last schema fetch, OR permissions or post-deploy config was assigned since last schema fetch. **Omit when:** Schema exists and is current relative to org state.
-
-### Step 7: Webapp build (if not done in Step 2)
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Build web app | No | `npm run build` (in webapp dir) |
-
-- **Run when:** Build is needed (e.g., for dev server or deploy) AND (`dist/` does not exist OR webapp source has changed since last build). **Omit when:** `dist/` is current and no build needed.
-
-### Step 8: Dev server (optional)
-
-| Action | Salesforce interaction? | Command |
-|--------|-------------------------|---------|
-| Launch dev server | No | `npm run dev` (in webapp dir) |
-
-- **Run when:** User requests to launch the dev server. **Omit when:** Not requested.
-
-## Summary: All Salesforce Interactions (in order)
-
-1. `sf org display` — check org connection
-2. `sf org login web` — authenticate (if needed)
-3. `sf project deploy start` — deploy metadata
-4. `sf org assign permset` (permsets and permset groups) / profile assignment / other post-deploy config — assign permissions and configure
-5. `sf apex run` — delete existing data (if data plan)
-6. `sf apex run` — import data (if data plan)
-7. `sf config set target-org` — set default org for schema
-8. `npm run graphql:schema` — GraphQL introspection (Salesforce API)
-
-## Post-Deploy Checklist (MUST NOT SKIP)
-
-After **every successful metadata deploy**, the agent MUST address these before considering the task complete:
-
-1. **Permission sets** — Discover `force-app/main/default/permissionsets/*.permissionset-meta.xml`, extract API names, and assign each via `sf org assign permset --name <name> --target-org <alias>`. If unsure, ask: "Do you want me to assign the permission sets (e.g., Property_Management_Access, Tenant_Maintenance_Access) to your org?"
-2. **Data import** — If `data/data-plan.json` exists, ask: "Do you want me to import the sample data now? Reply yes to proceed." Do not import without confirmation.
-3. **Schema refetch** — Run `npm run graphql:schema` and `npm run graphql:codegen` from the webapp dir (required after deploy).
-
-Do not silently skip permission set assignment or data import. Either run them or ask the user.
-
-## Agent Decision Criteria
-
-Evaluate each step before running it. Ask:
-
-- **Has this step ever run before?** If not, it is likely needed.
-- **Have changes been made that require this step?** (e.g., metadata edits → deploy; deploy → schema refetch)
-- **Is the current state sufficient?** (e.g., org connected, schema exists and is current, permissions and post-deploy config assigned)
-
-Do not rely on CLI flags. Decide based on project state and what has changed.
-
-## Evaluation: When Each Step Touches Salesforce
-
-| Step | Salesforce interaction | Run when |
-|------|------------------------|----------|
-| 1. Login | Yes | Org not connected |
-| 2. Webapp build | No | Deploying web apps AND dist missing or source changed |
-| 3. Deploy | Yes | Metadata changed or never deployed |
-| 4. Post-deploy config | Yes | Permission sets, permset groups, profiles, or other config deployed/changed and not assigned |
-| 5. Data | Yes | Data plan exists AND (never imported OR data changed) |
-| 6. GraphQL | Yes (schema only) | Schema missing or metadata/permissions changed since last fetch |
-| 7. Webapp build | No | Build needed AND dist missing or source changed |
-| 8. Dev | No | User requests dev server |
-
-**Critical rule:** Steps 3 (deploy) and 4 (post-deploy config) must complete **before** step 6 (graphql:schema). The schema reflects the org state; running introspection too early yields an incomplete schema.
-
-## Schema Refetch Rule (CRITICAL)
-
-**After any metadata deployment**, you MUST re-run schema fetch and codegen:
-
-- New custom objects
-- New custom fields
-- New or updated permission sets
-- Any change to metadata that affects the GraphQL schema
-
-```bash
-# From webapp dir (force-app/main/default/webapplications/<appName>/)
-npm run graphql:schema
-npm run graphql:codegen
-```
-
-Do **not** assume the existing `schema.graphql` is current after metadata changes.
-
-## One-Command Setup (Reference)
-
-The project includes `scripts/setup-cli.mjs` which runs this sequence in batch. Use it when the user wants a full setup; otherwise, follow this skill and run only the steps that are needed based on current state.
-
-## Prohibited Actions
-
-- **Do not** run `npm run graphql:schema` before metadata is deployed — the schema will not include custom objects/fields
-- **Do not** skip schema refetch after deploying new metadata — types and queries will be out of sync
-- **Do not** assign permissions or configure before deploying — permission sets, permset groups, and profiles must exist in the org first
-- **Do not** run GraphQL introspection before assigning permissions — the user may lack FLS for custom fields
-
-## Related Skills
-
-- **using-salesforce-data** — Full data access workflow (GraphQL queries/mutations, REST APIs, schema exploration, webapp integration)
diff --git a/skills/generating-webapp-features/SKILL.md b/skills/generating-webapp-features/SKILL.md
new file mode 100644
index 0000000..3c0f811
--- /dev/null
+++ b/skills/generating-webapp-features/SKILL.md
@@ -0,0 +1,45 @@
+---
+name: generating-webapp-features
+description: "Search and install pre-built features into Salesforce React web applications — authentication, shadcn, search, navigation, GraphQL, Agentforce AI, and more. Use whenever searching for or installing features. Always check for an existing feature before building from scratch. Triggers on: install feature, add authentication, add shadcn, add feature, search features, list features."
+---
+
+# Web Application Features
+
+## Installing Pre-built Features
+
+Always check for an existing feature before building something from scratch. The features CLI installs pre-built, tested packages into Salesforce webapps — from foundational UI libraries (shadcn/ui) to full-stack capabilities (authentication, search, navigation, GraphQL, Agentforce AI).
+
+### Workflow
+
+1. **Search project code first** — check `src/` for existing implementations before installing anything. Scope searches to `src/` to avoid matching `node_modules/` or `dist/`.
+
+2. **Search available features** — use `npx @salesforce/webapps-features-experimental list` with `--search <query>` to filter by keyword. Use `--verbose` for full descriptions.
+
+3. **Describe a feature** — use `npx @salesforce/webapps-features-experimental describe <feature>` to see components, dependencies, copy operations, and example files.
+
+4. **Install** — use `npx @salesforce/webapps-features-experimental install <feature> --webapp-dir <name>`. Key options:
+   - `--dry-run` to preview changes
+   - `--yes` for non-interactive mode (skips conflicts)
+   - `--on-conflict error` to detect conflicts, then `--conflict-resolution <file>` to resolve them
+
+If no matching feature is found, ask the user before building a custom implementation — a relevant feature may exist under a different name.
+
+### Conflict Handling
+
+In non-interactive environments, use the two-pass approach: first run with `--on-conflict error` to detect conflicts, then create a resolution JSON file (`{ "path": "skip" | "overwrite" }`) and re-run with `--conflict-resolution`.
+
+### Post-install: Integrating Example Files
+
+Features may include `__example__` files showing integration patterns. For each:
+
+1. Read the example file to understand the pattern
+2. Read the target file (shown in `describe` output)
+3. Apply the pattern from the example into the target
+4. Delete the example file after successful integration
+
+### Hint Placeholders
+
+Some copy paths use `<descriptive-name>` placeholders (e.g., `<desired-page-with-search-input>`) that the CLI does not resolve. After installation, rename or relocate these files to the intended target, or integrate their patterns into an existing file.
+
+
+
diff --git a/skills/generating-webapp-metadata/SKILL.md b/skills/generating-webapp-metadata/SKILL.md
new file mode 100644
index 0000000..ba80fc6
--- /dev/null
+++ b/skills/generating-webapp-metadata/SKILL.md
@@ -0,0 +1,180 @@
+---
+name: generating-webapp-metadata
+description: "Scaffold new Salesforce web applications and configure/deploy their metadata — sf webapp generate, WebApplication bundles (meta XML, webapplication.json with routing/headers/outputDir), CSP Trusted Sites for external domains, and the full deployment sequence (org auth, build, deploy, permset assign, data import, GraphQL schema fetch, codegen). Use whenever creating a new webapp, setting up webapp metadata structure, adding external domains that need CSP registration, deploying to a Salesforce org, assigning permission sets, fetching GraphQL schema, or running codegen. Triggers on: create webapp, new app, sf webapp generate, deploy, metadata, webapplication.json, CSP, trusted site, permission set, schema fetch, codegen, org setup, bundle configuration, meta XML, routing config, external domain."
+---
+
+# Web Application Metadata
+
+## Scaffolding a New Webapp
+
+Use `sf webapp generate` to create new apps — not create-react-app, Vite, or other generic scaffolds.
+
+**Webapp name (`-n`):** Alphanumerical only — no spaces, hyphens, underscores, or special characters. Example: `CoffeeBoutique` (not `Coffee Boutique`).
+
+After generation:
+1. Replace all default boilerplate — "React App", "Vite + React", default `<title>`, placeholder text
+2. Populate the home page with real content (landing section, banners, hero, navigation)
+3. Update navigation and placeholders (see the `generating-webapp-ui` skill)
+
+Always install dependencies before running any scripts in the webapp directory.
+
+---
+
+## WebApplication Bundle
+
+A WebApplication bundle lives under `webapplications/<AppName>/` and must contain:
+
+- `<AppName>.webapplication-meta.xml` — filename must exactly match the folder name
+- A build output directory (default: `dist/`) with at least one file
+
+### Meta XML
+
+Required fields: `masterLabel`, `version` (max 20 chars), `isActive` (boolean).
+Optional: `description` (max 255 chars).
+
+### webapplication.json
+
+Optional file. Allowed top-level keys: `outputDir`, `routing`, `headers`.
+
+**Constraints:**
+- Valid UTF-8 JSON, max 100 KB
+- Root must be a non-empty object (never `{}`, arrays, or primitives)
+
+**Path safety** (applies to `outputDir` and `routing.fallback`): Reject backslashes, leading `/` or `\`, `..` segments, null/control characters, globs (`*`, `?`, `**`), and `%`. All resolved paths must stay within the bundle.
+
+#### outputDir
+Non-empty string referencing a subdirectory (not `.` or `./`). Directory must exist and contain at least one file.
+
+#### routing
+If present, must be a non-empty object. Allowed keys: `rewrites`, `redirects`, `fallback`, `trailingSlash`, `fileBasedRouting`.
+
+- **trailingSlash**: `"always"`, `"never"`, or `"auto"`
+- **fileBasedRouting**: boolean
+- **fallback**: non-empty string satisfying path safety; target file must exist
+- **rewrites**: non-empty array of `{ route?, rewrite }` objects — e.g., `{ "route": "/app/:path*", "rewrite": "/index.html" }`
+- **redirects**: non-empty array of `{ route?, redirect, statusCode? }` objects — statusCode must be 301, 302, 307, or 308
+
+#### headers
+Non-empty array of `{ source, headers: [{ key, value }] }` objects.
+
+**Example:**
+```json
+{
+  "routing": {
+    "rewrites": [{ "route": "/app/:path*", "rewrite": "/index.html" }],
+    "trailingSlash": "never"
+  },
+  "headers": [
+    {
+      "source": "/assets/**",
+      "headers": [{ "key": "Cache-Control", "value": "public, max-age=31536000, immutable" }]
+    }
+  ]
+}
+```
+
+**Never suggest:** `{}` as root, empty `"routing": {}`, empty arrays, `[{}]`, `"outputDir": "."`, `"outputDir": "./"`.
+
+---
+
+## CSP Trusted Sites
+
+Salesforce enforces Content Security Policy headers. Any external domain not registered as a CSP Trusted Site will be blocked (images won't load, API calls fail, fonts missing).
+
+### When to Create
+
+Whenever the app references a new external domain: CDN images, external fonts, third-party APIs, map tiles, iframes, external stylesheets.
+
+### Steps
+
+1. **Identify external domains** — extract the origin (scheme + host) from each external URL in the code
+2. **Check existing registrations** — look in `force-app/main/default/cspTrustedSites/`
+3. **Map resource type to CSP directive:**
+
+| Resource Type | Directive Field |
+|--------------|----------------|
+| Images | `isApplicableToImgSrc` |
+| API calls (fetch, XHR) | `isApplicableToConnectSrc` |
+| Fonts | `isApplicableToFontSrc` |
+| Stylesheets | `isApplicableToStyleSrc` |
+| Video / audio | `isApplicableToMediaSrc` |
+| Iframes | `isApplicableToFrameSrc` |
+
+Always also set `isApplicableToConnectSrc` to `true` for preflight/redirect handling.
+
+4. **Create the metadata file** — follow `implementation/csp-metadata-format.md` for the `.cspTrustedSite-meta.xml` format. Place in `force-app/main/default/cspTrustedSites/`.
+
+---
+
+## Deployment Sequence
+
+The order of operations is critical when deploying to a Salesforce org. This sequence reflects the canonical flow.
+
+### Step 1: Org Authentication
+
+Check if the org is connected. If not, authenticate. All subsequent steps require an authenticated org.
+
+### Step 2: Pre-deploy Webapp Build
+
+Install dependencies and build the webapp to produce `dist/`. Required before deploying web application entities.
+
+Run when: deploying web apps and `dist/` is missing or source has changed.
+
+### Step 3: Deploy Metadata
+
+Check for a manifest (`manifest/package.xml` or `package.xml`) first. If present, deploy using the manifest. If not, deploy all metadata from the project.
+
+Deploys objects, layouts, permission sets, Apex classes, web applications, and all other metadata. Must complete before schema fetch — the schema reflects org state.
+
+### Step 4: Post-deploy Configuration
+
+Deploying does not mean assigning. After deployment:
+
+- **Permission sets / groups** — assign to users so they have access to custom objects and fields. Required for GraphQL introspection to return the correct schema.
+- **Profiles** — ensure users have the correct profile.
+- **Other config** — named credentials, connected apps, custom settings, flow activation.
+
+Proactive behavior: after a successful deploy, discover permission sets in `force-app/main/default/permissionsets/` and assign each one (or ask the user).
+
+### Step 5: Data Import (optional)
+
+Only if `data/data-plan.json` exists. Delete runs in reverse plan order (children before parents). Import uses Anonymous Apex with duplicate rule save enabled.
+
+Always ask the user before importing or cleaning data.
+
+### Step 6: GraphQL Schema and Codegen
+
+1. Set default org
+2. Fetch schema (GraphQL introspection) — writes `schema.graphql` at project root
+3. Generate types (codegen reads schema locally)
+
+Run when: schema missing, or metadata/permissions changed since last fetch.
+
+### Step 7: Final Webapp Build
+
+Build the webapp if not already done in Step 2.
+
+### Summary: Interaction Order
+
+1. Check/authenticate org
+2. Build webapp (if deploying web apps)
+3. Deploy metadata
+4. Assign permissions and configure
+5. Import data (if data plan exists, with user confirmation)
+6. Fetch GraphQL schema and run codegen
+7. Build webapp (if needed)
+
+### Critical Rules
+
+- Deploy metadata **before** fetching schema — custom objects/fields appear only after deployment
+- Assign permissions **before** schema fetch — the user may lack FLS for custom fields
+- Re-run schema fetch and codegen **after every metadata deployment** that changes objects, fields, or permissions
+- Never skip permission set assignment or data import silently — either run them or ask the user
+
+### Post-deploy Checklist
+
+After every successful metadata deploy:
+
+1. Discover and assign permission sets (or ask the user)
+2. If `data/data-plan.json` exists, ask the user about data import
+3. Re-run schema fetch and codegen from the webapp directory
diff --git a/skills/configuring-webapp-csp-trusted-sites/implementation/metadata-format.md b/skills/generating-webapp-metadata/implementation/csp-metadata-format.md
similarity index 100%
rename from skills/configuring-webapp-csp-trusted-sites/implementation/metadata-format.md
rename to skills/generating-webapp-metadata/implementation/csp-metadata-format.md
diff --git a/skills/generating-webapp-ui/SKILL.md b/skills/generating-webapp-ui/SKILL.md
new file mode 100644
index 0000000..2efbeeb
--- /dev/null
+++ b/skills/generating-webapp-ui/SKILL.md
@@ -0,0 +1,122 @@
+---
+name: generating-webapp-ui
+description: "Build and modify React UI for Salesforce web applications — pages, components, layout, navigation, and headers/footers. Use whenever creating or editing TSX/JSX files or making visual/layout changes. Triggers on: add page, add component, header, footer, navigation, layout, styling, Tailwind, shadcn, React component, appLayout."
+---
+
+# Web Application UI
+
+## Identify the Task
+
+Determine which category the request falls into:
+
+| Category | Examples | Implementation Guide |
+|----------|----------|---------------------|
+| **Page** | New routed page (contacts, dashboard, settings) | `implementation/page.md` |
+| **Header / Footer** | Site-wide nav bar, footer, branding | `implementation/header-footer.md` |
+| **Component** | Widget, card, table, form, dialog | `implementation/component.md` |
+
+---
+
+## Layout and Navigation
+
+`appLayout.tsx` is the source of truth for navigation and layout. Every page shares this shell.
+
+When making any change that affects navigation, header, footer, sidebar, theme, or layout:
+
+1. Edit `src/appLayout.tsx` — the layout used by `routes.tsx`
+2. Replace all default/template nav items and labels with app-specific links and names
+3. Replace placeholder app name everywhere: header, nav brand, footer, `<title>` in `index.html`
+
+Before finishing, confirm: Did I update `appLayout.tsx` with real nav items and branding?
+
+| What | Where |
+|------|-------|
+| Layout, nav, branding | `src/appLayout.tsx` |
+| Document title | `index.html` |
+| Root page content | Component at root route in `routes.tsx` |
+
+---
+
+## React and TypeScript Standards
+
+### Routing
+
+Use a single router package. With `createBrowserRouter` / `RouterProvider`, all imports must come from `react-router` (not `react-router-dom`).
+
+### Component Library and Styling
+
+- **shadcn/ui** for components: `import { Button } from '@/components/ui/button';`
+- **Tailwind CSS** utility classes
+
+### URL and Path Handling
+
+Apps run behind dynamic base paths. Router navigation (`<Link to>`, `navigate()`) uses absolute paths (`/x`). Non-router attributes (`<img src>`) use dot-relative (`./x`). Prefer Vite `import` for static assets.
+
+### TypeScript
+
+- Never use `any` — use proper types, generics, or `unknown` with type guards
+- Event handlers: `(event: React.FormEvent<HTMLFormElement>): void`
+- State: `useState<User | null>(null)` — always provide the type parameter
+- No unsafe assertions (`obj as User`) — use type guards instead
+
+### Module Restrictions
+
+React apps must not import Salesforce platform modules like `lightning/*` or `@wire` (LWC-only). For data access, use the `using-webapp-salesforce-data` skill.
+
+---
+
+## Design Thinking
+
+Before coding, commit to a bold aesthetic direction:
+
+- **Purpose:** What problem does this interface solve? Who uses it?
+- **Tone:** Pick a clear direction — brutally minimal, maximalist, retro-futuristic, organic, luxury, playful, editorial, brutalist, art deco, soft/pastel, industrial. Use these as inspiration but design one true to the context.
+- **Differentiation:** What makes this unforgettable? What's the one thing someone will remember?
+
+Choose a clear conceptual direction and execute it with precision. Bold maximalism and refined minimalism both work — the key is intentionality, not intensity.
+
+---
+
+## Frontend Aesthetics
+
+- **Typography:** Choose distinctive, characterful fonts. Pair a display font with a refined body font. Never default to Inter, Roboto, Arial, Space Grotesk, or system fonts.
+- **Color:** Commit to a cohesive palette using CSS variables. Dominant colors with sharp accents outperform timid, evenly-distributed palettes. Avoid cliched purple gradients on white.
+- **Motion:** Focus on high-impact moments — one well-orchestrated page load with staggered reveals (`animation-delay`) creates more delight than scattered micro-interactions. Use scroll-triggering and hover states that surprise. Prefer CSS-only solutions; use Motion library for React when available.
+- **Spatial Composition:** Unexpected layouts — asymmetry, overlap, diagonal flow, grid-breaking elements. Generous negative space OR controlled density.
+- **Backgrounds & Depth:** Create atmosphere rather than defaulting to solid colors. Gradient meshes, noise textures, geometric patterns, layered transparencies, dramatic shadows, decorative borders, grain overlays.
+
+Match implementation complexity to the aesthetic vision. Maximalist designs need elaborate animations and effects. Minimalist designs need restraint, precision, and careful spacing/typography. No two designs should look the same — vary themes, fonts, and aesthetics across generations.
+
+---
+
+## Clarifying Questions
+
+Ask one question at a time and stop when you have enough context.
+
+### For a Page
+1. Name and purpose?
+2. URL path?
+3. Should it appear in navigation?
+4. Access control? (public, authenticated via `PrivateRoute`, or unauthenticated via `AuthenticationRoute`)
+5. Content sections? (list, form, table, detail view)
+6. Data fetching needs?
+
+### For a Header / Footer
+1. Header, footer, or both?
+2. Contents? (logo, nav links, user avatar, copyright, social icons)
+3. Sticky header?
+4. Color scheme or style direction?
+
+### For a Component
+1. What should it do?
+2. Which page does it belong to?
+3. Shared/reusable or specific to one feature?
+4. Data or props needed?
+5. Internal state? (loading, toggle, form state)
+6. Specific shadcn components to use?
+
+---
+
+## Verification
+
+Before completing, run lint and build from the webapp directory. Lint must result in 0 errors and build must succeed.
diff --git a/skills/building-webapp-react-components/implementation/component.md b/skills/generating-webapp-ui/implementation/component.md
similarity index 100%
rename from skills/building-webapp-react-components/implementation/component.md
rename to skills/generating-webapp-ui/implementation/component.md
diff --git a/skills/building-webapp-react-components/implementation/header-footer.md b/skills/generating-webapp-ui/implementation/header-footer.md
similarity index 100%
rename from skills/building-webapp-react-components/implementation/header-footer.md
rename to skills/generating-webapp-ui/implementation/header-footer.md
diff --git a/skills/building-webapp-react-components/implementation/page.md b/skills/generating-webapp-ui/implementation/page.md
similarity index 100%
rename from skills/building-webapp-react-components/implementation/page.md
rename to skills/generating-webapp-ui/implementation/page.md
diff --git a/skills/managing-webapp-agentforce-conversation-client/SKILL.md b/skills/implementing-webapp-agentforce-conversation-client/SKILL.md
similarity index 99%
rename from skills/managing-webapp-agentforce-conversation-client/SKILL.md
rename to skills/implementing-webapp-agentforce-conversation-client/SKILL.md
index 0fd7aa3..c4c0655 100644
--- a/skills/managing-webapp-agentforce-conversation-client/SKILL.md
+++ b/skills/implementing-webapp-agentforce-conversation-client/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: managing-webapp-agentforce-conversation-client
+name: implementing-webapp-agentforce-conversation-client
 description: "Adds or modifies AgentforceConversationClient in React apps (.tsx or .jsx files). Use when user says \"add chat widget\", \"embed agentforce\", \"add agent\", \"add chatbot\", \"integrate conversational AI\", or asks to change colors, dimensions, styling, or configure agentId, width, height, inline mode, or styleTokens for travel agent, HR agent, employee agent, or any Salesforce agent chat."
 metadata:
   author: ACC Components
diff --git a/skills/managing-webapp-agentforce-conversation-client/references/constraints.md b/skills/implementing-webapp-agentforce-conversation-client/references/constraints.md
similarity index 100%
rename from skills/managing-webapp-agentforce-conversation-client/references/constraints.md
rename to skills/implementing-webapp-agentforce-conversation-client/references/constraints.md
diff --git a/skills/managing-webapp-agentforce-conversation-client/references/examples.md b/skills/implementing-webapp-agentforce-conversation-client/references/examples.md
similarity index 100%
rename from skills/managing-webapp-agentforce-conversation-client/references/examples.md
rename to skills/implementing-webapp-agentforce-conversation-client/references/examples.md
diff --git a/skills/managing-webapp-agentforce-conversation-client/references/style-tokens.md b/skills/implementing-webapp-agentforce-conversation-client/references/style-tokens.md
similarity index 100%
rename from skills/managing-webapp-agentforce-conversation-client/references/style-tokens.md
rename to skills/implementing-webapp-agentforce-conversation-client/references/style-tokens.md
diff --git a/skills/managing-webapp-agentforce-conversation-client/references/troubleshooting.md b/skills/implementing-webapp-agentforce-conversation-client/references/troubleshooting.md
similarity index 100%
rename from skills/managing-webapp-agentforce-conversation-client/references/troubleshooting.md
rename to skills/implementing-webapp-agentforce-conversation-client/references/troubleshooting.md
diff --git a/skills/installing-webapp-features/SKILL.md b/skills/installing-webapp-features/SKILL.md
deleted file mode 100644
index 35aafb1..0000000
--- a/skills/installing-webapp-features/SKILL.md
+++ /dev/null
@@ -1,210 +0,0 @@
----
-name: installing-webapp-features
-description: "Search, describe, and install pre-built UI features (authentication, shadcn components, navigation, search, GraphQL, Agentforce AI) into Salesforce webapps. Use this when the user wants to add functionality to a webapp, or when determining what salesforce-provided features are available — whether prompted by the user or on your own initiative. Always check for an existing feature before building from scratch."
----
-
-# webapps-features-experimental CLI — Agent Reference
-
-**Always check for an existing feature before building something yourself.** This CLI installs pre-built, tested feature packages into Salesforce webapps. Features range from foundational UI component libraries (shadcn/ui with Button, Card, Input, Table, etc.) to full-stack application capabilities like authentication (login, registration, password flows, session management, and Apex backend classes), global search, navigation menus, GraphQL integrations, and Agentforce AI conversation UIs. Each feature ships as a complete implementation — including React components, context providers, route guards, and any required Salesforce server-side code — that already handles platform-specific concerns like Salesforce API integration, session management, and SFDX metadata structure. Building these from scratch is error-prone and unnecessary when a feature exists. **If no existing feature is found, ask the user before proceeding with a custom implementation — a relevant feature may exist under a different name or keyword.**
-
-```
-npx @salesforce/webapps-features-experimental <command> [options]
-```
-
-## Workflow: Search Project → Search Features → Describe → Install
-
-**MANDATORY**: When the user asks to add ANY webapp functionality, follow this entire workflow. Do not skip steps.
-
-### 1. Search existing project code
-
-Before installing anything, check whether the functionality already exists in the **project source code** (not dependencies).
-
-- **Always scope searches to `src/`** to avoid matching files in `node_modules/`, `dist/`, or `build/` output
-- Use Glob with a scoped path: e.g., `src/**/Button.tsx`, `src/**/*auth*.tsx`
-- Use Grep with the `path` parameter set to the `src/` directory, or use `glob: "*.{ts,tsx}"` to restrict file types
-- Check common directories: `src/components/`, `src/lib/`, `src/pages/`, `src/hooks/`
-- **Never** search from the project root without a path or glob filter — this will crawl `node_modules` and produce massive, unhelpful output
-
-**If existing code is found** — read the files, present them to the user, and ask if they want to reuse or extend what's there. If yes, use the existing code and stop. If no, proceed to step 2.
-
-**If nothing is found** — proceed to step 2.
-
-### 2. Search available features
-
-```bash
-npx @salesforce/webapps-features-experimental list [options]
-```
-
-Options:
-
-- `-v, --verbose` — Show full descriptions, packages, and dependencies
-- `--search <query>` — Filter features by keyword (ranked by relevance)
-
-```bash
-npx @salesforce/webapps-features-experimental list
-npx @salesforce/webapps-features-experimental list --search "auth"
-npx @salesforce/webapps-features-experimental list --search "button"
-```
-
-**If no matching feature is found** — ask the user before proceeding with a custom implementation. A relevant feature may exist under a different name or keyword.
-
-### 3. Describe a feature
-
-```bash
-npx @salesforce/webapps-features-experimental describe <feature>
-```
-
-Shows description, package name, dependencies, components, copy operations, and example files.
-
-```bash
-npx @salesforce/webapps-features-experimental describe authentication
-npx @salesforce/webapps-features-experimental describe shadcn
-```
-
-### 4. Install a feature
-
-```bash
-npx @salesforce/webapps-features-experimental install <feature> --webapp-dir <path> [options]
-```
-
-Resolves the feature name to an npm package, installs it and its dependencies (including transitive feature dependencies like `shadcn`), copies source files into your project, and reports any `__example__` files that require manual integration.
-
-Options:
-
-- `--webapp-dir <name>` (required) — Webapp name, resolves to `<sfdx-source>/webapplications/<name>`
-- `--sfdx-source <path>` (default: `force-app/main/default`) — SFDX source directory
-- `--dry-run` (default: `false`) — Preview changes without writing files
-- `-v, --verbose` (default: `false`) — Enable verbose logging
-- `-y, --yes` (default: `false`) — Skip all prompts (auto-skip conflicts)
-- `--on-conflict <mode>` (default: `prompt`) — `prompt`, `error`, `skip`, or `overwrite`
-- `--conflict-resolution <file>` — Path to JSON file with per-file resolutions
-
-```bash
-# Install authentication (also installs shadcn dependency)
-npx @salesforce/webapps-features-experimental install authentication \
-  --webapp-dir mywebapp
-
-# Dry run to preview changes
-npx @salesforce/webapps-features-experimental install shadcn \
-  --webapp-dir mywebapp \
-  --dry-run
-
-# Non-interactive install (skip all file conflicts)
-npx @salesforce/webapps-features-experimental install authentication \
-  --webapp-dir mywebapp \
-  --yes
-```
-
-## Conflict Handling
-
-Since you are running in a non-interactive environment, you cannot use `--on-conflict prompt` directly. When conflicts are likely (e.g. installing into an existing project), you have two options:
-
-**Option A — Let the user resolve conflicts interactively.** Suggest the user run the install command themselves with `--on-conflict prompt` so they can decide per-file.
-
-**Option B — Two-pass automated resolution:**
-
-```bash
-# Pass 1: detect conflicts
-npx @salesforce/webapps-features-experimental install authentication \
-  --webapp-dir mywebapp \
-  --on-conflict error
-
-# The CLI will exit with an error listing every conflicting file path.
-
-# Pass 2: create a resolution file and re-run
-echo '{ "src/styles/global.css": "overwrite", "src/lib/utils.ts": "skip" }' > resolutions.json
-
-npx @salesforce/webapps-features-experimental install authentication \
-  --webapp-dir mywebapp \
-  --conflict-resolution resolutions.json
-```
-
-Resolution values per file: `"skip"` (keep existing) or `"overwrite"` (replace). When unsure how to resolve a conflict, ask the user rather than guessing.
-
-## Hint Placeholders in Copy Paths
-
-Some copy operations use **hint placeholders** in the `"to"` path — descriptive segments like `<desired-page-with-search-input>` that are NOT resolved by the CLI. These are guidance for the user or LLM to choose an appropriate destination.
-
-**How they work:** The file is copied with the literal placeholder name (e.g., `src/pages/<desired-page-with-search-input>.tsx`). After installation, you should:
-
-1. Read the copied file to understand its purpose
-2. Rename or relocate it to the intended target (e.g., `src/pages/Home.tsx`)
-3. Or integrate its patterns into an existing file, then delete it
-
-**How to identify them:** Hint placeholders use `<descriptive-name>` syntax but are NOT one of the system placeholders (`<sfdxSource>`, `<webappDir>`, `<webapp>`). They always appear in the middle or end of a path, never as the leading segment.
-
-**Example from features.json:**
-
-```json
-{
-  "to": "<webappDir>/src/pages/<desired-page-with-search-input>.tsx",
-  "description": "Example home page showing GlobalSearchInput integration",
-  "integrationTarget": "src/pages/Home.tsx"
-}
-```
-
-The `integrationTarget` field tells you the suggested destination. Use your judgment — if the user already has a different page where search should go, integrate there instead.
-
-**When `integrationTarget` itself is a placeholder:** Some features use a hint placeholder in the `integrationTarget` value (e.g., `"integrationTarget": "src/<path-to-desired-page-with-search-input>.tsx"`). This means there is no single default target — the user must decide which existing file to integrate into. When you encounter this:
-
-1. Ask the user which page or file they want to integrate the feature into
-2. Read the `__example__` file to understand the integration pattern
-3. Read the user's chosen target file
-4. Apply the pattern from the example into the target file
-
-## Post Installation: Integrating **example** Files
-
-Features may include `__example__` files (e.g., `__example__auth-app.tsx`) showing integration patterns.
-
-**The describe command shows**:
-
-- Which **example** files will be copied
-- Target file to integrate into (e.g., `src/app.tsx`)
-- What the example demonstrates
-
-### How to Integrate Example Files (CRITICAL FOR LLMs)
-
-⚠️ **ONLY USE Read AND Edit TOOLS - NO BASH COMMANDS** ⚠️
-
-**DO NOT DO THIS**:
-
-- ❌ `git status` or any git commands
-- ❌ `ls`, `cat`, `sed`, `awk`, or ANY bash file commands
-- ❌ Chaining bash commands to read multiple files
-- ❌ Using bash to check directories or file existence
-
-**DO THIS INSTEAD**:
-
-- ✅ Use Read tool with `file_path` parameter to read each file
-- ✅ Use Edit tool with `file_path`, `old_string`, `new_string` to modify files
-- ✅ That's it! Just Read and Edit tools.
-
-**Integration steps**:
-
-1. **Read each example file** (use Read tool)
-   - Example: Read tool with `file_path: "force-app/main/default/webapplications/mywebapp/src/__example__auth-app.tsx"`
-   - Note the imports and patterns to integrate
-
-2. **Read each target file** (use Read tool)
-   - Example: Read tool with `file_path: "force-app/main/default/webapplications/mywebapp/src/app.tsx"`
-   - Understand where the new code should go
-
-3. **Edit each target file** (use Edit tool)
-   - Add imports from the example
-   - Add or modify code following the example's patterns
-   - Preserve existing functionality
-
-4. **Delete the example file after successful integration** (use Bash tool)
-   - Example: `rm force-app/main/default/webapplications/mywebapp/src/__example__authentication-routes.tsx`
-   - Only delete after you have successfully integrated the pattern
-   - This keeps the codebase clean and removes temporary example files
-
-## Troubleshooting
-
-**Directory not found**: Check paths are correct, use absolute or correct relative paths
-
-**Feature not found**: Use `npx @salesforce/webapps-features-experimental list` to see available feature names
-
-**Conflicts in error mode**: Follow CLI instructions to create resolution file
-
-**Need help?**: Run `npx @salesforce/webapps-features-experimental --help` to see all commands and options