@onekeyfe/hd-core 1.2.2-alpha.0 → 1.2.2-alpha.100

package/dist/index.js

@@ -27476,9 +27476,6 @@ var nested = {
 			MessageType_DeviceCertificateSignature: 60423,
 			MessageType_DeviceCertificateSign: 60424,
 			MessageType_DeviceMiscUsbMscControl: 60440,
-			MessageType_DeviceFindMyTokenState: 60450,
-			MessageType_DeviceFindMyTokenUpdate: 60451,
-			MessageType_DeviceFindMyTokenStateGet: 60452,
 			MessageType_DeviceInfoGet: 60600,
 			MessageType_DeviceInfo: 60601,
 			MessageType_DeviceStatusGet: 60602,
@@ -32455,10 +32452,6 @@ var nested = {
 			request_id: {
 				type: "bytes",
 				id: 5
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 6
 			}
 		}
 	},
@@ -32594,14 +32587,6 @@ var nested = {
 			tx_type: {
 				type: "uint32",
 				id: 10
-			},
-			expected_address: {
-				type: "bytes",
-				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -32682,14 +32667,6 @@ var nested = {
 				rule: "repeated",
 				type: "EthereumAccessListOneKey",
 				id: 11
-			},
-			expected_address: {
-				type: "bytes",
-				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -32866,10 +32843,6 @@ var nested = {
 			chain_id: {
 				type: "uint64",
 				id: 3
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 4
 			}
 		}
 	},
@@ -36572,10 +36545,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -36620,10 +36589,6 @@ var nested = {
 			application_domain: {
 				type: "bytes",
 				id: 5
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 6
 			}
 		}
 	},
@@ -36641,10 +36606,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -38880,28 +38841,6 @@ var nested = {
 			}
 		}
 	},
