@itwin/core-backend 5.2.0-dev.3 → 5.2.0-dev.30

package/lib/esm/BlobContainerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlobContainerService.js","sourceRoot":"","sources":["../../src/BlobContainerService.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAOH;;;GAGG;AACH,MAAM,KAAW,aAAa,CA2K7B;AA3KD,WAAiB,aAAa;AA2K9B,CAAC,EA3KgB,aAAa,KAAb,aAAa,QA2K7B","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module BlobContainers\n */\n\n// spell:ignore datacenter\n\nimport { AccessToken, GuidString, Id64String } from \"@itwin/core-bentley\";\nimport { SettingsContainer } from \"./workspace/Settings\";\n\n/**\n * Types and functions for creating, deleting and authorizing access to cloud-based blob containers for an iTwin.\n * @beta\n */\nexport namespace BlobContainer {\n\n  /** Object that implements the methods to create, delete, and request access to a container. */\n  export let service: BlobContainer.ContainerService | undefined;\n\n  /** name of cloud provider for a container. */\n  export type Provider = \"azure\" | \"google\";\n\n  /** the name of the container within its `Scope` */\n  export type ContainerId = string;\n\n  /** token that authenticates a user. This token is required to obtain a `ContainerToken`. */\n  export type UserToken = AccessToken;\n\n  /** token that authenticates access to a container for either read or write. */\n  export type ContainerToken = AccessToken;\n\n  /**\n   * The scope for a container. This determines:\n   *  - the \"owner\" organization, including the contract that governs its legal and commercial terms and obligations\n   *  - the administrators who may configure RBAC permissions\n   *  - the datacenter for the container. Every container resides in a datacenter as determined by the iTwinId. This\n   * determines the region for data residency requirements.\n   *  - the lifecycle constraints for the container. No container can outlive its iTwin or its iModel (if defined). That is,\n   * when the iTwin/iModel is deleted (either explicitly or due to contract expiration), the container is also deleted.\n   */\n  export interface Scope {\n    /** iTwinId of the owner of this container. */\n    iTwinId: Id64String;\n    /** optionally, an iModelId within the iTwin. If present, container is deleted when the iModel is deleted. */\n    iModelId?: Id64String;\n    /** the user GUID an individual, if this container is private. */\n    ownerGuid?: GuidString;\n  }\n\n  /**\n   * Metadata about the use of a container so that:\n   *  - administrators can understand why a container exists for assigning RBAC permissions appropriately\n   *  - usage reports can aggregate types of containers\n   *  - applications can identify their containers\n   *  - applications can store properties about their containers\n   */\n  export interface Metadata {\n    /** The machine-readable string that describes what the container is being used for (e.g. \"workspace\"). Always lowercase and singular. */\n    containerType: string;\n    /** Human-readable name for the container. This will be displayed in the administrator RBAC panel, and on usage reports. Not required to be unique.*/\n    label: string;\n    /** Optional human-readable explanation of the information held in the container. This will be displayed in the administrator RBAC panel, and on usage reports. */\n    description?: string;\n    /** optional properties for the container */\n    json?: SettingsContainer;\n  }\n\n  /**\n   * Properties returned by queryContainersMetadata\n   */\n  export interface MetadataResponse extends Metadata {\n    containerId: string;\n  }\n\n  /** Properties returned by `Service.requestToken` */\n  export interface TokenProps {\n    /**\n     * Expiring token that provides the requested access to the container. Should be used in all subsequent requests for blobs within the container,\n     * and must be refreshed before it expires\n     */\n    token: ContainerToken;\n    /** Scope of the container. */\n    scope: Scope;\n    /** Name of the blob storage provider. */\n    provider: Provider;\n    /** Time at which the token will expire. The token should be refreshed (that is, a new token should be requested) before this time. */\n    expiration: Date;\n    /** Metadata of the container. */\n    metadata: Metadata;\n    /** Base URI of the storage account that hosts the container */\n    baseUri: string;\n  }\n\n  /** The URI and Id of the container. */\n  export interface UriAndId {\n    baseUri: string;\n    containerId: ContainerId;\n  }\n\n  /** Information required to access an existing container. */\n  export interface AccessContainerProps extends UriAndId {\n    userToken: UserToken;\n  }\n\n  /** Information about a newly created container. */\n  export interface CreatedContainerProps extends UriAndId {\n    /** name of the blob storage provider. */\n    provider: Provider;\n  }\n\n  /**\n   * Access level to request for token.\n   * - `\"write\"`: request a writeable AccessToken.\n   * - `\"read\"`:  request a read-only AccessToken.\n   * - `\"admin\"`:  request a admin AccessToken.\n   * - `\"writeIfPossible\"`: first request a writeable AccessToken. If the user is not authorized for write, request a read-only AccessToken.\n   * If the user is not authorized for the level requested, an exception is thrown.\n   */\n  export type RequestAccessLevel = \"write\" | \"read\" | \"admin\" | \"writeIfPossible\";\n\n  /** Information required to request an access token for a container. */\n  export interface RequestTokenProps extends Omit<AccessContainerProps, \"baseUri\"> {\n    /** the level of access requested. If not specified, defaults to `\"writeIfPossible\"`. */\n    accessLevel?: RequestAccessLevel;\n    /** the number of seconds before the token should expire.\n     * @note A maximum duration is determined by the service. If no value is supplied, or the value is larger than the maximum, the maximum duration is used.\n     */\n    durationSeconds?: number;\n  }\n\n  /** Information required to create a new container. */\n  export interface CreateNewContainerProps {\n    /** the scope of the new container */\n    scope: Scope;\n    /** metadata to be stored on the new container */\n    metadata: Metadata;\n    /** The user's access token. The user must be authorized with \"create container\" RBAC role for the iTwin. */\n    userToken: UserToken;\n    /**\n     * the id for the container. Useful for tests.\n     * @internal\n     */\n    containerId?: ContainerId;\n  }\n\n  /**\n   * Query Parameters for querying containers\n   */\n  export interface QueryContainerProps {\n    /** the iTwinId of the containers to query */\n    iTwinId: GuidString;\n    /** optional iModelId of the containers to query */\n    iModelId?: GuidString;\n    /** optional containerType of the containers to query */\n    containerType?: GuidString;\n    /** optional label of the containers to query */\n    label?: GuidString;\n  }\n\n  /** Methods to create, delete, and access blob containers. */\n  export interface ContainerService {\n    /**  Create a new blob container. Throws on failure (e.g. access denied or container already exists.) */\n    create(props: CreateNewContainerProps): Promise<CreatedContainerProps>;\n\n    /**\n     * Delete an existing blob container.\n     * @note This method requires that the user be authorized with \"delete container\" RBAC role for the iTwin.\n     */\n    delete(container: AccessContainerProps): Promise<void>;\n\n    /** query the Scope for a container */\n    queryScope(container: AccessContainerProps): Promise<Scope>;\n\n    /** query the Metadata for a specific container */\n    queryMetadata(container: AccessContainerProps): Promise<Metadata>;\n\n    /** Returns all containers and their metadata associated with a given iTwinId. Can be further queried by label and containerType. */\n    queryContainersMetadata(userToken: UserToken, args: QueryContainerProps): Promise<MetadataResponse[]>;\n\n    /** update the json properties of this container */\n    updateJson(container: AccessContainerProps, json: SettingsContainer): Promise<void>;\n\n    /** Request a `ContainerToken` for a container. Throws on failure. */\n    requestToken(props: RequestTokenProps): Promise<TokenProps>;\n  }\n}\n"]}
+{"version":3,"file":"BlobContainerService.js","sourceRoot":"","sources":["../../src/BlobContainerService.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAOH;;;GAGG;AACH,MAAM,KAAW,aAAa,CA2K7B;AA3KD,WAAiB,aAAa;AA2K9B,CAAC,EA3KgB,aAAa,KAAb,aAAa,QA2K7B","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module BlobContainers\r\n */\r\n\r\n// spell:ignore datacenter\r\n\r\nimport { AccessToken, GuidString, Id64String } from \"@itwin/core-bentley\";\r\nimport { SettingsContainer } from \"./workspace/Settings\";\r\n\r\n/**\r\n * Types and functions for creating, deleting and authorizing access to cloud-based blob containers for an iTwin.\r\n * @beta\r\n */\r\nexport namespace BlobContainer {\r\n\r\n  /** Object that implements the methods to create, delete, and request access to a container. */\r\n  export let service: BlobContainer.ContainerService | undefined;\r\n\r\n  /** name of cloud provider for a container. */\r\n  export type Provider = \"azure\" | \"google\";\r\n\r\n  /** the name of the container within its `Scope` */\r\n  export type ContainerId = string;\r\n\r\n  /** token that authenticates a user. This token is required to obtain a `ContainerToken`. */\r\n  export type UserToken = AccessToken;\r\n\r\n  /** token that authenticates access to a container for either read or write. */\r\n  export type ContainerToken = AccessToken;\r\n\r\n  /**\r\n   * The scope for a container. This determines:\r\n   *  - the \"owner\" organization, including the contract that governs its legal and commercial terms and obligations\r\n   *  - the administrators who may configure RBAC permissions\r\n   *  - the datacenter for the container. Every container resides in a datacenter as determined by the iTwinId. This\r\n   * determines the region for data residency requirements.\r\n   *  - the lifecycle constraints for the container. No container can outlive its iTwin or its iModel (if defined). That is,\r\n   * when the iTwin/iModel is deleted (either explicitly or due to contract expiration), the container is also deleted.\r\n   */\r\n  export interface Scope {\r\n    /** iTwinId of the owner of this container. */\r\n    iTwinId: Id64String;\r\n    /** optionally, an iModelId within the iTwin. If present, container is deleted when the iModel is deleted. */\r\n    iModelId?: Id64String;\r\n    /** the user GUID an individual, if this container is private. */\r\n    ownerGuid?: GuidString;\r\n  }\r\n\r\n  /**\r\n   * Metadata about the use of a container so that:\r\n   *  - administrators can understand why a container exists for assigning RBAC permissions appropriately\r\n   *  - usage reports can aggregate types of containers\r\n   *  - applications can identify their containers\r\n   *  - applications can store properties about their containers\r\n   */\r\n  export interface Metadata {\r\n    /** The machine-readable string that describes what the container is being used for (e.g. \"workspace\"). Always lowercase and singular. */\r\n    containerType: string;\r\n    /** Human-readable name for the container. This will be displayed in the administrator RBAC panel, and on usage reports. Not required to be unique.*/\r\n    label: string;\r\n    /** Optional human-readable explanation of the information held in the container. This will be displayed in the administrator RBAC panel, and on usage reports. */\r\n    description?: string;\r\n    /** optional properties for the container */\r\n    json?: SettingsContainer;\r\n  }\r\n\r\n  /**\r\n   * Properties returned by queryContainersMetadata\r\n   */\r\n  export interface MetadataResponse extends Metadata {\r\n    containerId: string;\r\n  }\r\n\r\n  /** Properties returned by `Service.requestToken` */\r\n  export interface TokenProps {\r\n    /**\r\n     * Expiring token that provides the requested access to the container. Should be used in all subsequent requests for blobs within the container,\r\n     * and must be refreshed before it expires\r\n     */\r\n    token: ContainerToken;\r\n    /** Scope of the container. */\r\n    scope: Scope;\r\n    /** Name of the blob storage provider. */\r\n    provider: Provider;\r\n    /** Time at which the token will expire. The token should be refreshed (that is, a new token should be requested) before this time. */\r\n    expiration: Date;\r\n    /** Metadata of the container. */\r\n    metadata: Metadata;\r\n    /** Base URI of the storage account that hosts the container */\r\n    baseUri: string;\r\n  }\r\n\r\n  /** The URI and Id of the container. */\r\n  export interface UriAndId {\r\n    baseUri: string;\r\n    containerId: ContainerId;\r\n  }\r\n\r\n  /** Information required to access an existing container. */\r\n  export interface AccessContainerProps extends UriAndId {\r\n    userToken: UserToken;\r\n  }\r\n\r\n  /** Information about a newly created container. */\r\n  export interface CreatedContainerProps extends UriAndId {\r\n    /** name of the blob storage provider. */\r\n    provider: Provider;\r\n  }\r\n\r\n  /**\r\n   * Access level to request for token.\r\n   * - `\"write\"`: request a writeable AccessToken.\r\n   * - `\"read\"`:  request a read-only AccessToken.\r\n   * - `\"admin\"`:  request a admin AccessToken.\r\n   * - `\"writeIfPossible\"`: first request a writeable AccessToken. If the user is not authorized for write, request a read-only AccessToken.\r\n   * If the user is not authorized for the level requested, an exception is thrown.\r\n   */\r\n  export type RequestAccessLevel = \"write\" | \"read\" | \"admin\" | \"writeIfPossible\";\r\n\r\n  /** Information required to request an access token for a container. */\r\n  export interface RequestTokenProps extends Omit<AccessContainerProps, \"baseUri\"> {\r\n    /** the level of access requested. If not specified, defaults to `\"writeIfPossible\"`. */\r\n    accessLevel?: RequestAccessLevel;\r\n    /** the number of seconds before the token should expire.\r\n     * @note A maximum duration is determined by the service. If no value is supplied, or the value is larger than the maximum, the maximum duration is used.\r\n     */\r\n    durationSeconds?: number;\r\n  }\r\n\r\n  /** Information required to create a new container. */\r\n  export interface CreateNewContainerProps {\r\n    /** the scope of the new container */\r\n    scope: Scope;\r\n    /** metadata to be stored on the new container */\r\n    metadata: Metadata;\r\n    /** The user's access token. The user must be authorized with \"create container\" RBAC role for the iTwin. */\r\n    userToken: UserToken;\r\n    /**\r\n     * the id for the container. Useful for tests.\r\n     * @internal\r\n     */\r\n    containerId?: ContainerId;\r\n  }\r\n\r\n  /**\r\n   * Query Parameters for querying containers\r\n   */\r\n  export interface QueryContainerProps {\r\n    /** the iTwinId of the containers to query */\r\n    iTwinId: GuidString;\r\n    /** optional iModelId of the containers to query */\r\n    iModelId?: GuidString;\r\n    /** optional containerType of the containers to query */\r\n    containerType?: GuidString;\r\n    /** optional label of the containers to query */\r\n    label?: GuidString;\r\n  }\r\n\r\n  /** Methods to create, delete, and access blob containers. */\r\n  export interface ContainerService {\r\n    /**  Create a new blob container. Throws on failure (e.g. access denied or container already exists.) */\r\n    create(props: CreateNewContainerProps): Promise<CreatedContainerProps>;\r\n\r\n    /**\r\n     * Delete an existing blob container.\r\n     * @note This method requires that the user be authorized with \"delete container\" RBAC role for the iTwin.\r\n     */\r\n    delete(container: AccessContainerProps): Promise<void>;\r\n\r\n    /** query the Scope for a container */\r\n    queryScope(container: AccessContainerProps): Promise<Scope>;\r\n\r\n    /** query the Metadata for a specific container */\r\n    queryMetadata(container: AccessContainerProps): Promise<Metadata>;\r\n\r\n    /** Returns all containers and their metadata associated with a given iTwinId. Can be further queried by label and containerType. */\r\n    queryContainersMetadata(userToken: UserToken, args: QueryContainerProps): Promise<MetadataResponse[]>;\r\n\r\n    /** update the json properties of this container */\r\n    updateJson(container: AccessContainerProps, json: SettingsContainer): Promise<void>;\r\n\r\n    /** Request a `ContainerToken` for a container. Throws on failure. */\r\n    requestToken(props: RequestTokenProps): Promise<TokenProps>;\r\n  }\r\n}\r\n"]}

