@faststore/core 4.10.1-dev.5 → 4.10.1-dev.6

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.10.1-dev.4 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.10.1-dev.5 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.10.1-dev.4 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.10.1-dev.5 gen-types /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run generate-types .
 
 [STARTED] Parse Configuration
@@ -19,7 +19,7 @@
 [COMPLETED] Generate to @generated/
 [COMPLETED] Generate outputs
 
-> @faststore/core@4.10.1-dev.4 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.10.1-dev.5 cache-graphql /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run cache-graphql --config=./discovery.config.default.js --queries=./@generated/persisted-documents.json
 
 [Info] - Config file location: /home/runner/work/faststore/faststore/packages/core/discovery.config.default.js

package/.turbo/turbo-test.log

@@ -1,5 +1,5 @@
 
-> @faststore/core@4.10.1-dev.4 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.10.1-dev.5 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
@@ -7,27 +7,31 @@
 
 Not implemented: navigation to another Document
 Not implemented: navigation to another Document
- ✓  browser  test/sdk/ui/useScrollRestoration.browser.test.ts (43 tests) 1277ms
+ ✓  browser  test/sdk/ui/useScrollRestoration.browser.test.ts (43 tests) 1091ms
 Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
- ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (22 tests) 2676ms
-     ✓ shows an error state when the list fails to load  421ms
-     ✓ keeps Confirm disabled when the selected contract is filtered out  319ms
- ✓  browser  test/components/account/cards/MyAccountListCards.browser.test.tsx (16 tests) 2958ms
-     ✓ shows the tab bar and renders Personal cards by default  1258ms
-     ✓ paginates when there are more than 25 cards  429ms
- ✓  browser  test/components/account/orders/BuyingPolicyAlert.browser.test.tsx (13 tests) 2902ms
-     ✓ opens the reject confirmation modal with the default English copy  1073ms
-     ✓ opens the reject confirmation modal with CMS-provided labels  445ms
-     ✓ shows the CMS-provided toast when a policy is rejected  308ms
- ✓  browser  test/components/ui/RichText/RichText.browser.test.tsx (8 tests) 454ms
- ✓  browser  test/components/CartRecommendationShelf/CartRecommendationShelf.browser.test.tsx (13 tests) 191ms
- ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (10 tests) 1460ms
-     ✓ renders the menu view with contract details and manage footer  856ms
- ✓  browser  test/sdk/localization/useBindingSelector.browser.test.tsx (9 tests) 49ms
- ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (6 tests) 34ms
- ✓  browser  test/components/ui/ProductGallery/GalleryPageHeightLock.browser.test.tsx (8 tests) 129ms
+ ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (22 tests) 4449ms
+     ✓ shows an error state when the list fails to load  1009ms
+     ✓ requires selecting a contract before Confirm is enabled, then switches (REQ-03)  566ms
+     ✓ keeps Confirm disabled until a different contract is selected  389ms
+     ✓ keeps Confirm disabled when switching is unavailable  458ms
+ ✓  browser  test/components/account/cards/MyAccountListCards.browser.test.tsx (16 tests) 2611ms
+     ✓ shows the tab bar and renders Personal cards by default  1155ms
+     ✓ paginates when there are more than 25 cards  411ms
+ ✓  browser  test/components/account/orders/BuyingPolicyAlert.browser.test.tsx (13 tests) 3396ms
+     ✓ opens the reject confirmation modal with the default English copy  1312ms
+     ✓ opens the reject confirmation modal with CMS-provided labels  558ms
+     ✓ shows the default English toast when a policy is rejected  350ms
+ ✓  browser  test/components/ui/RichText/RichText.browser.test.tsx (8 tests) 559ms
+ ✓  browser  test/sdk/product/usePageProductsQuery.browser.test.ts (9 tests) 119ms
+ ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (10 tests) 1598ms
+     ✓ renders the menu view with contract details and manage footer  844ms
+ ✓  browser  test/components/CartRecommendationShelf/CartRecommendationShelf.browser.test.tsx (13 tests) 251ms
+ ✓  browser  test/sdk/localization/useBindingSelector.browser.test.tsx (9 tests) 94ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (6 tests) 32ms
+ ✓  browser  test/components/ui/ProductGallery/GalleryPageHeightLock.browser.test.tsx (8 tests) 74ms
+ ✓  browser  test/sdk/recommendations/useRecommendationShelf.browser.test.tsx (12 tests) 56ms
 stderr | test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx
 Error in optimistic validation: TypeError: Failed to parse URL from /api/graphql?operationName=ValidateCartMutation&operationHash=3c71b0d3fc2bade14df68abfa271858beb361b12
     at node:internal/deps/undici/undici:16416:13
@@ -54,15 +58,13 @@ Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
   }
 }
 
- ✓  browser  test/sdk/recommendations/useRecommendationShelf.browser.test.tsx (12 tests) 56ms
 stderr | test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx > RecommendationShelf > renders nothing when there is an error
 Error fetching recommendations undefined boom for campaign vrn:recommendations:acc:rec-top-items-v2:campaign-1
 
- ✓  browser  test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx (8 tests) 111ms
- ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (7 tests) 17ms
- ✓  browser  test/components/CartSidebar/CartSidebar.browser.test.tsx (5 tests) 99ms
- ✓  browser  test/components/sections/Account/AccountOrderDetails.browser.test.tsx (4 tests) 175ms
- ✓  browser  test/components/navigation/Navbar.browser.test.tsx (3 tests) 79ms
+ ✓  browser  test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx (8 tests) 114ms
+ ✓  browser  test/components/CartSidebar/CartSidebar.browser.test.tsx (5 tests) 115ms
+ ✓  browser  test/components/sections/Account/AccountOrderDetails.browser.test.tsx (4 tests) 127ms
+ ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (7 tests) 9ms
 stderr | test/pages/password-protection.browser.test.tsx > PasswordProtectionLogin > posts the password and redirects to the requested return path
 Warning: An update to PasswordProtectionLogin inside a test was not wrapped in act(...).
 