-	DeviceFindMyTokenUpdate: {
-		fields: {
-			token: {
-				rule: "required",
-				type: "bytes",
-				id: 1
-			}
-		}
-	},
-	DeviceFindMyTokenStateGet: {
-		fields: {
-		}
-	},
-	DeviceFindMyTokenState: {
-		fields: {
-			burned: {
-				rule: "required",
-				type: "bool",
-				id: 1
-			}
-		}
-	},
 	DeviceFactoryAck: {
 		values: {
 			FACTORY_ACK_SUCCESS: 0,
@@ -39032,13 +38971,6 @@ var nested = {
 			FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS: 10
 		}
 	},
-	DeviceFirmwareUpdatePhase: {
-		values: {
-			FW_MGMT_UPDATER_PHASE_PREPARE: 0,
-			FW_MGMT_UPDATER_PHASE_INSTALL: 1,
-			FW_MGMT_UPDATER_PHASE_VERIFY: 2
-		}
-	},
 	DeviceFirmwareTarget: {
 		fields: {
 			target_id: {
@@ -39064,24 +38996,6 @@ var nested = {
 	},
 	DeviceFirmwareUpdateRequest: {
 		fields: {
-			reboot_after_update: {
-				type: "bool",
-				id: 1
-			}
-		}
-	},
-	DeviceFirmwareUpdatePhaseInfo: {
-		fields: {
-			phase: {
-				rule: "required",
-				type: "DeviceFirmwareUpdatePhase",
-				id: 1
-			},
-			progress_percent: {
-				rule: "required",
-				type: "uint32",
-				id: 2
-			}
 		}
 	},
 	DeviceFirmwareUpdateRecord: {
@@ -39095,14 +39009,6 @@ var nested = {
 				type: "DeviceFirmwareUpdateTaskStatus",
 				id: 10
 			},
-			progress_percent: {
-				type: "uint32",
-				id: 11
-			},
-			phase_info: {
-				type: "DeviceFirmwareUpdatePhaseInfo",
-				id: 12
-			},
 			payload_version: {
 				type: "uint32",
 				id: 20
@@ -39119,14 +39025,6 @@ var nested = {
 				type: "bool",
 				id: 10
 			},
-			progress_percent: {
-				type: "bool",
-				id: 11
-			},
-			phase_info: {
-				type: "bool",
-				id: 12
-			},
 			payload_version: {
 				type: "bool",
 				id: 20
@@ -39898,10 +39796,6 @@ var nested = {
 			text_id: {
 				type: "uint32",
 				id: 3
-			},
-			text_arg: {
-				type: "string",
-				id: 4
 			}
 		}
 	},
@@ -39969,10 +39863,6 @@ var nested = {
 			title_id: {
 				type: "uint32",
 				id: 8
-			},
-			title_arg: {
-				type: "string",
-				id: 9
 			}
 		}
 	},
@@ -40826,12 +40716,7 @@ function isProtocolV2ResourceArchiveEntryName(entryName) {
     const fileName = (_a = parts[parts.length - 1]) !== null && _a !== void 0 ? _a : '';
     return (fileName.length > 0 &&
         !fileName.startsWith('.') &&
-        !parts.some(part => !part ||
-            part === '.' ||
-            part === '..' ||
-            part === '.DS_Store' ||
-            part.startsWith('._') ||
-            part.toUpperCase() === '__MACOSX'));
+        !parts.some(part => part === '__MACOSX' || part === '.' || part === '..' || part === ''));
 }
 function isSafeResourceDevicePath(path) {
     return !(path.includes('\\') ||
@@ -41689,12 +41574,11 @@ const buildDeviceSessionGetRequest = ({ sessionId, expectedPassphraseState, deri
             hdTransport.DeviceSessionSeedDomain.SeedDomain_Standard,
             ...(deriveCardano ? [hdTransport.DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
         ] }));
-const askDevicePassphrase = (device, requestPayload, onStatusRefreshed) => __awaiter(void 0, void 0, void 0, function* () {
+const askDevicePassphrase = (device, requestPayload) => __awaiter(void 0, void 0, void 0, function* () {
     yield device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
     yield refreshProtocolV2DeviceStatus(device);
-    onStatusRefreshed === null || onStatusRefreshed === void 0 ? void 0 : onStatusRefreshed();
 });
-const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onStatusRefreshed) => __awaiter(void 0, void 0, void 0, function* () {
+const selectDeviceSession = (device, expectedPassphraseState, deriveCardano) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
     const existsAttachPinUser = ((_a = device.features) === null || _a === void 0 ? void 0 : _a.attachToPinEnabled) === true;
     const metadata = Object.assign({ source: 'wallet-session-coordinator', reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet' }, (expectedPassphraseState ? { expectedPassphraseState } : {}));
@@ -41727,19 +41611,18 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onS
             emitUiEvent: false,
             interaction: attachPinInteraction,
         });
-        onStatusRefreshed === null || onStatusRefreshed === void 0 ? void 0 : onStatusRefreshed();
         return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     if (hasHostPassphrase) {
         yield askDevicePassphrase(device, {
             passphrase: hostPassphrase,
             on_device: false,
-        }, onStatusRefreshed);
+        });
         return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     const passphraseOnDeviceInteraction = (_d = device.createProtocolV2UiPhaseMetadata) === null || _d === void 0 ? void 0 : _d.call(device, 'passphrase-on-device', 'start');
     device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, Object.assign(Object.assign({}, metadata), (passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {})));
-    yield askDevicePassphrase(device, { on_device: true }, onStatusRefreshed);
+    yield askDevicePassphrase(device, { on_device: true });
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 });
 function getProtocolV2WalletSession(device, options) {
@@ -41773,15 +41656,9 @@ function getProtocolV2WalletSession(device, options) {
             : undefined;
         let response;
         let resumed = false;
-        let walletStatusRefreshed = false;
-        const markWalletStatusRefreshed = () => {
-            walletStatusRefreshed = true;
-        };
-        let mainPinAuthenticated = (options === null || options === void 0 ? void 0 : options.mainPinSelected) === true ||
-            ((options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
-                ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
-                ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false);
-        let standardWalletSelected = (options === null || options === void 0 ? void 0 : options.mainPinSelected) === true;
+        let mainPinSelected = (options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
+            ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
+            ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false;
         const clearCurrentWalletSession = () => {
             var _a;
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -41794,7 +41671,6 @@ function getProtocolV2WalletSession(device, options) {
         const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
             var _k;
             const features = yield refreshProtocolV2DeviceStatus(device);
-            markWalletStatusRefreshed();
             if (features.unlockedAttachPin !== true) {
                 return;
             }
@@ -41816,35 +41692,28 @@ function getProtocolV2WalletSession(device, options) {
             yield rejectMismatchedAttachPinWallet();
         }
         const selectMainPin = (force = false) => __awaiter(this, void 0, void 0, function* () {
-            if (force || !mainPinAuthenticated) {
+            if (force || !mainPinSelected) {
                 yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
                     source: 'wallet-session-coordinator',
                     reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
                     deviceOnly: true,
                 });
-                markWalletStatusRefreshed();
-                mainPinAuthenticated = true;
-                standardWalletSelected = true;
+                mainPinSelected = true;
             }
         });
         const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
             var _m;
+            yield selectMainPin();
             if (((_m = device.features) === null || _m === void 0 ? void 0 : _m.passphraseProtection) === true) {
-                yield selectMainPin();
                 yield askDevicePassphrase(device, {
                     passphrase: '',
                     on_device: false,
-                }, markWalletStatusRefreshed);
-                standardWalletSelected = true;
-            }
-            else if (!standardWalletSelected) {
-                yield selectMainPin(true);
+                });
             }
         });
         if (readCurrentAttachPinSession) {
             const status = yield requestProtocolV2DeviceStatus$1(device);
             device.updateProtocolV2Status(status);
-            markWalletStatusRefreshed();
             if (status.unlocked !== true ||
                 status.passphrase_enabled !== true ||
                 status.unlocked_by_attach_to_pin !== true) {
@@ -41915,7 +41784,7 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
-            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
+            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
         }
         let { message } = response;
         try {
@@ -41944,7 +41813,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             else {
                 device.clearInternalState();
-                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
+                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
             }
             message = response.message;
             try {
@@ -41982,7 +41851,7 @@ function getProtocolV2WalletSession(device, options) {
         if (readCurrentAttachPinSession) {
             unlockedAttachPin = true;
         }
-        else if (mainPinAuthenticated) {
+        else if (mainPinSelected) {
             unlockedAttachPin = false;
         }
         return {
@@ -41990,7 +41859,6 @@ function getProtocolV2WalletSession(device, options) {
             newSession: message.session_id,
             unlockedAttachPin,
             resumed,
-            walletStatusRefreshed,
         };
     });
 }
@@ -42058,7 +41926,6 @@ const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(v
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
             deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
             rejectAttachPinForMainWallet: options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet,
-            mainPinSelected: options === null || options === void 0 ? void 0 : options.mainPinSelected,
         });
     }
     const { features } = device;
@@ -42104,7 +41971,6 @@ const getPassphraseState = (device, options) => __awaiter(void 0, void 0, void 0
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
             deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
             rejectAttachPinForMainWallet: options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet,
-            mainPinSelected: options === null || options === void 0 ? void 0 : options.mainPinSelected,
         });
     }
     const supportAttachPinCapability = existCapability(features, hdTransport.Enum_Capability.Capability_AttachToPin);
@@ -42623,7 +42489,7 @@ function invalidParameter$2(message) {
 function asBytes(rgba) {
     return rgba instanceof Uint8Array ? rgba : new Uint8Array(rgba);
 }
-function align$1(value, boundary) {
+function align(value, boundary) {
     return Math.ceil(value / boundary) * boundary;
 }
 function encodePro2Image(options) {
@@ -42651,7 +42517,7 @@ function encodePro2Image(options) {
         }
     }
     const colorFormat = hasTransparency ? 'RGB565A8' : 'RGB565';
-    const stride = align$1(width * 2, 4);
+    const stride = align(width * 2, 4);
     const alphaStride = stride / 2;
     const rgbSize = stride * height;
     const alphaSize = hasTransparency ? alphaStride * height : 0;
@@ -46589,7 +46455,7 @@ class Device extends events.exports {
             return Promise.resolve(features);
         });
     }
-    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck, deriveCardano, mainPinSelected) {
+    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck, deriveCardano) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isUnacquired())
                 return false;
@@ -46599,7 +46465,6 @@ class Device extends events.exports {
                 onlyMainPin: useEmptyPassphrase,
                 deriveCardano,
                 rejectAttachPinForMainWallet: useEmptyPassphrase === true,
-                mainPinSelected,
             });
             const mainWalletUseAttachPin = unlockedAttachPin && useEmptyPassphrase;
             const useErrorAttachPin = unlockedAttachPin &&
@@ -47424,10 +47289,6 @@ const wasResumed = (session) => !!session &&
     typeof session === 'object' &&
     'resumed' in session &&
     session.resumed === true;
-const wasWalletStatusRefreshed = (session) => !!session &&
-    typeof session === 'object' &&
-    'walletStatusRefreshed' in session &&
-    session.walletStatusRefreshed === true;
 const requireHiddenWalletResponse = (session) => {
     if (!session.passphraseState) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Hidden wallet response is missing passphraseState');
@@ -47470,20 +47331,12 @@ class OpenWalletSession extends BaseMethod {
         this.unlockPolicy = 'unlock-before-run';
         this.skipForceUpdateCheck = true;
         this.params = normalizeParams(this.payload);
-        this.protocolV2PreUnlockPinType =
-            this.params.mode === OpenWalletSessionMode.SelectHidden
-                ? hdTransport.DeviceSessionPinType.Any
-                : hdTransport.DeviceSessionPinType.Main;
         this.payload.useEmptyPassphrase = this.params.mode === OpenWalletSessionMode.Standard;
     }
     run() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const isProtocolV2 = this.device.isProtocolV2();
-            const reusePreflightStatus = isProtocolV2 && ((_a = this.protocolV2UnlockContext) === null || _a === void 0 ? void 0 : _a.preflightStatusRefreshed) === true;
-            let state = reusePreflightStatus
-                ? yield this.device.getDeviceState()
-                : yield this.device.getDeviceState({ refreshSections: ['status'] });
+            let state = yield this.device.getDeviceState({ refreshSections: ['status'] });
             let currentDeviceId = state.identity.deviceId;
             const hasAuthoritativeProtocolV2WalletStatus = (candidate) => candidate.status.unlocked === true &&
                 typeof candidate.status.passphraseProtection === 'boolean' &&
@@ -47505,18 +47358,9 @@ class OpenWalletSession extends BaseMethod {
                 currentDeviceId = state.identity.deviceId;
                 return state;
             });
-            const resolveProtocolV2DeviceStateAfterSession = (session) => __awaiter(this, void 0, void 0, function* () {
-                if (!wasWalletStatusRefreshed(session)) {
-                    return refreshProtocolV2DeviceState();
-                }
-                state = yield this.device.getDeviceState();
-                currentDeviceId = state.identity.deviceId;
-                return state;
-            });
             const ensureProtocolV2WalletStatus = () => __awaiter(this, void 0, void 0, function* () {
-                var _d;
                 if (isProtocolV2 && !hasAuthoritativeProtocolV2WalletStatus(state)) {
-                    yield this.device.unlockDevice((_d = this.protocolV2PreUnlockPinType) !== null && _d !== void 0 ? _d : hdTransport.DeviceSessionPinType.Main, {
+                    yield this.device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
                         source: 'unlock-coordinator',
                         reason: 'device-locked',
                         deviceOnly: true,
@@ -47535,14 +47379,13 @@ class OpenWalletSession extends BaseMethod {
                         deriveCardano: this.payload.deriveCardano,
                         selectMainWalletBeforeRestore: !hasAuthoritativeProtocolV2WalletStatus(state) ||
                             state.status.unlockedAttachPin === true,
-                        mainPinSelected: (_b = this.protocolV2UnlockContext) === null || _b === void 0 ? void 0 : _b.preflightMainPinSelected,
                     })
                     : yield getPassphraseStateWithRefreshDeviceInfo(this.device, {
                         onlyMainPin: true,
                         initSession: this.payload.initSession,
                     });
                 const refreshedState = isProtocolV2
-                    ? requireAuthoritativeProtocolV2WalletStatus(yield resolveProtocolV2DeviceStateAfterSession(session))
+                    ? requireAuthoritativeProtocolV2WalletStatus(yield refreshProtocolV2DeviceState())
                     : state;
                 const deviceId = requireDeviceId();
                 if (session.unlockedAttachPin ||
@@ -47550,7 +47393,7 @@ class OpenWalletSession extends BaseMethod {
                     try {
                         yield this.device.lockDevice();
                     }
-                    catch (_c) {
+                    catch (_a) {
                     }
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
@@ -47614,7 +47457,7 @@ class OpenWalletSession extends BaseMethod {
                     : { forceWalletSelection: true })), { deriveCardano: this.payload.deriveCardano }))
                 : yield getPassphraseStateWithRefreshDeviceInfo(this.device, { initSession: true });
             const refreshedState = isProtocolV2
-                ? requireAuthoritativeProtocolV2WalletStatus(yield resolveProtocolV2DeviceStateAfterSession(session))
+                ? requireAuthoritativeProtocolV2WalletStatus(yield refreshProtocolV2DeviceState())
                 : state;
             const deviceId = requireDeviceId();
             if (isProtocolV2 && refreshedState.status.passphraseProtection !== true) {
@@ -51816,12 +51659,6 @@ const getProtocolV2UnknownErrorText = (error) => {
     return parts.filter(Boolean).join(' ');
 };
 const isProtocolV2DeviceDisconnectedError = (error) => {
-    var _a;
-    const errorCode = error && typeof error === 'object'
-        ? (_a = error.errorCode) !== null && _a !== void 0 ? _a : error.code
-        : undefined;
-    if (errorCode === hdShared.HardwareErrorCode.BleDeviceDisconnected)
-        return true;
     const message = getProtocolV2UnknownErrorText(error).toLowerCase();
     const compactMessage = message.replace(/\s+/g, '');
     return (message.includes('notfounderror') ||
@@ -51866,289 +51703,14 @@ const INSTALLABLE_FIRMWARE_TARGET_IDS = new Set([
 ]);
 new Map(Object.entries(ProtocolV2FirmwareTargetType).flatMap(([key, value]) => INSTALLABLE_FIRMWARE_TARGET_IDS.has(value) ? [[key, value]] : []));
 
-const Log$7 = getLogger(exports.LoggerNames.Core);
-const MIN_FILE_CHUNK_SIZE = 64;
-const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
-const FILE_TRANSFER_LOG_INTERVAL_MS = 10000;
+const Log$7 = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$1 = 'session not found';
-function formatFileTransferRate(bytesPerSecond) {
-    return (Math.max(bytesPerSecond, 0) / 1024).toFixed(2);
-}
-function getAverageFileTransferRate(transferredBytes, elapsedMs) {
-    if (elapsedMs <= 0)
-        return 0;
-    return Math.round((Math.max(transferredBytes, 0) / elapsedMs) * 1000);
-}
-function getFileTransferTransport() {
-    const env = DataManager.getSettings('env');
-    return env && DataManager.isBleConnect(env) ? 'BLE' : String(env !== null && env !== void 0 ? env : 'unknown');
-}
-function logFileTransferMetrics({ transport, status, path, transferredBytes, totalBytes, elapsedMs, rateBytesPerSecond, hostWriteElapsedMs, responseWaitElapsedMs, measuredAttempts, }) {
-    const segmentedMetrics = measuredAttempts > 0
-        ? ` hostWriteTotal=${(hostWriteElapsedMs / 1000).toFixed(2)}s responseWaitTotal=${(responseWaitElapsedMs / 1000).toFixed(2)}s measuredAttempts=${measuredAttempts}`
-        : '';
-    Log$7.log(`[FileWrite] metrics transport=${transport} status=${status} path=${path} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s${segmentedMetrics}`);
-}
-function isProtocolV2ResponseTimeout(error) {
-    var _a, _b;
-    if (!error || typeof error !== 'object')
-        return false;
-    const candidate = error;
-    const code = (_a = candidate.errorCode) !== null && _a !== void 0 ? _a : candidate.code;
-    return (code === hdShared.HardwareErrorCode.BleTimeoutError ||
-        code === 'response-timeout' ||
-        /(?:BLE|Lowlevel|Protocol V2) response timeout/i.test((_b = candidate.message) !== null && _b !== void 0 ? _b : ''));
-}
-function getProtocolV2FileChunkLimit() {
-    const env = DataManager.getSettings('env');
-    return env && DataManager.isBleConnect(env)
-        ? hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
-}
-function dataToUint8Array(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof data === 'string')
-            return new TextEncoder().encode(data);
-        if (data instanceof ArrayBuffer)
-            return new Uint8Array(data);
-        if (ArrayBuffer.isView(data)) {
-            return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-        }
-        if (typeof Blob !== 'undefined' && data instanceof Blob) {
-            return new Uint8Array(yield data.arrayBuffer());
-        }
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Unsupported FilesystemFileWrite data');
-    });
-}
-function normalizeChunkSize(value, maxChunkSize) {
-    const numeric = Number(value);
-    if (!Number.isFinite(numeric) || numeric <= 0)
-        return maxChunkSize;
-    return Math.min(Math.max(Math.floor(numeric), MIN_FILE_CHUNK_SIZE), maxChunkSize);
-}
-function getDeviceTransferProgress(before, after, total) {
-    if (!Number.isFinite(total) || total <= 0)
-        return 100;
-    if (before <= 0 && after < total)
-        return 0;
-    if (after >= total)
-        return 100;
-    return Math.min(Math.max(Math.ceil((after / total) * 100), 1), 99);
-}
-function getConfirmedProgress(processed, total, written, length) {
-    if (Number.isFinite(processed) && Number.isFinite(total) && total > 0) {
-        if (processed >= total)
-            return 100;
-        return Math.min(Math.max(Math.floor((processed / total) * 100), 0), 99);
-    }
-    if (length > 0)
-        return written >= length ? 100 : Math.floor((written / length) * 100);
-    return 100;
-}
-function writeProtocolV2File(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    return __awaiter(this, void 0, void 0, function* () {
-        (_a = options.throwIfAborted) === null || _a === void 0 ? void 0 : _a.call(options);
-        const data = yield dataToUint8Array(options.data);
-        const dataLength = data.byteLength;
-        const startOffset = Number.isFinite(options.offset) && Number(options.offset) > 0 ? Number(options.offset) : 0;
-        const totalSize = Number.isFinite(options.totalSize) && Number(options.totalSize) > 0
-            ? Number(options.totalSize)
-            : startOffset + dataLength;
-        if (totalSize < startOffset + dataLength) {
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
-        }
-        const defaultChunkSizeLimit = getProtocolV2FileChunkLimit();
-        const configuredChunkSizeLimit = Number(options.chunkSizeLimit);
-        const chunkSizeLimit = Number.isFinite(configuredChunkSizeLimit) && configuredChunkSizeLimit > 0
-            ? Math.floor(configuredChunkSizeLimit)
-            : defaultChunkSizeLimit;
-        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, chunkSizeLimit);
-        let written = 0;
-        let chunks = 0;
-        let lastMessage;
-        const startTime = Date.now();
-        let rateWindowStartedAt = startTime;
-        let rateWindowStartedBytes = 0;
-        let rateBytesPerSecond;
-        let lastConfirmedAt = startTime;
-        let logWindowStartedAt = startTime;
-        let logWindowStartedBytes = 0;
-        let hostWriteElapsedMs = 0;
-        let responseWaitElapsedMs = 0;
-        let measuredAttempts = 0;
-        const transport = getFileTransferTransport();
-        Log$7.log(`[FileWrite] started transport=${transport} path=${options.path} bytes=${dataLength} offset=${startOffset} chunk=${chunkSize}`);
-        try {
-            while (written < dataLength) {
-                (_c = options.throwIfAborted) === null || _c === void 0 ? void 0 : _c.call(options);
-                const chunk = data.slice(written, Math.min(written + chunkSize, dataLength));
-                const offset = startOffset + written;
-                const progress = (_f = (_d = options.uiPercentage) !== null && _d !== void 0 ? _d : (_e = options.getUiPercentage) === null || _e === void 0 ? void 0 : _e.call(options, {
-                    offset,
-                    chunkLength: chunk.byteLength,
-                    totalSize,
-                })) !== null && _f !== void 0 ? _f : getDeviceTransferProgress(offset, offset + chunk.byteLength, totalSize);
-                const request = {
-                    file: { path: options.path, offset, total_size: totalSize, data: chunk },
-                    overwrite: chunks === 0 ? (_g = options.overwrite) !== null && _g !== void 0 ? _g : false : false,
-                    append: (_h = options.append) !== null && _h !== void 0 ? _h : false,
-                    ui_percentage: progress,
-                };
-                const maxChunkRetries = Math.max(Math.floor((_j = options.maxChunkRetries) !== null && _j !== void 0 ? _j : 0), 0);
-                let retryCount = 0;
-                let response;
-                let isWritePending = true;
-                while (isWritePending) {
-                    let currentHostWriteElapsedMs;
-                    let responseWaitStartedAt;
-                    try {
-                        const callOptions = options.writeWithResponse === undefined
-                            ? {
-                                timeoutMs: options.timeoutMs,
-                                onWriteCompleted: ({ elapsedMs }) => {
-                                    currentHostWriteElapsedMs = elapsedMs;
-                                    responseWaitStartedAt = Date.now();
-                                },
-                            }
-                            : Object.assign(Object.assign({}, (options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })), { writeWithResponse: options.writeWithResponse, onWriteCompleted: ({ elapsedMs }) => {
-                                    currentHostWriteElapsedMs = elapsedMs;
-                                    responseWaitStartedAt = Date.now();
-                                } });
-                        response = yield options.commands.typedCall('FilesystemFileWrite', 'FilesystemFile', request, callOptions);
-                        isWritePending = false;
-                    }
-                    catch (error) {
-                        if (retryCount >= maxChunkRetries || !isProtocolV2ResponseTimeout(error))
-                            throw error;
-                        retryCount += 1;
-                        (_k = options.throwIfAborted) === null || _k === void 0 ? void 0 : _k.call(options);
-                    }
-                    finally {
-                        if (currentHostWriteElapsedMs !== undefined && responseWaitStartedAt !== undefined) {
-                            hostWriteElapsedMs += currentHostWriteElapsedMs;
-                            responseWaitElapsedMs += Math.max(Date.now() - responseWaitStartedAt, 0);
-                            measuredAttempts += 1;
-                        }
-                    }
-                }
-                if (!response) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'FilesystemFileWrite completed without a response');
-                }
-                const responseType = response.type;
-                if (responseType && responseType !== 'FilesystemFile') {
-                    const responseError = (_l = response.message) === null || _l === void 0 ? void 0 : _l.error;
-                    if (typeof responseError === 'string' && responseError.includes(SESSION_ERROR$1)) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR$1);
-                    }
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite received unexpected response ${responseType}`);
-                }
-                (_m = options.throwIfAborted) === null || _m === void 0 ? void 0 : _m.call(options);
-                lastMessage = response.message;
-                const rawProcessedByte = (_o = response.message) === null || _o === void 0 ? void 0 : _o.processed_byte;
-                const processedByte = Number(rawProcessedByte);
-                if (rawProcessedByte !== undefined &&
-                    (!Number.isFinite(processedByte) ||
-                        processedByte <= offset ||
-                        processedByte > offset + chunk.byteLength)) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite invalid processed_byte ${processedByte}`);
-                }
-                written =
-                    rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
-                chunks += 1;
-                const now = Date.now();
-                lastConfirmedAt = now;
-                const elapsedMs = now - startTime;
-                const transferredBytes = Math.min(written, dataLength);
-                const rateWindowElapsedMs = now - rateWindowStartedAt;
-                if (rateWindowElapsedMs >= FILE_TRANSFER_RATE_WINDOW_MS) {
-                    const rateWindowBytes = Math.max(transferredBytes - rateWindowStartedBytes, 0);
-                    rateBytesPerSecond = Math.round((rateWindowBytes / rateWindowElapsedMs) * 1000);
-                    rateWindowStartedAt = now;
-                    rateWindowStartedBytes = transferredBytes;
-                }
-                else if (rateBytesPerSecond === undefined && elapsedMs > 0) {
-                    rateBytesPerSecond = Math.round((transferredBytes / elapsedMs) * 1000);
-                }
-                (_p = options.onProgress) === null || _p === void 0 ? void 0 : _p.call(options, {
-                    progress: getConfirmedProgress(startOffset + written, totalSize, written, dataLength),
-                    transferredBytes,
-                    totalBytes: dataLength,
-                    rateBytesPerSecond,
-                    elapsedMs,
-                });
-                const logWindowElapsedMs = now - logWindowStartedAt;
-                if (logWindowElapsedMs >= FILE_TRANSFER_LOG_INTERVAL_MS && transferredBytes < dataLength) {
-                    const logWindowBytes = Math.max(transferredBytes - logWindowStartedBytes, 0);
-                    logFileTransferMetrics({
-                        transport,
-                        status: 'progress',
-                        path: options.path,
-                        transferredBytes,
-                        totalBytes: dataLength,
-                        elapsedMs,
-                        rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
-                        hostWriteElapsedMs,
-                        responseWaitElapsedMs,
-                        measuredAttempts,
-                    });
-                    logWindowStartedAt = now;
-                    logWindowStartedBytes = transferredBytes;
-                }
-                if (options.paceMs && options.paceMs > 0) {
-                    yield new Promise(resolve => {
-                        setTimeout(resolve, options.paceMs);
-                    });
-                }
-            }
-        }
-        catch (error) {
-            const now = Date.now();
-            const elapsedMs = Math.max(now - startTime, 0);
-            const logWindowElapsedMs = Math.max(now - logWindowStartedAt, 0);
-            const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
-            logFileTransferMetrics({
-                transport,
-                status: 'failed',
-                path: options.path,
-                transferredBytes: written,
-                totalBytes: dataLength,
-                elapsedMs,
-                rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
-                hostWriteElapsedMs,
-                responseWaitElapsedMs,
-                measuredAttempts,
-            });
-            throw error;
-        }
-        const elapsedMs = Math.max(lastConfirmedAt - startTime, 0);
-        const logWindowElapsedMs = Math.max(lastConfirmedAt - logWindowStartedAt, 0);
-        const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
-        logFileTransferMetrics({
-            transport,
-            status: 'completed',
-            path: options.path,
-            transferredBytes: written,
-            totalBytes: dataLength,
-            elapsedMs,
-            rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
-            hostWriteElapsedMs,
-            responseWaitElapsedMs,
-            measuredAttempts,
-        });
-        return Object.assign(Object.assign({}, lastMessage), { path: options.path, offset: startOffset, total_size: totalSize, processed_byte: startOffset + written, chunks });
-    });
-}
-
-const Log$6 = getLogger(exports.LoggerNames.Method);
-const SESSION_ERROR = 'session not found';
 const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