package/lib/esm/BriefcaseManager.d.ts

@@ -6,6 +6,7 @@ import { BriefcaseId, BriefcaseProps, ChangesetFileProps, ChangesetIndex, Change
 import { AcquireNewBriefcaseIdArg, DownloadChangesetArg, DownloadChangesetRangeArg, IModelNameArg } from "./BackendHubAccess";
 import { ProgressFunction } from "./CheckpointManager";
 import { BriefcaseDb, IModelDb, TokenArg } from "./IModelDb";
+import { StashProps } from "./StashManager";
 /** The argument for [[BriefcaseManager.downloadBriefcase]]
  * @public
 */
@@ -33,7 +34,8 @@ export interface PushChangesArgs extends TokenArg {
     /** The delay to wait between retry attempts on failed pushes. Default is 3 seconds. */
     pushRetryDelay?: BeDuration;
     /**
-     *  For testing purpose
+     *  (unused)
+     * @deprecated Not used by BriefcaseManager. Caller should remove this flag.
      * @internal
      */
     noFastForward?: true;
@@ -55,7 +57,8 @@ export type PullChangesArgs = ToChangesetArgs & {
      */
     onProgress?: ProgressFunction;
     /**
-     *  For testing purpose
+     *  (unused)
+     * @deprecated Not used by BriefcaseManager. Caller should remove this flag.
      * @internal
      */
     noFastForward?: true;
@@ -77,6 +80,8 @@ export type RevertChangesArgs = Optional<PushChangesArgs, "description"> & {
  * @public
  */
 export declare class BriefcaseManager {
+    /** @internal */
+    static readonly PULL_MERGE_RESTORE_POINT_NAME = "$pull_merge_restore_point";
     /** Get the local path of the folder storing files that are associated with an imodel */
     static getIModelPath(iModelId: GuidString): LocalDirName;
     /** @internal */
@@ -209,8 +214,57 @@ export declare class BriefcaseManager {
     private static applySingleChangeset;
     /** @internal */
     static revertTimelineChanges(db: IModelDb, arg: RevertChangesArgs): Promise<void>;
-    /** @internal */
+    /**
+     * @internal
+     * Pulls and applies changesets from the iModelHub to the specified IModelDb instance.
+     *
+     * This method downloads and applies all changesets required to bring the local briefcase up to the specified changeset index.
+     * It supports both forward and reverse application of changesets, depending on the `toIndex` argument.
+     * If there are pending local transactions and a reverse operation is requested, an error is thrown.
+     * The method manages restore points for safe merging, handles local transaction reversal, applies each changeset in order,
+     * and resumes or rebases local changes as appropriate for the type of database.
+     *
+     * @param db The IModelDb instance to which changesets will be applied. Must be open and writable.
+     * @param arg The arguments for pulling changesets, including access token, target changeset index, and optional progress callback.
+     * @throws IModelError If the briefcase is not open in read-write mode, if there are pending transactions when reversing, or if applying a changeset fails.
+     * @returns A promise that resolves when all required changesets have been applied.
+     */
     static pullAndApplyChangesets(db: IModelDb, arg: PullChangesArgs): Promise<void>;
+    /**
+     * @internal
+     * Creates a restore point for the specified briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance for which to create the restore point.
+     * @param name - The unique name for the restore point. Must be a non-empty string.
+     * @returns A promise that resolves to the created stash object representing the restore point.
+     */
+    static createRestorePoint(db: BriefcaseDb, name: string): Promise<StashProps>;
+    /**
+     * @internal
+     * Drops a previously created restore point from the specified briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance from which to drop the restore point.
+     * @param name - The name of the restore point to be dropped. Must be a non-empty string.
+     */
+    static dropRestorePoint(db: BriefcaseDb, name: string): void;
+    /**
+     * @internal
+     * Checks if a restore point with the specified name exists in the given briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance to search within.
+     * @param name - The name of the restore point to check for existence.
+     * @returns `true` if the restore point exists and its stash is present; otherwise, `false`.
+     */
+    static containsRestorePoint(db: BriefcaseDb, name: string): boolean;
+    private static makeRestorePointKey;
+    /**
+     * @internal
+     * Restores the state of a briefcase database to a previously saved restore point.
+     *
+     * @param db - The {@link BriefcaseDb} instance to restore.
+     * @param name - The name of the restore point to apply.
+     */
+    static restorePoint(db: BriefcaseDb, name: string): Promise<void>;
     /** create a changeset from the current changes, and push it to iModelHub */
     private static pushChanges;
     /** Pull/merge (if necessary), then push all local changes as a changeset. Called by [[BriefcaseDb.pushChanges]]

package/lib/esm/BriefcaseManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BriefcaseManager.d.ts","sourceRoot":"","sources":["../../src/BriefcaseManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BriefcaseManager.d.ts","sourceRoot":"","sources":["../../src/BriefcaseManager.ts"],"names":[],"mappings":"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"}

package/lib/esm/BriefcaseManager.js

@@ -11,17 +11,20 @@ import { BeDuration, ChangeSetStatus, DbResult, IModelHubStatus, IModelStatus, L
 import { BriefcaseIdValue, ChangesetType, IModelError, IModelVersion, } from "@itwin/core-common";
 import { BackendLoggerCategory } from "./BackendLoggerCategory";
 import { CheckpointManager } from "./CheckpointManager";
-import { IModelDb } from "./IModelDb";
+import { BriefcaseDb, IModelDb } from "./IModelDb";
 import { IModelHost } from "./IModelHost";
 import { IModelJsFs } from "./IModelJsFs";
 import { SchemaSync } from "./SchemaSync";
 import { _hubAccess, _nativeDb, _releaseAllLocks } from "./internal/Symbols";
 import { IModelNative } from "./internal/NativePlatform";
+import { StashManager } from "./StashManager";
 const loggerCategory = BackendLoggerCategory.IModelDb;
 /** Manages downloading Briefcases and downloading and uploading changesets.
  * @public
  */
 export class BriefcaseManager {
+    /** @internal */
+    static PULL_MERGE_RESTORE_POINT_NAME = "$pull_merge_restore_point";
     /** Get the local path of the folder storing files that are associated with an imodel */
     static getIModelPath(iModelId) { return path.join(this._cacheDir, iModelId); }
     /** @internal */
@@ -238,7 +241,7 @@ export class BriefcaseManager {
                 IModelJsFs.unlinkSync(filePath);
         }
         catch (err) {
-            throw new IModelError(IModelStatus.BadRequest, `cannot delete briefcase file ${err}`);
+            throw new IModelError(IModelStatus.BadRequest, `cannot delete briefcase file ${String(err)}`);
         }
         // next, delete all files that start with the briefcase's filePath (e.g. "a.bim-locks", "a.bim-journal", etc.)
         try {
@@ -261,7 +264,7 @@ export class BriefcaseManager {
             IModelJsFs.unlinkSync(pathname);
         }
         catch (error) {
-            Logger.logError(loggerCategory, `Cannot delete file ${pathname}, ${error}`);
+            Logger.logError(loggerCategory, `Cannot delete file ${pathname}, ${String(error)}`);
             return false;
         }
         return true;
@@ -397,15 +400,30 @@ export class BriefcaseManager {
         });
         db.notifyChangesetApplied();
     }
-    /** @internal */
+    /**
+     * @internal
+     * Pulls and applies changesets from the iModelHub to the specified IModelDb instance.
+     *
+     * This method downloads and applies all changesets required to bring the local briefcase up to the specified changeset index.
+     * It supports both forward and reverse application of changesets, depending on the `toIndex` argument.
+     * If there are pending local transactions and a reverse operation is requested, an error is thrown.
+     * The method manages restore points for safe merging, handles local transaction reversal, applies each changeset in order,
+     * and resumes or rebases local changes as appropriate for the type of database.
+     *
+     * @param db The IModelDb instance to which changesets will be applied. Must be open and writable.
+     * @param arg The arguments for pulling changesets, including access token, target changeset index, and optional progress callback.
+     * @throws IModelError If the briefcase is not open in read-write mode, if there are pending transactions when reversing, or if applying a changeset fails.
+     * @returns A promise that resolves when all required changesets have been applied.
+     */
     static async pullAndApplyChangesets(db, arg) {
-        if (!db.isOpen || db[_nativeDb].isReadonly()) // don't use db.isReadonly - we reopen the file writable just for this operation but db.isReadonly is still true
+        const nativeDb = db[_nativeDb];
+        if (!db.isOpen || nativeDb.isReadonly()) // don't use db.isReadonly - we reopen the file writable just for this operation but db.isReadonly is still true
             throw new IModelError(ChangeSetStatus.ApplyError, "Briefcase must be open ReadWrite to process change sets");
         let currentIndex = db.changeset.index;
         if (currentIndex === undefined)
             currentIndex = (await IModelHost[_hubAccess].queryChangeset({ accessToken: arg.accessToken, iModelId: db.iModelId, changeset: { id: db.changeset.id } })).index;
         const reverse = (arg.toIndex && arg.toIndex < currentIndex) ? true : false;
-        if (db[_nativeDb].hasPendingTxns() && reverse) {
+        if (nativeDb.hasPendingTxns() && reverse) {
             throw new IModelError(ChangeSetStatus.ApplyError, "Cannot reverse changesets when there are pending changes");
         }
         // Download change sets
@@ -420,53 +438,139 @@ export class BriefcaseManager {
             return; // nothing to apply
         if (reverse)
             changesets.reverse();
-        let appliedChangesets = -1;
-        if (db[_nativeDb].hasPendingTxns() && !reverse && !arg.noFastForward) {
-            // attempt to perform fast forward
-            for (const changeset of changesets) {
-                // do not waste time on schema changesets. They cannot be fastforwarded.
-                if (changeset.changesType === ChangesetType.Schema || changeset.changesType === ChangesetType.SchemaSync)
-                    break;
-                try {
-                    const stopwatch = new StopWatch(`[${changeset.id}]`, true);
-                    Logger.logInfo(loggerCategory, `Starting application of changeset with id ${stopwatch.description} using fast forward method`);
-                    await this.applySingleChangeset(db, changeset, true);
-                    Logger.logInfo(loggerCategory, `Applied changeset with id ${stopwatch.description} (${stopwatch.elapsedSeconds} seconds)`);
-                    appliedChangesets++;
-                    db.saveChanges();
-                }
-                catch {
-                    db.abandonChanges();
-                    break;
+        const briefcaseDb = db instanceof BriefcaseDb ? db : undefined;
+        // create restore point if certain conditions are met
+        if (briefcaseDb && briefcaseDb.txns.hasPendingTxns && !briefcaseDb.txns.hasPendingSchemaChanges && !reverse && !IModelHost.configuration?.disableRestorePointOnPullMerge) {
+            Logger.logInfo(loggerCategory, `Creating restore point ${this.PULL_MERGE_RESTORE_POINT_NAME}`);
+            await this.createRestorePoint(briefcaseDb, this.PULL_MERGE_RESTORE_POINT_NAME);
+        }
+        if (!reverse) {
+            const reversedTxns = nativeDb.pullMergeReverseLocalChanges();
+            Logger.logInfo(loggerCategory, `Reversed ${reversedTxns.length} local changes`);
+        }
+        // apply incoming changes
+        for (const changeset of changesets) {
+            const stopwatch = new StopWatch(`[${changeset.id}]`, true);
+            Logger.logInfo(loggerCategory, `Starting application of changeset with id ${stopwatch.description}`);
+            try {
+                await this.applySingleChangeset(db, changeset, false);
+                Logger.logInfo(loggerCategory, `Applied changeset with id ${stopwatch.description} (${stopwatch.elapsedSeconds} seconds)`);
+            }
+            catch (err) {
+                if (err instanceof Error) {
+                    Logger.logError(loggerCategory, `Error applying changeset with id ${stopwatch.description}: ${err.message}`);
                 }
+                db.abandonChanges();
+                throw err;
             }
         }
-        if (appliedChangesets < changesets.length - 1) {
-            db[_nativeDb].pullMergeBegin();
-            for (const changeset of changesets.filter((_, index) => index > appliedChangesets)) {
-                const stopwatch = new StopWatch(`[${changeset.id}]`, true);
-                Logger.logInfo(loggerCategory, `Starting application of changeset with id ${stopwatch.description}`);
-                try {
-                    await this.applySingleChangeset(db, changeset, false);
-                    Logger.logInfo(loggerCategory, `Applied changeset with id ${stopwatch.description} (${stopwatch.elapsedSeconds} seconds)`);
+        if (!reverse) {
+            if (briefcaseDb) {
+                await briefcaseDb.txns.rebaser.resume();
+            }
+            else {
+                // Only Briefcase has change management. Following is
+                // for test related to standalone db with txn enabled.
+                nativeDb.pullMergeRebaseBegin();
+                let txnId = nativeDb.pullMergeRebaseNext();
+                while (txnId) {
+                    nativeDb.pullMergeRebaseReinstateTxn();
+                    nativeDb.pullMergeRebaseUpdateTxn();
+                    txnId = nativeDb.pullMergeRebaseNext();
                 }
-                catch (err) {
-                    if (err instanceof Error) {
-                        Logger.logError(loggerCategory, `Error applying changeset with id ${stopwatch.description}: ${err.message}`);
-                    }
-                    db.abandonChanges();
-                    db[_nativeDb].pullMergeEnd();
-                    throw err;
+                nativeDb.pullMergeRebaseEnd();
+                if (!nativeDb.isReadonly) {
+                    nativeDb.saveChanges("Merge.");
                 }
             }
-            db[_nativeDb].pullMergeEnd();
-            if (!db.isReadonly) {
-                db.saveChanges("Merge.");
+            if (briefcaseDb && this.containsRestorePoint(briefcaseDb, this.PULL_MERGE_RESTORE_POINT_NAME)) {
+                Logger.logInfo(loggerCategory, `Dropping restore point ${this.PULL_MERGE_RESTORE_POINT_NAME}`);
+                this.dropRestorePoint(briefcaseDb, this.PULL_MERGE_RESTORE_POINT_NAME);
             }
         }
         // notify listeners
         db.notifyChangesetApplied();
     }
+    /**
+     * @internal
+     * Creates a restore point for the specified briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance for which to create the restore point.
+     * @param name - The unique name for the restore point. Must be a non-empty string.
+     * @returns A promise that resolves to the created stash object representing the restore point.
+     */
+    static async createRestorePoint(db, name) {
+        Logger.logTrace(loggerCategory, `Creating restore point ${name}`);
+        this.dropRestorePoint(db, name);
+        const stash = await StashManager.stash({ db, description: this.makeRestorePointKey(name) });
+        db[_nativeDb].saveLocalValue(this.makeRestorePointKey(name), stash.id);
+        db.saveChanges("Create restore point");
+        Logger.logTrace(loggerCategory, `Created restore point ${name}`, () => stash);
+        return stash;
+    }
+    /**
+     * @internal
+     * Drops a previously created restore point from the specified briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance from which to drop the restore point.
+     * @param name - The name of the restore point to be dropped. Must be a non-empty string.
+     */
+    static dropRestorePoint(db, name) {
+        Logger.logTrace(loggerCategory, `Dropping restore point ${name}`);
+        const restorePointId = db[_nativeDb].queryLocalValue(this.makeRestorePointKey(name));
+        if (restorePointId) {
+            StashManager.dropStash({ db, stash: restorePointId });
+            db[_nativeDb].deleteLocalValue(this.makeRestorePointKey(name));
+            db.saveChanges("Drop restore point");
+            Logger.logTrace(loggerCategory, `Dropped restore point ${name}`);
+        }
+    }
+    /**
+     * @internal
+     * Checks if a restore point with the specified name exists in the given briefcase database.
+     *
+     * @param db - The {@link BriefcaseDb} instance to search within.
+     * @param name - The name of the restore point to check for existence.
+     * @returns `true` if the restore point exists and its stash is present; otherwise, `false`.
+     */
+    static containsRestorePoint(db, name) {
+        Logger.logTrace(loggerCategory, `Checking if restore point ${name} exists`);
+        const key = this.makeRestorePointKey(name);
+        const restorePointId = db[_nativeDb].queryLocalValue(key);
+        if (!restorePointId) {
+            return false;
+        }
+        const stash = StashManager.tryGetStash({ db, stash: restorePointId });
+        if (!stash) {
+            Logger.logTrace(loggerCategory, `Restore point ${name} does not exist. Deleting ${key}`);
+            db[_nativeDb].deleteLocalValue(key);
+            return false;
+        }
+        return true;
+    }
+    static makeRestorePointKey(name) {
+        if (name.length === 0) {
+            throw new Error("Invalid restore point name");
+        }
+        return `restore_point/${name}`;
+    }
+    /**
+     * @internal
+     * Restores the state of a briefcase database to a previously saved restore point.
+     *
+     * @param db - The {@link BriefcaseDb} instance to restore.
+     * @param name - The name of the restore point to apply.
+     */
+    static async restorePoint(db, name) {
+        Logger.logTrace(loggerCategory, `Restoring to restore point ${name}`);
+        const restorePointId = db[_nativeDb].queryLocalValue(this.makeRestorePointKey(name));
+        if (!restorePointId) {
+            throw new Error(`Restore point not found: ${name}`);
+        }
+        await StashManager.restore({ db, stash: restorePointId });
+        Logger.logTrace(loggerCategory, `Restored to restore point ${name}`);
+        this.dropRestorePoint(db, name);
+    }
     /** create a changeset from the current changes, and push it to iModelHub */
     static async pushChanges(db, arg) {
         const changesetProps = db[_nativeDb].startCreateChangeset();
@@ -523,7 +627,11 @@ export class BriefcaseManager {
                 await BriefcaseManager.pullAndApplyChangesets(db, arg);
                 if (!db.skipSyncSchemasOnPullAndPush)
                     await SchemaSync.pull(db);
-                return await BriefcaseManager.pushChanges(db, arg);
+                // pullAndApply rebase changes and might remove redundant changes in local briefcase
+                // this mean hasPendingTxns was true before but now after pullAndApply it might be false
+                if (!db[_nativeDb].hasPendingTxns())
+                    return;
+                await BriefcaseManager.pushChanges(db, arg);
             }
             catch (err) {
                 if (retryCount-- <= 0 || err.errorNumber !== IModelHubStatus.PullIsRequired)