@onekeyfe/hd-core 1.2.0-alpha.134 → 1.2.0-alpha.135

package/dist/index.js

@@ -2261,7 +2261,7 @@ const createLogMessage = (type, payload) => ({
 
 const MAX_ENTRIES = 500;
 let postMessage$1;
-class Log$m {
+class Log$n {
     constructor(prefix, enabled) {
         this.prefix = prefix;
         this.enabled = enabled;
@@ -2313,7 +2313,7 @@ class Log$m {
 }
 const _logs = {};
 const initLog = (prefix, enabled) => {
-    const instance = new Log$m(prefix, !!enabled);
+    const instance = new Log$n(prefix, !!enabled);
     _logs[prefix] = instance;
     return instance;
 };
@@ -2711,7 +2711,7 @@ function patchFeatures(response) {
     return response;
 }
 
-const Log$l = getLogger(exports.LoggerNames.Core);
+const Log$m = getLogger(exports.LoggerNames.Core);
 let globalInstanceCounter = 0;
 let sdkInstanceCounter = 0;
 function generateSdkInstanceId() {
@@ -2771,7 +2771,7 @@ function completeRequestContext(responseID, error) {
         context.status = error ? 'error' : 'success';
         if (error) {
             context.error = error.message;
-            Log$l.debug(`[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`);
+            Log$m.debug(`[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`);
         }
         globalActiveRequests.delete(responseID);
         if (context.sdkInstanceId) {
@@ -40799,7 +40799,7 @@ function selectProtocolV2ResourceManifestFiles({ manifest, targetsToUpdate, }) {
 
 var _a$1;
 const FIRMWARE_UPDATE_CONFIG_FRESHNESS_MS = 5 * 60 * 1000;
-const Log$k = getLogger(exports.LoggerNames.Core);
+const Log$l = getLogger(exports.LoggerNames.Core);
 const FIRMWARE_FIELDS = [
     'firmware',
     'firmware-v1',
@@ -40880,11 +40880,11 @@ class DataManager {
             const manifestMode = (_b = settings.firmwareManifestMode) !== null && _b !== void 0 ? _b : (settings.fetchConfig ? 'sdk-managed' : undefined);
             if (settings.preloadedConfig) {
                 this.applyRemoteConfig(settings.preloadedConfig);
-                Log$k.log('[DataConfig] Preloaded firmware config loaded');
+                Log$l.log('[DataConfig] Preloaded firmware config loaded');
                 return true;
             }
             if (manifestMode === 'external-only') {
-                Log$k.warn('[DataConfig] External firmware config is unavailable; SDK-managed networking remains disabled');
+                Log$l.warn('[DataConfig] External firmware config is unavailable; SDK-managed networking remains disabled');
                 return false;
             }
             if (manifestMode !== 'sdk-managed') {
@@ -40897,7 +40897,7 @@ class DataManager {
             let data = null;
             let fetchMethod = 'none';
             if (settings.configFetcher) {
-                Log$k.debug('[DataConfig] Trying client configFetcher...');
+                Log$l.debug('[DataConfig] Trying client configFetcher...');
                 try {
                     data = yield settings.configFetcher(urlWithCache);
                     if (data) {
@@ -40905,40 +40905,40 @@ class DataManager {
                     }
                 }
                 catch (e) {
-                    Log$k.warn('[DataConfig] Client configFetcher failed:', e);
+                    Log$l.warn('[DataConfig] Client configFetcher failed:', e);
                 }
             }
             if (!data) {
-                Log$k.debug('[DataConfig] Trying SDK-managed config request...');
+                Log$l.debug('[DataConfig] Trying SDK-managed config request...');
                 try {
                     const response = yield axios__default["default"].get(urlWithCache, {
                         timeout: 7000,
                     });
                     data = response.data;
                     fetchMethod = 'axios';
-                    Log$k.log('[DataConfig] SDK-managed config request succeeded');
+                    Log$l.log('[DataConfig] SDK-managed config request succeeded');
                 }
                 catch (e) {
-                    Log$k.warn('[DataConfig] SDK-managed config request failed:', e);
+                    Log$l.warn('[DataConfig] SDK-managed config request failed:', e);
                 }
             }
             if (data) {
                 this.applyRemoteConfig(data);
-                Log$k.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
+                Log$l.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
                 return true;
             }
-            Log$k.warn('[DataConfig] All fetch methods failed, using built-in default config');
+            Log$l.warn('[DataConfig] All fetch methods failed, using built-in default config');
             return false;
         });
     }
     static applyRemoteConfig(data) {
         const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, error => {
             this.protocolV2ResourcesConfigError = error;
-            Log$k.warn('[DataConfig] Ignoring invalid Pro2 release resources config:', error);
+            Log$l.warn('[DataConfig] Ignoring invalid Pro2 release resources config:', error);
         });
         const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, error => {
             this.protocolV2NeoResourcesConfigError = error;
-            Log$k.warn('[DataConfig] Ignoring invalid Neo release resources config:', error);
+            Log$l.warn('[DataConfig] Ignoring invalid Neo release resources config:', error);
         });
         this.deviceMap = {
             [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
@@ -43108,7 +43108,7 @@ const getDefectiveDeviceInfo = (features) => {
     };
 };
 
-const Log$j = getLogger(exports.LoggerNames.DevicePool);
+const Log$k = getLogger(exports.LoggerNames.DevicePool);
 const canPathIdentifyDevice = (path) => !!path && !/^0+$/.test(path);
 const getDiff = (current, descriptors) => {
     const connected = descriptors.filter(d => current.find(x => x.path === d.path) === undefined);
@@ -43170,7 +43170,7 @@ class DevicePool extends events.exports {
                         yield this._checkDevicePool(initOptions, connectId);
                         return { devices, deviceList };
                     }
-                    Log$j.debug('found device in cache, but path is different: ', connectId);
+                    Log$k.debug('found device in cache, but path is different: ', connectId);
                 }
             }
             const matchedDescriptor = connectId
@@ -43273,7 +43273,7 @@ class DevicePool extends events.exports {
                 });
             }
             catch (error) {
-                Log$j.debug('Unable to refresh Protocol V2 device label during discovery', error);
+                Log$k.debug('Unable to refresh Protocol V2 device label during discovery', error);
             }
         });
     }
@@ -43289,7 +43289,7 @@ class DevicePool extends events.exports {
                 const descriptor = this.connectedPool[i];
                 if (!connectId || descriptor.path === connectId) {
                     const device = yield this._createDevice(descriptor, initOptions);
-                    Log$j.debug('emit DEVICE.CONNECT: ', device === null || device === void 0 ? void 0 : device.features);
+                    Log$k.debug('emit DEVICE.CONNECT: ', device === null || device === void 0 ? void 0 : device.features);
                     this.emitter.emit(DEVICE.CONNECT, device);
                     this.connectedPool.splice(i, 1);
                 }
@@ -43311,9 +43311,9 @@ class DevicePool extends events.exports {
         const diff = getDiff(this.current || [], upcoming);
         this.upcoming = upcoming;
         this.current = this.upcoming;
-        Log$j.debug('device pool -> current: ', this.current);
-        Log$j.debug('device pool -> upcomming: ', this.upcoming);
-        Log$j.debug('DeviceCache.reportDeviceChange diff: ', diff);
+        Log$k.debug('device pool -> current: ', this.current);
+        Log$k.debug('device pool -> upcomming: ', this.upcoming);
+        Log$k.debug('DeviceCache.reportDeviceChange diff: ', diff);
         if (!diff.didUpdate) {
             return;
         }
@@ -43323,7 +43323,7 @@ class DevicePool extends events.exports {
                 this._addConnectedDeviceToPool(d);
                 return;
             }
-            Log$j.debug('emit DEVICE.CONNECT: ', device.features);
+            Log$k.debug('emit DEVICE.CONNECT: ', device.features);
             this.emitter.emit(DEVICE.CONNECT, device);
         });
         diff.disconnected.forEach(d => {
@@ -43333,7 +43333,7 @@ class DevicePool extends events.exports {
                 this._addDisconnectedDeviceToPool(d);
                 return;
             }
-            Log$j.debug('emit DEVICE.DISCONNECT: ', device.features);
+            Log$k.debug('emit DEVICE.DISCONNECT: ', device.features);
             device.markTransportDisconnected();
             this.emitter.emit(DEVICE.DISCONNECT, device);
         });
@@ -43371,7 +43371,7 @@ class DevicePool extends events.exports {
         this.connectedPool = [];
         this.disconnectPool = [];
         this.devicesCache = {};
-        Log$j.debug('DevicePool state has been reset');
+        Log$k.debug('DevicePool state has been reset');
     }
     static dispose() {
         this.resetState();
@@ -43385,7 +43385,7 @@ DevicePool.disconnectPool = [];
 DevicePool.devicesCache = {};
 DevicePool.emitter = new events.exports();
 
-const Log$i = getLogger(exports.LoggerNames.Transport);
+const Log$j = getLogger(exports.LoggerNames.Transport);
 const BleLogger = getLogger(exports.LoggerNames.HdBleTransport);
 const HttpLogger = getLogger(exports.LoggerNames.HdTransportHttp);
 const LowLevelLogger = getLogger(exports.LoggerNames.HdTransportLowLevel);
@@ -43395,7 +43395,7 @@ const WebUsbLogger = getLogger(exports.LoggerNames.HdTransportWebUsb);
 const REACT_NATIVE_BLE_SCAN_TIMEOUT_MS = 3000;
 class TransportManager {
     static load() {
-        Log$i.debug('transport manager load');
+        Log$j.debug('transport manager load');
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
         this.protocolV1MessageSchema = 'v1CurrentSchema';
@@ -43404,14 +43404,14 @@ class TransportManager {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const env = DataManager.getSettings('env');
-                Log$i.debug('Initializing transports', env);
+                Log$j.debug('Initializing transports', env);
                 if (env === 'react-native') {
                     if (!this.reactNativeInit) {
                         yield this.transport.init(BleLogger, DevicePool.emitter);
                         this.reactNativeInit = true;
                     }
                     else {
-                        Log$i.debug('React Native Do Not Initializing transports');
+                        Log$j.debug('React Native Do Not Initializing transports');
                     }
                 }
                 else if (env === 'node-usb') {
@@ -43432,15 +43432,15 @@ class TransportManager {
                 else {
                     yield this.transport.init(HttpLogger);
                 }
-                Log$i.debug('Configuring transports');
+                Log$j.debug('Configuring transports');
                 yield this.transport.configure(JSON.stringify(this.defaultMessages));
                 this.currentMessages = this.defaultMessages;
                 this.protocolV1MessageSchema = 'v1CurrentSchema';
                 yield this.configureProtocolV2Messages();
-                Log$i.debug('Configuring transports done');
+                Log$j.debug('Configuring transports done');
             }
             catch (error) {
-                Log$i.debug('Initializing transports error: ', error);
+                Log$j.debug('Initializing transports error: ', error);
                 if (error.code === 'ECONNABORTED') {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeTimeoutError);
                 }
@@ -43456,7 +43456,7 @@ class TransportManager {
             if (this.currentMessages === messages || !messages) {
                 return;
             }
-            Log$i.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
+            Log$j.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
             try {
                 yield this.transport.configure(JSON.stringify(messages));
                 this.currentMessages = messages;
@@ -43482,9 +43482,9 @@ class TransportManager {
         }
         if (plugin) {
             this.plugin = plugin;
-            Log$i.debug('set transport plugin: ', this.plugin);
+            Log$j.debug('set transport plugin: ', this.plugin);
         }
-        Log$i.debug('set transport: ', this.transport.name, this.transport.version, this.transport.configured);
+        Log$j.debug('set transport: ', this.transport.name, this.transport.version, this.transport.configured);
     }
     static getTransport() {
         return this.transport;
@@ -43495,7 +43495,7 @@ class TransportManager {
             const { configureProtocolV2 } = this.transport;
             if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
                 yield configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
-                Log$i.debug('Protocol V2 messages configured');
+                Log$j.debug('Protocol V2 messages configured');
             }
         });
     }
@@ -43538,7 +43538,7 @@ const DEVICE_CONTROL_CALLS = new Set([
     'DeviceCertificateSign',
     'DeviceMiscUsbMscControl',
 ]);
-const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
+const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|update cancel(?:led|ed)|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
 function shouldReduceDebugForCall(type) {
     return HIGH_VOLUME_DEBUG_CALLS.has(type);
 }
@@ -43617,7 +43617,7 @@ const cancelDeviceWithInitialize = (device) => {
         },
     }));
 };
-const Log$h = getLogger(exports.LoggerNames.DeviceCommands);
+const Log$i = getLogger(exports.LoggerNames.DeviceCommands);
 const LogCore = getLogger(exports.LoggerNames.Core);
 class DeviceCommands {
     constructor(device, mainId) {
@@ -43626,7 +43626,7 @@ class DeviceCommands {
         this.transport = TransportManager.getTransport();
         this.disposed = false;
         this.instanceId = generateInstanceId('DeviceCommands', device.sdkInstanceId);
-        Log$h.debug(`[DeviceCommands] Created: ${this.instanceId}, device: ${this.device.instanceId}`);
+        Log$i.debug(`[DeviceCommands] Created: ${this.instanceId}, device: ${this.device.instanceId}`);
     }
     dispose(_cancelRequest) {
         var _a, _b;
@@ -43679,6 +43679,7 @@ class DeviceCommands {
             }
             const activeCall = this.callPromise;
             let timer;
+            let timedOut = false;
             const cancellation = (() => __awaiter(this, void 0, void 0, function* () {
                 yield this.dispose(true);
                 yield (activeCall === null || activeCall === void 0 ? void 0 : activeCall.catch(() => undefined));
@@ -43687,13 +43688,23 @@ class DeviceCommands {
                 yield Promise.race([
                     cancellation,
                     new Promise(resolve => {
-                        timer = setTimeout(resolve, 10 * 1000);
+                        timer = setTimeout(() => {
+                            timedOut = true;
+                            resolve();
+                        }, 10 * 1000);
                     }),
                 ]);
             }
             finally {
                 if (timer)
                     clearTimeout(timer);
+                if (timedOut &&
+                    this.transport.name === 'ReactNativeBleTransport' &&
+                    this.transport.disconnect) {
+                    yield this.transport.disconnect(this.mainId).catch(error => {
+                        Log$i.debug('BLE cancellation timeout disconnect error (ignored)', error);
+                    });
+                }
                 if (this.callPromise === activeCall) {
                     this.callPromise = undefined;
                 }
@@ -43706,7 +43717,7 @@ class DeviceCommands {
         return __awaiter(this, void 0, void 0, function* () {
             const shouldReduceDebug = shouldReduceDebugForCall(type);
             if (!shouldReduceDebug) {
-                Log$h.debug('[DeviceCommands] [call] Sending', type, hdTransport.getSafeTransportLogPayload(msg !== null && msg !== void 0 ? msg : {}, type));
+                Log$i.debug('[DeviceCommands] [call] Sending', type, hdTransport.getSafeTransportLogPayload(msg !== null && msg !== void 0 ? msg : {}, type));
             }
             try {
                 const promise = this.transport.call(this.mainId, type, msg !== null && msg !== void 0 ? msg : {}, options);
@@ -43765,10 +43776,10 @@ class DeviceCommands {
                 assertType(response, resType);
             }
             catch (error) {
-                Log$h.debug('DeviceCommands typedcall error: ', error);
+                Log$i.debug('DeviceCommands typedcall error: ', error);
                 if (error instanceof hdShared.HardwareError) {
                     if (error.errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError) {
-                        Log$h.debug('[DeviceCommands] [typedCall] Unexpected response type', {
+                        Log$i.debug('[DeviceCommands] [typedCall] Unexpected response type', {
                             request: type,
                             expected: resType,
                             received: response.type,
@@ -43802,7 +43813,7 @@ class DeviceCommands {
         var _a;
         try {
             if (!shouldReduceDebugForCall(callType)) {
-                Log$h.debug('_filterCommonTypes: ', {
+                Log$i.debug('_filterCommonTypes: ', {
                     request: callType,
                     response: {
                         type: res.type,
@@ -44022,7 +44033,7 @@ class DeviceCommands {
                 reject(error);
             });
             const listenerCount = this.device.listenerCount(DEVICE.PIN);
-            Log$h.debug(`[${this.instanceId}] _promptPin called`, {
+            Log$i.debug(`[${this.instanceId}] _promptPin called`, {
                 responseID: this.currentResponseID,
                 deviceInstanceId: this.device.instanceId,
                 listenerCount,
@@ -45079,7 +45090,7 @@ const parseRunOptions = (options) => {
         options = {};
     return options;
 };
-const Log$g = getLogger(exports.LoggerNames.Device);
+const Log$h = getLogger(exports.LoggerNames.Device);
 const isProtocolV2DeviceStatusUnsupportedError = (error) => {
     var _a, _b, _c;
     if (error instanceof hdShared.HardwareError) {
@@ -45140,7 +45151,7 @@ class Device extends events.exports {
         this.sdkInstanceId = sdkInstanceId;
         this.instanceId = generateInstanceId('Device', this.sdkInstanceId);
         this.createdAt = Date.now();
-        Log$g.debug(`[Device] Created: ${this.instanceId}${this.sdkInstanceId ? ` for SDK: ${this.sdkInstanceId}` : ''}`);
+        Log$h.debug(`[Device] Created: ${this.instanceId}${this.sdkInstanceId ? ` for SDK: ${this.sdkInstanceId}` : ''}`);
     }
     static fromDescriptor(originalDescriptor, sdkInstanceId) {
         const descriptor = Object.assign({}, originalDescriptor);
@@ -45231,12 +45242,12 @@ class Device extends events.exports {
                 if (DataManager.isBleConnect(env)) {
                     acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, strictProtocol, undefined));
                     this.mainId = (_b = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.uuid) !== null && _b !== void 0 ? _b : '';
-                    Log$g.debug('Expected uuid:', this.mainId);
+                    Log$h.debug('Expected uuid:', this.mainId);
                 }
                 else {
                     acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, strictProtocol, undefined));
                     this.mainId = acquireResult;
-                    Log$g.debug('Expected session id:', this.mainId);
+                    Log$h.debug('Expected session id:', this.mainId);
                 }
                 const detectedProtocol = (_d = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.protocolType) !== null && _d !== void 0 ? _d : (_f = (_e = TransportManager.transport) === null || _e === void 0 ? void 0 : _e.getProtocolType) === null || _f === void 0 ? void 0 : _f.call(_e, DataManager.isBleConnect(env) ? this.originalDescriptor.id : this.originalDescriptor.path);
                 if ((options === null || options === void 0 ? void 0 : options.forceProtocolDetection) && !detectedProtocol) {
@@ -45263,7 +45274,7 @@ class Device extends events.exports {
                             yield ((_j = (_h = this.deviceConnector) === null || _h === void 0 ? void 0 : _h.release) === null || _j === void 0 ? void 0 : _j.call(_h, failedSession, false));
                         }
                         catch (releaseError) {
-                            Log$g.debug('Failed to release an unsuccessful protocol probe', releaseError);
+                            Log$h.debug('Failed to release an unsuccessful protocol probe', releaseError);
                         }
                     }
                     if (!DataManager.isBleConnect(env)) {
@@ -45292,11 +45303,11 @@ class Device extends events.exports {
                 (this.mainId && DataManager.isBleConnect(env))) {
                 if (this.pendingCallbackPromise) {
                     try {
-                        Log$g.debug('Waiting for callback tasks to complete before releasing device (in release method)');
+                        Log$h.debug('Waiting for callback tasks to complete before releasing device (in release method)');
                         yield this.pendingCallbackPromise.promise;
                     }
                     catch (error) {
-                        Log$g.error('Error waiting for callback tasks in release method:', error);
+                        Log$h.error('Error waiting for callback tasks in release method:', error);
                     }
                 }
                 if (this.commands) {
@@ -45315,7 +45326,7 @@ class Device extends events.exports {
                     this.updateDescriptor({ session: null });
                 }
                 catch (err) {
-                    Log$g.error('[Device] release error: ', err);
+                    Log$h.error('[Device] release error: ', err);
                 }
                 finally {
                     this.needReloadDevice = true;
@@ -45520,7 +45531,7 @@ class Device extends events.exports {
         });
     }
     getInternalState(_deviceId) {
-        Log$g.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `currentDeviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
+        Log$h.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `currentDeviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
         const deviceId = this.getSessionCacheDeviceKey(_deviceId);
         if (!deviceId)
             return undefined;
@@ -45535,7 +45546,7 @@ class Device extends events.exports {
         return deviceWalletSessionStore.getStandard(deviceId);
     }
     updateInternalState(enablePassphrase, passphraseState, deviceId, sessionId = null, featuresSessionId = null, walletType = 'hidden') {
-        Log$g.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `hasPassphraseState: ${Boolean(passphraseState)}`, `hasSessionId: ${Boolean(sessionId)}`, `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`);
+        Log$h.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `hasPassphraseState: ${Boolean(passphraseState)}`, `hasSessionId: ${Boolean(sessionId)}`, `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`);
         const cacheDeviceKey = this.getSessionCacheDeviceKey(deviceId);
         if (!cacheDeviceKey)
             return;
@@ -45551,7 +45562,7 @@ class Device extends events.exports {
         deviceWalletSessionStore.deletePending(cacheDeviceKey);
     }
     setInternalState(state, initSession) {
-        Log$g.debug('setInternalState session param: ', `hasState: ${Boolean(state)}`, `initSession: ${initSession}`, `deviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
+        Log$h.debug('setInternalState session param: ', `hasState: ${Boolean(state)}`, `initSession: ${initSession}`, `deviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
         if (!this.passphraseState && !initSession)
             return;
         const deviceId = this.getSessionCacheDeviceKey();
@@ -45565,7 +45576,7 @@ class Device extends events.exports {
         }
     }
     clearInternalState(_deviceId) {
-        Log$g.debug('clearInternalState param: ', _deviceId);
+        Log$h.debug('clearInternalState param: ', _deviceId);
         const deviceId = this.getSessionCacheDeviceKey(_deviceId);
         if (!deviceId)
             return;
@@ -45606,6 +45617,15 @@ class Device extends events.exports {
                     yield TransportManager.reconfigure(this.features);
                 });
                 const expectedDeviceId = options === null || options === void 0 ? void 0 : options.deviceId;
+                if (expectedDeviceId) {
+                    this.passphraseState = undefined;
+                    const { message } = yield this.commands.typedCall('GetFeatures', 'Features', {});
+                    this._updateFeatures(message);
+                    yield TransportManager.reconfigure(this.features);
+                    if (!this.checkDeviceId(expectedDeviceId)) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
+                    }
+                }
                 this.passphraseState = options === null || options === void 0 ? void 0 : options.passphraseState;
                 if (options === null || options === void 0 ? void 0 : options.initSession) {
                     this.clearInternalState(options === null || options === void 0 ? void 0 : options.deviceId);
@@ -45621,33 +45641,17 @@ class Device extends events.exports {
                 if (options === null || options === void 0 ? void 0 : options.deriveCardano) {
                     payload.derive_cardano = true;
                 }
-                if (this.features) {
-                    yield TransportManager.reconfigure(this.features);
-                }
-                const assertExpectedDeviceIdentity = () => {
-                    if (expectedDeviceId && !this.checkDeviceId(expectedDeviceId)) {
-                        this.clearInternalState();
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
-                    }
-                };
-                try {
-                    yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
-                }
-                catch (error) {
-                    assertExpectedDeviceIdentity();
-                    throw error;
-                }
-                assertExpectedDeviceIdentity();
+                yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
             }
             catch (error) {
-                Log$g.error('Initialization failed:', error);
+                Log$h.error('Initialization failed:', error);
                 throw error;
             }
         });
     }
     _initializeProtocolV2(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$g.debug('Initialize device via Protocol V2 features adapter');
+            Log$h.debug('Initialize device via Protocol V2 features adapter');
             try {
                 const deviceInfo = yield requestProtocolV2DeviceInfo({
                     commands: this.commands,
@@ -45656,7 +45660,7 @@ class Device extends events.exports {
                 yield this.probeProtocolV2RuntimeState(deviceInfo, options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs);
             }
             catch (error) {
-                Log$g.error('Protocol V2 initialization failed:', error);
+                Log$h.error('Protocol V2 initialization failed:', error);
                 throw error;
             }
         });
@@ -45739,6 +45743,11 @@ class Device extends events.exports {
             return params.includeRaw ? cloneDeviceState(this.state) : createPublicDeviceState(this.state);
         });
     }
+    refreshProtocolV2SettingsAfterMutation() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getDeviceState({ refreshSections: ['status', 'settings'] });
+        });
+    }
     _updateFeatures(protoFeatures, initSession) {
         var _a;
         const previousDeviceId = this.getCurrentDeviceId();
@@ -45765,7 +45774,7 @@ class Device extends events.exports {
             source,
             changedKeys: result.changedKeys,
         };
-        Log$g.debug('Device state updated', {
+        Log$h.debug('Device state updated', {
             source,
             revision: result.revision,
             changedKeyCount: result.changedKeys.length,
@@ -45989,17 +45998,25 @@ class Device extends events.exports {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.runPromise) {
                 yield this.interruptionFromOutside();
-                Log$g.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
+                Log$h.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
             }
             options = parseRunOptions(options);
             const runPromise = hdShared.createDeferred();
             this.runPromise = runPromise;
-            this._runInner(fn, options, runPromise).catch(error => {
+            const cleanupPromise = this._runInner(fn, options, runPromise).catch(error => {
                 if (this.runPromise === runPromise) {
                     this.runPromise = null;
                 }
                 runPromise.reject(error);
             });
+            this.runCleanupPromise = cleanupPromise;
+            cleanupPromise
+                .finally(() => {
+                if (this.runCleanupPromise === cleanupPromise) {
+                    this.runCleanupPromise = undefined;
+                }
+            })
+                .catch(() => undefined);
             return runPromise.promise;
         });
     }
@@ -46066,7 +46083,7 @@ class Device extends events.exports {
                             yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.disconnect(this.mainId));
                         }
                         yield this.release();
-                        Log$g.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
+                        Log$h.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
                     }
                     clearRunPromise();
                     return;
@@ -46076,7 +46093,7 @@ class Device extends events.exports {
                 options.keepSession === false) {
                 this.keepSession = false;
                 yield this.release();
-                Log$g.debug('release device, mainId: ', this.mainId);
+                Log$h.debug('release device, mainId: ', this.mainId);
             }
             runPromise.resolve();
             clearRunPromise();
@@ -46093,21 +46110,36 @@ class Device extends events.exports {
         });
     }
     interruptionFromUser() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInterruptedFromUser);
-            yield ((_a = this.cancelableAction) === null || _a === void 0 ? void 0 : _a.call(this, error));
-            yield ((_b = this.commands) === null || _b === void 0 ? void 0 : _b.cancel());
+            const cleanupPromise = this.runCleanupPromise;
+            const { cancelableAction } = this;
+            const env = DataManager.getSettings('env');
+            if (cancelableAction) {
+                yield cancelableAction(error);
+            }
+            else if (this.isProtocolV2() &&
+                (DataManager.isBleConnect(env) ||
+                    DataManager.isBrowserWebUsb(env) ||
+                    DataManager.isDesktopWebUsb(env)) &&
+                this.hasDeviceAcquire()) {
+                yield ((_b = (_a = this.commands) === null || _a === void 0 ? void 0 : _a.cancelDevice) === null || _b === void 0 ? void 0 : _b.call(_a).catch(cancelError => {
+                    Log$h.debug('Protocol V2 fallback cancel error', cancelError);
+                }));
+            }
+            yield ((_c = this.commands) === null || _c === void 0 ? void 0 : _c.cancel());
             if (this.runPromise) {
                 this.runPromise.reject(error);
                 this.runPromise = null;
             }
+            yield (cleanupPromise === null || cleanupPromise === void 0 ? void 0 : cleanupPromise.catch(() => undefined));
         });
     }
     setCancelableAction(callback) {
         this.cancelableAction = (e) => callback(e)
             .catch(e2 => {
-            Log$g.debug('cancelableAction error', e2);
+            Log$h.debug('cancelableAction error', e2);
         })
             .finally(() => {
             this.clearCancelableAction();
@@ -46390,7 +46422,7 @@ class Device extends events.exports {
                 expectedPassphraseState &&
                 expectedPassphraseState !== newPassphraseState;
             const passphraseStateMismatch = !!expectedPassphraseState && expectedPassphraseState !== newPassphraseState;
-            Log$g.debug('Check passphrase state safety: ', {
+            Log$h.debug('Check passphrase state safety: ', {
                 hasExpectedPassphraseState: Boolean(expectedPassphraseState),
                 hasNewPassphraseState: Boolean(newPassphraseState),
                 passphraseStateMatches: Boolean(expectedPassphraseState) && expectedPassphraseState === newPassphraseState,
@@ -46528,7 +46560,7 @@ const getBootloaderReleaseInfo = ({ features, willUpdateFirmwareVersion, firmwar
     };
 };
 
-const Log$f = getLogger(exports.LoggerNames.Method);
+const Log$g = getLogger(exports.LoggerNames.Method);
 const isEvmLedgerLegacyPathWithHighIndex = (path) => {
     let addressN;
     if (typeof path === 'string') {
@@ -46612,7 +46644,7 @@ class BaseMethod {
     setContext(context) {
         this.sdkInstanceId = context.sdkInstanceId;
         this.instanceId = generateInstanceId('Method', this.sdkInstanceId);
-        Log$f.debug(`[BaseMethod] Created: ${this.instanceId}, method: ${this.name}, SDK: ${this.sdkInstanceId}`);
+        Log$g.debug(`[BaseMethod] Created: ${this.instanceId}, method: ${this.name}, SDK: ${this.sdkInstanceId}`);
     }
     setDevice(device) {
         var _a, _b;
@@ -46632,7 +46664,7 @@ class BaseMethod {
         if (device.commands) {
             device.commands.currentResponseID = this.responseID;
         }
-        Log$f.debug(`[${this.instanceId}] setDevice: ${device.instanceId}, commands: ${(_b = device.commands) === null || _b === void 0 ? void 0 : _b.instanceId}`);
+        Log$g.debug(`[${this.instanceId}] setDevice: ${device.instanceId}, commands: ${(_b = device.commands) === null || _b === void 0 ? void 0 : _b.instanceId}`);
     }
     checkFirmwareRelease() {
         if (!this.device || this.device.isProtocolV2())
@@ -46707,7 +46739,7 @@ class BaseMethod {
                 checkFlag = true;
             }
             if (checkFlag && this.device.getCurrentSafetyChecks() === hdTransport.Enum_SafetyCheckLevel.Strict) {
-                Log$f.debug('will change safety_checks level');
+                Log$g.debug('will change safety_checks level');
                 yield this.device.commands.typedCall('ApplySettings', 'Success', {
                     safety_checks: hdTransport.Enum_SafetyCheckLevel.PromptTemporarily,
                 });
@@ -46783,7 +46815,7 @@ class Ping extends BaseMethod {
     }
 }
 
-const Log$e = getLogger(exports.LoggerNames.Core);
+const Log$f = getLogger(exports.LoggerNames.Core);
 const parseInitOptions$1 = (payload) => ({
     initSession: payload === null || payload === void 0 ? void 0 : payload.initSession,
     passphraseState: payload === null || payload === void 0 ? void 0 : payload.passphraseState,
@@ -46809,14 +46841,14 @@ class PreInitialize extends BaseMethod {
             }
             catch (_a) {
                 this.device.clearPreInitialized();
-                Log$e.debug('[PRE-INIT][FAILED]');
+                Log$f.debug('[PRE-INIT][FAILED]');
                 return false;
             }
         });
     }
 }
 
-const Log$d = getLogger(exports.LoggerNames.DevicePool);
+const Log$e = getLogger(exports.LoggerNames.DevicePool);
 class SearchDevices extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -46858,7 +46890,7 @@ class SearchDevices extends BaseMethod {
                     const errorCode = error && typeof error === 'object' && 'errorCode' in error
                         ? error.errorCode
                         : undefined;
-                    Log$d.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                    Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
                 }
             }
             return deviceList.map(device => device.toMessageObject());
@@ -47760,7 +47792,7 @@ function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification =
         release,
     };
 }
-const Log$c = getLogger(exports.LoggerNames.Method);
+const Log$d = getLogger(exports.LoggerNames.Method);
 class CheckAllFirmwareRelease extends BaseMethod {
     getSupportedProtocols() {
         return ['V1', 'V2'];
@@ -47821,7 +47853,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     ((_c = error.params) === null || _c === void 0 ? void 0 : _c.firmwareUpdateCode) !== 'FirmwarePlanInvalid') {
                     throw error;
                 }
-                Log$c.warn('[CheckAllFirmwareRelease] Optional firmware Plan is unavailable; using the legacy release result');
+                Log$d.warn('[CheckAllFirmwareRelease] Optional firmware Plan is unavailable; using the legacy release result');
                 firmwareUpdatePlan = undefined;
             }
             return {
@@ -47907,7 +47939,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) !== 'FirmwarePlanInvalid') {
                     throw error;
                 }
-                Log$c.warn('[CheckAllFirmwareRelease] Optional Protocol V2 firmware Plan is unavailable; using the release result');
+                Log$d.warn('[CheckAllFirmwareRelease] Optional Protocol V2 firmware Plan is unavailable; using the release result');
                 firmwareUpdatePlan = undefined;
             }
             const firmwarePlan = summarizeProtocolV2FirmwareRelease(plan, PROTOCOL_V2_MAIN_FIRMWARE_TARGETS);
@@ -48148,6 +48180,7 @@ class DeviceChangePin extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'remove', type: 'boolean' }]);
         this.params = {
@@ -48474,7 +48507,7 @@ class DeviceSettings extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.device.isProtocolV2()) {
-                    const refreshStatusAndSettings = () => this.device.getDeviceState({ refreshSections: ['status', 'settings'] });
+                    const refreshStatusAndSettings = () => this.device.refreshProtocolV2SettingsAfterMutation();
                     assertSettingsSupported(this.payload, DEVICE_SETTINGS_V1_ONLY_FIELDS, 'Protocol V2');
                     const capabilities = getDeviceSettingsCapabilities(this.device.getCurrentDeviceType(), 'V2');
                     assertProtocolV2SettingValues(this.payload, capabilities);
@@ -48497,14 +48530,7 @@ class DeviceSettings extends BaseMethod {
                         const res = yield this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
                             page: hdTransport.DeviceSettingsPage.DevicePassphrase,
                         });
-                        const updated = yield refreshStatusAndSettings();
-                        const lockedAfterDisabling = requestedPassphrase === false &&
-                            current.status.unlocked === true &&
-                            updated.status.unlocked === false;
-                        if (updated.status.passphraseProtection !== requestedPassphrase &&
-                            !lockedAfterDisabling) {
-                            throw hdShared.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 passphrase setting did not reach the requested value.');
-                        }
+                        yield refreshStatusAndSettings();
                         return res.message;
                     }
                     if (requestedAirgap !== undefined) {
@@ -48764,7 +48790,12 @@ class DeviceSupportFeatures extends BaseMethod {
 }
 
 class DeviceVerify extends BaseMethod {
+    getSupportedProtocols() {
+        return ['V1', 'V2'];
+    }
     init() {
+        this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);
         this.params = {
@@ -48803,6 +48834,7 @@ class DeviceWipe extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.protocolV2UiInteraction = {
             request: 'button',
@@ -48893,7 +48925,7 @@ const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
 const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '2.4.5';
 const SESSION_ERROR$3 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM$1 = 'Firmware install confirmed';
-const Log$b = getLogger(exports.LoggerNames.Method);
+const Log$c = getLogger(exports.LoggerNames.Method);
 const isDeviceDisconnectedError$1 = (error) => {
     const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
     return (message.includes('device was disconnected') ||
@@ -48948,13 +48980,13 @@ const uploadFirmwareFromSource = (updateType, typedCall, postMessage, device, so
             const newFeatures = yield typedCall('GetFeatures', 'Features', {});
             const deviceBootloaderVersion = getDeviceBootloaderVersion(buildProtocolV1FeaturesPayload(newFeatures.message, device.features)).join('.');
             const supportUpgradeFileHeader = semver__default["default"].gte(deviceBootloaderVersion, '2.1.0');
-            Log$b.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
+            Log$c.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
             if (supportUpgradeFileHeader) {
                 const HEADER_SIZE = 1024;
                 if (source.size < HEADER_SIZE) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `firmware payload too small: ${source.size} bytes, expected at least ${HEADER_SIZE} bytes`);
                 }
-                Log$b.debug('Uploading firmware header:', {
+                Log$c.debug('Uploading firmware header:', {
                     size: HEADER_SIZE,
                     totalSize: source.size,
                 });
@@ -48966,18 +48998,18 @@ const uploadFirmwareFromSource = (updateType, typedCall, postMessage, device, so
                     });
                     const isUnknownMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnknownMessage');
                     if (headerRes.type !== 'Success' && !isUnknownMessage) {
-                        Log$b.error('Firmware header upload failed:', headerRes);
+                        Log$c.error('Firmware header upload failed:', headerRes);
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'failed to upload firmware header');
                     }
                 }
                 catch (error) {
-                    Log$b.error('Firmware header upload failed:', error);
+                    Log$c.error('Firmware header upload failed:', error);
                     const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
                     if (!message.includes('Failure_UnknownMessage')) {
                         throw error;
                     }
                 }
-                Log$b.debug('Firmware header uploaded successfully');
+                Log$c.debug('Firmware header uploaded successfully');
             }
         }
         const eraseCommand = isFirmware ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -48996,7 +49028,7 @@ const uploadFirmwareFromSource = (updateType, typedCall, postMessage, device, so
         }
         catch (error) {
             if (isDeviceDisconnectedError$1(error)) {
-                Log$b.log('Rebooting device');
+                Log$c.log('Rebooting device');
                 updateResponse = {
                     type: 'Success',
                     message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
@@ -49094,7 +49126,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, source, rebootOn
     }
     catch (error) {
         if (isDeviceDisconnectedError$1(error)) {
-            Log$b.log('Rebooting device');
+            Log$c.log('Rebooting device');
             response = {
                 type: 'Success',
                 message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
@@ -49125,7 +49157,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, source, rebootOn
                         ]);
                     }
                     catch (e) {
-                        Log$b.log('catch Bluetooth error when device is restarting: ', e);
+                        Log$c.log('catch Bluetooth error when device is restarting: ', e);
                     }
                 }
                 else {
@@ -49146,7 +49178,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, source, rebootOn
             }
             catch (error) {
                 console.error('Device reconnect failed: ', error);
-                Log$b.error('Device reconnect failed:', error);
+                Log$c.error('Device reconnect failed:', error);
                 yield wait(1000);
             }
         }
@@ -49186,7 +49218,7 @@ const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, ov
             return result;
         }
         catch (error) {
-            Log$b.error(`emmcWrite error: `, error);
+            Log$c.error(`emmcWrite error: `, error);
             retryCount--;
             if (retryCount === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
@@ -49381,7 +49413,7 @@ class DeviceFullyUploadResource extends BaseMethod {
     }
 }
 
-const Log$a = getLogger(exports.LoggerNames.Method);
+const Log$b = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$2 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
 const BOOTLOADER_POLL_INITIALIZE_TIMEOUT_MS = 5000;
@@ -49459,7 +49491,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
         let bleProbeInFlight = false;
-        Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$b.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         let isFirstCheck = true;
         let checkCount = 0;
         let hasPromptedWebDevice = false;
@@ -49493,10 +49525,10 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             if (isFinished || isPromptingWebDevice)
                 return;
             checkCount += 1;
-            Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
+            Log$b.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
                 isFirstCheck = false;
-                Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] wait 3000ms');
+                Log$b.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] wait 3000ms');
                 yield wait(3000);
             }
             if (checkCount > 4 &&
@@ -49520,7 +49552,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                 catch (e) {
                     isFinished = true;
                     clearPollingTimers();
-                    Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ', e);
+                    Log$b.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ', e);
                     (_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.reject(e);
                 }
                 finally {
@@ -49542,7 +49574,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$a.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$b.log('catch Bluetooth error when device is restarting: ', e);
                 }
                 finally {
                     bleProbeInFlight = false;
@@ -49645,7 +49677,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }
             catch (error) {
                 if (isDeviceDisconnectedError(error)) {
-                    Log$a.log('Rebooting device');
+                    Log$b.log('Rebooting device');
                     updateResponse = {
                         type: 'Success',
                         message: { message: FIRMWARE_UPDATE_CONFIRM },
@@ -49761,7 +49793,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     return result;
                 }
                 catch (error) {
-                    Log$a.error(`emmcWrite error: `, error);
+                    Log$b.error(`emmcWrite error: `, error);
                     retryCount--;
                     if (retryCount === 0) {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
@@ -50068,7 +50100,7 @@ class GetNextU2FCounter extends BaseMethod {
     }
 }
 
-const Log$9 = getLogger(exports.LoggerNames.Method);
+const Log$a = getLogger(exports.LoggerNames.Method);
 class FirmwareUpdate extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -50107,7 +50139,7 @@ class FirmwareUpdate extends BaseMethod {
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
         let bleProbeInFlight = false;
-        Log$9.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$a.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             if (isBleReconnect) {
@@ -50123,7 +50155,7 @@ class FirmwareUpdate extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$9.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$a.log('catch Bluetooth error when device is restarting: ', e);
                 }
                 finally {
                     bleProbeInFlight = false;
@@ -50182,7 +50214,7 @@ class FirmwareUpdate extends BaseMethod {
                     if (e instanceof hdShared.HardwareError) {
                         return Promise.reject(e);
                     }
-                    Log$9.log('auto go to bootloader mode failed: ', e);
+                    Log$a.log('auto go to bootloader mode failed: ', e);
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure));
                 }
             }
@@ -50331,7 +50363,7 @@ const readVerifiedPreparedResourceArchive = ({ preparedPlan, reader, }) => __awa
     return verifiedEntries;
 });
 
-const Log$8 = getLogger(exports.LoggerNames.Method);
+const Log$9 = getLogger(exports.LoggerNames.Method);
 const FIRMWARE_DOWNLOAD_REQUEST_OPTIONS = {
     connectTimeoutMs: 60000,
     readTimeoutMs: 60000,
@@ -50488,7 +50520,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
         let probeInFlight = false;
-        Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$9.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         let isFirstCheck = true;
         let checkCount = 0;
         let hasPromptedWebDevice = false;
@@ -50523,10 +50555,10 @@ class FirmwareUpdateV2 extends BaseMethod {
                 return;
             probeInFlight = true;
             checkCount += 1;
-            Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
+            Log$9.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
                 isFirstCheck = false;
-                Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] wait 3000ms');
+                Log$9.log('FirmwareUpdateV2 [checkDeviceToBootloader] wait 3000ms');
                 yield wait(3000);
             }
             if (checkCount > 4 &&
@@ -50550,7 +50582,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                 catch (e) {
                     isFinished = true;
                     clearPollingTimers();
-                    Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ', e);
+                    Log$9.log('FirmwareUpdateV2 [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ', e);
                     (_b = this.checkPromise) === null || _b === void 0 ? void 0 : _b.reject(e);
                 }
                 finally {
@@ -50570,7 +50602,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$8.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$9.log('catch Bluetooth error when device is restarting: ', e);
                 }
                 finally {
                     probeInFlight = false;
@@ -50865,7 +50897,7 @@ class FirmwareUpdateV2 extends BaseMethod {
     }
 }
 
-const Log$7 = getLogger(exports.LoggerNames.Method);
+const Log$8 = getLogger(exports.LoggerNames.Method);
 const MIN_UPDATE_V3_BOOTLOADER_VERSION = '2.8.0';
 class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     constructor() {
@@ -50983,7 +51015,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$7.debug('FirmwareUpdateV3 strategy: Protocol V1');
+            Log$8.debug('FirmwareUpdateV3 strategy: Protocol V1');
             return this.runProtocolV1();
         });
     }
@@ -51130,7 +51162,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     resourceEntries: [],
                 };
             }
-            Log$7.warn('No resource url found');
+            Log$8.warn('No resource url found');
             return {
                 resourceBinary: null,
                 resourceEntries: [],
@@ -51291,7 +51323,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 yield this.startEmmcFirmwareUpdate({ path: '0:updates' });
             }
             catch (error) {
-                Log$7.error('triggerFirmwareUpdateEmmc error: ', error);
+                Log$8.error('triggerFirmwareUpdateEmmc error: ', error);
                 if (error === null || error === void 0 ? void 0 : error.errorCode) {
                     const unexpectedError = [
                         hdShared.HardwareErrorCode.ActionCancelled,
@@ -51361,7 +51393,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     yield hdShared.wait(1000);
                 }
                 catch (error) {
-                    Log$7.log('getFeatures error', error);
+                    Log$8.log('getFeatures error', error);
                     let shouldReconnect = true;
                     const progress = this.extractUpdateModeProgress(error);
                     if (progress !== null) {
@@ -51460,7 +51492,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                             return;
                         }
                         catch (e) {
-                            Log$7.log('catch Bluetooth error when device is restarting: ', e);
+                            Log$8.log('catch Bluetooth error when device is restarting: ', e);
                         }
                     }
                     else {
@@ -51475,7 +51507,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                                     yield this._promptDeviceForSwitchFirmwareWebDevice();
                                 }
                                 catch (e) {
-                                    Log$7.log('WebUSB re-authorization failed: ', e);
+                                    Log$8.log('WebUSB re-authorization failed: ', e);
                                 }
                                 webUsbCheckCount = 0;
                             }
@@ -51500,7 +51532,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 }
                 catch (error) {
                     console.error('Device reconnect failed: ', error);
-                    Log$7.error('Device reconnect failed:', error);
+                    Log$8.error('Device reconnect failed:', error);
                     yield hdShared.wait(1000);
                 }
             }
@@ -51684,15 +51716,14 @@ function prepareFirmwareUpdateV4MemoryHost({ sdk, plan, artifacts, }) {
     };
 }
 
-const Log$6 = getLogger(exports.LoggerNames.Method);
+const Log$7 = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$1 = '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 = 8 * 60 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
-const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -51706,6 +51737,8 @@ const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
 const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
+const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
+const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
 const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
@@ -51861,7 +51894,8 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return error instanceof hdShared.HardwareError &&
-        (error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
+        (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);
 };
@@ -52003,6 +52037,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
         this.requireDeviceMode = [];
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.skipForceUpdateCheck = true;
         const { payload } = this;
@@ -52162,7 +52197,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();
         });
     }
@@ -52736,8 +52771,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 ? visibleVersions[target]
                 : `${Math.floor(statusVersion / 0x10000) % 0x100}.${Math.floor(statusVersion / 0x100) % 0x100}.${statusVersion % 0x100}`;
             if (!observedVersion) {
-                if (this.protocolV2FinalStatusVerified) {
-                    Log$6.warn(`Protocol V2 target ${target} has no observable final version; completed target status is authoritative`);
+                const isUnobservableApplicationSlot = applicationTargets.length > 1 && (target === 'app_v1' || target === 'app_v2');
+                if (this.protocolV2FinalStatusVerified || isUnobservableApplicationSlot) {
+                    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`);
@@ -53107,7 +53143,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 return true;
             }
             catch (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;
             }
         });
@@ -53147,7 +53183,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);
             }
         });
@@ -53155,12 +53191,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;
@@ -53196,7 +53232,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     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);
             }
@@ -53293,7 +53329,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             for (const resource of resourceSources) {
                 const requiresFreshStaging = isProtocolV2BootResourcePackagePath(resource.devicePath);
                 if (!requiresFreshStaging && (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);
@@ -53407,8 +53443,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths = new Map()) {
-        var _a, _b, _c;
-        Log$6.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
+        Log$7.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
         const failedTarget = statusTargets.find(target => {
             var _a;
             return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1) &&
@@ -53421,8 +53456,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 payloadVersion: failedTarget.payload_version,
                 path: failedTarget.path,
             });
-            Log$6.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${(_a = failedTarget.status) !== null && _a !== void 0 ? _a : 'unknown'} payloadVersion=${(_b = failedTarget.payload_version) !== null && _b !== void 0 ? _b : 'unknown'} path=${(_c = failedTarget.path) !== null && _c !== void 0 ? _c : 'unknown'}`);
+            Log$7.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
+                firmwareUpdateCode: PROTOCOL_V2_INSTALL_FAILED_CODE,
+            });
         }
         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();
@@ -53431,7 +53468,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (targetId === undefined ||
                 seenTargetIds.has(targetId) ||
                 (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 install status conflicts with target ${target.target_id}`, {
+                Log$7.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
                     firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
                 });
             }
@@ -53524,15 +53562,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let lastError;
             let shouldReconnect = false;
             let deviceInfo;
-            let missingTargetStatusSince;
-            let missingTargetStatusKey;
-            let normalModeWithoutInstallEvidenceSince;
             let installEvidenceObserved = false;
             let currentInstallStatusObserved = false;
-            const resetMissingTargetStatusGrace = () => {
-                missingTargetStatusSince = undefined;
-                missingTargetStatusKey = undefined;
-            };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 this.throwIfAborted();
                 try {
@@ -53552,7 +53583,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
                         if (statusResponse.type === 'Success') {
                             installEvidenceObserved = true;
-                            resetMissingTargetStatusGrace();
                             lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
                         const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
@@ -53574,7 +53604,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (hasMatchingTargetStatus &&
                             (!requireCurrentInstallStatus || currentInstallStatusObserved)) {
                             installEvidenceObserved = true;
-                            normalModeWithoutInstallEvidenceSince = undefined;
                         }
                         const matchingStatusTargets = statusTargets.filter(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53596,13 +53625,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             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.postProgressMessage(100, 'installingFirmware');
                                 return;
                             }
                         }
                         if (statusTargets.length === 0) {
-                            resetMissingTargetStatusGrace();
                             if (statusResponse.type !== 'Success') {
                                 lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                             }
@@ -53610,23 +53638,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
                             if (missingTargetIds.length > 0) {
-                                const now = Date.now();
                                 const missingKey = missingTargetIds.join(',');
-                                if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
-                                    missingTargetStatusSince = now;
-                                    missingTargetStatusKey = missingKey;
-                                }
-                                else if (now - missingTargetStatusSince >=
-                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                    const reportedTargetIds = statusTargets
-                                        .map(target => normalizeProtocolV2TargetId(target.target_id))
-                                        .filter((targetId) => targetId !== undefined);
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(',')}`);
-                                }
                                 lastError = new Error(`Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`);
                             }
                             else {
-                                resetMissingTargetStatusGrace();
                                 lastError = new Error('Protocol V2 firmware targets are still installing');
                             }
                         }
@@ -53635,7 +53650,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (isProtocolV2TerminalInstallStatusError(error)) {
                             throw error;
                         }
-                        resetMissingTargetStatusGrace();
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
                             if (!currentDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
@@ -53644,21 +53658,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             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.postProgressMessage(100, 'installingFirmware');
                                 return;
                             }
                             if (isNormalMode) {
-                                const now = Date.now();
-                                normalModeWithoutInstallEvidenceSince !== null && normalModeWithoutInstallEvidenceSince !== void 0 ? normalModeWithoutInstallEvidenceSince : (normalModeWithoutInstallEvidenceSince = now);
-                                if (now - normalModeWithoutInstallEvidenceSince >=
-                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 device returned to normal mode without install ACK, target status, or version change');
-                                }
                                 lastError = new Error('Protocol V2 device is in normal mode but installation is not yet confirmed');
                             }
                             else {
-                                normalModeWithoutInstallEvidenceSince = undefined;
                                 lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
                             }
                         }
@@ -53666,7 +53673,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             shouldReconnect = true;
                             deviceInfo = undefined;
                             lastError = error;
-                            Log$6.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
+                            Log$7.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
                         }
                     }
                 }
@@ -53684,12 +53691,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     shouldReconnect = true;
                     deviceInfo = undefined;
-                    resetMissingTargetStatusGrace();
-                    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);
             }
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 firmware update status not complete within ${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, undefined, {
+                firmwareUpdateCode: PROTOCOL_V2_INSTALL_TIMEOUT_CODE,
+            });
         });
     }
     exitProtocolV2BootloaderToNormal() {
@@ -53698,12 +53707,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) {
-                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;
@@ -53731,7 +53740,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,
@@ -53780,7 +53789,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     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);
             }
@@ -53824,7 +53833,7 @@ 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;
@@ -53930,7 +53939,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;
@@ -53985,7 +53994,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'));
             }
         });
@@ -54088,7 +54097,7 @@ function decodeJpegBase64ToRgba({ jpegBase64, parameterName, expectedWidth, expe
     return decoded;
 }
 
-const Log$4 = getLogger(exports.LoggerNames.Core);
+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;
@@ -54109,7 +54118,7 @@ function logFileTransferMetrics({ transport, status, path, transferredBytes, tot
     const segmentedMetrics = measuredAttempts > 0
         ? ` hostWriteTotal=${(hostWriteElapsedMs / 1000).toFixed(2)}s responseWaitTotal=${(responseWaitElapsedMs / 1000).toFixed(2)}s measuredAttempts=${measuredAttempts}`
         : '';
-    Log$4.log(`[FileWrite] metrics transport=${transport} status=${status} path=${path} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s${segmentedMetrics}`);
+    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 isProtocolV2ResponseTimeout(error) {
     var _a, _b;
@@ -54200,7 +54209,7 @@ function writeProtocolV2File(options) {
         let responseWaitElapsedMs = 0;
         let measuredAttempts = 0;
         const transport = getFileTransferTransport();
-        Log$4.log(`[FileWrite] started transport=${transport} path=${options.path} bytes=${dataLength} offset=${startOffset} chunk=${chunkSize}`);
+        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);
@@ -54367,6 +54376,7 @@ const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
 const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2 = 60805;
 const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
+const Log$4 = getLogger(exports.LoggerNames.Method);
 function normalizeFileName(fileName, data) {
     if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
         throw invalidParameter$1('Parameter [fileName] may only contain letters, numbers, underscores, hyphens and an optional .bin suffix.');
@@ -54474,6 +54484,14 @@ class DeviceUploadWallpaper extends BaseMethod {
             const response = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
                 settings: { wallpaper_path: this.path },
             });
+            try {
+                yield this.device.refreshProtocolV2SettingsAfterMutation();
+            }
+            catch (error) {
+                Log$4.warn('Protocol V2 wallpaper settings refresh failed after apply', {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
             return {
                 path: this.path,
                 size: encoded.data.byteLength,
@@ -64995,6 +65013,7 @@ const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL
 
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
+const PRE_PENDING_CALL_TIMEOUT_MS = 15 * 1000;
 const preWarmInflight = new Map();
 const preWarmDoneAt = new Map();
 function hasDeriveCardano(method) {
@@ -65150,29 +65169,40 @@ const handlePreWarmSignal = (context, message, method) => __awaiter(void 0, void
         }
     }
 });
-const waitWithTimeout = (promise, timeout) => __awaiter(void 0, void 0, void 0, function* () {
-    const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error('Request timeout')), timeout);
-    });
-    return Promise.race([promise, timeoutPromise]);
-});
-const waitForPendingPromise = (getPrePendingCallPromise, removePrePendingCallPromise) => __awaiter(void 0, void 0, void 0, function* () {
-    const pendingPromise = getPrePendingCallPromise();
+const waitForPendingPromise = (connectId, getPrePendingCallPromise, removePrePendingCallPromise) => __awaiter(void 0, void 0, void 0, function* () {
+    const pendingPromise = getPrePendingCallPromise(connectId);
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
+        let timer;
+        let timedOut = false;
         try {
-            yield waitWithTimeout(pendingPromise, 5 * 1000);
+            yield Promise.race([
+                pendingPromise,
+                new Promise(resolve => {
+                    timer = setTimeout(() => {
+                        timedOut = true;
+                        resolve();
+                    }, PRE_PENDING_CALL_TIMEOUT_MS);
+                }),
+            ]);
         }
         catch (error) {
         }
-        removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(pendingPromise);
+        finally {
+            if (timer)
+                clearTimeout(timer);
+            removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
+        }
+        if (timedOut) {
+            Log.warn('pre pending call promise timed out before call method', { connectId });
+        }
         Log.debug('pre pending call promise before call method done');
     }
 });
 const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, void 0, function* () {
-    var _d, _e, _f, _g, _h;
+    var _d, _e, _f, _g, _h, _j, _k;
     let messageResponse;
-    const { requestQueue, getPrePendingCallPromise, setPrePendingCallPromise } = context;
+    const { requestQueue, getPrePendingCallPromise, removePrePendingCallPromise } = context;
     updateMethodRequestContext(method, { status: 'running' });
     const normalizePassphraseState = (s) => s || '';
     const connectStateChange = normalizePassphraseState(preConnectCache.passphraseState) !==
@@ -65187,7 +65217,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     if (method.connectId) {
         yield context.waitForCallbackTasks(method.connectId);
     }
-    yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
+    yield waitForPendingPromise((_d = method.connectId) !== null && _d !== void 0 ? _d : '', getPrePendingCallPromise, removePrePendingCallPromise);
     const task = requestQueue.createTask(method);
     let preWarmCallbackTask;
     if (method.isPreWarmSignal && method.connectId) {
@@ -65196,9 +65226,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     }
     let device;
     try {
-        const connectId = (_d = method.connectId) !== null && _d !== void 0 ? _d : '';
+        const connectId = (_e = method.connectId) !== null && _e !== void 0 ? _e : '';
         const pollingId = pollingManager.start(connectId);
-        device = yield ensureConnected(context, method, connectId, pollingId, (_e = task.abortController) === null || _e === void 0 ? void 0 : _e.signal);
+        device = yield ensureConnected(context, method, connectId, pollingId, (_f = task.abortController) === null || _f === void 0 ? void 0 : _f.signal);
     }
     catch (e) {
         preWarmCallbackTask === null || preWarmCallbackTask === void 0 ? void 0 : preWarmCallbackTask.resolve();
@@ -65213,17 +65243,17 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         requestQueue.releaseTask(method.responseID);
         return createResponseMessage(method.responseID, false, { error: e });
     }
-    if ((_f = method.payload) === null || _f === void 0 ? void 0 : _f.onlyConnectBleDevice) {
+    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);
         return createResponseMessage(method.responseID, true, null);
     }
     Log.debug('Call API - setDevice: ', device.mainId);
-    (_g = method.setDevice) === null || _g === void 0 ? void 0 : _g.call(method, device);
+    (_h = method.setDevice) === null || _h === void 0 ? void 0 : _h.call(method, device);
     method.context = context;
     updateMethodRequestContext(method, {
         deviceInstanceId: device.instanceId,
-        commandsInstanceId: (_h = device.commands) === null || _h === void 0 ? void 0 : _h.instanceId,
+        commandsInstanceId: (_j = device.commands) === null || _j === void 0 ? void 0 : _j.instanceId,
     });
     const activeRequests = getActiveRequestsByDeviceInstance(device.instanceId);
     if (activeRequests.length > 0) {
@@ -65252,14 +65282,14 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         if (method.connectId) {
             yield context.waitForCallbackTasks(method.connectId, preWarmCallbackTask);
         }
-        yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
+        yield waitForPendingPromise((_k = method.connectId) !== null && _k !== void 0 ? _k : '', getPrePendingCallPromise, removePrePendingCallPromise);
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _j, _k;
+            var _l, _m;
             method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
             protocolV2Operation = device.isProtocolV2();
             const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
-            const currentFirmwareVersion = (_j = device.getCurrentFirmwareVersionString()) !== null && _j !== void 0 ? _j : '0.0.0';
-            const currentBleVersion = (_k = device.getCurrentBLEFirmwareVersionString()) !== null && _k !== void 0 ? _k : '0.0.0';
+            const currentFirmwareVersion = (_l = device.getCurrentFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
+            const currentBleVersion = (_m = device.getCurrentBLEFirmwareVersionString()) !== null && _m !== void 0 ? _m : '0.0.0';
             const deviceFirmwareType = device.getCurrentFirmwareType();
             let newVersionStatus;
             if (device.features && !device.isProtocolV2()) {
@@ -65337,7 +65367,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _l, _m, _o, _p, _q;
+                        var _o, _p, _q, _r, _s;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -65357,7 +65387,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_l = method.payload) === null || _l === void 0 ? void 0 : _l.passphraseState, (_m = method.payload) === null || _m === void 0 ? void 0 : _m.useEmptyPassphrase, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.skipPassphraseCheck, hasDeriveCardano(method));
+                            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);
@@ -65375,7 +65405,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_q = (_p = method.device) === null || _p === void 0 ? void 0 : _p.commands) === null || _q === void 0 ? void 0 : _q.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);
@@ -65571,6 +65601,13 @@ function isRetryableBleProtocolV2ProbeError(method, error) {
         message.includes('expected V2') &&
         message.includes('did not respond to expected protocol'));
 }
+function isMissingDetectedProtocolV2Error(method, error) {
+    const typedError = error;
+    return (method.payload.connectProtocol === 'V2' &&
+        (typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.RuntimeError &&
+        typeof typedError.message === 'string' &&
+        typedError.message.includes('Device protocol has not been detected'));
+}
 function connectDeviceForBle(method, device, retryCount = 0) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -65605,7 +65642,8 @@ function connectDeviceForBle(method, device, retryCount = 0) {
             }
         }
         catch (err) {
-            if (hdShared.ERROR_CODES_REQUIRE_DISCONNECT.includes(err.errorCode) &&
+            const requiresColdReconnect = isMissingDetectedProtocolV2Error(method, err);
+            if ((hdShared.ERROR_CODES_REQUIRE_DISCONNECT.includes(err.errorCode) || requiresColdReconnect) &&
                 device.mainId &&
                 device.deviceConnector) {
                 yield device.deviceConnector.disconnect(device.mainId).catch(() => undefined);
@@ -65613,10 +65651,11 @@ function connectDeviceForBle(method, device, retryCount = 0) {
             }
             if ((err.errorCode === hdShared.HardwareErrorCode.BleTimeoutError ||
                 err.errorCode === hdShared.HardwareErrorCode.BleConnectedError ||
-                isRetryableBleProtocolV2ProbeError(method, err)) &&
+                isRetryableBleProtocolV2ProbeError(method, err) ||
+                requiresColdReconnect) &&
                 retryCount < 6) {
                 const nextRetry = retryCount + 1;
-                Log.debug(`Bluetooth connect timeout and will retry, retry count: ${nextRetry}`);
+                Log.debug(`Bluetooth connection will retry, retry count: ${nextRetry}`);
                 yield wait(3000);
                 yield connectDeviceForBle(method, device, nextRetry);
             }
@@ -65635,7 +65674,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 _r;
+            var _t;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -65750,7 +65789,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) && !((_r = method.payload) === null || _r === void 0 ? void 0 : _r.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));
                 }
@@ -65768,7 +65807,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     return poll();
 });
 const cancel = (context, connectId) => {
-    var _a, _b;
+    var _a, _b, _c;
     const { requestQueue, setPrePendingCallPromise } = context;
     if (connectId) {
         try {
@@ -65782,7 +65821,7 @@ const cancel = (context, connectId) => {
                 if (task && ((_a = task.method) === null || _a === void 0 ? void 0 : _a.device)) {
                     if (!canceledDevices.includes(task.method.device)) {
                         const { device } = task.method;
-                        setPrePendingCallPromise(device === null || device === void 0 ? void 0 : device.interruptionFromUser());
+                        setPrePendingCallPromise((_b = task.method.connectId) !== null && _b !== void 0 ? _b : connectId, device.interruptionFromUser());
                         canceledDevices.push(device);
                     }
                     requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
@@ -65802,7 +65841,7 @@ const cancel = (context, connectId) => {
             for (const requestId of requestQueue.getRequestTasksId()) {
                 const task = requestQueue.getTask(requestId);
                 Log.debug('Cancel Api connect task: ', task);
-                if (task && ((_b = task.method) === null || _b === void 0 ? void 0 : _b.device)) {
+                if (task && ((_c = task.method) === null || _c === void 0 ? void 0 : _c.device)) {
                     if (!canceledDevices.includes(task.method.device)) {
                         const { device } = task.method;
                         device === null || device === void 0 ? void 0 : device.interruptionFromUser();
@@ -65991,6 +66030,7 @@ class Core extends events.exports {
     constructor() {
         super();
         this.requestQueue = new RequestQueue();
+        this.prePendingCallPromises = new Map();
         this.methodSynchronize = getSynchronize();
         this.tracingContext = createSdkTracingContext();
         this.sdkInstanceId = this.tracingContext.sdkInstanceId;
@@ -66002,9 +66042,18 @@ class Core extends events.exports {
             tracingContext: this.tracingContext,
             requestQueue: this.requestQueue,
             methodSynchronize: this.methodSynchronize,
-            getPrePendingCallPromise: () => this.prePendingCallPromise,
-            setPrePendingCallPromise: (promise) => {
-                this.prePendingCallPromise = promise;
+            getPrePendingCallPromise: (connectId) => this.prePendingCallPromises.get(connectId),
+            setPrePendingCallPromise: (connectId, promise) => {
+                if (!promise) {
+                    this.prePendingCallPromises.delete(connectId);
+                    return;
+                }
+                this.prePendingCallPromises.set(connectId, promise);
+            },
+            removePrePendingCallPromise: (connectId, promise) => {
+                if (this.prePendingCallPromises.get(connectId) === promise) {
+                    this.prePendingCallPromises.delete(connectId);
+                }
             },
             registerCallbackTask: (connectId, callbackPromise) => {
                 this.requestQueue.registerPendingCallbackTask(connectId, callbackPromise);
@@ -66098,7 +66147,7 @@ class Core extends events.exports {
             preWarmInflight.clear();
             preWarmDoneAt.clear();
             preConnectCache = { passphraseState: undefined };
-            this.prePendingCallPromise = undefined;
+            this.prePendingCallPromises.clear();
             this.removeAllListeners();
             cleanupSdkInstance(this.sdkInstanceId);
             if (_core === this)