-const PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS = 4;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -52304,12 +51866,11 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
 };
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
-    return hdShared.isBleStaleBondHardwareError(error) ||
-        (error instanceof hdShared.HardwareError &&
-            (error.errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
-                error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
-                error.errorCode === hdShared.HardwareErrorCode.FirmwareVerificationFailed ||
-                ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE));
+    return error instanceof hdShared.HardwareError &&
+        (error.errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
+            error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
+            error.errorCode === hdShared.HardwareErrorCode.FirmwareVerificationFailed ||
+            ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
 };
 const isProtocolV2TargetStatusFinished = (status) => normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_FINISHED;
 const isProtocolV2TargetStatusInProgress = (status) => normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_PENDING ||
@@ -52333,14 +51894,6 @@ const normalizeProtocolV2TargetStatus = (status) => {
     }
     return undefined;
 };
-const PROTOCOL_V2_INSTALL_PHASE_BY_DECODED_VALUE = new Map([
-    [0, 'prepare'],
-    [1, 'install'],
-    [2, 'verify'],
-    ['FW_MGMT_UPDATER_PHASE_PREPARE', 'prepare'],
-    ['FW_MGMT_UPDATER_PHASE_INSTALL', 'install'],
-    ['FW_MGMT_UPDATER_PHASE_VERIFY', 'verify'],
-]);
 const normalizeProtocolV2Hex = (value) => value === null || value === void 0 ? void 0 : value.replace(/^0x/i, '').toLowerCase();
 const versionArrayToNumber = (version) => {
     if (!version)
@@ -52396,10 +51949,6 @@ const toProtocolV2FiniteNumber = (value) => {
     }
     return undefined;
 };
-const normalizeProtocolV2ProgressPercent = (value) => {
-    const progress = toProtocolV2FiniteNumber(value);
-    return progress === undefined ? undefined : Math.min(100, Math.max(0, progress));
-};
 const isProtocolV2FirmwareFingerprintValid = (binary, fingerprint) => {
     const expectedFingerprint = normalizeProtocolV2Hex(fingerprint);
     if (!expectedFingerprint)
@@ -52428,8 +51977,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2CompletedTargetVersions = new Map();
         this.protocolV2CompletedTargetIds = new Set();
         this.protocolV2InstallBaselineVersions = new Map();
-        this.protocolV2InstallNeedsReconnect = false;
-        this.protocolV2InstallTerminalSuccessObserved = false;
         this.protocolV2LastTransferProgressAt = 0;
     }
     getSupportedProtocols() {
@@ -52600,7 +52147,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$6.debug('FirmwareUpdateV4 strategy: Protocol V2');
+            Log$7.debug('FirmwareUpdateV4 strategy: Protocol V2');
             return this.runProtocolV2();
         });
     }
@@ -53032,7 +52579,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!observedVersion) {
                 const hasCompleteTargetEvidence = targetId !== undefined && this.protocolV2CompletedTargetIds.has(targetId);
                 if (hasCompleteTargetEvidence) {
-                    Log$6.warn(`Protocol V2 target ${target} has no observable final version; install completion is authoritative`);
+                    Log$7.warn(`Protocol V2 target ${target} has no observable final version; install completion is authoritative`);
                 }
                 else {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareVerificationFailed, `Protocol V2 target ${target} has no observable final version after status fallback`);
@@ -53395,10 +52942,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 return true;
             }
             catch (error) {
-                if (hdShared.isBleStaleBondHardwareError(error)) {
-                    throw error;
-                }
-                Log$6.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, error);
+                Log$7.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, error);
                 return false;
             }
         });
@@ -53438,7 +52982,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 if (error instanceof hdShared.HardwareError) {
                     throw error;
                 }
-                Log$6.log('Protocol V2 auto go to bootloader mode failed: ', error);
+                Log$7.log('Protocol V2 auto go to bootloader mode failed: ', error);
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure);
             }
         });
@@ -53446,12 +52990,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     enterProtocolV2BootloaderMode() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isProtocolV2RomloaderMode()) {
-                Log$6.debug('Protocol V2 device is in romloader mode; start firmware update directly');
+                Log$7.debug('Protocol V2 device is in romloader mode; start firmware update directly');
                 this.protocolV2ExecutionInLoader = true;
                 return false;
             }
             if (this.isProtocolV2BootloaderMode()) {
-                Log$6.debug('Protocol V2 device is already in bootloader mode, skip reboot');
+                Log$7.debug('Protocol V2 device is already in bootloader mode, skip reboot');
                 this.protocolV2ExecutionInLoader = true;
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
                 return false;
@@ -53482,12 +53026,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     lastError = new Error('Protocol V2 device is reachable but is not in bootloader mode');
                 }
                 catch (error) {
-                    if (hdShared.isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
+                    if (this.isProtocolV2ReconnectIdentityError(error)) {
                         throw error;
                     }
                     shouldReconnect = true;
                     lastError = error;
-                    Log$6.log('Protocol V2 bootloader mode not ready, polling reconnect: ', error);
+                    Log$7.log('Protocol V2 bootloader mode not ready, polling reconnect: ', error);
                 }
                 yield hdShared.wait(retryInterval);
             }
@@ -53583,7 +53127,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const resourcesToSync = [];
             for (const resource of resourceSources) {
                 if (yield this.isProtocolV2ResourceBundleUpToDate(resource)) {
-                    Log$6.log(`[FirmwareUpdateV4] skip RESC bundle ${resource.name}; already up to date`);
+                    Log$7.log(`[FirmwareUpdateV4] skip RESC bundle ${resource.name}; already up to date`);
                 }
                 else {
                     resourcesToSync.push(resource);
@@ -53685,9 +53229,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     return processedSize + source.size;
                 }
                 catch (error) {
-                    if (hdShared.isBleStaleBondHardwareError(error)) {
-                        throw error;
-                    }
                     lastError = error;
                     if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
                         yield this.recoverProtocolV2FileTransfer();
@@ -53711,25 +53252,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
         });
     }
-    collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds) {
-        statusTargets.forEach(target => {
-            const targetId = normalizeProtocolV2TargetId(target.target_id);
-            if (targetId !== undefined &&
-                expectedTargetIds.has(targetId) &&
-                isProtocolV2TargetStatusInProgress(target.status)) {
-                liveTargetIds.add(targetId);
-            }
-        });
-    }
-    assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths, liveTargetIds) {
-        const resolvedExpectedPaths = expectedPaths !== null && expectedPaths !== void 0 ? expectedPaths : new Map();
-        Log$6.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
+    assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths = new Map()) {
+        Log$7.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
         const failedTarget = statusTargets.find(target => {
             var _a;
-            const targetId = (_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1;
-            return (expectedTargetIds.has(targetId) &&
-                isProtocolV2TargetStatusFailed(target.status) &&
-                (!liveTargetIds || liveTargetIds.has(targetId)));
+            return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1) &&
+                isProtocolV2TargetStatusFailed(target.status);
         });
         if (failedTarget) {
             const failedTargetDetails = JSON.stringify({
@@ -53738,51 +53266,26 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 payloadVersion: failedTarget.payload_version,
                 path: failedTarget.path,
             });
-            Log$6.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
+            Log$7.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 firmware install failed', {
                 firmwareUpdateCode: PROTOCOL_V2_INSTALL_FAILED_CODE,
             });
         }
