@salesforce/lds-worker-api 1.462.0 → 1.464.0

package/dist/sfdc/es/ldsWorkerApi.js

@@ -359,19 +359,7 @@ function invokeDmlAdapter(adapter, configObject, onResponse, nativeAdapterReques
 function invokeAdapterWithDraftToReplace(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
     invokeAdapterWithDraftToMerge(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext);
 }
-/**
- * Executes the specified adapter with the given @param adapterId and @param config. Then
- * it merges the draft with the given id with the draft generated by
- * the mutating adapter. Will call onResult callback once with data or error.
- *
- * This function returns an error if the given adapterId cannot be found, or if the
- * adapterId is not a mutating adapter if a draft isn't created, or
- * if it fails to parse the given config string.
- *
- * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
- * The newly generated delete draft will replace the draft specified by @param targetDraftId
- */
-function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+function invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext) {
     const adapter = getDMLAdapterFromName(adapterId);
     if (adapter === undefined) {
         // Check if the adapter is non-mutating adapter and create proper error message.
@@ -387,10 +375,12 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
     // deleteRecord adapter call will generate a delete draft and
     // the newly generate draft will replace the target draft
     if (adapterId === 'deleteRecord') {
-        invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, onResponse, nativeAdapterRequestContext);
+        invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext);
         return;
     }
