@onekeyfe/hd-core 1.2.0-alpha.16 → 1.2.0-alpha.17

package/src/data/messages/messages-protocol-v2.json

@@ -482,7 +482,7 @@
         "MessageType_DeviceStatus": 60603,
         "MessageType_DevGetOnboardingStatus": 60604,
         "MessageType_DevOnboardingStatus": 60605,
-        "MessageType_DeviceSessionGet": 60606,
+        "MessageType_DeviceSessionOpen": 60606,
         "MessageType_DeviceSession": 60607,
         "MessageType_DeviceSessionAskPin": 60608,
         "MessageType_FilesystemPermissionFix": 60800,
@@ -12418,14 +12418,68 @@
         }
       }
     },
-    "DeviceSessionGet": {
+    "DeviceSessionResume": {
       "fields": {
         "session_id": {
+          "rule": "required",
           "type": "bytes",
           "id": 1
         }
       }
     },
+    "DeviceHostPassphrase": {
+      "fields": {
+        "passphrase": {
+          "rule": "required",
+          "type": "string",
+          "id": 1
+        }
+      }
+    },
+    "DevicePassphraseOnDevice": {
+      "fields": {}
+    },
+    "DeviceAttachPinOnDevice": {
+      "fields": {}
+    },
+    "DeviceWalletSelect": {
+      "oneofs": {
+        "access": {
+          "oneof": ["host_passphrase", "passphrase_on_device", "attach_pin_on_device"]
+        }
+      },
+      "fields": {
+        "host_passphrase": {
+          "type": "DeviceHostPassphrase",
+          "id": 1
+        },
+        "passphrase_on_device": {
+          "type": "DevicePassphraseOnDevice",
+          "id": 2
+        },
+        "attach_pin_on_device": {
+          "type": "DeviceAttachPinOnDevice",
+          "id": 3
+        }
+      }
+    },
+    "DeviceSessionOpen": {
+      "oneofs": {
+        "mode": {
+          "oneof": ["resume", "select"]
+        }
+      },
+      "fields": {
+        "resume": {
+          "type": "DeviceSessionResume",
+          "id": 1
+        },
+        "select": {
+          "type": "DeviceWalletSelect",
+          "id": 2
+        }
+      }
+    },
     "DeviceSession": {
       "fields": {
         "session_id": {
@@ -12481,21 +12535,59 @@
     "DeviceStatusGet": {
       "fields": {}
     },
-    "DevOnboardingStage": {
+    "DevOnboardingStep": {
+      "values": {
+        "DEV_ONBOARDING_STEP_UNKNOWN": 0,
+        "DEV_ONBOARDING_STEP_CHECKING": 1,
+        "DEV_ONBOARDING_STEP_PERSONALIZATION": 2,
+        "DEV_ONBOARDING_STEP_PIN": 3,
+        "DEV_ONBOARDING_STEP_SETUP": 4,
+        "DEV_ONBOARDING_STEP_DONE": 5
+      }
+    },
+    "DevOnboardingPhase": {
+      "values": {
+        "DEV_ONBOARDING_PHASE_UNKNOWN": 0,
+        "DEV_ONBOARDING_PHASE_SAFETY_CHECK": 1,
+        "DEV_ONBOARDING_PHASE_PIN_SETUP": 2,
+        "DEV_ONBOARDING_PHASE_FINGERPRINT_SETUP": 3,
+        "DEV_ONBOARDING_PHASE_SETUP_CHOICE": 4,
+        "DEV_ONBOARDING_PHASE_WALLET_CREATE_START": 5,
+        "DEV_ONBOARDING_PHASE_RECOVERY_PHRASE_VIEW": 6,
+        "DEV_ONBOARDING_PHASE_RECOVERY_PHRASE_CONFIRM": 7,
+        "DEV_ONBOARDING_PHASE_RESTORE_METHOD_CHOICE": 8,
+        "DEV_ONBOARDING_PHASE_RECOVERY_PHRASE_RESTORE": 9,
+        "DEV_ONBOARDING_PHASE_SEEDCARD_RESTORE": 10,
+        "DEV_ONBOARDING_PHASE_WALLET_READY": 11,
+        "DEV_ONBOARDING_PHASE_SEEDCARD_BACKUP_PROMPT": 12,
+        "DEV_ONBOARDING_PHASE_SEEDCARD_BACKUP": 13
+      }
+    },
+    "DevOnboardingSetupKind": {
       "values": {
-        "DEV_ONBOARDING_STAGE_UNKNOWN": 0,
-        "DEV_ONBOARDING_STAGE_SAFETY_CHECK": 1,
-        "DEV_ONBOARDING_STAGE_PERSONALIZATION": 2,
-        "DEV_ONBOARDING_STAGE_SELECT_SETUP_METHOD": 3,
-        "DEV_ONBOARDING_STAGE_NEW_DEVICE": 4,
-        "DEV_ONBOARDING_STAGE_SELECT_RESTORE_METHOD": 5,
-        "DEV_ONBOARDING_STAGE_RESTORE_MNEMONIC": 6,
-        "DEV_ONBOARDING_STAGE_RESTORE_SEEDCARD": 7,
-        "DEV_ONBOARDING_STAGE_WALLET_READY": 8,
-        "DEV_ONBOARDING_STAGE_SEEDCARD_BACKUP_PROMPT": 9,
-        "DEV_ONBOARDING_STAGE_SELECT_SEEDCARD_BACKUP_METHOD": 10,
-        "DEV_ONBOARDING_STAGE_SEEDCARD_BACKUP": 11,
-        "DEV_ONBOARDING_STAGE_DONE": 12
+        "DEV_ONBOARDING_SETUP_KIND_UNKNOWN": 0,
+        "DEV_ONBOARDING_SETUP_KIND_CHOICE": 1,
+        "DEV_ONBOARDING_SETUP_KIND_CREATE": 2,
+        "DEV_ONBOARDING_SETUP_KIND_RESTORE": 3
+      }
+    },
+    "DevOnboardingSetupMethod": {
+      "values": {
+        "DEV_ONBOARDING_SETUP_METHOD_UNKNOWN": 0,
+        "DEV_ONBOARDING_SETUP_METHOD_RECOVERY_PHRASE": 1,
+        "DEV_ONBOARDING_SETUP_METHOD_SEEDCARD": 2
+      }
+    },
+    "DevOnboardingSetupStatus": {
+      "fields": {
+        "kind": {
+          "type": "DevOnboardingSetupKind",
+          "id": 1
+        },
+        "method": {
+          "type": "DevOnboardingSetupMethod",
+          "id": 2
+        }
       }
     },
     "DevGetOnboardingStatus": {
@@ -12503,18 +12595,25 @@
     },
     "DevOnboardingStatus": {
       "fields": {
-        "stage": {
-          "rule": "required",
-          "type": "DevOnboardingStage",
+        "step": {
+          "type": "DevOnboardingStep",
           "id": 1
         },
-        "status_code": {
-          "type": "uint32",
+        "phase": {
+          "type": "DevOnboardingPhase",
           "id": 2
         },
-        "detail_code": {
-          "type": "uint32",
+        "setup": {
+          "type": "DevOnboardingSetupStatus",
           "id": 3
+        },
+        "pin_set": {
+          "type": "bool",
+          "id": 4
+        },
+        "wallet_initialized": {
+          "type": "bool",
+          "id": 5
         }
       }
     },

package/src/device/Device.ts

@@ -52,8 +52,8 @@ import TransportManager from '../data-manager/TransportManager';
 import { toHardened } from '../api/helpers/pathUtils';
 import { existCapability } from '../utils/capabilitieUtils';
 import {
-  PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
   requestProtocolV2DeviceInfo,
+  requestProtocolV2DeviceStatus,
 } from '../protocols/protocol-v2/features';
 import { buildProtocolV1FeaturesPayload, buildProtocolV2FeaturesPayload } from '../deviceProfile';
 
@@ -96,7 +96,8 @@ const Log = getLogger(LoggerNames.Device);
 
 export interface DeviceEvents {
   [DEVICE.PIN]: [Device, PROTO.PinMatrixRequestType | undefined, (err: any, pin: string) => void];
-  [DEVICE.PASSPHRASE_ON_DEVICE]: [Device, ((response: any) => void)?];
+  [DEVICE.PASSPHRASE_ON_DEVICE]: [Device, PassphraseRequestPayload?];
+  [DEVICE.ATTACH_PIN_ON_DEVICE]: [Device, PassphraseRequestPayload?];
   [DEVICE.BUTTON]: [Device, DeviceButtonRequestPayload];
   [DEVICE.FEATURES]: [Device, DeviceFeaturesPayload];
   [DEVICE.PASSPHRASE]: [
@@ -728,10 +729,8 @@ export class Device extends EventEmitter {
         if (this.features.bootloaderMode) {
           return;
         }
-        // 不能直接信任缓存 features：设备端 wipe / 完成初始化 / 改 label 后
-        // features 会永久陈旧。每次 run 做一次轻量 status 刷新（不含 fw/SE），
-        // 用字段级合并保留已有版本和 SE 信息。
-        await this._refreshProtocolV2Status(options);
+        // 普通业务调用复用缓存。动态状态由显式 getFeatures/deviceStatusGet、
+        // 解锁流程和设备事件刷新，避免每个 SDK 方法都额外轮询 DeviceStatus。
         return;
       }
       await this._initializeProtocolV2(options);
@@ -798,9 +797,15 @@ export class Device extends EventEmitter {
         commands: this.commands,
         timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
       });
+      const deviceStatus = await requestProtocolV2DeviceStatus({
+        commands: this.commands,
+      }).catch(error => {
+        Log.debug('Protocol V2 status unavailable during initialization:', error);
+        return undefined;
+      });
       // 默认请求不含 SE/hash 数据，scope 如实标注为 basic；
       // 完整数据由 getDeviceInfo(scope:'verify'|'full') 获取。
-      const features = this.updateProtocolV2Features(deviceInfo);
+      const features = this.updateProtocolV2Features(deviceInfo, deviceStatus);
       Log.debug('Protocol V2 features:', features);
       this.featuresNeedsReload = false;
     } catch (error) {
@@ -809,34 +814,15 @@ export class Device extends EventEmitter {
     }
   }
 
-  /**
-   * Protocol V2 的轻量状态刷新（每次 run 前调用）。
-   *
-   * 请求 hw + coprocessor + status（不含 fw/SE target）：status 提供 init_states / label /
-   * passphrase_enabled 等会在设备端变化的字段；hw/coprocessor 提供 serialNo / bleName。
-   * versions 为空时按字段级合并保留旧值，verify 数据不会被降级。
-   */
-  private async _refreshProtocolV2Status(options?: InitOptions) {
-    try {
-      const deviceInfo = await requestProtocolV2DeviceInfo({
-        commands: this.commands,
-        request: PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
-        timeoutMs: options?.protocolV2DeviceInfoTimeoutMs,
-      });
-      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;
-    }
-  }
-
   async getFeatures() {
     if (this.isProtocolV2()) {
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.commands,
       });
-      return this.updateProtocolV2Features(deviceInfo);
+      const deviceStatus = await requestProtocolV2DeviceStatus({
+        commands: this.commands,
+      }).catch(() => undefined);
+      return this.updateProtocolV2Features(deviceInfo, deviceStatus);
     }
 
     const { message } = await this.commands.typedCall('GetFeatures', 'Features', {});
@@ -871,10 +857,18 @@ export class Device extends EventEmitter {
     this.emit(DEVICE.FEATURES, this, feat);
   }
 
-  updateProtocolV2Features(deviceInfo?: ProtocolV2DeviceInfo) {
+  updateProtocolV2Features(deviceInfo?: ProtocolV2DeviceInfo, deviceStatus?: DeviceStatus | null) {
     const previousCacheDeviceKey = this.getSessionCacheDeviceKey();
+    const resolvedDeviceStatus =
+      deviceStatus === undefined
+        ? this.features?.raw?.protocolV2DeviceStatus
+        : deviceStatus ?? undefined;
     const features = fixFeaturesFirmwareVersion(
-      buildProtocolV2FeaturesPayload(deviceInfo, this.features)
+      buildProtocolV2FeaturesPayload({
+        deviceInfo,
+        deviceStatus: resolvedDeviceStatus,
+        previous: this.features,
+      })
     );
     this.features = features;
     const nextCacheDeviceKey = this.getSessionCacheDeviceKey();
@@ -888,14 +882,10 @@ export class Device extends EventEmitter {
 
   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,
-      },
+    const previousStatus = this.features?.raw?.protocolV2DeviceStatus;
+    return this.updateProtocolV2Features(previousDeviceInfo, {
+      ...previousStatus,
+      ...status,
     });
   }
 
@@ -1190,7 +1180,9 @@ export class Device extends EventEmitter {
   async unlockDevice() {
     if (this.isProtocolV2()) {
       try {
-        await this.commands.typedCall('DeviceSessionAskPin', 'Success');
+        await this.commands.typedCall('DeviceSessionAskPin', 'Success', undefined, {
+          timeoutMs: 120_000,
+        });
       } catch (error) {
         const errorText =
           error instanceof Error

package/src/device/DeviceCommands.ts

@@ -663,7 +663,7 @@ export class DeviceCommands {
 
     if (res.type === 'PassphraseRequest') {
       const existsAttachPinUser = res.message.exists_attach_pin_user;
-      return this._promptPassphrase({
+      return this.promptPassphrase({
         existsAttachPinUser,
       }).then(response => {
         const { passphrase, passphraseOnDevice, attachPinOnDevice } = response;
@@ -761,10 +761,27 @@ export class DeviceCommands {
     });
   }
 
-  _promptPassphrase(options: PassphraseRequestPayload) {
+  promptPassphrase(
+    options: PassphraseRequestPayload,
+    promptOptions: { cancelDeviceOnReject?: boolean } = {}
+  ) {
     return new Promise<PassphrasePromptResponse>((resolve, reject) => {
-      const cancelAndReject = (_error?: Error) =>
-        cancelDeviceInPrompt(this.device, false)
+      const cancelAndReject = (_error?: Error) => {
+        const rejectWithCancelledError = () => {
+          reject(
+            ERRORS.TypedError(
+              HardwareErrorCode.CallQueueActionCancelled,
+              `${DEVICE.PASSPHRASE} canceled`
+            )
+          );
+        };
+
+        if (promptOptions.cancelDeviceOnReject === false) {
+          rejectWithCancelledError();
+          return Promise.resolve();
+        }
+
+        return cancelDeviceInPrompt(this.device, false)
           .then(onCancel => {
             const error = ERRORS.TypedError(
               HardwareErrorCode.CallQueueActionCancelled,
@@ -781,6 +798,7 @@ export class DeviceCommands {
           .catch(error => {
             reject(error);
           });
+      };
 
       if (this.device.listenerCount(DEVICE.PASSPHRASE) > 0) {
         this.device.setCancelableAction(cancelAndReject);

package/src/device/DevicePool.ts

@@ -108,14 +108,19 @@ export class DevicePool extends EventEmitter {
           device.updateDescriptor(exist, true);
           devices[connectId] = device;
           deviceList.push(device);
-          await this._checkDevicePool(initOptions);
+          await this._checkDevicePool(initOptions, connectId);
           return { devices, deviceList };
         }
         Log.debug('found device in cache, but path is different: ', connectId);
       }
     }
 
-    for await (const descriptor of descriptorList) {
+    const matchedDescriptor = connectId
+      ? descriptorList.find(descriptor => descriptor.path === connectId)
+      : undefined;
+    const descriptorsToInitialize = matchedDescriptor ? [matchedDescriptor] : descriptorList;
+
+    for await (const descriptor of descriptorsToInitialize) {
       const device = await this._createDevice(descriptor, initOptions);
 
       const connectId = device.getConnectId();
@@ -133,7 +138,7 @@ export class DevicePool extends EventEmitter {
     // Log.debug('get devices result : ', devices, deviceList);
     // console.log('device poll -> connected: ', this.connectedPool);
     // console.log('device poll -> disconnected: ', this.disconnectPool);
-    await this._checkDevicePool(initOptions);
+    await this._checkDevicePool(initOptions, matchedDescriptor ? connectId : undefined);
     return { devices, deviceList };
   }
 
@@ -157,14 +162,17 @@ export class DevicePool extends EventEmitter {
     return device;
   }
 
-  static async _checkDevicePool(initOptions?: InitOptions) {
-    await this._sendConnectMessage(initOptions);
+  static async _checkDevicePool(initOptions?: InitOptions, connectId?: string) {
+    await this._sendConnectMessage(initOptions, connectId);
     this._sendDisconnectMessage();
   }
 
-  static async _sendConnectMessage(initOptions?: InitOptions) {
+  static async _sendConnectMessage(initOptions?: InitOptions, connectId?: string) {
     for (let i = this.connectedPool.length - 1; i >= 0; i--) {
       const descriptor = this.connectedPool[i];
+      if (connectId && descriptor.path !== connectId) {
+        continue;
+      }
       const device = await this._createDevice(descriptor, initOptions);
       Log.debug('emit DEVICE.CONNECT: ', device?.features);
       this.emitter.emit(DEVICE.CONNECT, device);

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -5,7 +5,11 @@ import {
   isProtocolV2RomloaderDeviceInfo,
 } from '../protocols/protocol-v2/features';
 
-import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceFirmwareImageInfo,
+  DeviceStatus,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 import type { PROTO } from '../constants';
 import type { DeviceFeaturesMode, Features } from '../types';
 
@@ -222,16 +226,21 @@ export const buildProtocolV1FeaturesPayload = (
  * 缓存的同名字段级合并；不存在协议等价语义的字段保持 null/空值，不再通过
  * DeviceProfile 或 transport path 做身份兜底。
  */
-export const buildProtocolV2FeaturesPayload = (
-  deviceInfo?: ProtocolV2DeviceInfo,
-  previous?: Features
-): Features => {
+export const buildProtocolV2FeaturesPayload = ({
+  deviceInfo,
+  deviceStatus,
+  previous,
+}: {
+  deviceInfo?: ProtocolV2DeviceInfo;
+  deviceStatus?: DeviceStatus;
+  previous?: Features;
+}): Features => {
   const info = deviceInfo;
   const fwApplication = info?.fw?.application;
   const fwBootloader = info?.fw?.bootloader;
   const fwBoard = info?.fw?.romloader;
   const bleApplication = info?.coprocessor?.application;
-  const status = info?.status;
+  const status = deviceStatus;
 
   const firmwareVersion = firstMeaningfulVersion(
     getImageVersion(fwApplication),
@@ -248,15 +257,17 @@ export const buildProtocolV2FeaturesPayload = (
   const label = previous?.label ?? null;
   const bleName = firstValue(info?.coprocessor?.bt_adv_name, previous?.bleName);
   const initialized = firstValue(status?.init_states, previous?.initialized) ?? null;
-  const passphraseProtection = status?.passphrase_enabled ?? null;
+  // Pro2 在锁定状态下返回的 passphrase_enabled 不是最终钱包状态。
+  // 只有完成 PIN 解锁后的 DeviceStatus 才能作为 passphrase 开关真值来源。
+  const passphraseProtection = status?.unlocked === true ? status.passphrase_enabled ?? null : null;
   const language = previous?.language ?? null;
   const backupRequired = firstValue(status?.backup_required, previous?.backupRequired) ?? null;
   const bleEnabled = previous?.bleEnabled;
   const unlocked = firstValue(status?.unlocked, previous?.unlocked) ?? null;
   const attachToPinEnabled = status?.attach_to_pin_enabled ?? null;
   const unlockedAttachPin = status?.unlocked_by_attach_to_pin ?? undefined;
-  const romloaderMode = isProtocolV2RomloaderDeviceInfo(info);
-  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info);
+  const romloaderMode = isProtocolV2RomloaderDeviceInfo(info, status);
+  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info, status);
   let mode: DeviceFeaturesMode = 'unknown';
   if (romloaderMode) {
     mode = 'romloader';
@@ -376,6 +387,7 @@ export const buildProtocolV2FeaturesPayload = (
     unlockedAttachPin,
     raw: {
       protocolV2DeviceInfo: deviceInfo,
+      protocolV2DeviceStatus: deviceStatus,
     },
   };
 };

package/src/deviceProfile/buildDeviceProfile.ts

@@ -29,7 +29,11 @@ import type {
   GetDeviceInfoParams,
 } from '../types/api/getDeviceInfo';
 import type { Features, OnekeyFeatures } from '../types';
-import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceFirmwareImageInfo,
+  DeviceStatus,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 
 type BuildProtocolV1ProfileParams = {
   protocol?: DeviceInfoProtocol;
@@ -42,6 +46,7 @@ type BuildProtocolV1ProfileParams = {
 
 type BuildProtocolV2ProfileParams = {
   deviceInfo?: ProtocolV2DeviceInfo;
+  deviceStatus?: DeviceStatus;
   sources?: DeviceInfoSource[];
   scope?: GetDeviceInfoParams['scope'];
   includeRaw?: boolean;
@@ -89,10 +94,13 @@ const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
   return 'unknown';
 };
 
-const getProtocolV2Mode = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus['mode'] => {
-  if (isProtocolV2RomloaderDeviceInfo(deviceInfo)) return 'romloader';
-  if (isProtocolV2BootloaderDeviceInfo(deviceInfo)) return 'bootloader';
-  const initialized = deviceInfo?.status?.init_states;
+const getProtocolV2Mode = (
+  deviceInfo?: ProtocolV2DeviceInfo,
+  deviceStatus?: DeviceStatus
+): DeviceInfoStatus['mode'] => {
+  if (isProtocolV2RomloaderDeviceInfo(deviceInfo, deviceStatus)) return 'romloader';
+  if (isProtocolV2BootloaderDeviceInfo(deviceInfo, deviceStatus)) return 'bootloader';
+  const initialized = deviceStatus?.init_states;
   if (initialized === false) return 'notInitialized';
   if (initialized === true) return 'normal';
   return 'unknown';
@@ -186,11 +194,14 @@ const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
   bleEnabled: features?.bleEnabled ?? null,
 });
 
-const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => {
-  const status = deviceInfo?.status;
-  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(deviceInfo);
+const normalizeV2Status = (
+  deviceInfo?: ProtocolV2DeviceInfo,
+  deviceStatus?: DeviceStatus
+): DeviceInfoStatus => {
+  const status = deviceStatus;
+  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(deviceInfo, deviceStatus);
   return {
-    mode: getProtocolV2Mode(deviceInfo),
+    mode: getProtocolV2Mode(deviceInfo, deviceStatus),
     initialized: status?.init_states ?? null,
     bootloaderMode,
     unlocked: status?.unlocked ?? null,
@@ -274,14 +285,17 @@ const normalizeRaw = ({
   features,
   protocolV1OneKeyFeatures,
   protocolV2DeviceInfo,
+  protocolV2DeviceStatus,
 }: {
   features?: Features;
   protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
+  protocolV2DeviceStatus?: DeviceStatus;
 }): DeviceProfileRaw => ({
   ...(features ? { features } : {}),
   ...(protocolV1OneKeyFeatures ? { protocolV1OneKeyFeatures } : {}),
   ...(protocolV2DeviceInfo ? { protocolV2DeviceInfo } : {}),
+  ...(protocolV2DeviceStatus ? { protocolV2DeviceStatus } : {}),
 });
 
 export function buildProfileFromProtocolV1({
@@ -320,12 +334,13 @@ export function buildProfileFromProtocolV1({
 
 export function buildProfileFromProtocolV2({
   deviceInfo,
+  deviceStatus,
   sources = ['deviceInfo'],
   scope = 'basic',
   includeRaw = false,
 }: BuildProtocolV2ProfileParams): DeviceProfile {
   const info = deviceInfo;
-  const deviceId = info?.status?.device_id || '';
+  const deviceId = deviceStatus?.device_id || '';
   const serialNo = deviceInfo?.hw?.serial_no || '';
   const label = null;
   const bleName = info?.coprocessor?.bt_adv_name ?? null;
@@ -340,13 +355,14 @@ export function buildProfileFromProtocolV2({
     serialNo,
     label,
     bleName,
-    status: normalizeV2Status(deviceInfo),
+    status: normalizeV2Status(deviceInfo, deviceStatus),
     versions: normalizeV2Versions(deviceInfo),
     ...(shouldIncludeVerify(scope) ? { verify } : {}),
     ...(includeRaw
       ? {
           raw: normalizeRaw({
             protocolV2DeviceInfo: deviceInfo,
+            protocolV2DeviceStatus: deviceStatus,
           }),
         }
       : {}),

package/src/events/device.ts

@@ -23,6 +23,7 @@ export const DEVICE = {
   PIN: 'pin',
   PASSPHRASE: 'passphrase',
   PASSPHRASE_ON_DEVICE: 'passphrase_on_device',
+  ATTACH_PIN_ON_DEVICE: 'attach_pin_on_device',
   WORD: 'word',
   SUPPORT_FEATURES: 'support_features',
   SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE: 'select_device_in_bootloader_for_web_device',
@@ -47,6 +48,9 @@ export interface DeviceButtonRequestPayload extends Omit<PROTO.ButtonRequest, 'c
 
 export type PassphraseRequestPayload = {
   existsAttachPinUser?: boolean;
+  source?: 'wallet-session-coordinator';
+  reason?: 'open-wallet' | 'session-recovery';
+  expectedPassphraseState?: string;
 };
 
 export interface DeviceButtonRequest {

package/src/events/ui-request.ts

@@ -49,6 +49,23 @@ export const UI_REQUEST = {
   NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device',
 } as const;
 
+export type ProtocolV2UiEventSource =
+  | 'unlock-coordinator'
+  | 'wallet-session-coordinator'
+  | 'method-lifecycle';
+
+export type ProtocolV2UiCompletion = 'page-accepted' | 'operation-completed';
+
+export type ProtocolV2UiEventMetadata = {
+  source?: ProtocolV2UiEventSource;
+  reason?: string;
+  deviceOnly?: boolean;
+  completion?: ProtocolV2UiCompletion;
+  method?: string;
+  page?: string | number;
+  operation?: string;
+};
+
 export interface UiRequestWithoutPayload {
   type:
     | typeof UI_REQUEST.CLOSE_UI_WINDOW
@@ -73,7 +90,7 @@ export interface UiRequestFirmwareProgressing {
 
 export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
-  payload: {
+  payload: ProtocolV2UiEventMetadata & {
     device: Device;
     type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry' | 'ButtonRequest_AttachPin';
   };
@@ -81,7 +98,7 @@ export type UiRequestDeviceAction = {
 
 export interface UiRequestButton {
   type: typeof UI_REQUEST.REQUEST_BUTTON;
-  payload: DeviceButtonRequest['payload'];
+  payload: DeviceButtonRequest['payload'] & ProtocolV2UiEventMetadata;
 }
 
 export interface UiRequestPassphrase {
@@ -90,6 +107,9 @@ export interface UiRequestPassphrase {
     device: Device;
     passphraseState?: string;
     existsAttachPinUser?: boolean;
+    source?: 'wallet-session-coordinator';
+    reason?: 'open-wallet' | 'session-recovery';
+    expectedPassphraseState?: string;
   };
 }
 
@@ -98,6 +118,8 @@ export interface UiRequestPassphraseOnDevice {
   payload: {
     device: Device;
     passphraseState?: string;
+    source?: 'wallet-session-coordinator';
+    reason?: 'open-wallet' | 'session-recovery';
   };
 }