@onekeyfe/hd-core 1.2.0-alpha.0 → 1.2.0-alpha.10

package/src/device/Device.ts

@@ -9,6 +9,7 @@ import {
   HardwareError,
   HardwareErrorCode,
   createDeferred,
+  createDeviceNotSupportMethodError,
 } from '@onekeyfe/hd-shared';
 
 import {
@@ -31,6 +32,7 @@ import {
 import { generateInstanceId } from '../utils/tracing';
 // eslint-disable-next-line import/no-cycle
 import { DeviceCommands } from './DeviceCommands';
+import { deviceWalletSessionStore } from './DeviceWalletSessionStore';
 import {
   type DeviceFirmwareRange,
   DeviceModelToTypes,
@@ -40,7 +42,6 @@ import {
   type Features,
   type IDeviceModel,
   type IDeviceType,
-  type IVersionArray,
   type IVersionRange,
   type SupportFeatureType,
   type UnavailableCapabilities,
@@ -54,11 +55,8 @@ import {
   PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
   requestProtocolV2DeviceInfo,
 } from '../protocols/protocol-v2/features';
-import {
-  buildProfileFromProtocolV1,
-  buildProfileFromProtocolV2,
-  buildProtocolV2GetFeaturesPayload,
-} from '../deviceProfile';
+import { refreshProtocolV2DeviceStatus } from '../protocols/protocol-v2/walletSession';
+import { buildProtocolV1FeaturesPayload, buildProtocolV2FeaturesPayload } from '../deviceProfile';
 
 import type { PROTO } from '../constants';
 import type {
@@ -70,11 +68,11 @@ import type { PassphrasePromptResponse } from './DeviceCommands';
 import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type {
   OneKeyDeviceInfo as DeviceDescriptor,
+  DeviceStatus,
   ProtocolV2DeviceInfo,
   Success,
 } from '@onekeyfe/hd-transport';
 import type DeviceConnector from './DeviceConnector';
-import type { DeviceProfile } from '../types/api/getDeviceInfo';
 
 export type InitOptions = {
   initSession?: boolean;
@@ -82,6 +80,7 @@ export type InitOptions = {
   passphraseState?: string;
   deriveCardano?: boolean;
   connectProtocol?: HardwareConnectProtocol;
+  protocolV2DeviceInfoTimeoutMs?: number;
 };
 
 export type RunOptions = {
@@ -96,11 +95,6 @@ const parseRunOptions = (options?: RunOptions): RunOptions => {
 
 const Log = getLogger(LoggerNames.Device);
 
-const profileVersionToArray = (version?: string | null): IVersionArray | null => {
-  if (!version) return null;
-  return version.split('.').map(part => Number(part) || 0) as IVersionArray;
-};
-
 export interface DeviceEvents {
   [DEVICE.PIN]: [Device, PROTO.PinMatrixRequestType | undefined, (err: any, pin: string) => void];
   [DEVICE.PASSPHRASE_ON_DEVICE]: [Device, ((response: any) => void)?];
@@ -129,8 +123,6 @@ export interface Device {
   emit<K extends keyof DeviceEvents>(type: K, ...args: DeviceEvents[K]): boolean;
 }
 
-const deviceSessionCache: Record<string, string> = {};
-
 /**
  * Pre-populate the device session cache with a known session ID.
  *
@@ -148,8 +140,7 @@ export function preloadSessionCache(
   passphraseState: string,
   sessionId: string
 ): void {
-  const key = `${deviceId}@${passphraseState}`;
-  deviceSessionCache[key] = sessionId;
+  deviceWalletSessionStore.set(deviceId, passphraseState, sessionId);
 }
 
 export class Device extends EventEmitter {
@@ -198,37 +189,17 @@ export class Device extends EventEmitter {
   /**
    * 唯一设备状态缓存。
    *
-   * V1 直接保存原生 Features；V2 保存由 DevGetDeviceInfo/profile 映射出的
-   * legacy Features 兼容视图。profile 作为结构化视图按需由 features 派生，
-   * 不再单独维护第二份缓存。
+   * V1 直接保存原生 Features；V2 保存由 DeviceInfoGet 映射出的
+   * Features 视图。Device 不再保存 profile，结构化 DeviceProfile 只作为
+   * getDeviceInfo() 的 API 返回值存在。
    */
   features: Features | undefined = undefined;
 
-  private getFeaturesProfile(): DeviceProfile | undefined {
-    if (!this.features) return undefined;
-    const protocol = this.originalDescriptor.protocolType === 'V2' ? 'V2' : 'V1';
-    return buildProfileFromProtocolV1({
-      protocol,
-      features: this.features,
-      onekeyFeatures: this.features as Parameters<typeof buildProfileFromProtocolV1>[0]['onekeyFeatures'],
-      sources: ['features'],
-      scope: 'verify',
-    });
-  }
-
-  get profile(): DeviceProfile | undefined {
-    return this.getFeaturesProfile();
-  }
-
-  set profile(profile: DeviceProfile | undefined) {
-    this.updateProfile(profile);
-  }
-
   /**
    * 是否需要更新设备信息。
    *
    * 历史名称保留用于兼容现有调用语义；对 V2 表示 features 需要由
-   * DevGetDeviceInfo 刷新。
+   * DeviceInfoGet 刷新。
    */
   featuresNeedsReload = false;
 
@@ -292,13 +263,14 @@ export class Device extends EventEmitter {
     const bleName = this.getCurrentBleName();
     const label = this.getCurrentLabel();
     const serialNo = this.getCurrentSerialNo();
+    const connectId = this.getConnectId();
     const deviceId = this.getCurrentDeviceId() || null;
 
-    const features = this.features;
+    const { features } = this;
 
     return {
       /** Android uses Mac address, iOS uses uuid, USB uses uuid  */
-      connectId: DataManager.isBleConnect(env) ? this.mainId || null : serialNo,
+      connectId: DataManager.isBleConnect(env) ? this.mainId || null : connectId,
       /** Hardware ID, will not change at any time */
       uuid: serialNo,
       commType: this.originalDescriptor.commType,
@@ -314,8 +286,7 @@ export class Device extends EventEmitter {
       label: label || 'OneKey',
       mode: this.getMode(),
       features,
-      profile: this.profile,
-      sessionId: this.features?.session_id ?? null,
+      sessionId: this.features?.sessionId ?? null,
       firmwareVersion: this.getFirmwareVersion(),
       bleFirmwareVersion: this.getBLEFirmwareVersion(),
       unavailableCapabilities: this.unavailableCapabilities,
@@ -357,7 +328,10 @@ export class Device extends EventEmitter {
     });
   }
 
-  async acquire(connectProtocol?: HardwareConnectProtocol) {
+  async acquire(
+    connectProtocol?: HardwareConnectProtocol,
+    options?: { throwOnRunPromiseError?: boolean }
+  ) {
     const env = DataManager.getSettings('env');
     const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
     const expectedProtocol = connectProtocol ?? this.originalDescriptor.protocolType;
@@ -406,6 +380,9 @@ export class Device extends EventEmitter {
 
       this.commands = new DeviceCommands(this, this.mainId ?? '');
     } catch (error) {
+      if (options?.throwOnRunPromiseError) {
+        throw error;
+      }
       if (this.runPromise) {
         this.runPromise.reject(error);
       } else {
@@ -508,10 +485,10 @@ export class Device extends EventEmitter {
   /**
    * 唯一协议判别器。
    *
-   * descriptor.protocolType 是协议探测后的结果；V2 features 由 DevGetDeviceInfo
-   * 映射产生，profile 只是 features 的结构化视图。
+   * descriptor.protocolType 是协议探测后的结果；V2 features 由 DeviceInfoGet
+   * 映射产生。
    * 全 SDK 的协议分支都必须走这里，不要直接读 originalDescriptor.protocolType
-   * 或 profile.protocol。
+   * 或从 features 反推。
    */
   getProtocol(): 'V1' | 'V2' {
     return this.originalDescriptor.protocolType === 'V2' ? 'V2' : 'V1';
@@ -522,57 +499,53 @@ export class Device extends EventEmitter {
   }
 
   getCurrentDeviceType() {
-    return this.profile?.deviceType ?? getDeviceType(this.features);
+    return getDeviceType(this.features);
   }
 
   getCurrentDeviceId() {
-    if (this.profile) {
-      return this.profile.deviceId || undefined;
-    }
-    return this.features?.device_id || undefined;
+    return this.features?.deviceId || undefined;
   }
 
   getCurrentSerialNo() {
-    if (this.profile) {
-      return this.profile.serialNo || '';
-    }
     return this.features ? getDeviceUUID(this.features) : '';
   }
 
+  getConnectId() {
+    const serialNo = this.getCurrentSerialNo();
+    if (serialNo) return serialNo;
+
+    // connectId 是 SDK 内部连接路由 key。这里兜底到 transport descriptor，
+    // 不改变 features.serialNo / deviceId 的业务语义。
+    return this.originalDescriptor.path || this.originalDescriptor.id || '';
+  }
+
   getCurrentBleName() {
-    // V2 不回退 legacy features，避免缓存残留的 V1 数据泄漏到 Pro2 视图
-    if (this.isProtocolV2()) return this.profile?.bleName ?? null;
-    return this.profile?.bleName ?? getDeviceBleName(this.features);
+    return getDeviceBleName(this.features);
   }
 
   getCurrentLabel() {
-    if (this.isProtocolV2()) return this.profile?.label ?? null;
-    return this.profile?.label ?? getDeviceLabel(this.features);
+    return getDeviceLabel(this.features);
   }
 
   getCurrentPassphraseProtection() {
-    if (this.profile) {
-      return this.profile.status.passphraseProtection;
-    }
-    return this.features?.passphrase_protection;
+    return this.features?.passphraseProtection;
   }
 
   getCurrentFirmwareType() {
-    return this.profile?.firmwareType ?? getFirmwareType(this.features);
+    return getFirmwareType(this.features);
   }
 
   getCurrentFirmwareVersionString() {
-    return this.profile?.versions.firmware ?? getDeviceFirmwareVersion(this.features)?.join('.');
+    return getDeviceFirmwareVersion(this.features)?.join('.');
   }
 
   getCurrentBLEFirmwareVersionString() {
-    if (this.profile?.versions.ble) return this.profile.versions.ble;
     if (!this.features) return undefined;
     return getDeviceBLEFirmwareVersion(this.features).join('.');
   }
 
   getCurrentSafetyChecks() {
-    return this.features?.safety_checks;
+    return this.features?.safetyChecks;
   }
 
   getCurrentMethodVersionRange(
@@ -656,24 +629,24 @@ export class Device extends EventEmitter {
     };
   }
 
-  private generateStateKey(deviceId: string, passphraseState?: string) {
-    if (passphraseState) {
-      return `${deviceId}@${passphraseState}`;
+  private getSessionCacheDeviceKey(_deviceId?: string) {
+    const deviceId = _deviceId || this.getCurrentDeviceId();
+    if (deviceId) return deviceId;
+    if (this.isProtocolV2()) {
+      return this.originalDescriptor.path || this.originalDescriptor.id;
     }
-    return deviceId;
+    return undefined;
   }
 
   getInternalState(_deviceId?: string) {
-    Log.debug('getInternalState session cache: ', deviceSessionCache);
     Log.debug(
       'getInternalState session param: ',
       `device_id: ${_deviceId}`,
-      `features.device_id: ${this.features?.device_id}`,
-      `profile.deviceId: ${this.profile?.deviceId}`,
+      `features.deviceId: ${this.features?.deviceId}`,
       `passphraseState: ${this.passphraseState}`
     );
 
-    const deviceId = _deviceId || this.getCurrentDeviceId();
+    const deviceId = this.getSessionCacheDeviceKey(_deviceId);
     if (!deviceId) return undefined;
     // Security invariant: no passphraseState → no session lookup.
     // A previous fallback that scanned `${deviceId}@*` keys could silently
@@ -683,15 +656,14 @@ export class Device extends EventEmitter {
     // downstream call carries it and hits the primary lookup below.
     if (!this.passphraseState) return undefined;
 
-    const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
-    return deviceSessionCache[usePassKey];
+    return deviceWalletSessionStore.get(deviceId, this.passphraseState);
   }
 
   // attach to pin to fix internal state
   updateInternalState(
     enablePassphrase: boolean,
     passphraseState: string | undefined,
-    deviceId: string,
+    deviceId: string | undefined,
     sessionId: string | null = null,
     featuresSessionId: string | null = null
   ) {
@@ -700,62 +672,52 @@ export class Device extends EventEmitter {
       `device_id: ${deviceId}`,
       `enablePassphrase: ${enablePassphrase}`,
       `passphraseState: ${passphraseState}`,
-      `sessionId: ${sessionId}`,
-      `featuresSessionId: ${featuresSessionId}`
+      `hasSessionId: ${Boolean(sessionId)}`,
+      `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`
     );
 
-    if (enablePassphrase) {
-      // update the sessionId
-      if (sessionId) {
-        deviceSessionCache[this.generateStateKey(deviceId, passphraseState)] = sessionId;
-      } else if (featuresSessionId) {
-        deviceSessionCache[this.generateStateKey(deviceId, passphraseState)] = featuresSessionId;
-      }
-    }
+    const cacheDeviceKey = this.getSessionCacheDeviceKey(deviceId);
+    if (!cacheDeviceKey) return;
 
-    // delete the old sessionId
-    const oldKey = `${deviceId}`;
-    if (deviceSessionCache[oldKey]) {
-      delete deviceSessionCache[oldKey];
+    if (enablePassphrase) {
+      const walletSessionId =
+        sessionId || featuresSessionId || deviceWalletSessionStore.getPending(cacheDeviceKey);
+      deviceWalletSessionStore.set(cacheDeviceKey, passphraseState, walletSessionId ?? undefined);
     }
 
-    Log.debug('updateInternalState session cache: ', deviceSessionCache);
+    deviceWalletSessionStore.deletePending(cacheDeviceKey);
   }
 
   private setInternalState(state: string, initSession?: boolean) {
     Log.debug(
       'setInternalState session param: ',
-      `state: ${state}`,
+      `hasState: ${Boolean(state)}`,
       `initSession: ${initSession}`,
-      `device_id: ${this.features?.device_id}`,
-      `profile.deviceId: ${this.profile?.deviceId}`,
+      `deviceId: ${this.features?.deviceId}`,
       `passphraseState: ${this.passphraseState}`
     );
 
     if (!this.passphraseState && !initSession) return;
 
-    const deviceId = this.getCurrentDeviceId();
+    const deviceId = this.getSessionCacheDeviceKey();
     if (!deviceId) return;
 
-    const key = this.generateStateKey(deviceId, this.passphraseState);
-
-    if (state) {
-      deviceSessionCache[key] = state;
+    if (this.passphraseState) {
+      deviceWalletSessionStore.set(deviceId, this.passphraseState, state);
+    } else if (initSession) {
+      deviceWalletSessionStore.setPending(deviceId, state);
     }
-    Log.debug('setInternalState done session cache: ', deviceSessionCache);
   }
 
   clearInternalState(_deviceId?: string) {
     Log.debug('clearInternalState param: ', _deviceId);
 
-    const deviceId = _deviceId || this.getCurrentDeviceId();
+    const deviceId = this.getSessionCacheDeviceKey(_deviceId);
     if (!deviceId) return;
-    const key = `${deviceId}`;
-    delete deviceSessionCache[key];
+    deviceWalletSessionStore.deletePending(deviceId);
 
     if (this.passphraseState) {
-      const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
-      delete deviceSessionCache[usePassKey];
+      deviceWalletSessionStore.delete(deviceId, this.passphraseState);
     }
   }
 
@@ -763,15 +725,17 @@ export class Device extends EventEmitter {
     // Protocol V2 不支持传统 Initialize，直接使用协议专用初始化流程。
     if (this.isProtocolV2()) {
       this.passphraseState = options?.passphraseState;
-      if (this.profile && !this.featuresNeedsReload && !options?.initSession) {
-        // 不能直接信任缓存 profile：设备端 wipe / 完成初始化 / 改 label 后
-        // profile 会永久陈旧。每次 run 做一次轻量 status 刷新（不含 fw/SE，
-        // 单帧请求开销很小），用 applyProfileUpdate 字段级合并，
-        // 不会降级已有的 verify / SE versions 数据。
-        await this._refreshProtocolV2Status();
+      if (this.features && !this.featuresNeedsReload && !options?.initSession) {
+        if (this.features.bootloaderMode) {
+          return;
+        }
+        // 不能直接信任缓存 features：设备端 wipe / 完成初始化 / 改 label 后
+        // features 会永久陈旧。每次 run 做一次轻量 status 刷新（不含 fw/SE），
+        // 用字段级合并保留已有版本和 SE 信息。
+        await this._refreshProtocolV2Status(options);
         return;
       }
-      await this._initializeProtocolV2();
+      await this._initializeProtocolV2(options);
       return;
     }
 
@@ -821,11 +785,11 @@ export class Device extends EventEmitter {
   /**
    * Device initialization over Protocol V2.
    *
-   * Protocol V2 不走传统 Initialize/GetFeatures；DeviceProfile 作为标准模型，
-   * 同时维护一份由 profile/deviceInfo 适配出的 legacy Features，兼容旧方法内部判断。
+   * Protocol V2 不走传统 Initialize/GetFeatures；直接用 DeviceInfoGet
+   * 生成唯一的 features 状态。
    */
-  private async _initializeProtocolV2() {
-    Log.debug('Initialize device via Protocol V2 profile adapter');
+  private async _initializeProtocolV2(options?: InitOptions) {
+    Log.debug('Initialize device via Protocol V2 features adapter');
 
     try {
       // 超时由 requestProtocolV2DeviceInfo 内部的 typedCall timeoutMs（默认 10s）负责，
@@ -833,19 +797,12 @@ export class Device extends EventEmitter {
       // 且 reject 后底层调用仍会残留。
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
+        timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
       });
       // 默认请求不含 SE/hash 数据，scope 如实标注为 basic；
       // 完整数据由 getDeviceInfo(scope:'verify'|'full') 获取。
-      const profile = this.applyProfileUpdate(
-        buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'basic',
-          fallbackSerialNo: this.originalDescriptor?.path,
-        }),
-        deviceInfo
-      );
-      Log.debug('Protocol V2 profile:', profile);
+      const features = this.updateProtocolV2Features(deviceInfo);
+      Log.debug('Protocol V2 features:', features);
       this.featuresNeedsReload = false;
     } catch (error) {
       Log.error('Protocol V2 initialization failed:', error);
@@ -856,27 +813,19 @@ export class Device extends EventEmitter {
   /**
    * Protocol V2 的轻量状态刷新（每次 run 前调用）。
    *
-   * 请求 hw + bt + status（不含 fw/SE target）：status 提供 init_states / label /
-   * passphrase_protection 等会在设备端变化的字段；hw/bt 提供 serialNo / bleName，
-   * 避免 applyProfileUpdate 的顶层字段覆盖把已有身份字段清空。
+   * 请求 hw + coprocessor + status（不含 fw/SE target）：status 提供 init_states / label /
+   * passphrase_enabled 等会在设备端变化的字段；hw/coprocessor 提供 serialNo / bleName。
    * versions 为空时按字段级合并保留旧值，verify 数据不会被降级。
    */
-  private async _refreshProtocolV2Status() {
+  private async _refreshProtocolV2Status(options?: InitOptions) {
     try {
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
         request: PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
+        timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
       });
-      const profile = this.applyProfileUpdate(
-        buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'basic',
-          fallbackSerialNo: this.originalDescriptor?.path,
-        }),
-        deviceInfo
-      );
-      Log.debug('Protocol V2 profile (status refresh):', profile);
+      const features = this.updateProtocolV2Features(deviceInfo);
+      Log.debug('Protocol V2 features (status refresh):', features);
     } catch (error) {
       Log.error('Protocol V2 status refresh failed:', error);
       throw error;
@@ -888,109 +837,67 @@ export class Device extends EventEmitter {
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
       });
-      const profile = this.applyProfileUpdate(
-        buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'basic',
-          fallbackSerialNo: this.originalDescriptor?.path,
-        }),
-        deviceInfo
-      );
-      return this.features ?? this.updateProtocolV2Features(profile, deviceInfo);
+      return this.updateProtocolV2Features(deviceInfo);
     }
 
     const { message } = await this.commands.typedCall('GetFeatures', 'Features', {});
     this._updateFeatures(message);
-    return message;
+    return this.features;
   }
 
-  _updateFeatures(feat: Features, initSession?: boolean) {
+  _updateFeatures(protoFeatures: PROTO.Features | Features, initSession?: boolean) {
+    const previousCacheDeviceKey = this.getSessionCacheDeviceKey();
+    let feat =
+      'protocol' in protoFeatures
+        ? protoFeatures
+        : buildProtocolV1FeaturesPayload(protoFeatures, this.features);
+
     // GetFeatures doesn't return 'session_id'
-    if (this.features && this.features.session_id && !feat.session_id) {
-      feat.session_id = this.features.session_id;
-    }
-    if (this.getCurrentDeviceId() && feat.session_id) {
-      this.setInternalState(feat.session_id, initSession);
+    if (this.features?.sessionId && !feat.sessionId) {
+      feat.sessionId = this.features.sessionId;
     }
     feat.unlocked = feat.unlocked ?? true;
 
     feat = fixFeaturesFirmwareVersion(feat);
 
     this.features = feat;
-    if (!this.isProtocolV2()) {
-      this.updateProfile(
-        buildProfileFromProtocolV1({
-          features: feat,
-          sources: ['features'],
-        })
-      );
+    const nextCacheDeviceKey = this.getSessionCacheDeviceKey();
+    if (previousCacheDeviceKey && nextCacheDeviceKey) {
+      deviceWalletSessionStore.migrateDeviceKey(previousCacheDeviceKey, nextCacheDeviceKey);
+    }
+    if (feat.deviceId && feat.sessionId) {
+      this.setInternalState(feat.sessionId, initSession);
     }
     this.featuresNeedsReload = false;
     this.emit(DEVICE.FEATURES, this, feat);
   }
 
-  updateProfile(profile: DeviceProfile | undefined) {
-    if (!profile) {
-      this.features = undefined;
-      return;
-    }
-    if (profile.protocol === 'V2') {
-      this.updateProtocolV2Features(profile, profile.raw?.protocolV2DeviceInfo);
-      return;
-    }
-    if (profile.raw?.features) {
-      this.features = fixFeaturesFirmwareVersion(profile.raw.features);
+  updateProtocolV2Features(deviceInfo?: ProtocolV2DeviceInfo) {
+    const previousCacheDeviceKey = this.getSessionCacheDeviceKey();
+    const features = fixFeaturesFirmwareVersion(
+      buildProtocolV2FeaturesPayload(deviceInfo, this.features)
+    );
+    this.features = features;
+    const nextCacheDeviceKey = this.getSessionCacheDeviceKey();
+    if (previousCacheDeviceKey && nextCacheDeviceKey) {
+      deviceWalletSessionStore.migrateDeviceKey(previousCacheDeviceKey, nextCacheDeviceKey);
     }
+    this.featuresNeedsReload = false;
+    this.emit(DEVICE.FEATURES, this, features);
+    return features;
   }
 
-  /**
-   * 字段级合并刷新 profile，并返回合并后的结果。
-   *
-   * basic 范围的刷新（initialize / getFeatures）拿不到 SE 版本和 verify 数据，
-   * 不能整体替换掉 getDeviceInfo(scope:'verify'|'full') 建立的完整 profile。
-   */
-  applyProfileUpdate(next: DeviceProfile, deviceInfo?: ProtocolV2DeviceInfo): DeviceProfile {
-    const prev = this.profile;
-    if (!prev || prev.protocol !== next.protocol) {
-      this.updateProfile({
-        ...next,
-        raw: {
-          ...next.raw,
-          ...(deviceInfo ? { protocolV2DeviceInfo: deviceInfo } : {}),
-        },
-      });
-      return next;
-    }
-
-    const versions = { ...prev.versions };
-    for (const [key, value] of Object.entries(next.versions)) {
-      if (value != null) {
-        (versions as Record<string, string | null | undefined>)[key] = value;
-      }
-    }
-
-    const merged: DeviceProfile = {
-      ...prev,
-      ...next,
-      versions,
-      verify: next.verify ?? prev.verify,
-      raw: {
-        ...prev.raw,
-        ...next.raw,
-        ...(deviceInfo ? { protocolV2DeviceInfo: deviceInfo } : {}),
+  updateProtocolV2Status(status: DeviceStatus) {
+    const previousDeviceInfo = this.features?.raw?.protocolV2DeviceInfo;
+    const previousStatus = previousDeviceInfo?.status;
+    return this.updateProtocolV2Features({
+      ...(previousDeviceInfo ?? {}),
+      protocol_version: previousDeviceInfo?.protocol_version ?? this.features?.protocolVersion ?? 2,
+      status: {
+        ...previousStatus,
+        ...status,
       },
-    };
-    this.updateProfile(merged);
-    return merged;
-  }
-
-  private updateProtocolV2Features(profile: DeviceProfile, deviceInfo?: ProtocolV2DeviceInfo) {
-    const features = fixFeaturesFirmwareVersion(
-      buildProtocolV2GetFeaturesPayload(profile, deviceInfo)
-    );
-    this._updateFeatures(features);
-    return features;
+    });
   }
 
   /**
@@ -1027,7 +934,6 @@ export class Device extends EventEmitter {
     if (device.features) {
       this._updateFeatures(device.features);
     }
-    this.updateProfile(device.profile);
   }
 
   async run(fn?: () => Promise<void>, options?: RunOptions) {
@@ -1160,17 +1066,7 @@ export class Device extends EventEmitter {
   }
 
   getMode() {
-    if (this.profile) {
-      if (this.profile.status.mode === 'bootloader') return EOneKeyDeviceMode.bootloader;
-      if (this.profile.status.mode === 'notInitialized') return EOneKeyDeviceMode.notInitialized;
-      if (this.profile.status.noBackup === true) return EOneKeyDeviceMode.backupMode;
-      if (this.profile.status.mode === 'normal') return EOneKeyDeviceMode.normal;
-      // mode 'unknown'（V2 设备未上报 init_states）保守按未初始化处理，
-      // 与 isInitialized() 的 fail-closed 行为保持一致。
-      if (this.isProtocolV2()) return EOneKeyDeviceMode.notInitialized;
-    }
-
-    if (this.features?.bootloader_mode) {
+    if (this.features?.bootloaderMode) {
       // bootloader mode
       return EOneKeyDeviceMode.bootloader;
     }
@@ -1180,7 +1076,7 @@ export class Device extends EventEmitter {
       return EOneKeyDeviceMode.notInitialized;
     }
 
-    if (this.features?.no_backup) {
+    if (this.features?.noBackup) {
       // backup mode
       return EOneKeyDeviceMode.backupMode;
     }
@@ -1190,17 +1086,11 @@ export class Device extends EventEmitter {
   }
 
   getFirmwareVersion() {
-    const profileVersion = profileVersionToArray(this.profile?.versions.firmware);
-    if (profileVersion) return profileVersion;
-    if (this.isProtocolV2()) return null;
     if (!this.features) return null;
     return getDeviceFirmwareVersion(this.features);
   }
 
   getBLEFirmwareVersion() {
-    const profileVersion = profileVersionToArray(this.profile?.versions.ble);
-    if (profileVersion) return profileVersion;
-    if (this.isProtocolV2()) return null;
     if (!this.features) return null;
     return getDeviceBLEFirmwareVersion(this.features);
   }
@@ -1230,37 +1120,19 @@ export class Device extends EventEmitter {
   }
 
   isBootloader() {
-    if (this.profile) {
-      return (
-        this.profile.status.mode === 'bootloader' || this.profile.status.bootloaderMode === true
-      );
-    }
-    return this.features && !!this.features.bootloader_mode;
+    return this.features && !!this.features.bootloaderMode;
   }
 
   isInitialized() {
-    if (this.profile) {
-      if (this.profile.status.initialized != null) return this.profile.status.initialized;
-      if (this.profile.status.mode === 'normal') return true;
-      if (this.profile.status.mode === 'notInitialized') return false;
-      // V2 设备未上报 init_states 时按未初始化处理（fail-closed）：
-      // 未知状态放行会让未初始化设备绕过 NOT_INITIALIZE 门禁。
-      if (this.isProtocolV2()) return false;
-      if (this.features) return !!this.features.initialized;
-      return false;
-    }
     return this.features && !!this.features.initialized;
   }
 
   isSeedless() {
-    if (this.profile) {
-      return this.profile.status.noBackup === true;
-    }
-    return this.features && !!this.features.no_backup;
+    return this.features && !!this.features.noBackup;
   }
 
   isUnacquired(): boolean {
-    return this.features === undefined && this.profile === undefined;
+    return this.features === undefined;
   }
 
   hasUnexpectedMode(allow: string[], require: string[]) {
@@ -1291,7 +1163,7 @@ export class Device extends EventEmitter {
       deviceType === EDeviceType.Touch ||
       deviceType === EDeviceType.Pro ||
       deviceType === EDeviceType.Pro2;
-    const unlocked = this.profile ? this.profile.status.unlocked : this.features?.unlocked;
+    const unlocked = this.features?.unlocked;
     const preCheckTouch = isModeT && unlocked === false;
     const passphraseProtection = this.getCurrentPassphraseProtection();
 
@@ -1308,8 +1180,7 @@ export class Device extends EventEmitter {
   }
 
   supportUnlockVersionRange(): DeviceFirmwareRange {
-    // 仅适用于 Protocol V1 的 Pro 系列；Pro2 走独立版本线，
-    // 且 Protocol V2 固件从首个版本即支持 UnLockDevice（见 unlockDevice 的 isProtocolV2 短路）。
+    // 仅适用于 Protocol V1 的 Pro 系列；Pro2 走独立的 Protocol V2 解锁流程。
     return {
       pro: {
         min: '4.15.0',
@@ -1318,8 +1189,24 @@ export class Device extends EventEmitter {
   }
 
   async unlockDevice() {
+    if (this.isProtocolV2()) {
+      try {
+        await this.commands.typedCall('DeviceSessionAskPin', 'DeviceSessionPinResult');
+      } catch (error) {
+        const errorText =
+          error instanceof Error
+            ? `${error.name} ${error.message}`
+            : String((error as { message?: unknown } | null)?.message ?? error ?? '');
+        if (errorText.includes('Failure_UnexpectedMessage')) {
+          throw createDeviceNotSupportMethodError('deviceUnlock', this.getCurrentFirmwareType());
+        }
+        throw error;
+      }
+
+      return refreshProtocolV2DeviceStatus(this);
+    }
+
     const firmwareVersion = this.getCurrentFirmwareVersionString() ?? '0.0.0';
-    // profile 优先的版本范围解析；features 仅作为 V1 capability 判断来源
     const versionRange = this.getCurrentMethodVersionRange(
       type => this.supportUnlockVersionRange()[type]
     );
@@ -1328,9 +1215,7 @@ export class Device extends EventEmitter {
       this.features,
       Enum_Capability.Capability_AttachToPin
     );
-    // Pro2 (Protocol V2) 版本线独立于 Pro 系列，固件从首个版本即支持 UnLockDevice
     const supportUnlock =
-      this.isProtocolV2() ||
       supportAttachPinCapability ||
       (versionRange &&
         semver.valid(firmwareVersion) &&
@@ -1338,24 +1223,11 @@ export class Device extends EventEmitter {
 
     if (supportUnlock) {
       const res = await this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
-      // 解锁结果同步到 profile（标准模型），features 仅在 V1 缓存存在时回写
-      if (this.profile) {
-        this.updateProfile({
-          ...this.profile,
-          status: {
-            ...this.profile.status,
-            unlocked: res.message.unlocked == null ? null : res.message.unlocked,
-            ...(res.message.passphrase_protection != null
-              ? { passphraseProtection: res.message.passphrase_protection }
-              : {}),
-          },
-        });
-      }
       if (this.features) {
         this.features.unlocked = res.message.unlocked == null ? null : res.message.unlocked;
-        this.features.unlocked_attach_pin =
+        this.features.unlockedAttachPin =
           res.message.unlocked_attach_pin == null ? undefined : res.message.unlocked_attach_pin;
-        this.features.passphrase_protection =
+        this.features.passphraseProtection =
           res.message.passphrase_protection == null ? null : res.message.passphrase_protection;
 
         return Promise.resolve(this.features);
@@ -1365,14 +1237,6 @@ export class Device extends EventEmitter {
       return Promise.resolve(features);
     }
 
-    // legacy 解锁探测仅适用于 Protocol V1 老固件；V2 固件必然支持 UnLockDevice
-    if (this.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'unlock device error: device firmware does not support UnLockDevice'
-      );
-    }
-
     const { type } = await this.commands.typedCall('GetAddress', 'Address', {
       address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
       coin_name: 'Testnet',