@@ -244,7 +246,6 @@ act(() => {
 This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act
     at PasswordProtectionLogin (/home/runner/work/faststore/faststore/packages/core/src/pages/password-protection/index.tsx:19:69)
 
- ✓  browser  test/components/account/OrganizationDrawerFooter.browser.test.tsx (8 tests) 537ms
 stderr | test/pages/password-protection.browser.test.tsx > PasswordProtectionLogin > shows service unavailable when the login request fails
 Warning: An update to PasswordProtectionLogin inside a test was not wrapped in act(...).
 
@@ -293,8 +294,10 @@ act(() => {
 This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act
     at PasswordProtectionLogin (/home/runner/work/faststore/faststore/packages/core/src/pages/password-protection/index.tsx:19:69)
 
- ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 747ms
-     ✓ renders the password protection form  350ms
+ ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 678ms
+     ✓ renders the password protection form  349ms
+ ✓  browser  test/components/navigation/Navbar.browser.test.tsx (3 tests) 62ms
+ ✓  browser  test/components/account/OrganizationDrawerFooter.browser.test.tsx (8 tests) 371ms
 stderr | test/sdk/session/validateSession.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -303,8 +306,8 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/session/validateSession.browser.test.ts (9 tests) 14ms
- ✓  browser  test/sdk/account/useSwitchContract.browser.test.ts (5 tests) 43ms
+ ✓  browser  test/sdk/session/validateSession.browser.test.ts (9 tests) 13ms
+ ✓  browser  test/sdk/account/useSwitchContract.browser.test.ts (5 tests) 49ms
 stderr | test/components/cms/RenderSections.browser.test.tsx
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -313,8 +316,9 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/components/navigation/NavbarSlider.browser.test.tsx (2 tests) 43ms
- ✓  browser  test/components/cms/RenderSections.browser.test.tsx (5 tests) 89ms
+ ✓  browser  test/components/cms/RenderSections.browser.test.tsx (5 tests) 92ms
+ ✓  browser  test/components/navigation/NavbarSlider.browser.test.tsx (2 tests) 31ms
+ ✓  browser  test/sdk/product/usePageProductsQuery.deliveryPromise.browser.test.ts (3 tests) 25ms
 stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -323,15 +327,15 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/components/account/Menu.browser.test.tsx (6 tests) 307ms
- ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 5ms
- ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 40ms
- ✓  browser  test/components/templates/SearchPage/SearchWrapper.browser.test.tsx (3 tests) 28ms
- ✓  browser  test/sdk/recommendations/useRecommendationShelf.sessionFallback.browser.test.tsx (2 tests) 133ms
- ✓  browser  test/components/sections/Account/AccountListQuotes.browser.test.tsx (4 tests) 123ms
- ✓  browser  test/components/CartRecommendationShelf/CartRecommendationProductCard.browser.test.tsx (3 tests) 52ms
- ✓  browser  test/components/navigation/NavbarAccountArea.browser.test.tsx (4 tests) 55ms
- ✓  browser  test/sdk/account/changeContractToken.browser.test.ts (9 tests) 16ms
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 6ms
+ ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 29ms
+ ✓  browser  test/components/account/Menu.browser.test.tsx (6 tests) 352ms
+ ✓  browser  test/components/templates/SearchPage/SearchWrapper.browser.test.tsx (3 tests) 41ms
+ ✓  browser  test/sdk/recommendations/useRecommendationShelf.sessionFallback.browser.test.tsx (2 tests) 111ms
+ ✓  browser  test/components/sections/Account/AccountListQuotes.browser.test.tsx (4 tests) 145ms
+ ✓  browser  test/components/navigation/NavbarAccountArea.browser.test.tsx (4 tests) 59ms
+ ✓  browser  test/components/CartRecommendationShelf/CartRecommendationProductCard.browser.test.tsx (3 tests) 54ms
+ ✓  browser  test/sdk/account/changeContractToken.browser.test.ts (9 tests) 14ms
 stderr | test/components/account/doLogout.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -340,10 +344,10 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 15ms
- ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (5 tests) 366ms
- ✓  browser  test/sdk/account/useRefreshToken.browser.test.ts (4 tests) 151ms
- ✓  browser  test/components/ui/LocalizationButton.browser.test.tsx (3 tests) 43ms
+ ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 23ms
+ ✓  browser  test/sdk/account/useRefreshToken.browser.test.ts (4 tests) 143ms
+ ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (5 tests) 307ms
+ ✓  browser  test/components/ui/LocalizationButton.browser.test.tsx (3 tests) 50ms
 stderr | test/sdk/account/clearPersistedSessionState.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -352,15 +356,15 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/account/clearPersistedSessionState.browser.test.ts (4 tests) 20ms
- ✓  browser  test/components/sections/Account/AccountOrderDelivery.browser.test.tsx (2 tests) 69ms
- ✓  browser  test/components/account/orders/DeliveryOptionAccordion.browser.test.tsx (2 tests) 103ms
- ✓  browser  test/components/sections/Account/AccountOrderStatus.browser.test.tsx (3 tests) 135ms
- ✓  browser  test/components/sections/Account/AccountListCards.browser.test.tsx (3 tests) 95ms
- ✓  browser  test/components/region/useRegion.browser.test.ts (1 test) 25ms
- ✓  browser  test/components/sections/Account/AccountOrdersList.browser.test.tsx (2 tests) 30ms
- ✓  browser  test/components/account/orders/SummaryCard.browser.test.tsx (2 tests) 85ms
- ✓  browser  test/components/account/OrganizationSignInButton.browser.test.tsx (2 tests) 253ms
+ ✓  browser  test/sdk/account/clearPersistedSessionState.browser.test.ts (4 tests) 34ms
+ ✓  browser  test/components/sections/Account/AccountOrderDelivery.browser.test.tsx (2 tests) 84ms
+ ✓  browser  test/components/account/orders/DeliveryOptionAccordion.browser.test.tsx (2 tests) 99ms
+ ✓  browser  test/components/sections/Account/AccountOrderStatus.browser.test.tsx (3 tests) 94ms
+ ✓  browser  test/components/sections/Account/AccountListCards.browser.test.tsx (3 tests) 93ms
+ ✓  browser  test/components/region/useRegion.browser.test.ts (1 test) 26ms
+ ✓  browser  test/components/sections/Account/AccountOrdersList.browser.test.tsx (2 tests) 29ms
+ ✓  browser  test/components/account/orders/SummaryCard.browser.test.tsx (2 tests) 98ms
+ ✓  browser  test/components/account/OrganizationSignInButton.browser.test.tsx (2 tests) 260ms
 stderr | test/sdk/session/sessionStore.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -369,14 +373,14 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/session/sessionStore.browser.test.ts (2 tests) 5ms
- ✓  browser  test/components/account/orders/DeliveryOptionAccordionDeliveryInfo.browser.test.tsx (1 test) 33ms
+ ✓  browser  test/sdk/session/sessionStore.browser.test.ts (2 tests) 7ms
+ ✓  browser  test/components/account/orders/DeliveryOptionAccordionDeliveryInfo.browser.test.tsx (1 test) 46ms
  ✓  browser  test/utils/shouldBypassRefreshToken.browser.test.ts (5 tests) 6ms
- ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 3ms
- ✓  browser  test/components/account/orders/StatusCard.browser.test.tsx (2 tests) 100ms
- ✓  browser  test/components/account/orders/DeliveryCard.browser.test.tsx (1 test) 46ms
- ✓  browser  test/components/account/orders/DeliveryOptionAccordionProducts.browser.test.tsx (1 test) 31ms
- ✓  browser  test/components/skeletons/ProductGridSkeleton.browser.test.tsx (2 tests) 41ms
+ ✓  browser  test/components/account/orders/StatusCard.browser.test.tsx (2 tests) 94ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 4ms
+ ✓  browser  test/components/account/orders/DeliveryCard.browser.test.tsx (1 test) 53ms
+ ✓  browser  test/components/account/orders/DeliveryOptionAccordionProducts.browser.test.tsx (1 test) 54ms
+ ✓  browser  test/components/skeletons/ProductGridSkeleton.browser.test.tsx (2 tests) 43ms
 stderr | test/sdk/account/refreshToken.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -385,12 +389,12 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:357:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 30ms
- ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 5ms
- ✓  node  test/server/password-protection-service.test.ts (22 tests) 37ms
- ✓  browser  test/components/account/orders/FilterFacetPendingApproval.browser.test.tsx (1 test) 232ms
- ✓  node  test/server/content/service.test.ts (27 tests) 39ms
- ✓  node  test/pages/api/switch-contract.test.ts (25 tests) 98ms
+ ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 31ms
+ ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 6ms
+ ✓  node  test/server/password-protection-service.test.ts (22 tests) 36ms
+ ✓  browser  test/components/account/orders/FilterFacetPendingApproval.browser.test.tsx (1 test) 226ms
+ ✓  node  test/server/content/service.test.ts (27 tests) 40ms
+ ✓  node  test/pages/api/switch-contract.test.ts (25 tests) 84ms
 stderr | test/sdk/deliveryPromise/provider.effect.test.tsx > DeliveryPromiseProvider pickup fetch > clears the loading flag after a failed request and retries on the next update
 Failed to fetch pickup points: Error: network
     at /home/runner/work/faststore/faststore/packages/core/test/sdk/deliveryPromise/provider.effect.test.tsx:250:30
@@ -417,9 +421,9 @@ This ensures that you're testing the behavior the user would see in the browser.
     at trace (file:///home/runner/work/faststore/faststore/node_modules/.pnpm/vitest@4.0.18_@opentelemetry+api@1.9.0_@types+node@20.19.13_jiti@2.6.1_jsdom@27.4.0_sas_13be941c57d55f08f06eeaf1c180ddfe/node_modules/vitest/dist/chunks/test.B8ej_ZHS.js:239:21)
     at runTest (file:///home/runner/work/faststore/faststore/node_modules/.pnpm/@vitest+runner@4.0.18/node_modules/@vitest/runner/dist/index.js:1653:12)
 
- ✓  node  test/sdk/deliveryPromise/provider.effect.test.tsx (9 tests) 98ms
- ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 16ms
- ✓  node  test/utils/match-url.test.ts (10 tests) 10ms
+ ✓  node  test/sdk/deliveryPromise/provider.effect.test.tsx (9 tests) 80ms
+ ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 15ms
+ ✓  node  test/utils/match-url.test.ts (10 tests) 11ms
 stderr | test/pages/api/graphql.test.ts > /api/graphql error status propagation > propagates the upstream 400 from a wrapped BadRequestError instead of 500
 Graphql execution returned with error:  [
   {
@@ -561,13 +565,13 @@ This ensures that you're testing the behavior the user would see in the browser.
   extensions: { status: 401, type: 'UnauthorizedError' }
 }
 
- ✓  node  test/pages/api/graphql.test.ts (30 tests) 42ms
- ✓  node  test/pages/api/unlock.test.ts (15 tests) 150ms
- ✓  node  test/sdk/session/syncSalesChannelFromOrderForm.test.ts (14 tests) 14ms
+ ✓  node  test/pages/api/graphql.test.ts (30 tests) 51ms
+ ✓  node  test/pages/api/unlock.test.ts (15 tests) 185ms
+ ✓  node  test/sdk/session/syncSalesChannelFromOrderForm.test.ts (14 tests) 12ms
 stderr | test/components/search/SearchInputComponent.test.tsx
 Warning: forwardRef render functions accept exactly two parameters: props and ref. Did you forget to use the ref parameter?
 
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 9ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 12ms
 stderr | test/components/search/SearchInputComponent.test.tsx > SearchInput (OES integration) > renders without crashing
 Warning: React does not recognize the `visibleDropdown` prop on a DOM element. If you intentionally want it to appear in the DOM as a custom attribute, spell it as lowercase `visibledropdown` instead. If you accidentally passed it from a parent component, remove it from the DOM element.
     at div
@@ -628,95 +632,94 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
     at Suspense
     at Wrapper (/home/runner/work/faststore/faststore/packages/core/test/components/search/SearchInputComponent.test.tsx:106:20)
 
- ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 82ms
- ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (15 tests) 412ms
- ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 44ms
- ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (11 tests) 825ms
-     ✓ navigates with the search term on blur  360ms
-     ✓ navigates without a label param when the search is cleared  361ms
+ ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 62ms
+ ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (15 tests) 410ms
+ ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 52ms
 stderr | test/pages/pvt/account/cards/index.test.ts > Cards page getServerSideProps > redirects to /pvt/account/403 when the query fails with 401/403
 { extensions: { status: 401 } }
 
 stderr | test/pages/pvt/account/cards/index.test.ts > Cards page getServerSideProps > renders the error state (no redirect) when the query fails with a non-auth status
 { extensions: { status: 502 } }
 
- ✓  node  test/pages/pvt/account/cards/index.test.ts (8 tests) 11ms
- ✓  node  test/components/quotes/quoteFilters.test.ts (26 tests) 25ms
- ✓  node  test/utils/productJsonLd.test.ts (36 tests) 15ms
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 13ms
- ✓  node  test/experimental/myAccountCmsServerSideProps.test.ts (5 tests) 10ms
+ ✓  node  test/pages/pvt/account/cards/index.test.ts (8 tests) 8ms
+ ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (11 tests) 869ms
+     ✓ navigates with the search term on blur  363ms
+     ✓ navigates without a label param when the search is cleared  361ms
+ ✓  node  test/components/quotes/quoteFilters.test.ts (26 tests) 28ms
+ ✓  node  test/utils/productJsonLd.test.ts (36 tests) 13ms
+ ✓  node  test/experimental/myAccountCmsServerSideProps.test.ts (5 tests) 7ms
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 16ms
  ✓  node  test/utils/clearCookies.test.ts (20 tests) 28ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 7ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 8ms
 stderr | test/sdk/account/useSetPassword.test.ts > useSetPassword > maps wrongcredentials error responses to the existing message
 Set password request failed: Bad Request
 
- ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 52ms
- ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 55ms
- ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 7ms
- ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (8 tests) 158ms
- ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (14 tests) 184ms
- ✓  node  test/utils/localization/hreflang.test.ts (8 tests) 9ms
- ✓  node  test/server/cms/index.test.ts (7 tests) 10ms
- ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (10 tests) 121ms
+ ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 46ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 42ms
+ ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 5ms
+ ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (8 tests) 182ms
+ ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (14 tests) 178ms
+ ✓  node  test/utils/localization/hreflang.test.ts (8 tests) 6ms
+ ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (10 tests) 132ms
+ ✓  node  test/server/cms/index.test.ts (7 tests) 12ms
  ✓  node  test/sdk/account/getMyAccountRoutes.test.ts (13 tests) 10ms
- ✓  node  test/server/content/promiseCache.test.ts (10 tests) 12ms
- ✓  node  test/sdk/redirects/index.test.ts (7 tests) 53ms
- ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 57ms
- ✓  node  test/proxy.localization.test.ts (5 tests) 31ms
- ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 44ms
- ✓  node  test/components/account/orders/getDeliveryOptionLabel.test.ts (21 tests) 7ms
- ✓  node  test/sdk/graphql/retryPolicy.test.ts (18 tests) 25ms
- ✓  node  test/server/cms/myAccountDefaultSections.test.ts (9 tests) 10ms
- ✓  node  test/utils/productJsonLdRendering.test.tsx (5 tests) 16ms
- ✓  node  test/utils/trustedForwardedHost.test.ts (27 tests) 12ms
- ✓  node  test/server/index.test.ts (7 tests) 845ms
-       ✓ should handle options and execute  315ms
- ✓  node  test/proxy.test.ts (4 tests) 31ms
- ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 46ms
- ✓  node  test/utils/shouldBypassRefreshToken.test.ts (14 tests) 5ms
- ✓  node  test/server/webops-api.test.ts (9 tests) 11ms
- ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 46ms
- ✓  node  test/components/account/orders/StatusCard.test.ts (3 tests) 31ms
+ ✓  node  test/server/content/promiseCache.test.ts (10 tests) 16ms
+ ✓  node  test/sdk/redirects/index.test.ts (7 tests) 49ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 48ms
+ ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 57ms
+ ✓  node  test/proxy.localization.test.ts (5 tests) 113ms
+ ✓  node  test/components/account/orders/getDeliveryOptionLabel.test.ts (21 tests) 9ms
+ ✓  node  test/sdk/graphql/retryPolicy.test.ts (18 tests) 26ms
+ ✓  node  test/server/cms/myAccountDefaultSections.test.ts (9 tests) 8ms
+ ✓  node  test/utils/productJsonLdRendering.test.tsx (5 tests) 28ms
+ ✓  node  test/server/index.test.ts (7 tests) 667ms
+ ✓  node  test/utils/trustedForwardedHost.test.ts (27 tests) 8ms
+ ✓  node  test/proxy.test.ts (4 tests) 16ms
+ ✓  node  test/utils/shouldBypassRefreshToken.test.ts (14 tests) 8ms
+ ✓  node  test/server/webops-api.test.ts (9 tests) 16ms
+ ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 45ms
+ ✓  node  test/components/account/orders/StatusCard.test.ts (3 tests) 22ms
+ ✓  node  test/sdk/localization/store-url.test.ts (4 tests) 5ms
+ ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 51ms
  ✓  node  test/sdk/deliveryPromise/queries.test.ts (4 tests) 10ms
- ✓  node  test/sdk/localization/store-url.test.ts (4 tests) 6ms
- ✓  node  test/sdk/cart/waitForSessionValidated.test.ts (5 tests) 11ms
- ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 8ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 5ms
- ✓  node  test/sdk/deliveryPromise/provider.test.ts (11 tests) 6ms
- ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 29ms
- ✓  node  test/components/account/Layout.test.tsx (6 tests) 64ms
- ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 7ms
- ✓  node  test/server/rootSpan.test.ts (4 tests) 41ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 8ms
- ✓  node  test/components/search/SearchInput.test.ts (6 tests) 7ms
+ ✓  node  test/sdk/cart/waitForSessionValidated.test.ts (5 tests) 12ms
+ ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 9ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 4ms
+ ✓  node  test/sdk/deliveryPromise/provider.test.ts (11 tests) 7ms
+ ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 32ms
+ ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 8ms
+ ✓  node  test/components/account/Layout.test.tsx (6 tests) 65ms
+ ✓  node  test/server/rootSpan.test.ts (4 tests) 46ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 9ms
+ ✓  node  test/components/search/SearchInput.test.ts (6 tests) 8ms
  ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 4ms
  ✓  node  test/pages/pvt/account/403.test.ts (5 tests) 6ms
- ✓  node  test/sdk/recommendations/vrn.test.ts (5 tests) 6ms
- ✓  node  test/components/region/useRegion.test.ts (1 test) 25ms
- ✓  node  test/utils/retry.test.ts (5 tests) 14ms
- ✓  node  test/sdk/account/getB2BSessionClaims.test.ts (4 tests) 4ms
- ✓  node  test/utils/userOrderStatus.test.ts (4 tests) 4ms
- ✓  node  test/sdk/recommendations/useRecommendationUserId.test.ts (4 tests) 192ms
- ✓  node  test/utils/unlockResponse.test.ts (11 tests) 7ms
- ✓  node  test/sdk/recommendations/useRecommendations.test.ts (2 tests) 4ms
- ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 54ms
- ✓  node  test/sdk/deliveryPromise/reducer.test.ts (2 tests) 5ms
- ✓  node  test/utils/isLocalHost.test.ts (7 tests) 6ms
- ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (4 tests) 32ms
+ ✓  node  test/components/region/useRegion.test.ts (1 test) 27ms
+ ✓  node  test/utils/retry.test.ts (5 tests) 15ms
+ ✓  node  test/sdk/recommendations/vrn.test.ts (5 tests) 5ms
+ ✓  node  test/sdk/account/getB2BSessionClaims.test.ts (4 tests) 5ms
+ ✓  node  test/utils/userOrderStatus.test.ts (4 tests) 5ms
+ ✓  node  test/sdk/recommendations/useRecommendationUserId.test.ts (4 tests) 193ms
+ ✓  node  test/utils/unlockResponse.test.ts (11 tests) 6ms
+ ✓  node  test/sdk/recommendations/useRecommendations.test.ts (2 tests) 7ms
+ ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 49ms
+ ✓  node  test/sdk/deliveryPromise/reducer.test.ts (2 tests) 6ms
+ ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (4 tests) 45ms
+ ✓  node  test/utils/isLocalHost.test.ts (7 tests) 4ms
  ✓  node  test/sdk/session/toSessionInput.test.ts (3 tests) 5ms
  ✓  node  test/components/account/orders/getOrderTotalLabel.test.ts (6 tests) 5ms
- ✓  node  test/components/account/orders/listOrdersLabels.test.ts (2 tests) 4ms
- ✓  node  test/utils/getCookie.test.ts (4 tests) 5ms
- ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 42ms
- ✓  node  test/sdk/session/isSignInAreaResolved.test.ts (3 tests) 2ms
+ ✓  node  test/components/account/orders/listOrdersLabels.test.ts (2 tests) 3ms
+ ✓  node  test/utils/getCookie.test.ts (4 tests) 7ms
+ ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 40ms
+ ✓  node  test/sdk/session/isSignInAreaResolved.test.ts (3 tests) 4ms
  ✓  node  test/utils/filterChannel.test.ts (2 tests) 4ms
- ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 4ms
- ✓  node  test/instrumentation.test.ts (3 tests) 6ms
- ✓  node  test/components/account/orders/orderDetailsLabels.test.ts (1 test) 3ms
- ✓  node  test/sdk/account/clearPersistedSessionState.test.ts (1 test) 8ms
-
- Test Files  139 passed (139)
-      Tests  1147 passed (1147)
-   Start at  21:11:55
-   Duration  61.46s (transform 15.20s, setup 0ms, import 56.17s, tests 21.35s, environment 74.47s)
+ ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 3ms
+ ✓  node  test/instrumentation.test.ts (3 tests) 5ms
+ ✓  node  test/components/account/orders/orderDetailsLabels.test.ts (1 test) 4ms
+ ✓  node  test/sdk/account/clearPersistedSessionState.test.ts (1 test) 11ms
+
+ Test Files  141 passed (141)
+      Tests  1159 passed (1159)
+   Start at  22:57:57
+   Duration  65.40s (transform 15.23s, setup 0ms, import 57.33s, tests 23.25s, environment 80.48s)
 

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.10.1-dev.6](https://github.com/vtex/faststore/compare/v4.10.1-dev.5...v4.10.1-dev.6) (2026-10-28)
+
+### Bug Fixes
+
+- **core:** document that gallery scope keys reach the request URL ([dc61bdf](https://github.com/vtex/faststore/commit/dc61bdf2411b88ac15d29066a668a26f521785de))
+- **core:** hash the B2B contract scope sent with gallery queries ([f8bfac9](https://github.com/vtex/faststore/commit/f8bfac9f5dd4fbda848982a701e54eb1f3d2c14b))
+- **core:** refetch PLP first page for B2B buyers so the contract assortment applies ([72ddfdf](https://github.com/vtex/faststore/commit/72ddfdf06b7cc7a74aca7036cce37c400fef2cc0))
+- **core:** tell B2B buyers apart by org unit in the gallery cache key ([c7fe237](https://github.com/vtex/faststore/commit/c7fe237088515c40a49f34b46297022279c57f93))
+- **core:** widen the B2B contract scope hash to 53 bits ([f05f556](https://github.com/vtex/faststore/commit/f05f556c135b914af7c1058633ca50144a41669c))
+
 ## [4.10.1-dev.5](https://github.com/vtex/faststore/compare/v4.10.1-dev.4...v4.10.1-dev.5) (2026-10-28)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.10.1-dev.5",
+  "version": "4.10.1-dev.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -71,11 +71,11 @@
     "style-loader": "^3.3.1",
     "swr": "^2.2.5",
     "use-sync-external-store": "^1.6.0",
-    "@faststore/api": "4.10.1-dev.5",
-    "@faststore/diagnostics": "4.10.1-dev.5",
-    "@faststore/lighthouse": "4.10.1-dev.5",
-    "@faststore/ui": "4.10.1-dev.5",
-    "@faststore/sdk": "4.10.1-dev.5"
+    "@faststore/api": "4.10.1-dev.6",
+    "@faststore/lighthouse": "4.10.1-dev.6",
+    "@faststore/diagnostics": "4.10.1-dev.6",
+    "@faststore/ui": "4.10.1-dev.6",
+    "@faststore/sdk": "4.10.1-dev.6"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

package/src/sdk/product/usePageProductsQuery.ts

@@ -69,6 +69,69 @@ export const query = gql(`
 
 const getKey = (object: any) => JSON.stringify(object)
 
+const isDeliveryPromiseEnabled = storeConfig.deliveryPromise?.enabled ?? false
+
+/**
+ * Cache-only keys that scope gallery pages to the shopper context. They make
+ * the local cache comparison (and the SWR key) miss when a page was loaded for
+ * another context (e.g. the anonymous SSG page). They are not declared by the
+ * operation, so the API ignores them, but they are still sent with the
+ * variables, which go in the URL because this query is a GET operation.
+ * - `_postalCode`: pages are invalidated on region change. Only applied when
+ *   deliveryPromise is enabled to avoid unnecessary cache fragmentation.
+ * - `_contract`: the B2B contract assortment is applied server-side from the
+ *   session cookie, so it never shows up in the query variables. Keyed off
+ *   the presence of a `b2b` session (not `customerId`'s value) because
+ *   `customerId` can resolve to an empty string for a legitimate B2B buyer
+ *   (see `buildB2bSession` in `@faststore/api`). The fallback chain still
+ *   forces the re-fetch for them: the real `customerId`, when present, keeps
+ *   invalidating the cache on contract switch; otherwise the organizational
+ *   unit (`unitId`) tells buyers of different units apart; a generic marker is
+ *   the last resort. Since the value ends up in the URL, it is hashed so the
+ *   raw contract or unit id is not written to access, CDN or RUM logs as is.
+ *   These ids are not secrets (the session already hands them to the
+ *   browser), so the hash is cosmetic, not a privacy control: it is unkeyed
+ *   and a guessable id can be recovered from it. The URL still differs per
+ *   contract, so a contract page is never served from the anonymous page's
+ *   cache entry.
+ */
+const getShopperScope = ({
+  postalCode,
+  contract,
+}: {
+  postalCode?: string | null
+  contract?: string | null
+}) => ({
+  ...(isDeliveryPromiseEnabled && { _postalCode: postalCode ?? '' }),
+  ...(contract && { _contract: hashContractScope(contract) }),
+})
+
+/** The id a B2B session is scoped by, or `null` outside a B2B session. */
+const getContractScope = (
+  b2b?: { customerId?: string | null; unitId?: string | null } | null
+) => (b2b ? b2b.customerId || b2b.unitId || 'b2b' : null)
+
+/**
+ * 53-bit string hash (cyrb53): wide enough that two contracts in the same
+ * browser never share a cache key in practice, without exposing the raw id.
+ */
+export function hashContractScope(value: string) {
+  let h1 = 0xdeadbeef
+  let h2 = 0x41c6ce57
+  for (const char of value) {
+    const code = char.codePointAt(0) ?? 0
+    h1 = Math.imul(h1 ^ code, 2654435761)
+    h2 = Math.imul(h2 ^ code, 1597334677)
+  }
+  h1 =
+    Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^
+    Math.imul(h2 ^ (h2 >>> 13), 3266489909)
+  h2 =
+    Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^
+    Math.imul(h1 ^ (h1 >>> 13), 3266489909)
+  return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(36)
+}
+
 interface UseCreateUseGalleryPageProps {
   initialPages: ClientManyProductsQueryWithSearchIdQuery
   serverManyProductsVariables: ClientManyProductsQueryWithSearchIdQueryVariables
@@ -82,21 +145,17 @@ export const useCreateUseGalleryPage = (
 ) => {
   const initialPages = params?.initialPages?.search ? [params.initialPages] : []
 
-  // Seed the cache with the same region-aware key shape that useGalleryPage uses,
-  // so hasSameVariables correctly matches on first mount and avoids an unnecessary
-  // re-fetch of the SSR-loaded page.
-  const isDeliveryPromiseEnabled = storeConfig.deliveryPromise?.enabled ?? false
+  // Seed the cache with the same key shape that useGalleryPage uses, so
+  // hasSameVariables matches on first mount and avoids an unnecessary re-fetch
+  // of the SSR-loaded page. The SSG page is built without a buyer, so it is
+  // seeded without a contract: B2B buyers re-fetch it with their assortment.
   const { postalCode } = useSession()
   const initialVariables = params?.serverManyProductsVariables
     ? [
-        getKey(
-          isDeliveryPromiseEnabled
-            ? {
-                ...params.serverManyProductsVariables,
-                _postalCode: postalCode ?? '',
-              }
-            : params.serverManyProductsVariables
-        ),
+        getKey({
+          ...params.serverManyProductsVariables,
+          ...getShopperScope({ postalCode }),
+        }),
       ]
     : []
 
@@ -113,7 +172,7 @@ export const useCreateUseGalleryPage = (
       itemsPerPage,
     } = useSearch()
 
-    const { postalCode, isValidating: isSessionValidating } = useSession()
+    const { postalCode, b2b, isValidating: isSessionValidating } = useSession()
 
     const localizedVariables = useLocalizedVariables({
       first: itemsPerPage,
@@ -123,15 +182,15 @@ export const useCreateUseGalleryPage = (
       selectedFacets,
     })
 
-    // Include postalCode in the cache key so pages are invalidated on region change.
-    // _postalCode is not sent to the API — it only affects the local cache comparison.
-    // Only applied when deliveryPromise is enabled to avoid unnecessary cache fragmentation.
+    // Keyed on the contract id, not the `b2b` object, which is rebuilt on
+    // every session update.
+    const contract = getContractScope(b2b)
     const localizedVariablesWithRegion = useMemo(
-      () =>
-        isDeliveryPromiseEnabled
-          ? { ...localizedVariables, _postalCode: postalCode ?? '' }
-          : localizedVariables,
-      [localizedVariables, postalCode]
+      () => ({
+        ...localizedVariables,
+        ...getShopperScope({ postalCode, contract }),
+      }),
+      [localizedVariables, postalCode, contract]
     )
 
     const hasSameVariables = deepEquals(

package/test/sdk/product/usePageProductsQuery.browser.test.ts

@@ -0,0 +1,260 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { renderHook } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const mockUseSession = vi.hoisted(() => vi.fn())
+const mockUseQuery = vi.hoisted(() => vi.fn())
+const mockUseLocalizedVariables = vi.hoisted(() => vi.fn())
+
+vi.mock('@generated', () => ({ gql: (query: unknown) => query }))
+vi.mock('discovery.config', () => ({
+  default: { deliveryPromise: { enabled: false } },
+}))
+vi.mock('@faststore/sdk', () => ({
+  useSearch: () => ({
+    state: { sort: 'score_desc', term: '', selectedFacets: [] },
+    itemsPerPage: 12,
+  }),
+}))
+vi.mock('src/sdk/session', () => ({ useSession: mockUseSession }))
+vi.mock('src/sdk/graphql/useQuery', () => ({ useQuery: mockUseQuery }))
+vi.mock('src/sdk/product/useLocalizedVariables', () => ({
+  useLocalizedVariables: mockUseLocalizedVariables,
+}))
+
+import {
+  hashContractScope,
+  useCreateUseGalleryPage,
+} from '../../../src/sdk/product/usePageProductsQuery'
+
+const serverManyProductsVariables = {
+  first: 12,
+  after: '0',
+  sort: 'score_desc' as const,
+  term: '',
+  selectedFacets: [
+    { key: 'category-1', value: 'computers---tablets' },
+    { key: 'channel', value: '{"salesChannel":"1"}' },
+    { key: 'locale', value: 'en-CA' },
+  ],
+  sponsoredCount: 3,
+}
+
+type GalleryProps = NonNullable<Parameters<typeof useCreateUseGalleryPage>[0]>
+
+const initialPages = {
+  search: { products: { pageInfo: { totalCount: 2 }, edges: [] } },
+} as unknown as GalleryProps['initialPages']
+
+const renderFirstGalleryPage = () => {
+  const { result: created } = renderHook(() =>
+    useCreateUseGalleryPage({ initialPages, serverManyProductsVariables })
+  )
+
+  return renderHook(() => created.current.useGalleryPage(0))
+}
+
+describe('useCreateUseGalleryPage', () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('reuses the SSG first page for anonymous shoppers', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: null,
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    const { result } = renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      serverManyProductsVariables,
+      expect.objectContaining({ doNotRun: true })
+    )
+    expect(result.current.data).toBe(initialPages)
+  })
+
+  it('re-fetches the first page for B2B buyers so the contract assortment applies', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: 'contract-137' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      {
+        ...serverManyProductsVariables,
+        _contract: hashContractScope('contract-137'),
+      },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('still re-fetches for B2B buyers whose customerId resolves to an empty string', () => {
+    // `buildB2bSession` in @faststore/api can resolve `customerId` to `''`
+    // (see validateSessionHelpers.ts) even for a representative with an
+    // active contract. The fix must not depend on the value being truthy —
+    // only on the `b2b` session existing — or it silently falls back to the
+    // anonymous behavior (reusing the unfiltered SSG page).
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: '' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      { ...serverManyProductsVariables, _contract: hashContractScope('b2b') },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('hashes the contract scope to a stable value', () => {
+    // Golden value: catches a change to the hash itself, which the other
+    // tests miss because they derive their expectations from it.
+    expect(hashContractScope('contract-137')).toBe('185k3l4sd4t')
+  })
+
+  it('keeps the raw contract id out of the query variables', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: 'contract-137', unitId: 'unit-42' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    // The variables go in the GET URL, so they must not carry the raw ids.
+    const variables = JSON.stringify(mockUseQuery.mock.calls.at(-1)?.[1])
+    expect(variables).not.toContain('contract-137')
+    expect(variables).not.toContain('unit-42')
+    expect(hashContractScope('contract-a')).not.toBe(
+      hashContractScope('contract-b')
+    )
+  })
+
+  it('tells B2B buyers apart by organizational unit when customerId is empty', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: '', unitId: 'unit-42' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      {
+        ...serverManyProductsVariables,
+        _contract: hashContractScope('unit-42'),
+      },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('re-fetches the first page when the buyer switches contract', () => {
+    const contractPage = {
+      search: { products: { pageInfo: { totalCount: 1 }, edges: [] } },
+    }
+
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: 'contract-a' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: contractPage })
+
+    const { result: created } = renderHook(() =>
+      useCreateUseGalleryPage({ initialPages, serverManyProductsVariables })
+    )
+    const { rerender } = renderHook(() => created.current.useGalleryPage(0))
+
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: 'contract-b' },
+      isValidating: false,
+    })
+    rerender()
+
+    expect(mockUseQuery).toHaveBeenLastCalledWith(
+      expect.anything(),
+      {
+        ...serverManyProductsVariables,
+        _contract: hashContractScope('contract-b'),
+      },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('stops scoping the first page once the B2B session ends', () => {
+    const contractPage = {
+      search: { products: { pageInfo: { totalCount: 1 }, edges: [] } },
+    }
+
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: { customerId: 'contract-a' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: contractPage })
+
+    const { result: created } = renderHook(() =>
+      useCreateUseGalleryPage({ initialPages, serverManyProductsVariables })
+    )
+    const { rerender } = renderHook(() => created.current.useGalleryPage(0))
+
+    mockUseSession.mockReturnValue({
+      postalCode: null,
+      b2b: null,
+      isValidating: false,
+    })
+    rerender()
+
+    expect(mockUseQuery).toHaveBeenLastCalledWith(
+      expect.anything(),
+      serverManyProductsVariables,
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('ignores the postal code while deliveryPromise is disabled', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: '01310-100',
+      b2b: null,
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    const { result } = renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      serverManyProductsVariables,
+      expect.objectContaining({ doNotRun: true })
+    )
+    expect(result.current.data).toBe(initialPages)
+  })
+})

package/test/sdk/product/usePageProductsQuery.deliveryPromise.browser.test.ts

@@ -0,0 +1,130 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { renderHook } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const mockUseSession = vi.hoisted(() => vi.fn())
+const mockUseQuery = vi.hoisted(() => vi.fn())
+const mockUseLocalizedVariables = vi.hoisted(() => vi.fn())
+
+vi.mock('@generated', () => ({ gql: (query: unknown) => query }))
+vi.mock('discovery.config', () => ({
+  default: { deliveryPromise: { enabled: true } },
+}))
+vi.mock('@faststore/sdk', () => ({
+  useSearch: () => ({
+    state: { sort: 'score_desc', term: '', selectedFacets: [] },
+    itemsPerPage: 12,
+  }),
+}))
+vi.mock('src/sdk/session', () => ({ useSession: mockUseSession }))
+vi.mock('src/sdk/graphql/useQuery', () => ({ useQuery: mockUseQuery }))
+vi.mock('src/sdk/product/useLocalizedVariables', () => ({
+  useLocalizedVariables: mockUseLocalizedVariables,
+}))
+
+import {
+  hashContractScope,
+  useCreateUseGalleryPage,
+} from '../../../src/sdk/product/usePageProductsQuery'
+
+const serverManyProductsVariables = {
+  first: 12,
+  after: '0',
+  sort: 'score_desc' as const,
+  term: '',
+  selectedFacets: [
+    { key: 'category-1', value: 'computers---tablets' },
+    { key: 'channel', value: '{"salesChannel":"1"}' },
+    { key: 'locale', value: 'en-CA' },
+  ],
+  sponsoredCount: 3,
+}
+
+type GalleryProps = NonNullable<Parameters<typeof useCreateUseGalleryPage>[0]>
+
+const initialPages = {
+  search: { products: { pageInfo: { totalCount: 2 }, edges: [] } },
+} as unknown as GalleryProps['initialPages']
+
+const renderFirstGalleryPage = () => {
+  const { result: created } = renderHook(() =>
+    useCreateUseGalleryPage({ initialPages, serverManyProductsVariables })
+  )
+
+  return renderHook(() => created.current.useGalleryPage(0))
+}
+
+// `isDeliveryPromiseEnabled` is read when the module loads, so this scenario
+// needs its own file with the flag mocked on.
+describe('useCreateUseGalleryPage with deliveryPromise enabled', () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('scopes the page by postal code and contract together for B2B buyers', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: '01310-100',
+      b2b: { customerId: 'contract-137' },
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      {
+        ...serverManyProductsVariables,
+        _postalCode: '01310-100',
+        _contract: hashContractScope('contract-137'),
+      },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+
+  it('still reuses the SSG page for an anonymous shopper with a postal code', () => {
+    mockUseSession.mockReturnValue({
+      postalCode: '01310-100',
+      b2b: null,
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    const { result } = renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      { ...serverManyProductsVariables, _postalCode: '01310-100' },
+      expect.objectContaining({ doNotRun: true })
+    )
+    expect(result.current.data).toBe(initialPages)
+  })
+
+  it('re-fetches when the postal code changed after the SSG page was seeded', () => {
+    mockUseSession.mockReturnValueOnce({
+      postalCode: null,
+      b2b: null,
+      isValidating: false,
+    })
+    mockUseSession.mockReturnValue({
+      postalCode: '01310-100',
+      b2b: null,
+      isValidating: false,
+    })
+    mockUseLocalizedVariables.mockReturnValue(serverManyProductsVariables)
+    mockUseQuery.mockReturnValue({ data: null })
+
+    renderFirstGalleryPage()
+
+    expect(mockUseQuery).toHaveBeenCalledWith(
+      expect.anything(),
+      { ...serverManyProductsVariables, _postalCode: '01310-100' },
+      expect.objectContaining({ doNotRun: false })
+    )
+  })
+})