-    draftManager.getQueue().then((draftInfo) => {
+    draftManager
+        .getQueue()
+        .then((draftInfo) => {
         const draftIds = draftInfo.items.map((draft) => draft.id);
         if (draftIds.includes(targetDraftId) === false) {
             onResponse({
@@ -407,14 +397,32 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
                 const draftId = draftIds[draftIds.length - 1];
                 draftManager
                     .mergeActions(targetDraftId, draftId)
-                    .then(() => {
+                    .then(async () => {
                     if (responseValue.data === undefined ||
                         responseValue.data.drafts === undefined) {
                         onResponse(responseValue);
                         return;
                     }
                     const newResponse = removeDraftNodeActionId(draftId, responseValue);
-                    onResponse(newResponse);
+                    if (metadata !== undefined) {
+                        const mergedState = await draftManager.getQueue();
+                        const mergedItem = mergedState.items.find((item) => item.id === targetDraftId);
+                        const mergedMetadata = mergedItem?.metadata ?? {};
+                        draftManager
+                            .setMetadata(targetDraftId, {
+                            ...mergedMetadata,
+                            ...metadata,
+                        })
+                            .then(() => {
+                            onResponse(newResponse);
+                        })
+                            .catch((error) => {
+                            onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                        });
+                    }
+                    else {
+                        onResponse(newResponse);
+                    }
                 })
                     .catch((error) => {
                     onResponse(convertErrorIntoNativeFetchError(error, `Unknown error merging draft`));
@@ -426,8 +434,26 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
                 onResponse(response);
             }
         }, nativeAdapterRequestContext);
+    })
+        .catch((error) => {
+        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
     });
 }
+/**
+ * Executes the specified adapter with the given @param adapterId and @param config. Then
+ * it merges the draft with the given id with the draft generated by
+ * the mutating adapter. Will call onResult callback once with data or error.
+ *
+ * This function returns an error if the given adapterId cannot be found, or if the
+ * adapterId is not a mutating adapter if a draft isn't created, or
+ * if it fails to parse the given config string.
+ *
+ * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
+ * The newly generated delete draft will replace the draft specified by @param targetDraftId
+ */
+function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+    invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, undefined, onResponse, nativeAdapterRequestContext);
+}
 /**
  * Executes the specified adapter with the given adapterId and config. Then
  * it sets the given metadata on the draft created by the mutating adapter.  Will call
@@ -563,18 +589,20 @@ This is a special case version of the invokeAdapterWithDraftToMerge function
 which should only be used for the deleteRecord wire adapter, since it does not
 contain record data in the result and has to do special querying of the draft queue
 */
-function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
+function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, metadata, onResponse, nativeAdapterRequestContext) {
     const targetedRecordId = parse(config);
     let priorDraftIds;
-    draftManager.getQueue().then((draftState) => {
-        priorDraftIds = draftState.items.map((item) => {
-            return item.id;
-        });
+    draftManager
+        .getQueue()
+        .then((draftState) => {
+        priorDraftIds = draftState.items.map((item) => item.id);
         invokeDmlAdapter(adapter, parse(config), (responseValue) => {
             if (responseValue.error === undefined &&
                 responseValue.errors === undefined &&
                 responseValue.data === undefined) {
-                draftManager.getQueue().then((newState) => {
+                draftManager
+                    .getQueue()
+                    .then((newState) => {
                     const draftIdsToFilter = priorDraftIds ? priorDraftIds : [];
                     const newDrafts = newState.items;
                     const addedDrafts = newDrafts.filter((item) => {
@@ -591,13 +619,35 @@ function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToRep
                     else {
                         draftManager
                             .replaceAction(draftIdToReplace, addedDrafts[0].id)
-                            .then(() => {
-                            onResponse(responseValue);
+                            .then((replacedDraft) => {
+                            if (metadata !== undefined) {
+                                // Spread the metadata returned by replaceAction
+                                // (not the pre-replace snapshot) so that keys the
+                                // replacement clears — notably retryCount — stay
+                                // cleared instead of being reintroduced here.
+                                draftManager
+                                    .setMetadata(draftIdToReplace, {
+                                    ...replacedDraft.metadata,
+                                    ...metadata,
+                                })
+                                    .then(() => {
+                                    onResponse(responseValue);
+                                })
+                                    .catch((error) => {
+                                    onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                                });
+                            }
+                            else {
+                                onResponse(responseValue);
+                            }
                         })
                             .catch((error) => {
                             onResponse(convertErrorIntoNativeFetchError(error, 'Unknown error replacing action'));
                         });
                     }
+                })
+                    .catch((error) => {
+                    onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
                 });
             }
             else {
@@ -606,6 +656,9 @@ function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToRep
                 onResponse(response);
             }
         }, nativeAdapterRequestContext);
+    })
+        .catch((error) => {
+        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
     });
 }
 function removeDraftNodeActionId(targetDraftId, responseValue) {
@@ -1372,5 +1425,5 @@ if (process.env.NODE_ENV !== 'production') {
     });
 }
 
-export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
-// version: 1.462.0-50d9a13ba4
+export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
+// version: 1.464.0-e54c238397

package/dist/sfdc/es/types/executeAdapter.d.ts

@@ -57,6 +57,7 @@ export declare function subscribeToAdapter(adapterId: string, config: string, on
  * Will be removed in future, ideally 2 releases later.
  */
 export declare function invokeAdapterWithDraftToReplace(adapterId: string, config: string, draftIdToReplace: string, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
+export declare function invokeAdapterWithDraftToMergeAndMetadata(adapterId: string, config: string, targetDraftId: string, metadata: DraftQueueItemMetadata | undefined, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
 /**
  * Executes the specified adapter with the given @param adapterId and @param config. Then
  * it merges the draft with the given id with the draft generated by

package/dist/sfdc/es/types/main.d.ts

@@ -1,4 +1,4 @@
-import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter } from './executeAdapter';
+import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter } from './executeAdapter';
 import { getImperativeAdapterNames } from './lightningAdapterApi';
 import { nimbusDraftQueue } from './nimbusDraftQueue';
 import { draftQueue, draftManager } from './draftQueueImplementation';
@@ -8,4 +8,4 @@ import { createPrimingSession } from './primingApi';
 import { evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction } from './cachePurging';
 import { importLuvioAdapterModule } from './customLuvioAdapter';
 import { importOneStoreAdapterModule } from './customOneStoreAdapter';
-export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };
+export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };

package/dist/standalone/es/lds-worker-api.js

@@ -4276,7 +4276,7 @@ function withDefaultLuvio(callback) {
     }
     callbacks.push(callback);
 }
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
 function instrumentAdapter$1(createFunction, _metadata) {
@@ -5320,7 +5320,7 @@ function createGraphQLWireAdapterConstructor(luvio, adapter, metadata, astResolv
     const { apiFamily, name } = metadata;
     return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
 }
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 function isSupportedEntity(_objectApiName) {
     return true;
@@ -32547,7 +32547,7 @@ withDefaultLuvio((luvio) => {
     throttle(60, 60000, setupNotifyAllListRecordUpdateAvailable(luvio));
     throttle(60, 60000, setupNotifyAllListInfoSummaryUpdateAvailable(luvio));
 });
-// version: 1.462.0-2919385b97
+// version: 1.464.0-b35c0e7723
 
 var draftQueueMaxRetryAttemptsGate = {
     isOpen: function (e) {
@@ -44741,9 +44741,18 @@ function validateDiscriminatedOneOf$1(data, discriminator, path, document, visit
   if (data === null || typeof data !== "object" || Array.isArray(data)) {
     return invalidSchemaResponseWithError$1(incorrectTypeError$1("object", typeof data, path));
   }
-  const { propertyName, mapping } = discriminator;
+  const { propertyName, mapping, defaultMapping } = discriminator;
   const discriminatorValue = data[propertyName];
   if (discriminatorValue === void 0) {
+    if (defaultMapping !== void 0) {
+      return validateJsonSchemaInternal$1(
+        data,
+        { $ref: defaultMapping },
+        path,
+        document,
+        visited
+      );
+    }
     return invalidSchemaResponseWithError$1(
       new MissingRequiredPropertyError$1(
         `Object at path '${path}' is missing required discriminator property '${propertyName}'.`
@@ -44755,7 +44764,7 @@ function validateDiscriminatedOneOf$1(data, discriminator, path, document, visit
       incorrectTypeError$1("string", typeof discriminatorValue, `${path}.${propertyName}`)
     );
   }
-  const targetRef = mapping[discriminatorValue];
+  const targetRef = mapping[discriminatorValue] ?? defaultMapping;
   if (targetRef === void 0) {
     return invalidSchemaResponseWithError$1(
       new JsonSchemaViolationError$1(
@@ -95756,6 +95765,15 @@ function buildServiceDescriptor$m() {
   };
 }
 
+function applyOperationRequestOptions$1(init, operationType) {
+  if (operationType === void 0) {
+    return init;
+  }
+  return {
+    ...init,
+    onestore: { ...init?.onestore, retrySafe: operationType === "query" }
+  };
+}
 class AuraNetworkCommand extends NetworkCommand$1 {
   constructor(services) {
     super(services);
@@ -95774,6 +95792,18 @@ class AuraNetworkCommand extends NetworkCommand$1 {
       "Fetch parameters must be specified when using HTTP transport on an Aura adapter"
     );
   }
+  /**
+   * The command's operation type. Generated command subclasses override this
+   * getter with their concrete operation (see the generator's
+   * `generateOperationType`); the base returns `undefined` for commands that
+   * don't declare one. On the HTTP fallback path (`fetch`) it derives the
+   * request's `onestore.retrySafe` — reads (`query`) are retry-safe, writes
+   * (`mutation`) are not. Mirrors `FetchNetworkCommand.operationType`, which
+   * this class does not inherit (it extends `NetworkCommand` directly).
+   */
+  get operationType() {
+    return void 0;
+  }
   coerceAuraErrors(auraErrors) {
     return new UserVisibleError(getFetchResponseFromAuraError(auraErrors[0]));
   }
@@ -95875,9 +95905,11 @@ class AuraNetworkCommand extends NetworkCommand$1 {
         this.coerceAuraErrors
       );
     } else if (this.shouldUseFetch()) {
-      const params = this.fetchParams;
+      const [input, init] = this.fetchParams;
+      const initWithOptions = applyOperationRequestOptions$1(init, this.operationType);
       try {
-        return this.convertFetchResponseToData(this.services.fetch(...params));
+        const fetchCall = initWithOptions === void 0 ? this.services.fetch(input) : this.services.fetch(input, initWithOptions);
+        return this.convertFetchResponseToData(fetchCall);
       } catch (reason) {
         return resolvedPromiseLike$2(err$1(toError(reason)));
       }
@@ -96624,6 +96656,15 @@ class NetworkCommand extends BaseCommand {
   async afterRequestHooks(_options) {
   }
 }
+function applyOperationRequestOptions(init, operationType) {
+  if (operationType === void 0) {
+    return init;
+  }
+  return {
+    ...init,
+    onestore: { ...init?.onestore, retrySafe: operationType === "query" }
+  };
+}
 function isAbortableCommand(command) {
   return !!command && typeof command === "object" && "isAbortableCommand" in command && command.isAbortableCommand === true;
 }
@@ -96696,7 +96737,8 @@ const _FetchNetworkCommand = class _FetchNetworkCommand extends NetworkCommand {
    * `generateOperationType`); the base returns `undefined` for commands that
    * don't declare one (e.g. hand-written commands). Transport-layer
    * interceptors use it to tell a read (`query`) apart from a write — see
-   * `fetch`, which folds it into the context seed.
+   * `fetch`, which folds it into the context seed and derives
+   * `onestore.retrySafe` from it.
    */
   get operationType() {
     return void 0;
@@ -96705,8 +96747,9 @@ const _FetchNetworkCommand = class _FetchNetworkCommand extends NetworkCommand {
     try {
       const [input, init] = this.fetchParams;
       const operationType = this.operationType;
+      const initWithOptions = applyOperationRequestOptions(init, operationType);
       const seed = operationType === void 0 ? contextSeed : { operationType, ...contextSeed };
-      const initWithSeed = seed === void 0 ? init : { ...init, __contextSeed: seed };
+      const initWithSeed = seed === void 0 ? initWithOptions : { ...initWithOptions, __contextSeed: seed };
       const fetchCall = initWithSeed === void 0 ? this.services.fetch(input) : this.services.fetch(input, initWithSeed);
       return this.convertFetchResponseToData(fetchCall);
     } catch (reason) {
@@ -97800,7 +97843,7 @@ function buildServiceDescriptor$b(luvio) {
         },
     };
 }
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -97826,7 +97869,7 @@ function buildServiceDescriptor$a(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 function findExecutableOperation$1(input) {
   const operations = input.query.definitions.filter(
@@ -98407,9 +98450,18 @@ function validateDiscriminatedOneOf(data, discriminator, path, document, visited
   if (data === null || typeof data !== "object" || Array.isArray(data)) {
     return invalidSchemaResponseWithError(incorrectTypeError("object", typeof data, path));
   }
-  const { propertyName, mapping } = discriminator;
+  const { propertyName, mapping, defaultMapping } = discriminator;
   const discriminatorValue = data[propertyName];
   if (discriminatorValue === void 0) {
+    if (defaultMapping !== void 0) {
+      return validateJsonSchemaInternal(
+        data,
+        { $ref: defaultMapping },
+        path,
+        document,
+        visited
+      );
+    }
     return invalidSchemaResponseWithError(
       new MissingRequiredPropertyError(
         `Object at path '${path}' is missing required discriminator property '${propertyName}'.`
@@ -98421,7 +98473,7 @@ function validateDiscriminatedOneOf(data, discriminator, path, document, visited
       incorrectTypeError("string", typeof discriminatorValue, `${path}.${propertyName}`)
     );
   }
-  const targetRef = mapping[discriminatorValue];
+  const targetRef = mapping[discriminatorValue] ?? defaultMapping;
   if (targetRef === void 0) {
     return invalidSchemaResponseWithError(
       new JsonSchemaViolationError(
@@ -99500,7 +99552,12 @@ function buildServiceDescriptor$1(interceptors = {
       }
       const fetchArgs = cleanInit === void 0 ? [input] : [input, cleanInit];
       const baseContext = interceptors.createContext?.();
-      const context = contextSeed === void 0 ? baseContext : { ...baseContext, ...contextSeed };
+      const onestore = cleanInit?.onestore;
+      const context = contextSeed === void 0 && onestore === void 0 ? baseContext : {
+        ...baseContext,
+        ...contextSeed,
+        ...onestore !== void 0 && { onestore }
+      };
       const {
         request: requestInterceptors = [],
         retry: retryInterceptor = void 0,
@@ -100531,7 +100588,7 @@ register$1({
     id: '@salesforce/lds-network-adapter',
     instrument: instrument$2,
 });
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 const { create: create$2, keys: keys$2 } = Object;
 const { stringify, parse } = JSON;
@@ -108083,7 +108140,7 @@ function registerCallback(cb) {
         cb(graphql_v1_import, graphql_imperative$1, graphql_imperative_legacy_v1_import, graphql_state_manager, useOneStoreGraphQL);
     }
 }
-// version: 1.462.0-2919385b97
+// version: 1.464.0-b35c0e7723
 
 function createFragmentMap(documentNode) {
     const fragments = {};
@@ -137326,7 +137383,7 @@ register$1({
     configuration: { ...configurationForGraphQLAdapters$1 },
     instrument: instrument$1,
 });
-// version: 1.462.0-2919385b97
+// version: 1.464.0-b35c0e7723
 
 // On core the unstable adapters are re-exported with different names,
 // we want to match them here.
@@ -137478,7 +137535,7 @@ withDefaultLuvio((luvio) => {
     unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
     graphQLImperative = ldsAdapter;
 });
-// version: 1.462.0-2919385b97
+// version: 1.464.0-b35c0e7723
 
 var gqlApi = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -137801,19 +137858,7 @@ function invokeDmlAdapter(adapter, configObject, onResponse, nativeAdapterReques
 function invokeAdapterWithDraftToReplace(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
     invokeAdapterWithDraftToMerge(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext);
 }
-/**
- * Executes the specified adapter with the given @param adapterId and @param config. Then
- * it merges the draft with the given id with the draft generated by
- * the mutating adapter. Will call onResult callback once with data or error.
- *
- * This function returns an error if the given adapterId cannot be found, or if the
- * adapterId is not a mutating adapter if a draft isn't created, or
- * if it fails to parse the given config string.
- *
- * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
- * The newly generated delete draft will replace the draft specified by @param targetDraftId
- */
-function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+function invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext) {
     const adapter = getDMLAdapterFromName(adapterId);
     if (adapter === undefined) {
         // Check if the adapter is non-mutating adapter and create proper error message.
@@ -137829,10 +137874,12 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
     // deleteRecord adapter call will generate a delete draft and
     // the newly generate draft will replace the target draft
     if (adapterId === 'deleteRecord') {
-        invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, onResponse, nativeAdapterRequestContext);
+        invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext);
         return;
     }
-    draftManager.getQueue().then((draftInfo) => {
+    draftManager
+        .getQueue()
+        .then((draftInfo) => {
         const draftIds = draftInfo.items.map((draft) => draft.id);
         if (draftIds.includes(targetDraftId) === false) {
             onResponse({
@@ -137849,14 +137896,32 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
                 const draftId = draftIds[draftIds.length - 1];
                 draftManager
                     .mergeActions(targetDraftId, draftId)
-                    .then(() => {
+                    .then(async () => {
                     if (responseValue.data === undefined ||
                         responseValue.data.drafts === undefined) {
                         onResponse(responseValue);
                         return;
                     }
                     const newResponse = removeDraftNodeActionId(draftId, responseValue);
-                    onResponse(newResponse);
+                    if (metadata !== undefined) {
+                        const mergedState = await draftManager.getQueue();
+                        const mergedItem = mergedState.items.find((item) => item.id === targetDraftId);
+                        const mergedMetadata = mergedItem?.metadata ?? {};
+                        draftManager
+                            .setMetadata(targetDraftId, {
+                            ...mergedMetadata,
+                            ...metadata,
+                        })
+                            .then(() => {
+                            onResponse(newResponse);
+                        })
+                            .catch((error) => {
+                            onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                        });
+                    }
+                    else {
+                        onResponse(newResponse);
+                    }
                 })
                     .catch((error) => {
                     onResponse(convertErrorIntoNativeFetchError(error, `Unknown error merging draft`));
@@ -137868,8 +137933,26 @@ function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onRespo
                 onResponse(response);
             }
         }, nativeAdapterRequestContext);
+    })
+        .catch((error) => {
+        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
     });
 }
+/**
+ * Executes the specified adapter with the given @param adapterId and @param config. Then
+ * it merges the draft with the given id with the draft generated by
+ * the mutating adapter. Will call onResult callback once with data or error.
+ *
+ * This function returns an error if the given adapterId cannot be found, or if the
+ * adapterId is not a mutating adapter if a draft isn't created, or
+ * if it fails to parse the given config string.
+ *
+ * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
+ * The newly generated delete draft will replace the draft specified by @param targetDraftId
+ */
+function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+    invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, undefined, onResponse, nativeAdapterRequestContext);
+}
 /**
  * Executes the specified adapter with the given adapterId and config. Then
  * it sets the given metadata on the draft created by the mutating adapter.  Will call
@@ -138005,18 +138088,20 @@ This is a special case version of the invokeAdapterWithDraftToMerge function
 which should only be used for the deleteRecord wire adapter, since it does not
 contain record data in the result and has to do special querying of the draft queue
 */
-function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
+function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, metadata, onResponse, nativeAdapterRequestContext) {
     const targetedRecordId = parse(config);
     let priorDraftIds;
-    draftManager.getQueue().then((draftState) => {
-        priorDraftIds = draftState.items.map((item) => {
-            return item.id;
-        });
+    draftManager
+        .getQueue()
+        .then((draftState) => {
+        priorDraftIds = draftState.items.map((item) => item.id);
         invokeDmlAdapter(adapter, parse(config), (responseValue) => {
             if (responseValue.error === undefined &&
                 responseValue.errors === undefined &&
                 responseValue.data === undefined) {
-                draftManager.getQueue().then((newState) => {
+                draftManager
+                    .getQueue()
+                    .then((newState) => {
                     const draftIdsToFilter = priorDraftIds ? priorDraftIds : [];
                     const newDrafts = newState.items;
                     const addedDrafts = newDrafts.filter((item) => {
@@ -138033,13 +138118,35 @@ function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToRep
                     else {
                         draftManager
                             .replaceAction(draftIdToReplace, addedDrafts[0].id)
-                            .then(() => {
-                            onResponse(responseValue);
+                            .then((replacedDraft) => {
+                            if (metadata !== undefined) {
+                                // Spread the metadata returned by replaceAction
+                                // (not the pre-replace snapshot) so that keys the
+                                // replacement clears — notably retryCount — stay
+                                // cleared instead of being reintroduced here.
+                                draftManager
+                                    .setMetadata(draftIdToReplace, {
+                                    ...replacedDraft.metadata,
+                                    ...metadata,
+                                })
+                                    .then(() => {
+                                    onResponse(responseValue);
+                                })
+                                    .catch((error) => {
+                                    onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                                });
+                            }
+                            else {
+                                onResponse(responseValue);
+                            }
                         })
                             .catch((error) => {
                             onResponse(convertErrorIntoNativeFetchError(error, 'Unknown error replacing action'));
                         });
                     }
+                })
+                    .catch((error) => {
+                    onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
                 });
             }
             else {
@@ -138048,6 +138155,9 @@ function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToRep
                 onResponse(response);
             }
         }, nativeAdapterRequestContext);
+    })
+        .catch((error) => {
+        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
     });
 }
 function removeDraftNodeActionId(targetDraftId, responseValue) {
@@ -138277,7 +138387,7 @@ const callbacks$1 = [];
 function register(r) {
     callbacks$1.forEach((callback) => callback(r));
 }
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -139565,5 +139675,5 @@ class OneStoreAdapterModule {
 const { luvio } = getRuntime();
 setDefaultLuvio({ luvio });
 
-export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
-// version: 1.462.0-50d9a13ba4
+export { createPrimingSession, draftManager, draftQueue, evictCacheRecordsByIds, evictExpiredCacheEntries, executeAdapter, executeMutatingAdapter, getImperativeAdapterNames, importLuvioAdapterModule, importOneStoreAdapterModule, invokeAdapter, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithMetadata, nimbusDraftQueue, registerReportObserver, setMetadataTTL, setUiApiRecordTTL, stopEviction, subscribeToAdapter };
+// version: 1.464.0-e54c238397

package/dist/standalone/es/types/executeAdapter.d.ts

@@ -57,6 +57,7 @@ export declare function subscribeToAdapter(adapterId: string, config: string, on
  * Will be removed in future, ideally 2 releases later.
  */
 export declare function invokeAdapterWithDraftToReplace(adapterId: string, config: string, draftIdToReplace: string, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
+export declare function invokeAdapterWithDraftToMergeAndMetadata(adapterId: string, config: string, targetDraftId: string, metadata: DraftQueueItemMetadata | undefined, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
 /**
  * Executes the specified adapter with the given @param adapterId and @param config. Then
  * it merges the draft with the given id with the draft generated by

package/dist/standalone/es/types/main.d.ts

@@ -1,4 +1,4 @@
-import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter } from './executeAdapter';
+import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter } from './executeAdapter';
 import { getImperativeAdapterNames } from './lightningAdapterApi';
 import { nimbusDraftQueue } from './nimbusDraftQueue';
 import { draftQueue, draftManager } from './draftQueueImplementation';
@@ -8,4 +8,4 @@ import { createPrimingSession } from './primingApi';
 import { evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction } from './cachePurging';
 import { importLuvioAdapterModule } from './customLuvioAdapter';
 import { importOneStoreAdapterModule } from './customOneStoreAdapter';
-export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };
+export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };

package/dist/standalone/umd/lds-worker-api.js

@@ -4282,7 +4282,7 @@
         }
         callbacks.push(callback);
     }
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     // TODO [TD-0081508]: once that TD is fulfilled we can probably change this file
     function instrumentAdapter$1(createFunction, _metadata) {
@@ -5326,7 +5326,7 @@
         const { apiFamily, name } = metadata;
         return createGraphQLWireAdapterConstructor$1(adapter, `${apiFamily}.${name}`, luvio, astResolver);
     }
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     function isSupportedEntity(_objectApiName) {
         return true;
@@ -32553,7 +32553,7 @@
         throttle(60, 60000, setupNotifyAllListRecordUpdateAvailable(luvio));
         throttle(60, 60000, setupNotifyAllListInfoSummaryUpdateAvailable(luvio));
     });
-    // version: 1.462.0-2919385b97
+    // version: 1.464.0-b35c0e7723
 
     var draftQueueMaxRetryAttemptsGate = {
         isOpen: function (e) {
@@ -44747,9 +44747,18 @@
       if (data === null || typeof data !== "object" || Array.isArray(data)) {
         return invalidSchemaResponseWithError$1(incorrectTypeError$1("object", typeof data, path));
       }
-      const { propertyName, mapping } = discriminator;
+      const { propertyName, mapping, defaultMapping } = discriminator;
       const discriminatorValue = data[propertyName];
       if (discriminatorValue === void 0) {
+        if (defaultMapping !== void 0) {
+          return validateJsonSchemaInternal$1(
+            data,
+            { $ref: defaultMapping },
+            path,
+            document,
+            visited
+          );
+        }
         return invalidSchemaResponseWithError$1(
           new MissingRequiredPropertyError$1(
             `Object at path '${path}' is missing required discriminator property '${propertyName}'.`
@@ -44761,7 +44770,7 @@
           incorrectTypeError$1("string", typeof discriminatorValue, `${path}.${propertyName}`)
         );
       }
-      const targetRef = mapping[discriminatorValue];
+      const targetRef = mapping[discriminatorValue] ?? defaultMapping;
       if (targetRef === void 0) {
         return invalidSchemaResponseWithError$1(
           new JsonSchemaViolationError$1(
@@ -95762,6 +95771,15 @@
       };
     }
 
+    function applyOperationRequestOptions$1(init, operationType) {
+      if (operationType === void 0) {
+        return init;
+      }
+      return {
+        ...init,
+        onestore: { ...init?.onestore, retrySafe: operationType === "query" }
+      };
+    }
     class AuraNetworkCommand extends NetworkCommand$1 {
       constructor(services) {
         super(services);
@@ -95780,6 +95798,18 @@
           "Fetch parameters must be specified when using HTTP transport on an Aura adapter"
         );
       }
+      /**
+       * The command's operation type. Generated command subclasses override this
+       * getter with their concrete operation (see the generator's
+       * `generateOperationType`); the base returns `undefined` for commands that
+       * don't declare one. On the HTTP fallback path (`fetch`) it derives the
+       * request's `onestore.retrySafe` — reads (`query`) are retry-safe, writes
+       * (`mutation`) are not. Mirrors `FetchNetworkCommand.operationType`, which
+       * this class does not inherit (it extends `NetworkCommand` directly).
+       */
+      get operationType() {
+        return void 0;
+      }
       coerceAuraErrors(auraErrors) {
         return new UserVisibleError(getFetchResponseFromAuraError(auraErrors[0]));
       }
@@ -95881,9 +95911,11 @@
             this.coerceAuraErrors
           );
         } else if (this.shouldUseFetch()) {
-          const params = this.fetchParams;
+          const [input, init] = this.fetchParams;
+          const initWithOptions = applyOperationRequestOptions$1(init, this.operationType);
           try {
-            return this.convertFetchResponseToData(this.services.fetch(...params));
+            const fetchCall = initWithOptions === void 0 ? this.services.fetch(input) : this.services.fetch(input, initWithOptions);
+            return this.convertFetchResponseToData(fetchCall);
           } catch (reason) {
             return resolvedPromiseLike$2(err$1(toError(reason)));
           }
@@ -96630,6 +96662,15 @@
       async afterRequestHooks(_options) {
       }
     }
+    function applyOperationRequestOptions(init, operationType) {
+      if (operationType === void 0) {
+        return init;
+      }
+      return {
+        ...init,
+        onestore: { ...init?.onestore, retrySafe: operationType === "query" }
+      };
+    }
     function isAbortableCommand(command) {
       return !!command && typeof command === "object" && "isAbortableCommand" in command && command.isAbortableCommand === true;
     }
@@ -96702,7 +96743,8 @@
        * `generateOperationType`); the base returns `undefined` for commands that
        * don't declare one (e.g. hand-written commands). Transport-layer
        * interceptors use it to tell a read (`query`) apart from a write — see
-       * `fetch`, which folds it into the context seed.
+       * `fetch`, which folds it into the context seed and derives
+       * `onestore.retrySafe` from it.
        */
       get operationType() {
         return void 0;
@@ -96711,8 +96753,9 @@
         try {
           const [input, init] = this.fetchParams;
           const operationType = this.operationType;
+          const initWithOptions = applyOperationRequestOptions(init, operationType);
           const seed = operationType === void 0 ? contextSeed : { operationType, ...contextSeed };
-          const initWithSeed = seed === void 0 ? init : { ...init, __contextSeed: seed };
+          const initWithSeed = seed === void 0 ? initWithOptions : { ...initWithOptions, __contextSeed: seed };
           const fetchCall = initWithSeed === void 0 ? this.services.fetch(input) : this.services.fetch(input, initWithSeed);
           return this.convertFetchResponseToData(fetchCall);
         } catch (reason) {
@@ -97806,7 +97849,7 @@
             },
         };
     }
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -97832,7 +97875,7 @@
             },
         };
     }
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     function findExecutableOperation$1(input) {
       const operations = input.query.definitions.filter(
@@ -98413,9 +98456,18 @@
       if (data === null || typeof data !== "object" || Array.isArray(data)) {
         return invalidSchemaResponseWithError(incorrectTypeError("object", typeof data, path));
       }
-      const { propertyName, mapping } = discriminator;
+      const { propertyName, mapping, defaultMapping } = discriminator;
       const discriminatorValue = data[propertyName];
       if (discriminatorValue === void 0) {
+        if (defaultMapping !== void 0) {
+          return validateJsonSchemaInternal(
+            data,
+            { $ref: defaultMapping },
+            path,
+            document,
+            visited
+          );
+        }
         return invalidSchemaResponseWithError(
           new MissingRequiredPropertyError(
             `Object at path '${path}' is missing required discriminator property '${propertyName}'.`
@@ -98427,7 +98479,7 @@
           incorrectTypeError("string", typeof discriminatorValue, `${path}.${propertyName}`)
         );
       }
-      const targetRef = mapping[discriminatorValue];
+      const targetRef = mapping[discriminatorValue] ?? defaultMapping;
       if (targetRef === void 0) {
         return invalidSchemaResponseWithError(
           new JsonSchemaViolationError(
@@ -99506,7 +99558,12 @@
           }
           const fetchArgs = cleanInit === void 0 ? [input] : [input, cleanInit];
           const baseContext = interceptors.createContext?.();
-          const context = contextSeed === void 0 ? baseContext : { ...baseContext, ...contextSeed };
+          const onestore = cleanInit?.onestore;
+          const context = contextSeed === void 0 && onestore === void 0 ? baseContext : {
+            ...baseContext,
+            ...contextSeed,
+            ...onestore !== void 0 && { onestore }
+          };
           const {
             request: requestInterceptors = [],
             retry: retryInterceptor = void 0,
@@ -100537,7 +100594,7 @@
         id: '@salesforce/lds-network-adapter',
         instrument: instrument$2,
     });
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     const { create: create$2, keys: keys$2 } = Object;
     const { stringify, parse } = JSON;
@@ -108089,7 +108146,7 @@
             cb(graphql_v1_import, graphql_imperative$1, graphql_imperative_legacy_v1_import, graphql_state_manager, useOneStoreGraphQL);
         }
     }
-    // version: 1.462.0-2919385b97
+    // version: 1.464.0-b35c0e7723
 
     function createFragmentMap(documentNode) {
         const fragments = {};
@@ -137332,7 +137389,7 @@
         configuration: { ...configurationForGraphQLAdapters$1 },
         instrument: instrument$1,
     });
-    // version: 1.462.0-2919385b97
+    // version: 1.464.0-b35c0e7723
 
     // On core the unstable adapters are re-exported with different names,
     // we want to match them here.
@@ -137484,7 +137541,7 @@
         unstable_graphQL_imperative = createImperativeAdapter(luvio, createInstrumentedAdapter(ldsAdapter, adapterMetadata), adapterMetadata);
         graphQLImperative = ldsAdapter;
     });
-    // version: 1.462.0-2919385b97
+    // version: 1.464.0-b35c0e7723
 
     var gqlApi = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -137807,19 +137864,7 @@
     function invokeAdapterWithDraftToReplace(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
         invokeAdapterWithDraftToMerge(adapterId, config, draftIdToReplace, onResponse, nativeAdapterRequestContext);
     }
-    /**
-     * Executes the specified adapter with the given @param adapterId and @param config. Then
-     * it merges the draft with the given id with the draft generated by
-     * the mutating adapter. Will call onResult callback once with data or error.
-     *
-     * This function returns an error if the given adapterId cannot be found, or if the
-     * adapterId is not a mutating adapter if a draft isn't created, or
-     * if it fails to parse the given config string.
-     *
-     * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
-     * The newly generated delete draft will replace the draft specified by @param targetDraftId
-     */
-    function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+    function invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext) {
         const adapter = getDMLAdapterFromName(adapterId);
         if (adapter === undefined) {
             // Check if the adapter is non-mutating adapter and create proper error message.
@@ -137835,10 +137880,12 @@
         // deleteRecord adapter call will generate a delete draft and
         // the newly generate draft will replace the target draft
         if (adapterId === 'deleteRecord') {
-            invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, onResponse, nativeAdapterRequestContext);
+            invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, targetDraftId, metadata, onResponse, nativeAdapterRequestContext);
             return;
         }
-        draftManager.getQueue().then((draftInfo) => {
+        draftManager
+            .getQueue()
+            .then((draftInfo) => {
             const draftIds = draftInfo.items.map((draft) => draft.id);
             if (draftIds.includes(targetDraftId) === false) {
                 onResponse({
@@ -137855,14 +137902,32 @@
                     const draftId = draftIds[draftIds.length - 1];
                     draftManager
                         .mergeActions(targetDraftId, draftId)
-                        .then(() => {
+                        .then(async () => {
                         if (responseValue.data === undefined ||
                             responseValue.data.drafts === undefined) {
                             onResponse(responseValue);
                             return;
                         }
                         const newResponse = removeDraftNodeActionId(draftId, responseValue);
-                        onResponse(newResponse);
+                        if (metadata !== undefined) {
+                            const mergedState = await draftManager.getQueue();
+                            const mergedItem = mergedState.items.find((item) => item.id === targetDraftId);
+                            const mergedMetadata = mergedItem?.metadata ?? {};
+                            draftManager
+                                .setMetadata(targetDraftId, {
+                                ...mergedMetadata,
+                                ...metadata,
+                            })
+                                .then(() => {
+                                onResponse(newResponse);
+                            })
+                                .catch((error) => {
+                                onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                            });
+                        }
+                        else {
+                            onResponse(newResponse);
+                        }
                     })
                         .catch((error) => {
                         onResponse(convertErrorIntoNativeFetchError(error, `Unknown error merging draft`));
@@ -137874,8 +137939,26 @@
                     onResponse(response);
                 }
             }, nativeAdapterRequestContext);
+        })
+            .catch((error) => {
+            onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
         });
     }
+    /**
+     * Executes the specified adapter with the given @param adapterId and @param config. Then
+     * it merges the draft with the given id with the draft generated by
+     * the mutating adapter. Will call onResult callback once with data or error.
+     *
+     * This function returns an error if the given adapterId cannot be found, or if the
+     * adapterId is not a mutating adapter if a draft isn't created, or
+     * if it fails to parse the given config string.
+     *
+     * If the @param adapterId is deleteRecod, the invocation of it will generate a delele draft.
+     * The newly generated delete draft will replace the draft specified by @param targetDraftId
+     */
+    function invokeAdapterWithDraftToMerge(adapterId, config, targetDraftId, onResponse, nativeAdapterRequestContext) {
+        invokeAdapterWithDraftToMergeAndMetadata(adapterId, config, targetDraftId, undefined, onResponse, nativeAdapterRequestContext);
+    }
     /**
      * Executes the specified adapter with the given adapterId and config. Then
      * it sets the given metadata on the draft created by the mutating adapter.  Will call
@@ -138011,18 +138094,20 @@
     which should only be used for the deleteRecord wire adapter, since it does not
     contain record data in the result and has to do special querying of the draft queue
     */
-    function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, onResponse, nativeAdapterRequestContext) {
+    function invokeAdapterWithDraftToMergeDeleteRecord(adapter, config, draftIdToReplace, metadata, onResponse, nativeAdapterRequestContext) {
         const targetedRecordId = parse(config);
         let priorDraftIds;
-        draftManager.getQueue().then((draftState) => {
-            priorDraftIds = draftState.items.map((item) => {
-                return item.id;
-            });
+        draftManager
+            .getQueue()
+            .then((draftState) => {
+            priorDraftIds = draftState.items.map((item) => item.id);
             invokeDmlAdapter(adapter, parse(config), (responseValue) => {
                 if (responseValue.error === undefined &&
                     responseValue.errors === undefined &&
                     responseValue.data === undefined) {
-                    draftManager.getQueue().then((newState) => {
+                    draftManager
+                        .getQueue()
+                        .then((newState) => {
                         const draftIdsToFilter = priorDraftIds ? priorDraftIds : [];
                         const newDrafts = newState.items;
                         const addedDrafts = newDrafts.filter((item) => {
@@ -138039,13 +138124,35 @@
                         else {
                             draftManager
                                 .replaceAction(draftIdToReplace, addedDrafts[0].id)
-                                .then(() => {
-                                onResponse(responseValue);
+                                .then((replacedDraft) => {
+                                if (metadata !== undefined) {
+                                    // Spread the metadata returned by replaceAction
+                                    // (not the pre-replace snapshot) so that keys the
+                                    // replacement clears — notably retryCount — stay
+                                    // cleared instead of being reintroduced here.
+                                    draftManager
+                                        .setMetadata(draftIdToReplace, {
+                                        ...replacedDraft.metadata,
+                                        ...metadata,
+                                    })
+                                        .then(() => {
+                                        onResponse(responseValue);
+                                    })
+                                        .catch((error) => {
+                                        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to set metadata on draft'));
+                                    });
+                                }
+                                else {
+                                    onResponse(responseValue);
+                                }
                             })
                                 .catch((error) => {
                                 onResponse(convertErrorIntoNativeFetchError(error, 'Unknown error replacing action'));
                             });
                         }
+                    })
+                        .catch((error) => {
+                        onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
                     });
                 }
                 else {
@@ -138054,6 +138161,9 @@
                     onResponse(response);
                 }
             }, nativeAdapterRequestContext);
+        })
+            .catch((error) => {
+            onResponse(convertErrorIntoNativeFetchError(error, 'Unable to get draft queue'));
         });
     }
     function removeDraftNodeActionId(targetDraftId, responseValue) {
@@ -138283,7 +138393,7 @@
     function register(r) {
         callbacks$1.forEach((callback) => callback(r));
     }
-    // version: 1.462.0-50d9a13ba4
+    // version: 1.464.0-e54c238397
 
     /**
      * Copyright (c) 2022, Salesforce, Inc.,
@@ -139583,6 +139693,7 @@
     exports.importOneStoreAdapterModule = importOneStoreAdapterModule;
     exports.invokeAdapter = invokeAdapter;
     exports.invokeAdapterWithDraftToMerge = invokeAdapterWithDraftToMerge;
+    exports.invokeAdapterWithDraftToMergeAndMetadata = invokeAdapterWithDraftToMergeAndMetadata;
     exports.invokeAdapterWithDraftToReplace = invokeAdapterWithDraftToReplace;
     exports.invokeAdapterWithMetadata = invokeAdapterWithMetadata;
     exports.nimbusDraftQueue = nimbusDraftQueue;
@@ -139593,4 +139704,4 @@
     exports.subscribeToAdapter = subscribeToAdapter;
 
 }));
-// version: 1.462.0-50d9a13ba4
+// version: 1.464.0-e54c238397

package/dist/standalone/umd/types/executeAdapter.d.ts

@@ -57,6 +57,7 @@ export declare function subscribeToAdapter(adapterId: string, config: string, on
  * Will be removed in future, ideally 2 releases later.
  */
 export declare function invokeAdapterWithDraftToReplace(adapterId: string, config: string, draftIdToReplace: string, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
+export declare function invokeAdapterWithDraftToMergeAndMetadata(adapterId: string, config: string, targetDraftId: string, metadata: DraftQueueItemMetadata | undefined, onResponse: NativeOnResponse, nativeAdapterRequestContext?: NativeAdapterRequestContext): void;
 /**
  * Executes the specified adapter with the given @param adapterId and @param config. Then
  * it merges the draft with the given id with the draft generated by

package/dist/standalone/umd/types/main.d.ts

@@ -1,4 +1,4 @@
-import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter } from './executeAdapter';
+import { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter } from './executeAdapter';
 import { getImperativeAdapterNames } from './lightningAdapterApi';
 import { nimbusDraftQueue } from './nimbusDraftQueue';
 import { draftQueue, draftManager } from './draftQueueImplementation';
@@ -8,4 +8,4 @@ import { createPrimingSession } from './primingApi';
 import { evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction } from './cachePurging';
 import { importLuvioAdapterModule } from './customLuvioAdapter';
 import { importOneStoreAdapterModule } from './customOneStoreAdapter';
-export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };
+export { subscribeToAdapter, invokeAdapter, invokeAdapterWithMetadata, invokeAdapterWithDraftToReplace, invokeAdapterWithDraftToMerge, invokeAdapterWithDraftToMergeAndMetadata, executeAdapter, executeMutatingAdapter, nimbusDraftQueue, draftQueue, draftManager, setUiApiRecordTTL, setMetadataTTL, registerReportObserver, getImperativeAdapterNames, createPrimingSession, evictCacheRecordsByIds, evictExpiredCacheEntries, stopEviction, importLuvioAdapterModule, importOneStoreAdapterModule, };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-worker-api",
-    "version": "1.462.0",
+    "version": "1.464.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "",
     "main": "dist/standalone/es/lds-worker-api.js",
@@ -35,14 +35,14 @@
     },
     "devDependencies": {
         "@oat-sa/rollup-plugin-wildcard-external": "^1.0.0",
-        "@salesforce/lds-adapters-graphql": "^1.462.0",
-        "@salesforce/lds-adapters-uiapi": "^1.462.0",
-        "@salesforce/lds-default-luvio": "^1.462.0",
-        "@salesforce/lds-drafts": "^1.462.0",
-        "@salesforce/lds-graphql-parser": "^1.462.0",
-        "@salesforce/lds-luvio-engine": "^1.462.0",
-        "@salesforce/lds-runtime-mobile": "^1.462.0",
-        "@salesforce/nimbus-plugin-lds": "^1.462.0",
+        "@salesforce/lds-adapters-graphql": "^1.464.0",
+        "@salesforce/lds-adapters-uiapi": "^1.464.0",
+        "@salesforce/lds-default-luvio": "^1.464.0",
+        "@salesforce/lds-drafts": "^1.464.0",
+        "@salesforce/lds-graphql-parser": "^1.464.0",
+        "@salesforce/lds-luvio-engine": "^1.464.0",
+        "@salesforce/lds-runtime-mobile": "^1.464.0",
+        "@salesforce/nimbus-plugin-lds": "^1.464.0",
         "ajv": "^8.11.0",
         "glob": "^7.1.5",
         "nimbus-types": "^2.0.0-alpha1",
@@ -54,9 +54,9 @@
         {
             "path": "./dist/sfdc/es/ldsWorkerApi.js",
             "maxSize": {
-                "none": "55 kB",
-                "min": "23 kB",
-                "compressed": "9 kB"
+                "none": "58 kB",
+                "min": "24 kB",
+                "compressed": "10 kB"
             }
         }
     ],