@faststore/api 4.9.3-dev.0 → 4.9.3-dev.1

package/dist/src/observability/telemetry.d.ts

@@ -1,3 +1,5 @@
+/** OpenTelemetry log emitter; a no-op while telemetry is disabled. */
+export declare const OTELLogger: (severity: import('@faststore/diagnostics').LogSeverity, ...args: unknown[]) => void;
 export declare const ResolverTrace: <TContext extends {
     OTEL_ENABLED: boolean;
     account: string;

package/dist/src/observability/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/observability/telemetry.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,aAAa,GACxB,QAAQ,SAAS;IACf,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACrC,EACD,OAAO,GAAG,GAAG,EACb,KAAK,GAAG,GAAG,EACX,OAAO,GAAG,GAAG,EAEb,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,EAC3E,qBAAyC,MAGvC,QAAQ,OAAO,EACf,MAAM,KAAK,EACX,gBAAgB,QAAQ,EACxB,MAAM,GAAG,KACR,OA2CJ,CAAA"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/observability/telemetry.ts"],"names":[],"mappings":"AAGA,sEAAsE;AACtE,eAAO,MAAM,UAAU,sFAA2B,CAAA;AAElD,eAAO,MAAM,aAAa,GACxB,QAAQ,SAAS;IACf,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACrC,EACD,OAAO,GAAG,GAAG,EACb,KAAK,GAAG,GAAG,EACX,OAAO,GAAG,GAAG,EAEb,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,EAC3E,qBAAyC,MAGvC,QAAQ,OAAO,EACf,MAAM,KAAK,EACX,gBAAgB,QAAQ,EACxB,MAAM,GAAG,KACR,OA2CJ,CAAA"}

package/dist/src/platforms/vtex/index.d.ts

@@ -330,7 +330,7 @@ export declare function getResolvers(): {
                 status: any;
             }[];
         } | null>;