-        if (liveTargetIds) {
-            const staleFailedTargets = statusTargets.filter(target => {
-                var _a;
-                const targetId = (_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1;
-                return (expectedTargetIds.has(targetId) &&
-                    isProtocolV2TargetStatusFailed(target.status) &&
-                    !liveTargetIds.has(targetId));
-            });
-            if (staleFailedTargets.length > 0) {
-                Log$6.log(`[FirmwareUpdateV4] ignoring stale failed firmware status until those targets start: ${JSON.stringify(staleFailedTargets.map(target => ({
-                    targetId: target.target_id,
-                    status: target.status,
-                    path: target.path,
-                })))}`);
-            }
-        }
         const matchingTargets = statusTargets.filter(target => { var _a; return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1); });
         const seenTargetIds = new Set();
         for (const target of matchingTargets) {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
-            const pathConflictsWithCurrentInstall = targetId !== undefined &&
-                Boolean(target.path) &&
-                Boolean(resolvedExpectedPaths.get(targetId)) &&
-                target.path !== resolvedExpectedPaths.get(targetId) &&
-                (!liveTargetIds || liveTargetIds.has(targetId));
             if (targetId === undefined ||
                 seenTargetIds.has(targetId) ||
-                pathConflictsWithCurrentInstall) {
-                Log$6.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
+                (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))) {
+                Log$7.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 firmware install status conflict', {
                     firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
                 });
             }
             seenTargetIds.add(targetId);
         }
-        const completedTargets = matchingTargets.filter(target => {
-            const targetId = normalizeProtocolV2TargetId(target.target_id);
-            return (isProtocolV2TargetStatusFinished(target.status) &&
-                (!liveTargetIds || (targetId !== undefined && liveTargetIds.has(targetId))));
-        });
+        const completedTargets = matchingTargets.filter(target => isProtocolV2TargetStatusFinished(target.status));
         const completedTargetIds = new Set();
         completedTargets.forEach(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53812,41 +53315,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return true;
         }
         if (expectedTargetIds.size > 0 && matchingTargets.length > 0) {
-            let detailedProgress = completedTargetIds.size * 100;
-            let installProgressMetadata;
-            let hasInProgressTarget = false;
-            matchingTargets.forEach(target => {
-                var _a, _b;
-                const targetId = normalizeProtocolV2TargetId(target.target_id);
-                if (targetId === undefined ||
-                    completedTargetIds.has(targetId) ||
-                    !isProtocolV2TargetStatusInProgress(target.status) ||
-                    (liveTargetIds && !liveTargetIds.has(targetId))) {
-                    return;
-                }
-                hasInProgressTarget = true;
-                detailedProgress += (_a = normalizeProtocolV2ProgressPercent(target.progress_percent)) !== null && _a !== void 0 ? _a : 0;
-                const installPhase = target.phase_info
-                    ? PROTOCOL_V2_INSTALL_PHASE_BY_DECODED_VALUE.get(target.phase_info.phase)
-                    : undefined;
-                const installPhaseProgress = normalizeProtocolV2ProgressPercent((_b = target.phase_info) === null || _b === void 0 ? void 0 : _b.progress_percent);
-                if (installPhase && installPhaseProgress !== undefined && !installProgressMetadata) {
-                    installProgressMetadata = {
-                        installTargetId: targetId,
-                        installPhase,
-                        installPhaseProgress,
-                    };
-                }
-            });
+            const hasInProgressTarget = matchingTargets.some(target => isProtocolV2TargetStatusInProgress(target.status));
             const completedProgress = Math.floor((completedTargetIds.size / expectedTargetIds.size) * 100);
-            const reportedProgress = Math.floor(detailedProgress / expectedTargetIds.size);
-            const progress = Math.min(99, Math.max(completedProgress, reportedProgress, hasInProgressTarget ? 1 : 0));
-            if (installProgressMetadata) {
-                this.postProgressMessage(progress, 'installingFirmware', installProgressMetadata);
-            }
-            else {
-                this.postProgressMessage(progress, 'installingFirmware');
-            }
+            const progress = Math.min(99, Math.max(completedProgress, hasInProgressTarget ? 1 : 0));
+            this.postProgressMessage(progress, 'installingFirmware');
         }
         return false;
     }
@@ -53899,54 +53371,43 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const expectedTargetIds = new Set(targets.map(target => target.target_id));
             const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
-            const isBleCoprocessorInstall = this.isBleReconnect() &&
-                expectedTargetIds.has(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR);
             const startTime = Date.now();
             let lastError;
-            let shouldReconnect = this.protocolV2InstallNeedsReconnect;
-            this.protocolV2InstallNeedsReconnect = false;
+            let shouldReconnect = false;
             let deviceInfo;
-            let bleInstallLinkReady = false;
-            let installStatusDisconnectObserved = false;
-            let installReconnectObserved = false;
-            let finishedStatusSnapshotKey;
-            let finishedStatusSnapshotPolls = 0;
-            let fastFinishedInstallProgressReported = false;
-            let installEvidenceObserved = this.protocolV2InstallTerminalSuccessObserved;
+            let installEvidenceObserved = false;
             let currentInstallStatusObserved = false;
-            const liveTargetIds = new Set();
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 this.throwIfAborted();
                 try {
                     if (shouldReconnect) {
-                        const isBleInstallReconnect = this.isBleReconnect();
-                        yield this.reconnectProtocolV2Device({ skipProtocolProbe: true });
-                        bleInstallLinkReady = isBleInstallReconnect;
-                        deviceInfo = isBleInstallReconnect
-                            ? undefined
-                            : yield this.verifyProtocolV2ReconnectIdentity();
-                        if (isBleInstallReconnect && installStatusDisconnectObserved) {
-                            installReconnectObserved = true;
-                        }
+                        yield this.reconnectProtocolV2Device();
+                        deviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
                         shouldReconnect = false;
                     }
-                    let currentDeviceInfo = deviceInfo;
+                    const currentDeviceInfo = deviceInfo;
                     try {
-                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
+                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', ['DeviceFirmwareUpdateStatus', 'Success'], {
                             fields: {
                                 status: true,
-                                progress_percent: true,
-                                phase_info: true,
                                 payload_version: true,
                                 path: true,
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
-                        if (this.protocolV2InstallTerminalSuccessObserved) {
+                        if (statusResponse.type === 'Success') {
                             installEvidenceObserved = true;
+                            lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
-                        const statusTargets = ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : []);
-                        this.collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds);
-                        if (liveTargetIds.size > 0) {
+                        const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
+                            ? ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : [])
+                            : [];
+                        const hasInProgressTarget = statusTargets.some(target => {
+                            const targetId = normalizeProtocolV2TargetId(target.target_id);
+                            return (targetId !== undefined &&
+                                expectedTargetIds.has(targetId) &&
+                                isProtocolV2TargetStatusInProgress(target.status));
+                        });
+                        if (hasInProgressTarget) {
                             currentInstallStatusObserved = true;
                         }
                         const hasMatchingTargetStatus = statusTargets.some(target => {
@@ -53961,102 +53422,31 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
                             return targetId !== undefined && expectedTargetIds.has(targetId);
                         });
-                        const matchingFinishedTargetIds = new Set();
-                        const matchingFinishedStatus = matchingStatusTargets
-                            .map(target => {
-                            var _a;
-                            const targetId = normalizeProtocolV2TargetId(target.target_id);
-                            const expectedPath = targetId === undefined ? undefined : expectedPaths.get(targetId);
-                            const expectedVersion = targetId === undefined
-                                ? undefined
-                                : this.getExpectedProtocolV2TargetVersion(targetId);
-                            const payloadVersion = toProtocolV2FiniteNumber(target.payload_version);
-                            if (targetId === undefined ||
-                                matchingFinishedTargetIds.has(targetId) ||
-                                !isProtocolV2TargetStatusFinished(target.status) ||
-                                (Boolean(target.path) && Boolean(expectedPath) && target.path !== expectedPath) ||
-                                (expectedVersion !== undefined &&
-                                    payloadVersion !== undefined &&
-                                    payloadVersion !== expectedVersion)) {
-                                return undefined;
-                            }
-                            matchingFinishedTargetIds.add(targetId);
-                            return [targetId, (_a = target.path) !== null && _a !== void 0 ? _a : null, payloadVersion !== null && payloadVersion !== void 0 ? payloadVersion : null];
-                        })
-                            .filter((target) => !!target)
-                            .sort(([leftTargetId], [rightTargetId]) => leftTargetId - rightTargetId);
-                        const hasCompleteMatchingFinishedStatus = matchingFinishedStatus.length === expectedTargetIds.size &&
-                            matchingFinishedTargetIds.size === expectedTargetIds.size &&
-                            expectedTargetIds.size > 0;
-                        if (requireCurrentInstallStatus &&
-                            installReconnectObserved &&
-                            hasCompleteMatchingFinishedStatus) {
-                            const nextSnapshotKey = JSON.stringify(matchingFinishedStatus);
-                            if (nextSnapshotKey === finishedStatusSnapshotKey) {
-                                finishedStatusSnapshotPolls += 1;
-                            }
-                            else {
-                                finishedStatusSnapshotKey = nextSnapshotKey;
-                                finishedStatusSnapshotPolls = 1;
-                            }
-                        }
-                        else {
-                            finishedStatusSnapshotKey = undefined;
-                            finishedStatusSnapshotPolls = 0;
-                        }
-                        if (requireCurrentInstallStatus &&
-                            installReconnectObserved &&
-                            hasCompleteMatchingFinishedStatus &&
-                            !currentInstallStatusObserved &&
-                            !this.protocolV2InstallTerminalSuccessObserved &&
-                            !fastFinishedInstallProgressReported) {
-                            this.postProgressMessage(1, 'installingFirmware');
-                            fastFinishedInstallProgressReported = true;
-                        }
-                        const finishedAfterDisconnectObserved = finishedStatusSnapshotPolls >= PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS;
-                        const hasCurrentInstallEvidence = currentInstallStatusObserved ||
-                            this.protocolV2InstallTerminalSuccessObserved ||
-                            finishedAfterDisconnectObserved;
-                        if (hasCurrentInstallEvidence) {
-                            installEvidenceObserved = true;
-                        }
-                        const shouldVerifyTargetCompletion = !requireCurrentInstallStatus || hasCurrentInstallEvidence;
+                        const shouldVerifyTargetCompletion = !requireCurrentInstallStatus || currentInstallStatusObserved;
                         if (shouldVerifyTargetCompletion &&
-                            this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths, requireCurrentInstallStatus &&
-                                !this.protocolV2InstallTerminalSuccessObserved &&
-                                !finishedAfterDisconnectObserved
-                                ? liveTargetIds
-                                : undefined)) {
+                            this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
                             return;
                         }
-                        if (!hasCurrentInstallEvidence) {
-                            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
-                        }
                         if (requireCurrentInstallStatus &&
-                            !hasCurrentInstallEvidence &&
+                            !currentInstallStatusObserved &&
                             matchingStatusTargets.length > 0) {
                             lastError = new Error('Protocol V2 firmware status is stale; waiting for the current install to start');
                         }
-                        if (statusTargets.length === 0 &&
-                            !currentDeviceInfo &&
-                            bleInstallLinkReady &&
-                            installEvidenceObserved) {
-                            currentDeviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
-                            deviceInfo = currentDeviceInfo;
-                        }
                         if (statusTargets.length === 0 && currentDeviceInfo) {
                             const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
                             if (isNormalMode &&
                                 (installEvidenceObserved ||
                                     this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
-                                Log$6.log('[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete');
+                                Log$7.log('[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete');
                                 this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
                                 this.postProgressMessage(100, 'installingFirmware');
                                 return;
                             }
                         }
                         if (statusTargets.length === 0) {
-                            lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
+                            if (statusResponse.type !== 'Success') {
+                                lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
+                            }
                         }
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
@@ -54075,20 +53465,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         }
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
                             if (!currentDeviceInfo) {
-                                if (!bleInstallLinkReady) {
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
-                                }
-                                deviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
-                            }
-                            const reconnectDeviceInfo = currentDeviceInfo !== null && currentDeviceInfo !== void 0 ? currentDeviceInfo : deviceInfo;
-                            if (!reconnectDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
                             }
-                            const isNormalMode = yield this.probeProtocolV2NormalMode(reconnectDeviceInfo);
+                            const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
                             if (isNormalMode &&
                                 (installEvidenceObserved ||
                                     this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
-                                Log$6.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
+                                Log$7.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
                                 this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
                                 this.postProgressMessage(100, 'installingFirmware');
                                 return;
@@ -54101,18 +53484,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         else {
-                            if (isBleCoprocessorInstall &&
-                                isProtocolV2DeviceDisconnectedError(error) &&
-                                !isProtocolV2ResponseTimeout(error)) {
-                                installStatusDisconnectObserved = true;
-                                finishedStatusSnapshotKey = undefined;
-                                finishedStatusSnapshotPolls = 0;
-                            }
                             shouldReconnect = true;
                             deviceInfo = undefined;
-                            bleInstallLinkReady = false;
                             lastError = error;
-                            Log$6.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
+                            Log$7.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
                         }
                     }
                 }
@@ -54130,12 +53505,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     shouldReconnect = true;
                     deviceInfo = undefined;
-                    bleInstallLinkReady = false;
-                    Log$6.log('Protocol V2 firmware install device readiness probe failed: ', error);
+                    Log$7.log('Protocol V2 firmware install device readiness probe failed: ', error);
                 }
                 yield hdShared.wait(1000);
             }