-        validateSession: (_: any, { session: oldSession, search }: import('../..').MutationValidateSessionArgs, { clients, headers, account }: GraphqlContext) => Promise<import('../..').StoreSession | null>;
+        validateSession: (_: any, { session: oldSession, search }: import('../..').MutationValidateSessionArgs, { clients, headers, account, storage, discoveryConfig }: GraphqlContext) => Promise<import('../..').StoreSession | null>;
         subscribeToNewsletter: (_: any, { data }: import('../..').MutationSubscribeToNewsletterArgs, { clients: { commerce } }: GraphqlContext) => Promise<import('../..').PersonNewsletter | null>;
         cancelOrder: (_: any, { data }: import('../..').MutationCancelOrderArgs, { clients: { commerce } }: GraphqlContext) => Promise<import('../..').UserOrderCancel | null>;
         processOrderAuthorization: (_: any, { data }: {

package/dist/src/platforms/vtex/resolvers/index.d.ts

@@ -289,7 +289,7 @@ export declare const getResolvers: () => {
                 status: any;
             }[];
         } | null>;
-        validateSession: (_: any, { session: oldSession, search }: import('../../..').MutationValidateSessionArgs, { clients, headers, account }: import('..').GraphqlContext) => Promise<import('../../..').StoreSession | null>;
+        validateSession: (_: any, { session: oldSession, search }: import('../../..').MutationValidateSessionArgs, { clients, headers, account, storage, discoveryConfig }: import('..').GraphqlContext) => Promise<import('../../..').StoreSession | null>;
         subscribeToNewsletter: (_: any, { data }: import('../../..').MutationSubscribeToNewsletterArgs, { clients: { commerce } }: import('..').GraphqlContext) => Promise<import('../../..').PersonNewsletter | null>;
         cancelOrder: (_: any, { data }: import('../../..').MutationCancelOrderArgs, { clients: { commerce } }: import('..').GraphqlContext) => Promise<import('../../..').UserOrderCancel | null>;
         processOrderAuthorization: (_: any, { data }: {

package/dist/src/platforms/vtex/resolvers/mutation.d.ts

@@ -57,7 +57,7 @@ export declare const Mutation: {
             status: any;
         }[];
     } | null>;
-    validateSession: (_: any, { session: oldSession, search }: import('../../..').MutationValidateSessionArgs, { clients, headers, account }: import('..').GraphqlContext) => Promise<import('../../..').StoreSession | null>;
+    validateSession: (_: any, { session: oldSession, search }: import('../../..').MutationValidateSessionArgs, { clients, headers, account, storage, discoveryConfig }: import('..').GraphqlContext) => Promise<import('../../..').StoreSession | null>;
     subscribeToNewsletter: (_: any, { data }: import('../../..').MutationSubscribeToNewsletterArgs, { clients: { commerce } }: import('..').GraphqlContext) => Promise<import('../../..').PersonNewsletter | null>;
     cancelOrder: (_: any, { data }: import('../../..').MutationCancelOrderArgs, { clients: { commerce } }: import('..').GraphqlContext) => Promise<import('../../..').UserOrderCancel | null>;
     processOrderAuthorization: (_: any, { data }: {

package/dist/src/platforms/vtex/resolvers/validateCart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateCart.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/validateCart.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAA;AACxC,OAAO,KAAK,EAMV,wBAAwB,EACzB,MAAM,+BAA+B,CAAA;AAyYtC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,YAAY,GACvB,GAAG,OAAO,EACV,8BAA8B,wBAAwB,EACtD,KAAK,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA6OpB,CAAA"}
+{"version":3,"file":"validateCart.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/validateCart.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAA;AACxC,OAAO,KAAK,EAMV,wBAAwB,EACzB,MAAM,+BAA+B,CAAA;AAybtC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,YAAY,GACvB,GAAG,OAAO,EACV,8BAA8B,wBAAwB,EACtD,KAAK,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqPpB,CAAA"}

package/dist/src/platforms/vtex/resolvers/validateSession.d.ts

@@ -1,4 +1,4 @@
 import { GraphqlContext } from '..';
 import { MutationValidateSessionArgs, StoreSession } from '../../../__generated__/schema';
-export declare const validateSession: (_: any, { session: oldSession, search }: MutationValidateSessionArgs, { clients, headers, account }: GraphqlContext) => Promise<StoreSession | null>;
+export declare const validateSession: (_: any, { session: oldSession, search }: MutationValidateSessionArgs, { clients, headers, account, storage, discoveryConfig }: GraphqlContext) => Promise<StoreSession | null>;
 //# sourceMappingURL=validateSession.d.ts.map

package/dist/src/platforms/vtex/resolvers/validateSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateSession.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/validateSession.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAA;AACxC,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,+BAA+B,CAAA;AAwBtC,eAAO,MAAM,eAAe,GAC1B,GAAG,GAAG,EACN,iCAAiC,2BAA2B,EAC5D,+BAA+B,cAAc,KAC5C,OAAO,CAAC,YAAY,GAAG,IAAI,CAoH7B,CAAA"}
+{"version":3,"file":"validateSession.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/validateSession.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAA;AACxC,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACb,MAAM,+BAA+B,CAAA;AAsItC,eAAO,MAAM,eAAe,GAC1B,GAAG,GAAG,EACN,iCAAiC,2BAA2B,EAC5D,yDAAyD,cAAc,KACtE,OAAO,CAAC,YAAY,GAAG,IAAI,CAgJ7B,CAAA"}

package/dist/src/platforms/vtex/utils/cartSalesChannel.d.ts

@@ -1,3 +1,4 @@
+import { OrderForm } from '../clients/commerce/types/OrderForm';
 import { Channel } from './channel';
 /**
  * When session SC and orderForm SC diverge, keep Checkout on the orderForm
@@ -8,4 +9,11 @@ import { Channel } from './channel';
  * items that exist only on the orderForm's sales channel.
  */
 export declare function channelWhenSessionDivergesFromOrderForm(currentChannel: Required<Channel>, orderFormSalesChannel: string | null | undefined): string | null;
+/**
+ * Checkout stores an SC on the orderForm only after an items mutation sent
+ * with `sc`. An SC-less request on an orderForm that never had items falls
+ * back to the platform default (SC 1), so its SC is meaningful only when the
+ * orderForm has items or already matches the session.
+ */
+export declare function shouldTrustOrderFormSalesChannel(orderForm: Pick<OrderForm, 'items' | 'salesChannel'>, sessionSalesChannel: string | number, rejectedSalesChannel?: string): boolean;
 //# sourceMappingURL=cartSalesChannel.d.ts.map

package/dist/src/platforms/vtex/utils/cartSalesChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartSalesChannel.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/utils/cartSalesChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC;;;;;;;GAOG;AACH,wBAAgB,uCAAuC,CACrD,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,EACjC,qBAAqB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/C,MAAM,GAAG,IAAI,CAgBf"}
+{"version":3,"file":"cartSalesChannel.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/utils/cartSalesChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC;;;;;;;GAOG;AACH,wBAAgB,uCAAuC,CACrD,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,EACjC,qBAAqB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/C,MAAM,GAAG,IAAI,CAgBf;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,cAAc,CAAC,EAEpD,mBAAmB,EAAE,MAAM,GAAG,MAAM,EAEpC,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAkBT"}

package/dist/src/platforms/vtex/utils/sessionChannel.d.ts

@@ -1,10 +1,45 @@
 import { Channel } from './channel';
+/**
+ * Why the session SC must not be replaced by Session Manager:
+ * - `orderForm`: adopted from an orderForm with items (e.g. after Quick Order);
+ *   kept until the cart is empty.
+ * - `url`: derived from the URL by localization; always sent to Checkout.
+ *
+ * Lives only in the raw `channel` JSON string so the public `Channel` type
+ * stays unchanged.
+ */
+export type SalesChannelSource = 'orderForm' | 'url';
+/**
+ * Reads the marker from the raw channel string. A `url` marker only means
+ * something while localization is enabled; a leftover one (e.g. after a store
+ * turns localization off) is ignored so Session Manager decides again.
+ */
+export declare function salesChannelSourceOf(channel: string | null | undefined, { localizationEnabled }?: {
+    localizationEnabled?: boolean;
+}): SalesChannelSource | undefined;
+/** Whether the store config enables localization (URL-derived SC). */
+export declare const isLocalizationEnabled: (discoveryConfig: Record<string, unknown> | undefined) => boolean;
+/**
+ * SC that Session Manager rejected (401/403) for this shopper after it was
+ * adopted from the orderForm. validateCart must not adopt it again, otherwise
+ * adoption and rejection would loop.
+ */
+export declare function rejectedSalesChannelOf(channel: string | null | undefined): string | undefined;
 /**
  * Builds the session `channel` string after Session Manager responds.
  *
- * When the client already pinned an explicit SC (e.g. adopted from the
- * orderForm after Quick Order), keep it. Session Manager often still reports
- * the default SC and would otherwise overwrite the adoption.
+ * Session Manager is the SC authority, except when the client channel carries
+ * a `salesChannelSource` marker: then the client SC is kept and the marker is
+ * re-emitted so it survives this validation. A recorded rejection is also
+ * re-emitted until Session Manager resolves that SC for the shopper.
+ */
+export declare function channelAfterSessionManager(channel: Required<Channel>, storeChannelValue: string | null | undefined, regionId: string | null | undefined, sellerId: string | undefined, salesChannelSource?: SalesChannelSource, rejectedSalesChannel?: string): string;
+/**
+ * SC to request from Session Manager. FastStore 4.6–4.9 could move a session
+ * to the SC 1 fallback of an empty orderForm and pin it there. When an
+ * unmarked session is on SC 1 but the store runs on another SC, ask for the
+ * store SC instead: if Session Manager assigns SC 1 on purpose (e.g. by
+ * profile), it still answers SC 1.
  */
-export declare function channelAfterSessionManager(channel: Required<Channel>, storeChannelValue: string | null | undefined, regionId: string | null | undefined, sellerId: string | undefined): string;
+export declare function salesChannelToRequest(channel: Required<Channel>, salesChannelSource: SalesChannelSource | undefined, storeSalesChannel: string | undefined, search: string): string;
 //# sourceMappingURL=sessionChannel.d.ts.map

package/dist/src/platforms/vtex/utils/sessionChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionChannel.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/utils/sessionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAC1B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC5C,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,CAgBR"}
+{"version":3,"file":"sessionChannel.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/utils/sessionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG,KAAK,CAAA;AAUpD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAClC,EAAE,mBAA0B,EAAE,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,GACrE,kBAAkB,GAAG,SAAS,CAQhC;AAED,sEAAsE;AACtE,eAAO,MAAM,qBAAqB,GAChC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,YAKnD,CAAA;AAEH;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAMpB;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAC1B,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC5C,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CAkBR;AAKD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAC1B,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EAClD,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,MAAM,EAAE,MAAM,GACb,MAAM,CAUR"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "4.9.3-dev.0",
+  "version": "4.9.3-dev.1",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "typings": "dist/src/index.d.ts",
@@ -58,11 +58,11 @@
     "vite": "7.1.5",
     "vite-plugin-dts": "4.5.4",
     "vitest": "4.0.18",
-    "@faststore/diagnostics": "^4.9.3-dev.0"
+    "@faststore/diagnostics": "^4.9.3-dev.1"
   },
   "peerDependencies": {
     "graphql": "16.11.0",
-    "@faststore/diagnostics": "4.9.3-dev.0"
+    "@faststore/diagnostics": "4.9.3-dev.1"
   },
   "publishConfig": {
     "access": "public"

package/src/observability/telemetry.ts

@@ -1,7 +1,8 @@
 import { logger, OTELAPI } from '@faststore/diagnostics'
 import { name, version } from '../../package.json' with { type: 'json' }
 
-const OTELLogger = logger('@faststore/api')
+/** OpenTelemetry log emitter; a no-op while telemetry is disabled. */
+export const OTELLogger = logger('@faststore/api')
 
 export const ResolverTrace = <
   TContext extends {

package/src/platforms/vtex/resolvers/validateCart.ts

@@ -1,7 +1,15 @@
 import deepEquals from 'fast-deep-equal'
 
 import { parse } from 'cookie'
-import { channelWhenSessionDivergesFromOrderForm } from '../utils/cartSalesChannel'
+import {
+  channelWhenSessionDivergesFromOrderForm,
+  shouldTrustOrderFormSalesChannel,
+} from '../utils/cartSalesChannel'
+import {
+  isLocalizationEnabled,
+  rejectedSalesChannelOf,
+  salesChannelSourceOf,
+} from '../utils/sessionChannel'
 import { mutateChannelContext, mutateLocaleContext } from '../utils/contex'
 import { md5 } from '../utils/md5'
 import {
@@ -381,11 +389,59 @@ const getCookieCheckoutOrderNumber = (ctx: string, nameCookie: string) => {
   return cookieValue ? cookieValue.split('=')[1] : ''
 }
 
-/** Keep Checkout on the orderForm SC when the browser session lags behind it. */
+/**
+ * Fetches the orderForm, omitting `sc` for existing carts so Checkout keeps the
+ * SC stored on the cart (unless the session SC comes from the URL).
+ *
+ * Checkout only stores an SC after an items mutation with `sc`. An empty
+ * orderForm fetched without `sc` may report the platform default (SC 1):
+ * refetch it with the session SC instead of trusting (and adopting) it. Same
+ * for an orderForm on an SC Session Manager rejected for this shopper.
+ */
+const getOrderForm = async (
+  ctx: GraphqlContext,
+  orderFormId: string | undefined,
+  isUrlSalesChannel: boolean,
+  rejectedSalesChannel: string | undefined
+) => {
+  const { commerce } = ctx.clients
+  const orderForm = await commerce.checkout.orderForm({
+    id: orderFormId,
+    channel: ctx.storage.channel,
+    preserveSalesChannel: Boolean(orderFormId) && !isUrlSalesChannel,
+  })
+
+  if (
+    !orderFormId ||
+    shouldTrustOrderFormSalesChannel(
+      orderForm,
+      ctx.storage.channel.salesChannel,
+      rejectedSalesChannel
+    )
+  ) {
+    return orderForm
+  }
+
+  return commerce.checkout.orderForm({
+    id: orderFormId,
+    channel: ctx.storage.channel,
+  })
+}
+
+/**
+ * Keep Checkout on the orderForm SC when the browser session lags behind it.
+ * Only orderForms with items have a stored SC worth protecting, and a
+ * URL-derived (localization) session SC always wins.
+ */
 const adoptOrderFormSalesChannelWhenSessionDiverges = (
   ctx: GraphqlContext,
-  orderForm: OrderForm
+  orderForm: OrderForm,
+  canAdopt: boolean
 ): string | null => {
+  if (!canAdopt || orderForm.items.length === 0) {
+    return null
+  }
+
   const adoptedChannel = channelWhenSessionDivergesFromOrderForm(
     ctx.storage.channel,
     orderForm.salesChannel
@@ -442,6 +498,12 @@ export const validateCart = async (
 
   const channel = session?.channel
   const locale = session?.locale
+  // Localization derives the SC from the URL: never omit `sc` nor adopt.
+  const isUrlSalesChannel =
+    salesChannelSourceOf(channel, {
+      localizationEnabled: isLocalizationEnabled(ctx.discoveryConfig),
+    }) === 'url'
+  const rejectedSalesChannel = rejectedSalesChannelOf(channel)
 
   if (channel) {
     mutateChannelContext(ctx, channel)
@@ -457,12 +519,12 @@ export const validateCart = async (
   // session SC (e.g. after Quick Order) would recalculate the cart and drop
   // items only available in the orderForm's trade policy. New carts still
   // send `sc` from the session (see commerce.checkout.orderForm).
-  const orderFormId = orderFormIdFromCookie || undefined
-  const orderForm = await commerce.checkout.orderForm({
-    id: orderFormId,
-    channel: ctx.storage.channel,
-    preserveSalesChannel: Boolean(orderFormId),
-  })
+  const orderForm = await getOrderForm(
+    ctx,
+    orderFormIdFromCookie || undefined,
+    isUrlSalesChannel,
+    rejectedSalesChannel
+  )
   const orderNumber = orderForm.orderFormId
 
   // Clear messages so it doesn't keep populating toasts on a loop
@@ -486,7 +548,8 @@ export const validateCart = async (
     // on the trade policy that actually owns the items.
     const adoptedSalesChannel = adoptOrderFormSalesChannelWhenSessionDiverges(
       ctx,
-      orderForm
+      orderForm,
+      !isUrlSalesChannel
     )
 
     const newOrderForm = await setOrderFormEtag(
@@ -509,7 +572,8 @@ export const validateCart = async (
   // items that exist only on the orderForm's sales channel.
   const adoptedSalesChannel = adoptOrderFormSalesChannelWhenSessionDiverges(
     ctx,
-    orderForm
+    orderForm,
+    !isUrlSalesChannel
   )
 
   // Step2: Process items from both browser and checkout so they have the same shape

package/src/platforms/vtex/resolvers/validateSession.ts

@@ -6,7 +6,16 @@ import type {
   StoreSession,
 } from '../../../__generated__/schema'
 import ChannelMarshal from '../utils/channel'
-import { channelAfterSessionManager } from '../utils/sessionChannel'
+import { OTELLogger } from '../../../observability/telemetry'
+import { FastStoreError } from '../../errors'
+import {
+  channelAfterSessionManager,
+  isLocalizationEnabled,
+  rejectedSalesChannelOf,
+  type SalesChannelSource,
+  salesChannelSourceOf,
+  salesChannelToRequest,
+} from '../utils/sessionChannel'
 import {
   buildB2bSession,
   buildMarketingData,
@@ -28,12 +37,127 @@ type SessionCheckoutNamespace = {
   regionId?: { value?: string | null } | null
 }
 
+const isSalesChannelRejected = (error: unknown) =>
+  error instanceof FastStoreError &&
+  (error.extensions.status === 401 || error.extensions.status === 403)
+
+/**
+ * Whether the rejection is about the requested SC (e.g. "You must be logged
+ * in to access the requested SalesChannel"), not an unrelated auth failure.
+ * Only then is an adopted SC recorded as rejected.
+ */
+const isAboutSalesChannel = (error: unknown) =>
+  error instanceof Error && /sales\s*channel/i.test(error.message)
+
+/**
+ * Whether a Session Manager rejection drops the `orderForm` adoption: only
+ * when the rejected `sc` is the adopted SC itself and the error is about the
+ * sales channel. A rejected `?sc=` from the page URL or an unrelated 401/403
+ * keeps the adoption.
+ */
+const rejectsAdoption = (
+  error: unknown,
+  salesChannelSource: SalesChannelSource | undefined,
+  requestedSalesChannel: string | undefined,
+  clientSalesChannel: string
+) => {
+  if (
+    salesChannelSource !== 'orderForm' ||
+    requestedSalesChannel !== clientSalesChannel
+  ) {
+    return false
+  }
+
+  if (isAboutSalesChannel(error)) {
+    return true
+  }
+
+  // Session Manager has no structured code for this; make a wording change
+  // observable (stdout and OpenTelemetry logs) instead of silently keeping
+  // the adoption.
+  const message = `[validateSession] Session Manager rejected adopted sales channel ${requestedSalesChannel} with an unrecognized error; keeping the adoption.`
+  const detail = error instanceof Error ? error.message : error
+
+  console.warn(message, detail)
+  OTELLogger('warn', '%s %o', message, detail)
+
+  return false
+}
+
+/**
+ * Calls Session Manager. When it rejects the requested `sc` (401/403), retries
+ * once without it so Session Manager resolves an SC the shopper can use:
+ * - no marker: a stale SC (e.g. left by an older version) would stick forever;
+ * - `orderForm` marker: if the adopted SC itself is not available to this
+ *   shopper, the adoption is dropped and the SC is recorded as rejected
+ *   (see `rejectsAdoption`);
+ * - `url` marker: the URL SC is intentional, so no retry.
+ * If the retry also fails, the current channel is kept as is.
+ */
+const fetchSessionData = async (
+  clients: GraphqlContext['clients'],
+  params: URLSearchParams,
+  salesChannelSource: SalesChannelSource | undefined,
+  clientSalesChannel: string
+) => {
+  const unchanged = { salesChannelSource, rejectedSalesChannel: undefined }
+
+  try {
+    return {
+      ...unchanged,
+      sessionData: await clients.commerce.session(params.toString()),
+    }
+  } catch (error) {
+    if (salesChannelSource === 'url' || !isSalesChannelRejected(error)) {
+      return { ...unchanged, sessionData: null }
+    }
+
+    const requestedSalesChannel = params.get('sc') ?? undefined
+    const dropsAdoption = rejectsAdoption(
+      error,
+      salesChannelSource,
+      requestedSalesChannel,
+      clientSalesChannel
+    )
+
+    params.delete('sc')
+
+    const sessionData = await clients.commerce
+      .session(params.toString())
+      .catch(() => null)
+
+    if (!sessionData || !dropsAdoption) {
+      return { ...unchanged, sessionData }
+    }
+
+    return {
+      sessionData,
+      salesChannelSource: undefined,
+      rejectedSalesChannel: requestedSalesChannel,
+    }
+  }
+}
+
 export const validateSession = async (
   _: any,
   { session: oldSession, search }: MutationValidateSessionArgs,
-  { clients, headers, account }: GraphqlContext
+  { clients, headers, account, storage, discoveryConfig }: GraphqlContext
 ): Promise<StoreSession | null> => {
-  const channel = ChannelMarshal.parse(oldSession.channel ?? '')
+  const clientChannel = ChannelMarshal.parse(oldSession.channel ?? '')
+  const incomingSalesChannelSource = salesChannelSourceOf(oldSession.channel, {
+    localizationEnabled: isLocalizationEnabled(discoveryConfig),
+  })
+  const channel = {
+    ...clientChannel,
+    salesChannel: salesChannelToRequest(
+      clientChannel,
+      incomingSalesChannelSource,
+      storage?.channel?.salesChannel
+        ? String(storage.channel.salesChannel)
+        : undefined,
+      search
+    ),
+  }
   const postalCode = String(oldSession.postalCode ?? '')
   const country = oldSession.country ?? ''
   let city = oldSession.city ?? null
@@ -69,9 +193,13 @@ export const validateSession = async (
     account
   )
 
-  const sessionData = await clients.commerce
-    .session(params.toString())
-    .catch(() => null)
+  const { sessionData, salesChannelSource, rejectedSalesChannel } =
+    await fetchSessionData(
+      clients,
+      params,
+      incomingSalesChannelSource,
+      String(channel.salesChannel ?? '')
+    )
 
   const profile = sessionData?.namespaces.profile ?? null
   const shopper = sessionData?.namespaces.shopper ?? null
@@ -101,9 +229,17 @@ export const validateSession = async (
     postalCode,
     geoCoordinates,
     country,
-    params.get('sc') ?? channel.salesChannel
+    params.get('sc') ?? store?.channel?.value ?? channel.salesChannel
   )
 
+  const person = buildPersonFromProfile(profile)
+  // A rejection belongs to the shopper it was recorded for: forget it when
+  // they log in or out, so a new identity can have the SC adopted again.
+  const previousRejection =
+    (oldSession.person?.id ?? null) === (person?.id ?? null)
+      ? rejectedSalesChannelOf(oldSession.channel)
+      : undefined
+
   const newSession = {
     ...oldSession,
     currency: {
@@ -115,7 +251,9 @@ export const validateSession = async (
       channel,
       store?.channel?.value,
       checkout?.regionId?.value,
-      sellerId
+      sellerId,
+      salesChannelSource,
+      rejectedSalesChannel ?? previousRejection
     ),
     /**
      * B2B data structure in Session:
@@ -134,7 +272,7 @@ export const validateSession = async (
       unitId,
     }),
     marketingData,
-    person: buildPersonFromProfile(profile),
+    person,
     geoCoordinates:
       (geoCoordinates?.latitude &&
         geoCoordinates?.longitude &&

package/src/platforms/vtex/utils/cartSalesChannel.ts

@@ -1,3 +1,4 @@
+import type { OrderForm } from '../clients/commerce/types/OrderForm'
 import type { Channel } from './channel'
 import ChannelMarshal from './channel'
 
@@ -29,3 +30,35 @@ export function channelWhenSessionDivergesFromOrderForm(
     hasOnlyDefaultSalesChannel: false,
   })
 }
+
+/**
+ * Checkout stores an SC on the orderForm only after an items mutation sent
+ * with `sc`. An SC-less request on an orderForm that never had items falls
+ * back to the platform default (SC 1), so its SC is meaningful only when the
+ * orderForm has items or already matches the session.
+ */
+export function shouldTrustOrderFormSalesChannel(
+  orderForm: Pick<OrderForm, 'items' | 'salesChannel'>,
+  // Persisted sessions may carry a numeric SC (e.g. `{"salesChannel":2}`).
+  sessionSalesChannel: string | number,
+  // SC that Session Manager rejected for this shopper (see validateSession).
+  rejectedSalesChannel?: string
+): boolean {
+  if (
+    rejectedSalesChannel != null &&
+    String(orderForm.salesChannel ?? '') === rejectedSalesChannel &&
+    String(sessionSalesChannel ?? '') !== rejectedSalesChannel
+  ) {
+    return false
+  }
+
+  if (orderForm.items.length > 0) {
+    return true
+  }
+
+  if (orderForm.salesChannel == null || orderForm.salesChannel === '') {
+    return false
+  }
+
+  return String(orderForm.salesChannel) === String(sessionSalesChannel ?? '')
+}