-            Log$6.error(`[FirmwareUpdateV4] install timed out after ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
+            Log$7.error(`[FirmwareUpdateV4] install timed out after ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 firmware install timed out', {
                 firmwareUpdateCode: PROTOCOL_V2_INSTALL_TIMEOUT_CODE,
             });
@@ -54147,15 +53521,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const deviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
             try {
                 if (yield this.probeProtocolV2NormalMode(deviceInfo)) {
-                    Log$6.log('[FirmwareUpdateV4] device already returned to App mode; skip Normal reboot');
+                    Log$7.log('[FirmwareUpdateV4] device already returned to App mode; skip Normal reboot');
                     return;
                 }
             }
             catch (error) {
-                if (hdShared.isBleStaleBondHardwareError(error)) {
-                    throw error;
-                }
-                Log$6.log('[FirmwareUpdateV4] unable to confirm App mode before Normal reboot: ', error);
+                Log$7.log('[FirmwareUpdateV4] unable to confirm App mode before Normal reboot: ', error);
             }
             yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Normal);
             this.protocolV2ExecutionInLoader = false;
@@ -54183,7 +53554,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
         this.protocolV2LatestFinalFeatures = features;
         if (firmwareVersion === '0.0.0') {
-            Log$6.warn('Protocol V2 firmware update finished but app firmware version is still 0.0.0. This is allowed for Pro2 debug BLE-only update flows.');
+            Log$7.warn('Protocol V2 firmware update finished but app firmware version is still 0.0.0. This is allowed for Pro2 debug BLE-only update flows.');
         }
         return {
             bootloaderVersion,
@@ -54229,49 +53600,29 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     lastError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, 'Protocol V2 device is still in bootloader mode');
                 }
                 catch (error) {
-                    if (hdShared.isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
+                    if (this.isProtocolV2ReconnectIdentityError(error)) {
                         throw error;
                     }
                     shouldReconnect = true;
                     lastError = error;
-                    Log$6.log('Protocol V2 normal mode not ready, polling Ping: ', error);
+                    Log$7.log('Protocol V2 normal mode not ready, polling Ping: ', error);
                 }
                 yield hdShared.wait(1000);
             }
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Protocol V2 final features not ready within ${timeout / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
         });
     }
-    reconnectProtocolV2Device(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    reconnectProtocolV2Device() {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isBleReconnect()) {
-                yield this.acquireProtocolV2BleDevice(options === null || options === void 0 ? void 0 : options.skipProtocolProbe);
+                yield this.acquireProtocolV2BleDevice();
                 return;
             }
             const deviceDiff = yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.enumerate());
             const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
-            const env = DataManager.getSettings('env');
-            const isWebUsb = DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env);
-            if (isWebUsb && (options === null || options === void 0 ? void 0 : options.skipProtocolProbe)) {
-                const expectedSerialNumber = (_c = this.protocolV2ExpectedSerialNumber) === null || _c === void 0 ? void 0 : _c.trim();
-                const expectedPath = (_d = this.protocolV2ExpectedPath) === null || _d === void 0 ? void 0 : _d.trim();
-                const reconnectDescriptor = devicesDescriptor.find(descriptor => {
-                    var _a;
-                    const descriptorPath = (_a = descriptor.path) === null || _a === void 0 ? void 0 : _a.trim();
-                    return ((!!expectedSerialNumber && descriptorPath === expectedSerialNumber) ||
-                        (!!expectedPath && descriptorPath === expectedPath));
-                });
-                if (!(reconnectDescriptor === null || reconnectDescriptor === void 0 ? void 0 : reconnectDescriptor.path)) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
-                }
-                this.device.updateDescriptor(Object.assign(Object.assign({}, reconnectDescriptor), { protocolType: PROTOCOL_V2_CONNECT_PROTOCOL }), true);
-                const mainId = yield ((_e = this.device.deviceConnector) === null || _e === void 0 ? void 0 : _e.acquire(reconnectDescriptor.path, null, undefined, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, true));
-                this.device.mainId = typeof mainId === 'string' ? mainId : reconnectDescriptor.path;
-                this.device.commands.disposed = false;
-                this.device.getCommands().mainId = this.device.mainId;
-                return;
-            }
-            if (isWebUsb && devicesDescriptor.length === 1) {
+            if (DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
+                devicesDescriptor.length === 1) {
                 const descriptor = devicesDescriptor[0];
                 if (!this.protocolV2ExpectedSerialNumber && descriptor.path !== this.protocolV2ExpectedPath) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
@@ -54279,14 +53630,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 this.device.updateDescriptor(Object.assign(Object.assign({}, descriptor), { protocolType: PROTOCOL_V2_CONNECT_PROTOCOL }), true);
                 yield this.ensureProtocolV2DeviceAcquired();
                 this.device.commands.disposed = false;
-                this.device.getCommands().mainId = (_f = this.device.mainId) !== null && _f !== void 0 ? _f : '';
+                this.device.getCommands().mainId = (_c = this.device.mainId) !== null && _c !== void 0 ? _c : '';
                 return;
             }
             const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined, {
                 connectProtocol: PROTOCOL_V2_CONNECT_PROTOCOL,
             });
-            const expectedSerialNumber = (_g = this.protocolV2ExpectedSerialNumber) === null || _g === void 0 ? void 0 : _g.trim();
-            const expectedPath = (_h = this.protocolV2ExpectedPath) === null || _h === void 0 ? void 0 : _h.trim();
+            const expectedSerialNumber = (_d = this.protocolV2ExpectedSerialNumber) === null || _d === void 0 ? void 0 : _d.trim();
+            const expectedPath = (_e = this.protocolV2ExpectedPath) === null || _e === void 0 ? void 0 : _e.trim();
             const reconnectDevice = deviceList.find(candidate => {
                 var _a;
                 const candidateSerialNumber = (_a = candidate.getCurrentSerialNo) === null || _a === void 0 ? void 0 : _a.call(candidate).trim();
@@ -54298,11 +53649,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!reconnectDevice) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
             }
-            Log$6.debug('Protocol V2 firmware reconnect using matched device:', reconnectDevice.getConnectId());
+            Log$7.debug('Protocol V2 firmware reconnect using matched device:', reconnectDevice.getConnectId());
             this.device.updateFromCache(reconnectDevice);
             yield this.ensureProtocolV2DeviceAcquired();
             this.device.commands.disposed = false;
-            this.device.getCommands().mainId = (_j = this.device.mainId) !== null && _j !== void 0 ? _j : '';
+            this.device.getCommands().mainId = (_f = this.device.mainId) !== null && _f !== void 0 ? _f : '';
         });
     }
     ensureProtocolV2DeviceAcquired() {
@@ -54339,8 +53690,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             });
             if (writeRes.type !== 'FilesystemFile') {
                 if (writeRes.type === 'CallMethodError') {
-                    if (((_a = writeRes.message.error) !== null && _a !== void 0 ? _a : '').indexOf(SESSION_ERROR) > -1) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR);
+                    if (((_a = writeRes.message.error) !== null && _a !== void 0 ? _a : '').indexOf(SESSION_ERROR$1) > -1) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR$1);
                     }
                 }
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
@@ -54360,51 +53711,21 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             yield hdShared.wait(2000);
         });
     }
-    acquireProtocolV2BleDevice(skipProtocolProbe = false) {
+    acquireProtocolV2BleDevice() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const connector = this.device.deviceConnector;
-            const expectedId = this.device.originalDescriptor.id;
-            if (!skipProtocolProbe) {
-                yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL));
-                return;
-            }
-            yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, skipProtocolProbe));
-            this.device.commands.disposed = false;
-            this.device.getCommands().mainId = expectedId;
+            yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true, PROTOCOL_V2_CONNECT_PROTOCOL));
         });
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
         return __awaiter(this, void 0, void 0, function* () {
             this.protocolV2LastRuntimeProbeFeatures = undefined;
-            this.protocolV2InstallNeedsReconnect = false;
-            this.protocolV2InstallTerminalSuccessObserved = false;
             const commands = this.device.getCommands();
             yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
-            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+            this.device.setCancelableAction(() => commands.cancelDevice());
             const interaction = this.device.createProtocolV2UiPhaseMetadata('button', 'start');
             this.postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, Object.assign({ device: this.device.toMessageObject(), source: 'method-lifecycle', reason: 'firmware-update', completion: 'operation-completed', deviceOnly: true, operation: this.name }, (interaction ? { interaction } : {}))));
-            try {
-                yield commands.call('DeviceFirmwareUpdateRequest', {}, {
-                    returnAfterWrite: true,
-                    expectedTypes: ['Success'],
-                    onResponseAfterWrite: response => {
-                        if (response.type !== 'Success')
-                            return;
-                        this.protocolV2InstallTerminalSuccessObserved = true;
-                        this.device.clearCancelableAction();
-                        Log$6.log('[FirmwareUpdateV4] firmware install completed by device response');
-                    },
-                });
-                Log$6.log('[FirmwareUpdateV4] firmware install request written; continue with status polling');
-            }
-            catch (error) {
-                this.throwIfAborted();
-                if (!isProtocolV2DeviceDisconnectedError(error)) {
-                    throw error;
-                }
-                Log$6.log('[FirmwareUpdateV4] transport released while writing install request; continue status polling');
-                this.protocolV2InstallNeedsReconnect = true;
-            }
+            yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
         });
     }
     protocolV2Reboot(rebootType) {
@@ -54413,14 +53734,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             try {
                 const res = yield typedCall('DeviceReboot', 'Success', {
                     reboot_type: rebootType,
-                }, { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT });
+                });
                 this.device.markProtocolV2Reboot(rebootType);
                 return res.message;
             }
             catch (error) {
-                if (isProtocolV2DeviceDisconnectedError(error) ||
-                    isProtocolV2ReconnectProbeError(error) ||
-                    isProtocolV2ResponseTimeout(error)) {
+                if (isProtocolV2DeviceDisconnectedError(error) || isProtocolV2ReconnectProbeError(error)) {
                     this.device.markProtocolV2Reboot(rebootType);
                     return { message: 'Device rebooted successfully' };
                 }
@@ -54436,7 +53755,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
 }
 
-const Log$5 = getLogger(exports.LoggerNames.Method);
+const Log$6 = getLogger(exports.LoggerNames.Method);
 class PromptWebDeviceAccess extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -54491,7 +53810,7 @@ class PromptWebDeviceAccess extends BaseMethod {
                 return { device: null };
             }
             catch (error) {
-                Log$5.debug(error);
+                Log$6.debug(error);
                 return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Please select the device to connect'));
             }
         });
@@ -54596,234 +53915,281 @@ function decodeJpegBase64ToRgba({ jpegBase64, parameterName, expectedWidth, expe
     return decoded;
 }
 
-const PRO2_HOST_ASSET_PACKAGE_MIN_VERSION = '1.0.1';
-const CONTAINER_HEADER_SIZE = 0x5f90;
-const CONTAINER_HEADER_HASH_INPUT_LENGTH = 0x240;
-const CONTAINER_HASH_SECTION_OFFSET = 0x200;
-const CONTAINER_SIGNATURE_ALGORITHM_OFFSET = 0x408;
-const CONTAINER_HEADER_MAGIC = 0x50504b4f;
-const CONTAINER_HEADER_VERSION = 1;
-const CONTAINER_RESOURCE_TYPE_MAGIC = 0x43534552;
-const CONTAINER_ED25519_SIGNATURE_ALGORITHM = 0x71717171;
-const ARCHIVE_MAGIC = 0x52414b4f;
-const ARCHIVE_VERSION = 1;
-const ARCHIVE_HEADER_SIZE = 42;
-const ARCHIVE_ENTRY_SIZE = 296;
-const ARCHIVE_ENTRY_NAME_MAX_LENGTH = 255;
-const ARCHIVE_COMPRESS_LZ4_BLOCKED = 1;
-const ARCHIVE_ALIGNMENT = 4;
-const LZ4_BLOCK_SIZE_LOG2 = 12;
-const LZ4_MIN_MATCH = 4;
-const LZ4_LAST_LITERALS = 5;
-const LZ4_MATCH_FIND_LIMIT = 12;
-const LZ4_MAX_OFFSET = 0xffff;
-const LZ4_LENGTH_MASK = 15;
-const LZ4_HASH_LOG = 16;
-const LZ4_HASH_MULTIPLIER = 2654435761;
-const LZ4_SKIP_TRIGGER = 6;
-const HOST_ASSET_PACKAGE_MAX_SIZE = 4 * 1024 * 1024;
-function supportsPro2HostAssetPackage(firmwareVersion) {
-    return Boolean(firmwareVersion &&
-        semver__default["default"].valid(firmwareVersion) &&
-        semver__default["default"].gte(firmwareVersion, PRO2_HOST_ASSET_PACKAGE_MIN_VERSION));
-}
-function align(value) {
-    return (value + ARCHIVE_ALIGNMENT - 1) & ~(ARCHIVE_ALIGNMENT - 1);
+const Log$5 = getLogger(exports.LoggerNames.Core);
+const MIN_FILE_CHUNK_SIZE = 64;
+const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
+const FILE_TRANSFER_LOG_INTERVAL_MS = 10000;
+const SESSION_ERROR = 'session not found';
+function formatFileTransferRate(bytesPerSecond) {
+    return (Math.max(bytesPerSecond, 0) / 1024).toFixed(2);
 }
-function concatBytes(parts) {
-    const output = new Uint8Array(parts.reduce((length, part) => length + part.byteLength, 0));
-    let offset = 0;
-    for (const part of parts) {
-        output.set(part, offset);
-        offset += part.byteLength;
-    }
-    return output;
+function getAverageFileTransferRate(transferredBytes, elapsedMs) {
+    if (elapsedMs <= 0)
+        return 0;
+    return Math.round((Math.max(transferredBytes, 0) / elapsedMs) * 1000);
 }
-function writeExtendedLength(output, offset, length) {
-    let remaining = length;
-    let nextOffset = offset;
-    while (remaining >= 255) {
-        output[nextOffset] = 255;
-        nextOffset += 1;
-        remaining -= 255;
-    }
-    output[nextOffset] = remaining;
-    return nextOffset + 1;
+function getFileTransferTransport() {
+    const env = DataManager.getSettings('env');
+    return env && DataManager.isBleConnect(env) ? 'BLE' : String(env !== null && env !== void 0 ? env : 'unknown');
 }
-function copyBytes(output, outputOffset, input, inputOffset, length) {
-    output.set(input.subarray(inputOffset, inputOffset + length), outputOffset);
-    return outputOffset + length;
+function logFileTransferMetrics({ transport, status, path, transferredBytes, totalBytes, elapsedMs, rateBytesPerSecond, hostWriteElapsedMs, responseWaitElapsedMs, measuredAttempts, }) {
+    const segmentedMetrics = measuredAttempts > 0
+        ? ` hostWriteTotal=${(hostWriteElapsedMs / 1000).toFixed(2)}s responseWaitTotal=${(responseWaitElapsedMs / 1000).toFixed(2)}s measuredAttempts=${measuredAttempts}`
+        : '';
+    Log$5.log(`[FileWrite] metrics transport=${transport} status=${status} path=${path} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s${segmentedMetrics}`);
 }
-function emitSequence(output, outputOffset, input, anchor, literalLength, matchOffset, matchLengthCode) {
-    const tokenOffset = outputOffset;
-    let nextOffset = outputOffset + 1;
-    let token = 0;
-    if (literalLength >= LZ4_LENGTH_MASK) {
-        token = LZ4_LENGTH_MASK << 4;
-        nextOffset = writeExtendedLength(output, nextOffset, literalLength - LZ4_LENGTH_MASK);
-    }
-    else {
-        token = literalLength << 4;
-    }
-    nextOffset = copyBytes(output, nextOffset, input, anchor, literalLength);
-    output[nextOffset] = matchOffset & 0xff;
-    output[nextOffset + 1] = (matchOffset >>> 8) & 0xff;
-    nextOffset += 2;
-    if (matchLengthCode >= LZ4_LENGTH_MASK) {
-        token |= LZ4_LENGTH_MASK;
-        nextOffset = writeExtendedLength(output, nextOffset, matchLengthCode - LZ4_LENGTH_MASK);
-    }
-    else {
-        token |= matchLengthCode;
-    }
-    output[tokenOffset] = token;
-    return nextOffset;
+function isProtocolV2ResponseTimeout(error) {
+    var _a, _b;
+    if (!error || typeof error !== 'object')
+        return false;
+    const candidate = error;
+    const code = (_a = candidate.errorCode) !== null && _a !== void 0 ? _a : candidate.code;
+    return (code === hdShared.HardwareErrorCode.BleTimeoutError ||
+        code === 'response-timeout' ||
+        /(?:BLE|Lowlevel|Protocol V2) response timeout/i.test((_b = candidate.message) !== null && _b !== void 0 ? _b : ''));
 }
-function emitLastLiterals(output, outputOffset, input, anchor, literalLength) {
-    const tokenOffset = outputOffset;
-    let nextOffset = outputOffset + 1;
-    if (literalLength >= LZ4_LENGTH_MASK) {
-        output[tokenOffset] = LZ4_LENGTH_MASK << 4;
-        nextOffset = writeExtendedLength(output, nextOffset, literalLength - LZ4_LENGTH_MASK);
-    }
-    else {
-        output[tokenOffset] = literalLength << 4;
-    }
-    return copyBytes(output, nextOffset, input, anchor, literalLength);
+function getProtocolV2FileChunkLimit() {
+    const env = DataManager.getSettings('env');
+    return env && DataManager.isBleConnect(env)
+        ? hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
+        : hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
 }
-function compressRawLz4Block(input, hashTable) {
-    const output = new Uint8Array(input.byteLength + Math.floor(input.byteLength / 255) + 16);
-    const inputView = new DataView(input.buffer, input.byteOffset, input.byteLength);
-    const matchFindLimit = input.byteLength - LZ4_MATCH_FIND_LIMIT;
-    const matchExtendLimit = input.byteLength - LZ4_LAST_LITERALS;
-    let anchor = 0;
-    let inputOffset = 0;
-    let outputOffset = 0;
-    let searchMatchCount = 1 << LZ4_SKIP_TRIGGER;
-    hashTable.fill(0);
-    while (inputOffset < matchFindLimit) {
-        const sequence = inputView.getUint32(inputOffset, true);
-        const hash = Math.imul(sequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_LOG);
-        const candidate = hashTable[hash] - 1;
-        hashTable[hash] = inputOffset + 1;
-        const hasMatch = !(candidate < 0 ||
-            inputOffset - candidate > LZ4_MAX_OFFSET ||
-            inputView.getUint32(candidate, true) !== sequence);
-        if (!hasMatch) {
-            inputOffset += searchMatchCount >> LZ4_SKIP_TRIGGER;
-            searchMatchCount += 1;
+function dataToUint8Array(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof data === 'string')
+            return new TextEncoder().encode(data);
+        if (data instanceof ArrayBuffer)
+            return new Uint8Array(data);
+        if (ArrayBuffer.isView(data)) {
+            return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
         }
-        else {
-            searchMatchCount = 1 << LZ4_SKIP_TRIGGER;
-            let matchEnd = inputOffset + LZ4_MIN_MATCH;
-            let reference = candidate + LZ4_MIN_MATCH;
-            while (matchEnd < matchExtendLimit && input[matchEnd] === input[reference]) {
-                matchEnd += 1;
-                reference += 1;
-            }
-            outputOffset = emitSequence(output, outputOffset, input, anchor, inputOffset - anchor, inputOffset - candidate, matchEnd - inputOffset - LZ4_MIN_MATCH);
-            inputOffset = matchEnd;
-            anchor = inputOffset;
+        if (typeof Blob !== 'undefined' && data instanceof Blob) {
+            return new Uint8Array(yield data.arrayBuffer());
         }
-    }
-    outputOffset = emitLastLiterals(output, outputOffset, input, anchor, input.byteLength - anchor);
-    return output.slice(0, outputOffset);
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Unsupported FilesystemFileWrite data');
+    });
 }
-function encodeLz4Blocked(data) {
-    const blockSize = 1 << LZ4_BLOCK_SIZE_LOG2;
-    const blockCount = Math.ceil(data.byteLength / blockSize);
-    const hashTable = new Uint32Array(1 << LZ4_HASH_LOG);
-    const blocks = [];
-    const header = new Uint8Array(8 + blockCount * 4);
-    const headerView = new DataView(header.buffer);
-    headerView.setUint16(0, blockCount, true);
-    headerView.setUint16(2, LZ4_BLOCK_SIZE_LOG2, true);
-    for (let index = 0; index < blockCount; index += 1) {
-        const block = compressRawLz4Block(data.subarray(index * blockSize, Math.min((index + 1) * blockSize, data.byteLength)), hashTable);
-        headerView.setUint32(8 + index * 4, block.byteLength, true);
-        blocks.push(block);
-    }
-    return concatBytes([header, ...blocks]);
+function normalizeChunkSize(value, maxChunkSize) {
+    const numeric = Number(value);
+    if (!Number.isFinite(numeric) || numeric <= 0)
+        return maxChunkSize;
+    return Math.min(Math.max(Math.floor(numeric), MIN_FILE_CHUNK_SIZE), maxChunkSize);
 }
-const CRC32_TABLE = (() => {
-    const table = new Uint32Array(256);
-    for (let index = 0; index < table.length; index += 1) {
-        let value = index;
-        for (let bit = 0; bit < 8; bit += 1) {
-            value = value & 1 ? 0xedb88320 ^ (value >>> 1) : value >>> 1;
-        }
-        table[index] = value >>> 0;
-    }
-    return table;
-})();
-function crc32(data) {
-    let value = 0xffffffff;
-    for (const byte of data) {
-        value = CRC32_TABLE[(value ^ byte) & 0xff] ^ (value >>> 8);
+function getDeviceTransferProgress(before, after, total) {
+    if (!Number.isFinite(total) || total <= 0)
+        return 100;
+    if (before <= 0 && after < total)
+        return 0;
+    if (after >= total)
+        return 100;
+    return Math.min(Math.max(Math.ceil((after / total) * 100), 1), 99);
+}
+function getConfirmedProgress(processed, total, written, length) {
+    if (Number.isFinite(processed) && Number.isFinite(total) && total > 0) {
+        if (processed >= total)
+            return 100;
+        return Math.min(Math.max(Math.floor((processed / total) * 100), 0), 99);
     }
-    return (value ^ 0xffffffff) >>> 0;
+    if (length > 0)
+        return written >= length ? 100 : Math.floor((written / length) * 100);
+    return 100;
 }
-function buildArchive(entries) {
-    const textEncoder = new TextEncoder();
-    let dataOffset = ARCHIVE_HEADER_SIZE + entries.length * ARCHIVE_ENTRY_SIZE;
-    const encodedEntries = entries.map(entry => {
-        const nameBytes = textEncoder.encode(entry.name);
-        if (!entry.name || nameBytes.byteLength > ARCHIVE_ENTRY_NAME_MAX_LENGTH) {
-            throw new Error('Pro2 host asset package entry names must contain 1 to 255 UTF-8 bytes.');
+function writeProtocolV2File(options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    return __awaiter(this, void 0, void 0, function* () {
+        (_a = options.throwIfAborted) === null || _a === void 0 ? void 0 : _a.call(options);
+        const data = yield dataToUint8Array(options.data);
+        const dataLength = data.byteLength;
+        const startOffset = Number.isFinite(options.offset) && Number(options.offset) > 0 ? Number(options.offset) : 0;
+        const totalSize = Number.isFinite(options.totalSize) && Number(options.totalSize) > 0
+            ? Number(options.totalSize)
+            : startOffset + dataLength;
+        if (totalSize < startOffset + dataLength) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
         }
-        if (!(entry.data instanceof Uint8Array) || entry.data.byteLength === 0) {
-            throw new Error(`Pro2 host asset package entry [${entry.name}] must not be empty.`);
+        const defaultChunkSizeLimit = getProtocolV2FileChunkLimit();
+        const configuredChunkSizeLimit = Number(options.chunkSizeLimit);
+        const chunkSizeLimit = Number.isFinite(configuredChunkSizeLimit) && configuredChunkSizeLimit > 0
+            ? Math.floor(configuredChunkSizeLimit)
+            : defaultChunkSizeLimit;
+        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, chunkSizeLimit);
+        let written = 0;
+        let chunks = 0;
+        let lastMessage;
+        const startTime = Date.now();
+        let rateWindowStartedAt = startTime;
+        let rateWindowStartedBytes = 0;
+        let rateBytesPerSecond;
+        let lastConfirmedAt = startTime;
+        let logWindowStartedAt = startTime;
+        let logWindowStartedBytes = 0;
+        let hostWriteElapsedMs = 0;
+        let responseWaitElapsedMs = 0;
+        let measuredAttempts = 0;
+        const transport = getFileTransferTransport();
+        Log$5.log(`[FileWrite] started transport=${transport} path=${options.path} bytes=${dataLength} offset=${startOffset} chunk=${chunkSize}`);
+        try {
+            while (written < dataLength) {
+                (_c = options.throwIfAborted) === null || _c === void 0 ? void 0 : _c.call(options);
+                const chunk = data.slice(written, Math.min(written + chunkSize, dataLength));
+                const offset = startOffset + written;
+                const progress = (_f = (_d = options.uiPercentage) !== null && _d !== void 0 ? _d : (_e = options.getUiPercentage) === null || _e === void 0 ? void 0 : _e.call(options, {
+                    offset,
+                    chunkLength: chunk.byteLength,
+                    totalSize,
+                })) !== null && _f !== void 0 ? _f : getDeviceTransferProgress(offset, offset + chunk.byteLength, totalSize);
+                const request = {
+                    file: { path: options.path, offset, total_size: totalSize, data: chunk },
+                    overwrite: chunks === 0 ? (_g = options.overwrite) !== null && _g !== void 0 ? _g : false : false,
+                    append: (_h = options.append) !== null && _h !== void 0 ? _h : false,
+                    ui_percentage: progress,
+                };
+                const maxChunkRetries = Math.max(Math.floor((_j = options.maxChunkRetries) !== null && _j !== void 0 ? _j : 0), 0);
+                let retryCount = 0;
+                let response;
+                let isWritePending = true;
+                while (isWritePending) {
+                    let currentHostWriteElapsedMs;
+                    let responseWaitStartedAt;
+                    try {
+                        const callOptions = options.writeWithResponse === undefined
+                            ? {
+                                timeoutMs: options.timeoutMs,
+                                onWriteCompleted: ({ elapsedMs }) => {
+                                    currentHostWriteElapsedMs = elapsedMs;
+                                    responseWaitStartedAt = Date.now();
+                                },
+                            }
+                            : Object.assign(Object.assign({}, (options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })), { writeWithResponse: options.writeWithResponse, onWriteCompleted: ({ elapsedMs }) => {
+                                    currentHostWriteElapsedMs = elapsedMs;
+                                    responseWaitStartedAt = Date.now();
+                                } });
+                        response = yield options.commands.typedCall('FilesystemFileWrite', 'FilesystemFile', request, callOptions);
+                        isWritePending = false;
+                    }
+                    catch (error) {
+                        if (retryCount >= maxChunkRetries || !isProtocolV2ResponseTimeout(error))
+                            throw error;
+                        retryCount += 1;
+                        (_k = options.throwIfAborted) === null || _k === void 0 ? void 0 : _k.call(options);
+                    }
+                    finally {
+                        if (currentHostWriteElapsedMs !== undefined && responseWaitStartedAt !== undefined) {
+                            hostWriteElapsedMs += currentHostWriteElapsedMs;
+                            responseWaitElapsedMs += Math.max(Date.now() - responseWaitStartedAt, 0);
+                            measuredAttempts += 1;
+                        }
+                    }
+                }
+                if (!response) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'FilesystemFileWrite completed without a response');
+                }
+                const responseType = response.type;
+                if (responseType && responseType !== 'FilesystemFile') {
+                    const responseError = (_l = response.message) === null || _l === void 0 ? void 0 : _l.error;
+                    if (typeof responseError === 'string' && responseError.includes(SESSION_ERROR)) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR);
+                    }
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite received unexpected response ${responseType}`);
+                }
+                (_m = options.throwIfAborted) === null || _m === void 0 ? void 0 : _m.call(options);
+                lastMessage = response.message;
+                const rawProcessedByte = (_o = response.message) === null || _o === void 0 ? void 0 : _o.processed_byte;
+                const processedByte = Number(rawProcessedByte);
+                if (rawProcessedByte !== undefined &&
+                    (!Number.isFinite(processedByte) ||
+                        processedByte <= offset ||
+                        processedByte > offset + chunk.byteLength)) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite invalid processed_byte ${processedByte}`);
+                }
+                written =
+                    rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
+                chunks += 1;
+                const now = Date.now();
+                lastConfirmedAt = now;
+                const elapsedMs = now - startTime;
+                const transferredBytes = Math.min(written, dataLength);
+                const rateWindowElapsedMs = now - rateWindowStartedAt;
+                if (rateWindowElapsedMs >= FILE_TRANSFER_RATE_WINDOW_MS) {
+                    const rateWindowBytes = Math.max(transferredBytes - rateWindowStartedBytes, 0);
+                    rateBytesPerSecond = Math.round((rateWindowBytes / rateWindowElapsedMs) * 1000);
+                    rateWindowStartedAt = now;
+                    rateWindowStartedBytes = transferredBytes;
+                }
+                else if (rateBytesPerSecond === undefined && elapsedMs > 0) {
+                    rateBytesPerSecond = Math.round((transferredBytes / elapsedMs) * 1000);
+                }
+                (_p = options.onProgress) === null || _p === void 0 ? void 0 : _p.call(options, {
+                    progress: getConfirmedProgress(startOffset + written, totalSize, written, dataLength),
+                    transferredBytes,
+                    totalBytes: dataLength,
+                    rateBytesPerSecond,
+                    elapsedMs,
+                });
+                const logWindowElapsedMs = now - logWindowStartedAt;
+                if (logWindowElapsedMs >= FILE_TRANSFER_LOG_INTERVAL_MS && transferredBytes < dataLength) {
+                    const logWindowBytes = Math.max(transferredBytes - logWindowStartedBytes, 0);
+                    logFileTransferMetrics({
+                        transport,
+                        status: 'progress',
+                        path: options.path,
+                        transferredBytes,
+                        totalBytes: dataLength,
+                        elapsedMs,
+                        rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+                        hostWriteElapsedMs,
+                        responseWaitElapsedMs,
+                        measuredAttempts,
+                    });
+                    logWindowStartedAt = now;
+                    logWindowStartedBytes = transferredBytes;
+                }
+                if (options.paceMs && options.paceMs > 0) {
+                    yield new Promise(resolve => {
+                        setTimeout(resolve, options.paceMs);
+                    });
+                }
+            }
         }
-        const compressed = encodeLz4Blocked(entry.data);
-        const offset = align(dataOffset);
-        dataOffset = offset + compressed.byteLength;
-        return Object.assign(Object.assign({}, entry), { nameBytes, compressed, offset });
-    });
-    const archive = new Uint8Array(dataOffset);
-    const view = new DataView(archive.buffer);
-    view.setUint32(0, ARCHIVE_MAGIC, true);
-    view.setUint32(4, ARCHIVE_VERSION, true);
-    view.setUint16(8, encodedEntries.length, true);
-    encodedEntries.forEach((entry, index) => {
-        const recordOffset = ARCHIVE_HEADER_SIZE + index * ARCHIVE_ENTRY_SIZE;
-        archive[recordOffset] = entry.nameBytes.byteLength;
-        archive.set(entry.nameBytes, recordOffset + 1);
-        view.setUint32(recordOffset + 0x100, entry.offset, true);
-        view.setUint32(recordOffset + 0x104, entry.data.byteLength, true);
-        view.setUint32(recordOffset + 0x108, entry.compressed.byteLength, true);
-        view.setUint32(recordOffset + 0x10c, crc32(entry.data), true);
-        view.setUint32(recordOffset + 0x110, crc32(entry.compressed), true);
-        archive[recordOffset + 0x114] = ARCHIVE_COMPRESS_LZ4_BLOCKED;
-        archive.set(entry.compressed, entry.offset);
+        catch (error) {
+            const now = Date.now();
+            const elapsedMs = Math.max(now - startTime, 0);
+            const logWindowElapsedMs = Math.max(now - logWindowStartedAt, 0);
+            const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
+            logFileTransferMetrics({
+                transport,
+                status: 'failed',
+                path: options.path,
+                transferredBytes: written,
+                totalBytes: dataLength,
+                elapsedMs,
+                rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+                hostWriteElapsedMs,
+                responseWaitElapsedMs,
+                measuredAttempts,
+            });
+            throw error;
+        }
+        const elapsedMs = Math.max(lastConfirmedAt - startTime, 0);
+        const logWindowElapsedMs = Math.max(lastConfirmedAt - logWindowStartedAt, 0);
+        const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
+        logFileTransferMetrics({
+            transport,
+            status: 'completed',
+            path: options.path,
+            transferredBytes: written,
+            totalBytes: dataLength,
+            elapsedMs,
+            rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+            hostWriteElapsedMs,
+            responseWaitElapsedMs,
+            measuredAttempts,
+        });
+        return Object.assign(Object.assign({}, lastMessage), { path: options.path, offset: startOffset, total_size: totalSize, processed_byte: startOffset + written, chunks });
     });
-    return archive;
-}
-function buildPro2HostAssetPackage(entries) {
-    if (entries.length === 0 || new Set(entries.map(entry => entry.name)).size !== entries.length) {
-        throw new Error('Pro2 host asset package entries must have unique, non-empty names.');
-    }
-    const payload = buildArchive(entries);
-    const header = new Uint8Array(CONTAINER_HEADER_SIZE);
-    const view = new DataView(header.buffer);
-    view.setUint32(0, CONTAINER_HEADER_MAGIC, true);
-    view.setUint32(4, CONTAINER_HEADER_VERSION, true);
-    view.setUint32(8, CONTAINER_RESOURCE_TYPE_MAGIC, true);
-    view.setUint32(0x0c, CONTAINER_HEADER_SIZE, true);
-    view.setUint32(0x10, 1, true);
-    view.setUint32(0x14, payload.byteLength, true);
-    header.set(sha3.sha3_512(payload), CONTAINER_HASH_SECTION_OFFSET);
-    header.set(sha3.sha3_512(header.subarray(0, CONTAINER_HEADER_HASH_INPUT_LENGTH)), 0x240);
-    view.setUint32(CONTAINER_SIGNATURE_ALGORITHM_OFFSET, CONTAINER_ED25519_SIGNATURE_ALGORITHM, true);
-    const packageData = concatBytes([header, payload]);
-    if (packageData.byteLength > HOST_ASSET_PACKAGE_MAX_SIZE) {
-        throw new Error('Pro2 host asset package exceeds the firmware 4 MiB limit.');
-    }
-    return packageData;
 }
 
 const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
-const WALLPAPER_PACKAGE_PATH = `${WALLPAPER_DIRECTORY}/wallpaper.okpkg`;
-const WALLPAPER_PACKAGE_ENTRY = 'wallpaper.bin';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
 const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2 = 60805;
@@ -54899,15 +54265,18 @@ class DeviceUploadWallpaper extends BaseMethod {
             this.directoryReady = true;
         });
     }
-    upload(path, data) {
+    upload() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.uploaded)
                 return;
+            const { encoded } = this;
+            if (!encoded)
+                throw invalidParameter$1('Wallpaper data has not been initialized.');
             yield writeProtocolV2File({
                 commands: this.device.commands,
-                path,
-                data,
-                totalSize: data.byteLength,
+                path: this.path,
+                data: encoded.data,
+                totalSize: encoded.data.byteLength,
                 chunkSize: this.params.chunkSize,
                 maxChunkRetries: 3,
                 overwrite: true,
@@ -54930,13 +54299,7 @@ class DeviceUploadWallpaper extends BaseMethod {
                 throw invalidParameter$1('Wallpaper data has not been initialized.');
             yield this.assertCapabilities();
             yield this.ensureDirectory();
-            const useHostAssetPackage = supportsPro2HostAssetPackage(this.device.getCurrentFirmwareVersionString());
-            const data = useHostAssetPackage
-                ? buildPro2HostAssetPackage([{ name: WALLPAPER_PACKAGE_ENTRY, data: encoded.data }])
-                : encoded.data;
-            if (useHostAssetPackage)
-                this.path = WALLPAPER_PACKAGE_PATH;
-            yield this.upload(this.path, data);
+            yield this.upload();
             const response = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
                 settings: { wallpaper_path: this.path },
             });
@@ -54950,7 +54313,7 @@ class DeviceUploadWallpaper extends BaseMethod {
             }
             return {
                 path: this.path,
-                size: data.byteLength,
+                size: encoded.data.byteLength,
                 colorFormat: encoded.colorFormat,
                 message: (_a = response.message) === null || _a === void 0 ? void 0 : _a.message,
             };
@@ -55029,14 +54392,14 @@ class DeviceUploadNft extends BaseMethod {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
     }
-    assertCapabilities(useHostAssetPackage) {
+    assertCapabilities() {
         return __awaiter(this, void 0, void 0, function* () {
             const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
             const hasFileWrite = supportsProtocolV2Message(protocolInfo, FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$1);
             const hasPathInfo = supportsProtocolV2Message(protocolInfo, FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE);
             const hasDirList = supportsProtocolV2Message(protocolInfo, FILESYSTEM_DIR_LIST_MESSAGE_TYPE);
             const hasNftUpdate = supportsProtocolV2Message(protocolInfo, NFT_UPDATE_MESSAGE_TYPE);
-            if (!hasFileWrite || !hasNftUpdate || (!useHostAssetPackage && (!hasPathInfo || !hasDirList))) {
+            if (!hasFileWrite || !hasPathInfo || !hasDirList || !hasNftUpdate) {
                 throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
             }
         });
@@ -55067,28 +54430,15 @@ class DeviceUploadNft extends BaseMethod {
             const { bundle } = this;
             if (!bundle)
                 throw invalidParameter$1('NFT data has not been initialized.');
-            const useHostAssetPackage = supportsPro2HostAssetPackage(this.device.getCurrentFirmwareVersionString());
-            yield this.assertCapabilities(useHostAssetPackage);
+            yield this.assertCapabilities();
             this.throwIfAborted();
-            if (!useHostAssetPackage)
-                yield this.assertStorageCapacity(bundle.basename);
+            yield this.assertStorageCapacity(bundle.basename);
             this.throwIfAborted();
-            const extractedFiles = [
+            const files = [
                 { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}.bin`, data: bundle.image },
                 { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}_m.bin`, data: bundle.thumbnail },
                 { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}.json`, data: bundle.metadata },
             ];
-            const files = useHostAssetPackage
-                ? [
-                    {
-                        path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}.okpkg`,
-                        data: buildPro2HostAssetPackage(extractedFiles.map(file => ({
-                            name: file.path.slice(`${PRO2_NFT_DIRECTORY}/`.length),
-                            data: file.data,
-                        }))),
-                    },
-                ]
-                : extractedFiles;
             const totalSize = files.reduce((sum, file) => sum + file.data.byteLength, 0);
             let transferredBeforeFile = 0;
             for (const file of files) {
@@ -55117,9 +54467,9 @@ class DeviceUploadNft extends BaseMethod {
             const response = yield this.updateNft(bundle.basename);
             return {
                 basename: bundle.basename,
-                imagePath: extractedFiles[0].path,
-                thumbnailPath: extractedFiles[1].path,
-                metadataPath: extractedFiles[2].path,
+                imagePath: files[0].path,
+                thumbnailPath: files[1].path,
+                metadataPath: files[2].path,
                 totalSize,
                 nftUpdated: true,
                 message: (_a = response.message) === null || _a === void 0 ? void 0 : _a.message,
@@ -55398,8 +54748,6 @@ class ProtocolV2UiInteractionCoordinator {
 const Log$3 = getLogger(exports.LoggerNames.Core);
 const createProtocolV2UnlockContext = () => ({
     preflightCompleted: false,
-    preflightStatusRefreshed: false,
-    preflightMainPinSelected: false,
 });
 const resolvePreUnlockPinType = (method) => {
     var _a, _b;
@@ -55432,11 +54780,10 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
             }
             yield (afterStatusBeforeUnlock === null || afterStatusBeforeUnlock === void 0 ? void 0 : afterStatusBeforeUnlock());
             if (!status.unlocked) {
-                const preUnlockPinType = resolvePreUnlockPinType(method);
                 const unlockInteraction = shouldCoordinateUi
                     ? uiCoordinator.enterUnlockInteraction(method.name)
                     : undefined;
-                const unlockedStatus = yield device.unlockDevice(preUnlockPinType, shouldCoordinateUi
+                const unlockedStatus = yield device.unlockDevice(resolvePreUnlockPinType(method), shouldCoordinateUi
                     ? { emitUiEvent: false, interaction: unlockInteraction }
                     : {
                         source: 'unlock-coordinator',
@@ -55447,10 +54794,8 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
                 if ((unlockedStatus === null || unlockedStatus === void 0 ? void 0 : unlockedStatus.unlocked) !== true) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device remained locked after the unlock flow.');
                 }
-                context.preflightMainPinSelected = preUnlockPinType === hdTransport.DeviceSessionPinType.Main;
                 Log$3.debug('Protocol V2 pre-unlock completed', { method: method.name });
             }
-            context.preflightStatusRefreshed = true;
             context.preflightCompleted = true;
         }
         yield (prepare === null || prepare === void 0 ? void 0 : prepare());
@@ -55739,7 +55084,6 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 const response = yield runMethodWithUnlockPolicy(method, this.device, {
                     context: this.protocolV2UnlockContext,
                     prepare: () => __awaiter(this, void 0, void 0, function* () {
-                        var _d;
                         if (this.temporarySafetyCheckPrompted) {
                             method.temporarySafetyCheckPrompted = true;
                         }
@@ -55753,7 +55097,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         const deriveCardano = method.name.startsWith('cardano');
                         const shouldResumeWalletSession = useEmptyPassphrase || !!this.payload.passphraseState;
                         if (this.device.isProtocolV2() && shouldResumeWalletSession) {
-                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano, (_d = this.protocolV2UnlockContext) === null || _d === void 0 ? void 0 : _d.preflightMainPinSelected);
+                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano);
                             if (!passphraseStateSafety) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
                             }
@@ -58414,7 +57758,6 @@ class EVMSignTypedData extends BaseMethod {
         const currentDeviceType = this.device.getCurrentDeviceType();
         const supportBiggerDataVersion = '4.4.0';
         const supportBiggerData = DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
-            DeviceModelToTypes.model_pro2.includes(currentDeviceType) ||
             (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
                 semver__default["default"].gte(currentVersion, supportBiggerDataVersion));
         if (supportBiggerData) {
@@ -65195,7 +64538,7 @@ class DeviceConnector {
     stop() {
         this.listening = false;
     }
-    acquire(path, session, forceCleanRunPromise, expectedProtocol, protocolHint, forceProtocolDetection, skipProtocolProbe) {
+    acquire(path, session, forceCleanRunPromise, expectedProtocol, protocolHint, forceProtocolDetection) {
         return __awaiter(this, void 0, void 0, function* () {
             Log$2.debug('acquire', path, session, expectedProtocol, protocolHint);
             const env = DataManager.getSettings('env');
@@ -65203,15 +64546,13 @@ class DeviceConnector {
                 const transport = this.getActiveTransport();
                 let res;
                 if (DataManager.isBleConnect(env)) {
-                    const acquireInput = {
+                    res = yield transport.acquire({
                         uuid: path,
                         forceCleanRunPromise,
                         expectedProtocol,
                         protocolHint,
                         forceProtocolDetection,
-                        skipProtocolProbe,
-                    };
-                    res = yield transport.acquire(acquireInput);
+                    });
                 }
                 else {
                     res = yield transport.acquire({
@@ -65220,7 +64561,6 @@ class DeviceConnector {
                         expectedProtocol,
                         protocolHint,
                         forceProtocolDetection,
-                        skipProtocolProbe,
                     });
                 }
                 if (expectedProtocol) {
@@ -65728,8 +65068,6 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     if ((_g = method.payload) === null || _g === void 0 ? void 0 : _g.onlyConnectBleDevice) {
         preWarmCallbackTask === null || preWarmCallbackTask === void 0 ? void 0 : preWarmCallbackTask.resolve();
         Log.debug('Call API - only connect ble device: ', device === null || device === void 0 ? void 0 : device.mainId);
-        completeMethodRequestContext(method);
-        requestQueue.releaseTask(method.responseID);
         return createResponseMessage(method.responseID, true, null);
     }
     Log.debug('Call API - setDevice: ', device.mainId);
@@ -65851,7 +65189,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _o, _p, _q, _r, _s, _t;
+                        var _o, _p, _q, _r, _s;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -65871,7 +65209,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, hasDeriveCardano(method), (_r = method.protocolV2UnlockContext) === null || _r === void 0 ? void 0 : _r.preflightMainPinSelected);
+                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, hasDeriveCardano(method));
                             checkPassphraseEnableState(method, device.features);
                             if (!passphraseStateSafety) {
                                 DevicePool.clearDeviceCache(method.payload.connectId);
@@ -65889,7 +65227,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_t = (_s = method.device) === null || _s === void 0 ? void 0 : _s.commands) === null || _t === void 0 ? void 0 : _t.checkDisposed();
+                        (_s = (_r = method.device) === null || _r === void 0 ? void 0 : _r.commands) === null || _s === void 0 ? void 0 : _s.checkDisposed();
                     }),
                 });
                 messageResponse = createResponseMessage(method.responseID, true, response);
@@ -66105,36 +65443,7 @@ function isMissingDetectedProtocolV2Error(method, error) {
         typeof typedError.message === 'string' &&
         typedError.message.includes('Device protocol has not been detected'));
 }
-function isProtocolV2PeerRemovedPairingError(method, error) {
-    return (method.payload.connectProtocol === 'V2' &&
-        (error === null || error === void 0 ? void 0 : error.errorCode) ===
-            hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation);
-}
-const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000;
-function raceBleAcquire(acquirePromise, abortSignal) {
-    return new Promise((resolve, reject) => {
-        let settled = false;
-        const settle = (fn) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(deadline);
-            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', onAbort);
-            fn();
-        };
-        const onAbort = () => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled)));
-        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`))), BLE_ACQUIRE_DEADLINE_MS);
-        acquirePromise.then(value => settle(() => resolve(value)), error => settle(() => reject(error)));
-        if (abortSignal) {
-            if (abortSignal.aborted) {
-                onAbort();
-                return;
-            }
-            abortSignal.addEventListener('abort', onAbort);
-        }
-    });
-}
-function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
+function connectDeviceForBle(method, device, retryCount = 0) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -66149,31 +65458,9 @@ function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
                 !device.commands ||
                 device.commands.disposed;
             if (shouldAcquire) {
-                const useAcquireGuards = DataManager.getSettings('env') === 'desktop-web-ble';
-                if (useAcquireGuards && (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
-                }
-                if (!useAcquireGuards) {
-                    yield device.acquire(method.payload.connectProtocol, {
-                        forceProtocolDetection: method.payload.forceProtocolDetection,
-                    });
-                }
-                else {
-                    try {
-                        yield raceBleAcquire(device.acquire(method.payload.connectProtocol, {
-                            forceProtocolDetection: method.payload.forceProtocolDetection,
-                        }), abortSignal);
-                    }
-                    catch (err) {
-                        if (err.errorCode === hdShared.HardwareErrorCode.BleTimeoutError &&
-                            device.mainId &&
-                            device.deviceConnector) {
-                            yield device.deviceConnector.disconnect(device.mainId).catch(() => undefined);
-                            device.markTransportDisconnected();
-                        }
-                        throw err;
-                    }
-                }
+                yield device.acquire(method.payload.connectProtocol, {
+                    forceProtocolDetection: method.payload.forceProtocolDetection,
+                });
             }
             if ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.onlyConnectBleDevice) {
                 if (shouldAcquire) {
@@ -66204,7 +65491,7 @@ function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
                 const nextRetry = retryCount + 1;
                 Log.debug(`Bluetooth connection will retry, retry count: ${nextRetry}`);
                 yield wait(3000);
-                yield connectDeviceForBle(method, device, abortSignal, nextRetry);
+                yield connectDeviceForBle(method, device, nextRetry);
             }
             else {
                 throw err;
@@ -66221,7 +65508,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     Log.debug(`EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `);
     const poll = (time = POLL_INTERVAL_TIME) => __awaiter(void 0, void 0, void 0, function* () {
         return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            var _u;
+            var _t;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -66289,7 +65576,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                         if (tryCount === 1) {
                             device.beginConnectionAttempt();
                         }
-                        yield connectDeviceForBle(method, device, abortSignal);
+                        yield connectDeviceForBle(method, device);
                     }
                     resolve(device);
                     return;
@@ -66331,8 +65618,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     hdShared.HardwareErrorCode.BridgeNeedsPermission,
                     hdShared.HardwareErrorCode.DeviceInterruptedFromUser,
                     hdShared.HardwareErrorCode.CallQueueActionCancelled,
-                ].includes(error.errorCode) ||
-                    isProtocolV2PeerRemovedPairingError(method, error)) {
+                ].includes(error.errorCode)) {
                     reject(error);
                     return;
                 }
@@ -66342,7 +65628,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     clearTimeout(timer);
                 }
                 Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-                if (DataManager.isBrowserWebUsb(env) && !((_u = method.payload) === null || _u === void 0 ? void 0 : _u.skipWebDevicePrompt)) {
+                if (DataManager.isBrowserWebUsb(env) && !((_t = method.payload) === null || _t === void 0 ? void 0 : _t.skipWebDevicePrompt)) {
                     postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
                     reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
                 }
@@ -66367,7 +65653,6 @@ const cancel = (context, connectId) => {
             requestQueue.cancelCallbackTasks(connectId);
             const requestIds = requestQueue.getRequestTasksId();
             Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
-            requestQueue.abortRequestsByConnectId(connectId);
             const canceledDevices = [];
             const interruptDevice = (device, deviceConnectId) => {
                 if (!device || canceledDevices.includes(device)) {
@@ -66386,6 +65671,7 @@ const cancel = (context, connectId) => {
                 }
             }
             interruptDevice(deviceCacheMap.get(connectId), connectId);
+            requestQueue.abortRequestsByConnectId(connectId);
             pollingManager.stop(connectId);
         }
         catch (e) {
@@ -66396,7 +65682,6 @@ const cancel = (context, connectId) => {
         const env = DataManager.getSettings('env');
         if (DataManager.isBleConnect(env)) {
             Log.debug('Cancel Api all _deviceList: ');
-            requestQueue.abortAllRequests();
             const canceledDevices = [];
             const interruptDevice = (device) => {
                 if (!device || canceledDevices.includes(device)) {
@@ -66418,6 +65703,7 @@ const cancel = (context, connectId) => {
                 }
             }
             deviceCacheMap.forEach(interruptDevice);
+            requestQueue.abortAllRequests();
             pollingManager.stopAll();
         }
         else {
@@ -66455,12 +65741,8 @@ const checkPassphraseEnableState = (method, features) => {
     }
 };
 const shouldCheckPassphraseState = (method, device) => {
-    var _a;
     if (!method.useDevicePassphraseState)
         return false;
-    if (device.isProtocolV2() && ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.useEmptyPassphrase) === true) {
-        return true;
-    }
     return device.hasUsePassphrase();
 };
 const cleanup = () => {