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

package/src/protocols/protocol-v2/features.ts

@@ -1,19 +1,19 @@
-import { DevSEState, DevSeType } from '@onekeyfe/hd-transport';
+import { DeviceSEState, DeviceSeType } from '@onekeyfe/hd-transport';
 
-import type { DeviceGetDeviceInfo, DevSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DeviceInfoGet, DeviceSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
-// 单源类型：直接使用 hd-transport 生成的 ProtocolV2DeviceInfo / DevSEInfo /
-// DevFirmwareImageInfo（与 firmware-pro2 proto 一致），不再维护手写副本。
+// 单源类型：直接使用 hd-transport 生成的 ProtocolV2DeviceInfo / DeviceSEInfo /
+// DeviceFirmwareImageInfo（与 firmware-pro2 proto 一致），不再维护手写副本。
 export type { ProtocolV2DeviceInfo };
-export type { DevFirmwareImageInfo as ProtocolV2FirmwareImageInfo } from '@onekeyfe/hd-transport';
-export type { DevSEInfo as ProtocolV2SEInfo } from '@onekeyfe/hd-transport';
+export type { DeviceFirmwareImageInfo as ProtocolV2FirmwareImageInfo } from '@onekeyfe/hd-transport';
+export type { DeviceSEInfo as ProtocolV2SEInfo } from '@onekeyfe/hd-transport';
 
 export type ProtocolV2SeStateLabel = 'BOOT' | 'APP_FACTORY' | 'APP';
 
 /**
- * 传输层解码会把 proto 枚举输出为名称字符串（见 hd-transport 的 messageToJSON），
- * 但生成类型声明为数值枚举；这里统一兼容两种形态。
+ * 传输层沿用历史 decode 语义：单值 proto enum 输出为名称字符串。
+ * 这里按 SDK decode 后的字符串语义处理，同时接受数字枚举，便于低层调用复用。
  */
 const normalizeEnumValue = <T extends Record<string | number, string | number>>(
   enumObject: T,
@@ -26,11 +26,11 @@ const normalizeEnumValue = <T extends Record<string | number, string | number>>(
 };
 
 /**
- * DevSEInfo.state → 可读标签。SDK 内唯一的 SE 状态映射实现，
- * deviceProfile 与 legacy Features 兼容视图都从这里取。
+ * DeviceSEInfo.state → 可读标签。SDK 内唯一的 SE 状态映射实现，
+ * DeviceProfile 与标准 Features 构建都从这里取。
  */
-export const getProtocolV2SeState = (se?: DevSEInfo): ProtocolV2SeStateLabel | null => {
-  const label = normalizeEnumValue(DevSEState, se?.state);
+export const getProtocolV2SeState = (se?: DeviceSEInfo): ProtocolV2SeStateLabel | null => {
+  const label = normalizeEnumValue(DeviceSEState, se?.state);
   switch (label) {
     case 'BOOT':
       return 'BOOT';
@@ -44,17 +44,20 @@ export const getProtocolV2SeState = (se?: DevSEInfo): ProtocolV2SeStateLabel | n
 };
 
 /**
- * DevSEInfo.type → 可读标签（如 'THD89'）。legacy Features 兼容视图的
- * onekey_se_type 字段从这里取。
+ * DeviceSEInfo.type → 可读标签（如 'THD89'）。DeviceProfile / Features
+ * 的 SE 类型归一化从这里取。
  */
-export const getProtocolV2SeType = (se?: DevSEInfo): string | null =>
-  normalizeEnumValue(DevSeType, se?.type);
+export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
+  normalizeEnumValue(DeviceSeType, se?.type);
+
+export const isProtocolV2BootloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInfo | null) =>
+  !!deviceInfo && deviceInfo.status == null;
 
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
     fw: true,
-    bt: true,
+    coprocessor: true,
     status: true,
   },
   types: {
@@ -66,15 +69,13 @@ export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
 /**
  * 轻量状态刷新请求（每次 run 前使用）。
  *
- * status 提供 init_states / label / passphrase_protection 等会在设备端变化的字段；
- * hw / bt 提供 serialNo / bleName 等身份字段——applyProfileUpdate 对顶层字段是整体
- * 覆盖语义，缺少 hw/bt 会把已有 profile 的身份字段清空。不含 fw/SE targets，
- * 单帧请求开销很小。
+ * status 提供 init_states / passphrase_enabled 等会在设备端变化的字段；
+ * hw / coprocessor 提供 serialNo / bleName 等身份字段；不含 fw/SE targets，单帧请求开销很小。
  */
 export const PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
-    bt: true,
+    coprocessor: true,
     status: true,
   },
   types: {
@@ -87,7 +88,7 @@ export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
     fw: true,
-    bt: true,
+    coprocessor: true,
     se1: true,
     se2: true,
     se3: true,
@@ -104,7 +105,7 @@ export const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
     fw: true,
-    bt: true,
+    coprocessor: true,
     se1: true,
     se2: true,
     se3: true,
@@ -122,43 +123,6 @@ export const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
 export const PROTOCOL_V2_DEVICE_INFO_REQUEST = PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST;
 export const PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS = 10 * 1000;
 
-/**
- * 临时开关（默认开启）：当前 Pro2 测试固件 / 早期工程板尚未实现 DevGetDeviceInfo，
- * 真实调用只会超时失败。开启时跳过 wire 调用，直接返回 mock DeviceInfo；
- * profile 的身份字段（serialNo/deviceId）由 buildProfileFromProtocolV2 的
- * fallbackSerialNo（transport path）兜底。
- *
- * 固件实现 DevGetDeviceInfo 后：把默认值改回 false（或直接删除开关与 mock）。
- * 注意：开启期间 FirmwareUpdateV4 的“升级完成版本比对”拿到的也是 mock 版本，
- * 不能作为升级成功的依据。
- */
-let protocolV2DeviceInfoMockEnabled = true;
-
-export const setProtocolV2DeviceInfoMock = (enabled: boolean) => {
-  protocolV2DeviceInfoMockEnabled = enabled;
-};
-
-export const isProtocolV2DeviceInfoMockEnabled = () => protocolV2DeviceInfoMockEnabled;
-
-/** 每次调用返回新对象，避免调用方原地修改互相污染。 */
-export const buildMockProtocolV2DeviceInfo = (): ProtocolV2DeviceInfo => ({
-  protocol_version: 2,
-  hw: {
-    // 留空：profile 身份走 fallbackSerialNo（transport path）
-    serial_no: '',
-  },
-  fw: {
-    app: { version: '0.1.0' },
-  },
-  bt: {},
-  status: {
-    init_states: true,
-    language: 'en_US',
-    passphrase_protection: false,
-    bt_enable: true,
-  },
-});
-
 export async function requestProtocolV2DeviceInfo({
   commands,
   timeoutMs = PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS,
@@ -166,15 +130,12 @@ export async function requestProtocolV2DeviceInfo({
 }: {
   commands: DeviceCommands;
   timeoutMs?: number;
-  request?: DeviceGetDeviceInfo;
+  request?: DeviceInfoGet;
 }): Promise<ProtocolV2DeviceInfo> {
-  if (protocolV2DeviceInfoMockEnabled) {
-    return buildMockProtocolV2DeviceInfo();
-  }
-  const { message } = await commands.typedCall('DevGetDeviceInfo', 'DeviceInfo', request, {
+  const { message } = await commands.typedCall('DeviceInfoGet', 'DeviceInfo', request, {
     timeoutMs,
   });
   // 'DeviceInfo' 在生成类型里是 V1 DeviceInfo | ProtocolV2DeviceInfo 的合并；
-  // DevGetDeviceInfo 是 V2-only 消息，这里收窄到 V2 形态。
+  // DeviceInfoGet 是 V2-only 消息，这里收窄到 V2 形态。
   return message as ProtocolV2DeviceInfo;
 }

package/src/protocols/protocol-v2/firmware.ts

@@ -1,43 +1,19 @@
 /**
- * 当前 firmware-pro2 子模块的 DevFirmwareTargetType。
- *
- * 注意：仓库里的 hd-transport 生成物暂时仍带旧 target 名称；这里显式按
- * submodules/firmware-pro2/sys/protobuf/onekey_protocol/latest/messages_device.proto
- * 对齐当前子模块，避免运行时取到 undefined。
+ * 当前 firmware-pro2 子模块的 DeviceFirmwareTargetType。
  */
 export const ProtocolV2FirmwareTargetType = {
-  TARGET_MAIN_APP: 0,
-  TARGET_MAIN_BOOT: 1,
-  TARGET_BT: 2,
-  TARGET_SE1: 3,
-  TARGET_SE2: 4,
-  TARGET_SE3: 5,
-  TARGET_SE4: 6,
-  TARGET_RESOURCE: 10,
+  FW_MGMT_TARGET_INVALID: 0,
+  FW_MGMT_TARGET_CRATE: 1,
+  FW_MGMT_TARGET_ROMLOADER: 2,
+  FW_MGMT_TARGET_BOOTLOADER: 3,
+  FW_MGMT_TARGET_APPLICATION_P1: 4,
+  FW_MGMT_TARGET_APPLICATION_P2: 5,
+  FW_MGMT_TARGET_COPROCESSOR: 6,
+  FW_MGMT_TARGET_SE01: 7,
+  FW_MGMT_TARGET_SE02: 8,
+  FW_MGMT_TARGET_SE03: 9,
+  FW_MGMT_TARGET_SE04: 10,
 } as const;
 
 export type ProtocolV2FirmwareTargetType =
   (typeof ProtocolV2FirmwareTargetType)[keyof typeof ProtocolV2FirmwareTargetType];
-
-/**
- * Map Protocol V2 firmware file name to DevFirmwareUpdate target_id.
- */
-export function protocolV2FileNameToTargetId(fileName: string): ProtocolV2FirmwareTargetType {
-  const normalized = fileName.toLowerCase();
-  if (normalized.includes('bootloader') || normalized.includes('update_rom')) {
-    return ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT;
-  }
-  if (
-    normalized.includes('coprocessor') ||
-    normalized.includes('ble') ||
-    normalized.includes('bluetooth') ||
-    normalized.includes('bt')
-  ) {
-    return ProtocolV2FirmwareTargetType.TARGET_BT;
-  }
-  if (normalized.includes('se4')) return ProtocolV2FirmwareTargetType.TARGET_SE4;
-  if (normalized.includes('se3')) return ProtocolV2FirmwareTargetType.TARGET_SE3;
-  if (normalized.includes('se2')) return ProtocolV2FirmwareTargetType.TARGET_SE2;
-  if (normalized.includes('se')) return ProtocolV2FirmwareTargetType.TARGET_SE1;
-  return ProtocolV2FirmwareTargetType.TARGET_MAIN_APP;
-}

package/src/protocols/protocol-v2/index.ts

@@ -14,3 +14,4 @@ export type {
   ProtocolV2SeStateLabel,
 } from './features';
 export * from './firmware';
+export * from './walletSession';

package/src/protocols/protocol-v2/walletSession.ts

@@ -0,0 +1,83 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import type { Device } from '../../device/Device';
+
+const getErrorText = (error: unknown) => {
+  if (error instanceof Error) return `${error.name} ${error.message}`;
+  if (typeof error === 'string') return error;
+  if (error && typeof error === 'object') {
+    const record = error as Record<string, unknown>;
+    return [record.code, record.errorCode, record.message, record.reason]
+      .filter(value => value !== undefined && value !== null)
+      .join(' ');
+  }
+  return String(error ?? '');
+};
+
+export const isProtocolV2InvalidSessionError = (error: unknown) =>
+  getErrorText(error).toLowerCase().includes('failure_invalidsession');
+
+export async function requestProtocolV2DeviceStatus(device: Device) {
+  const { message } = await device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+  return message;
+}
+
+export async function refreshProtocolV2DeviceStatus(device: Device) {
+  const status = await requestProtocolV2DeviceStatus(device);
+  return device.updateProtocolV2Status(status);
+}
+
+export async function getProtocolV2WalletSession(
+  device: Device,
+  options?: { initSession?: boolean; expectedPassphraseState?: string }
+) {
+  if (device.features?.unlocked === false) {
+    throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device is locked');
+  }
+
+  if (options?.initSession) {
+    device.clearInternalState();
+  }
+
+  const cachedSessionId =
+    typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+
+  try {
+    const { message } = await device.commands.typedCall(
+      'DeviceSessionGet',
+      'DeviceSession',
+      cachedSessionId ? { session_id: cachedSessionId } : {}
+    );
+
+    if (
+      options?.expectedPassphraseState &&
+      options.expectedPassphraseState !== message.btc_test_address
+    ) {
+      device.clearInternalState();
+      throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
+    }
+
+    if (message.btc_test_address && device.getCurrentPassphraseProtection() !== true) {
+      await refreshProtocolV2DeviceStatus(device);
+    }
+
+    device.updateInternalState(
+      (device.getCurrentPassphraseProtection() ?? false) || Boolean(message.btc_test_address),
+      message.btc_test_address,
+      device.getCurrentDeviceId(),
+      message.session_id,
+      options?.initSession ? null : device.features?.sessionId
+    );
+
+    return {
+      passphraseState: message.btc_test_address,
+      newSession: message.session_id,
+      unlockedAttachPin: device.features?.unlockedAttachPin ?? undefined,
+    };
+  } catch (error) {
+    if (isProtocolV2InvalidSessionError(error)) {
+      device.clearInternalState();
+    }
+    throw error;
+  }
+}

package/src/types/api/firmwareUpdate.ts

@@ -58,42 +58,38 @@ export interface FirmwareUpdateV3Params {
 }
 
 /**
- * firmwareUpdateV4（Protocol V2）按 DevFirmwareTargetType 拆分的目标二进制。
- * 每个字段对应一个固件升级 target，可单独更新，也可任意组合一次更新。
+ * firmwareUpdateV4（Protocol V2）按 DeviceFirmwareTargetType 拆分的目标二进制。
+ * 除 romloader 外，每个字段对应一个 bootloader 可接受的固件升级 target。
  */
 export interface FirmwareUpdateV4Params {
   platform: IPlatform;
   chunkSize?: number;
   firmwareType?: EFirmwareType;
 
-  /** TARGET_MAIN_BOOT = 1 */
+  /** FW_MGMT_TARGET_ROMLOADER = 2；当前 Pro2 bootloader 不接受通过 firmwareUpdateV4 安装 */
   romloaderBinary?: ArrayBuffer;
-  /** TARGET_MAIN_BOOT = 1 */
+  /** FW_MGMT_TARGET_BOOTLOADER = 3 */
   bootloaderBinary?: ArrayBuffer;
-  /** TARGET_MAIN_APP = 0 */
+  /** FW_MGMT_TARGET_APPLICATION_P1 = 4 */
   applicationP1Binary?: ArrayBuffer;
-  /** TARGET_MAIN_APP = 0 */
+  /** FW_MGMT_TARGET_APPLICATION_P2 = 5 */
   applicationP2Binary?: ArrayBuffer;
-  /** TARGET_BT = 2 */
+  /** FW_MGMT_TARGET_COPROCESSOR = 6 */
   coprocessorBinary?: ArrayBuffer;
-  /** TARGET_SE1-4 = 3-6 */
+  /** FW_MGMT_TARGET_SE01-04 = 7-10 */
   se01Binary?: ArrayBuffer;
   se02Binary?: ArrayBuffer;
   se03Binary?: ArrayBuffer;
   se04Binary?: ArrayBuffer;
-  /** TARGET_RESOURCE = 10（zip 包，解压后逐文件上传） */
-  resourceBinary?: ArrayBuffer;
   forcedUpdateRes?: boolean;
-
-  /** 按 release 配置自动下载 */
-  firmwareVersion?: number[];
-  bleVersion?: number[];
-  bootloaderVersion?: number[];
-
-  /** legacy 别名：等价 applicationP1Binary */
-  firmwareBinary?: ArrayBuffer;
-  /** legacy 别名：等价 coprocessorBinary */
-  bleBinary?: ArrayBuffer;
+  /**
+   * RESC bundle okpkg 列表，通过 FilesystemFileWrite 直写到 devicePath（vol0:/bundles/...）。
+   * 手动传入模式：SDK 直接 FileWrite 安装，不做版本比对。
+   */
+  resourceBundleFiles?: Array<{
+    binary: ArrayBuffer;
+    devicePath: string;
+  }>;
 }
 
 export declare function firmwareUpdateV3(

package/src/types/api/getDeviceInfo.ts

@@ -6,7 +6,7 @@ import type { ProtocolType, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport'
 // 协议类型单源：从 hd-transport 的 ProtocolType 派生，只额外允许 'unknown'。
 export type DeviceInfoProtocol = ProtocolType | 'unknown';
 
-export type DeviceInfoSource = 'features' | 'onekeyFeatures' | 'deviceInfo';
+export type DeviceInfoSource = 'features' | 'protocolV1OneKeyFeatures' | 'deviceInfo';
 
 export type DeviceInfoScope = 'basic' | 'versions' | 'verify' | 'full';
 
@@ -24,6 +24,8 @@ export type DeviceInfoStatus = {
   bootloaderMode: boolean | null;
   unlocked: boolean | null;
   passphraseProtection: boolean | null;
+  attachToPinEnabled?: boolean | null;
+  unlockedAttachPin?: boolean | null;
   backupRequired: boolean | null;
   noBackup: boolean | null;
   language: string | null;
@@ -74,7 +76,7 @@ export type DeviceProfileVerify = {
 
 export type DeviceProfileRaw = {
   features?: Features;
-  onekeyFeatures?: OnekeyFeatures;
+  protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
 };
 

package/src/types/api/getPassphraseState.ts

@@ -1,10 +1,10 @@
 import type { CommonParams, Response } from '../params';
 
 export type GetPassphraseStatePayload = {
-  passphrase_state?: string;
-  session_id?: string;
-  unlocked_attach_pin?: boolean;
-  passphrase_protection?: boolean | null;
+  passphraseState?: string;
+  sessionId?: string;
+  unlockedAttachPin?: boolean;
+  passphraseProtection?: boolean | null;
 };
 
 export type GetPassphraseStateParams = CommonParams & {

package/src/types/api/index.ts

@@ -1,18 +1,15 @@
 import type {
+  deviceFactoryInfoGet,
+  deviceFactoryInfoSet,
   deviceFirmwareUpdate,
-  deviceGetDeviceInfo,
   deviceGetFirmwareUpdateStatus,
-  deviceGetOnboardingStatus,
+  deviceInfoGet,
   deviceReboot,
-  devFirmwareUpdate,
-  devGetDeviceInfo,
-  devGetFirmwareUpdateStatus,
-  devReboot,
+  deviceSessionGet,
+  deviceStatusGet,
   dirList,
   dirMake,
   dirRemove,
-  factoryDeviceInfoSettings,
-  factoryGetDeviceInfo,
   fileDelete,
   fileRead,
   fileWrite,
@@ -23,12 +20,12 @@ import type {
   filesystemFileDelete,
   filesystemFileRead,
   filesystemFileWrite,
-  filesystemFixPermission,
   filesystemFormat,
   filesystemPathInfoQuery,
-  getProtoVersion,
+  filesystemPermissionFix,
   pathInfo,
   ping,
+  protocolInfoRequest,
 } from './protocolV2';
 import type { off, on, removeAllListeners } from './event';
 import type { uiResponse } from './uiResponse';
@@ -36,6 +33,7 @@ import type { init, updateSettings } from './init';
 import type { testInitializeDeviceDuration } from './testInitializeDeviceDuration';
 import type { preInitialize } from './preInitialize';
 import type { getLogs } from './getLogs';
+import type { clearSessionCache } from './sessionCache';
 import type { checkBridgeStatus } from './checkBridgeStatus';
 import type { checkBridgeRelease } from './checkBridgeRelease';
 import type { checkBootloaderRelease } from './checkBootloaderRelease';
@@ -182,6 +180,7 @@ export type {
   DeviceProfileVersions,
 } from './getDeviceInfo';
 export type { GetPassphraseStateParams, GetPassphraseStatePayload } from './getPassphraseState';
+export type { ClearSessionCacheParams, ClearSessionCachePayload } from './sessionCache';
 
 export type CoreApi = {
   /**
@@ -199,6 +198,7 @@ export type CoreApi = {
   updateSettings: typeof updateSettings;
   switchTransport: (env: ConnectSettings['env']) => Promise<{ success: boolean }>;
   getLogs: typeof getLogs;
+  clearSessionCache: typeof clearSessionCache;
 
   /**
    * Test function
@@ -255,20 +255,17 @@ export type CoreApi = {
   /**
    * File system & device control API (Protocol V2 only)
    */
-  getProtoVersion: typeof getProtoVersion;
+  protocolInfoRequest: typeof protocolInfoRequest;
   ping: typeof ping;
   deviceReboot: typeof deviceReboot;
-  deviceGetDeviceInfo: typeof deviceGetDeviceInfo;
-  deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
+  deviceInfoGet: typeof deviceInfoGet;
+  deviceStatusGet: typeof deviceStatusGet;
+  deviceSessionGet: typeof deviceSessionGet;
   deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
   deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
-  devReboot: typeof devReboot;
-  devGetDeviceInfo: typeof devGetDeviceInfo;
-  devFirmwareUpdate: typeof devFirmwareUpdate;
-  devGetFirmwareUpdateStatus: typeof devGetFirmwareUpdateStatus;
-  factoryDeviceInfoSettings: typeof factoryDeviceInfoSettings;
-  factoryGetDeviceInfo: typeof factoryGetDeviceInfo;
-  filesystemFixPermission: typeof filesystemFixPermission;
+  deviceFactoryInfoSet: typeof deviceFactoryInfoSet;
+  deviceFactoryInfoGet: typeof deviceFactoryInfoGet;
+  filesystemPermissionFix: typeof filesystemPermissionFix;
   fileRead: typeof fileRead;
   fileWrite: typeof fileWrite;
   fileDelete: typeof fileDelete;

package/src/types/api/protocolV2.ts

@@ -1,33 +1,37 @@
 import type { CommonParams, Response } from '../params';
 import type {
+  DeviceFactoryInfo,
   DeviceFirmwareUpdateStatus,
-  DevFirmwareUpdateStatus,
-  FactoryDeviceInfo,
-  OnboardingStatus,
-  ProtoVersion,
+  DeviceSession,
+  DeviceStatus,
+  ProtocolInfo,
   ProtocolV2DeviceInfo,
   Success,
 } from '@onekeyfe/hd-transport';
 import type {
+  DeviceFactoryInfoSetParams,
   DeviceFirmwareUpdateParams,
+  DeviceFirmwareUpdateStatusGetParams,
   DeviceRebootParams,
-  FactoryDeviceInfoSettingsParams,
 } from '../../api/protocol-v2/helpers';
-import type { DeviceGetDeviceInfoParams } from '../../api/protocol-v2/DeviceGetDeviceInfo';
+import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
+import type { DeviceSessionGetParams } from '../../api/protocol-v2/DeviceSessionGet';
 
 // 参数类型单源：以 api/protocol-v2 的实现为准（type-only re-export，无运行时依赖）
 export type {
   DeviceFirmwareTargetInput,
   DeviceFirmwareUpdateParams,
+  DeviceFirmwareUpdateStatusGetParams,
   DeviceRebootParams,
-  FactoryDeviceInfoSettingsParams,
+  DeviceFactoryInfoSetParams,
   RebootTypeInput,
 } from '../../api/protocol-v2/helpers';
 export type {
-  DeviceGetDeviceInfoParams,
-  DeviceGetDeviceInfoTargets,
-  DeviceGetDeviceInfoTypes,
-} from '../../api/protocol-v2/DeviceGetDeviceInfo';
+  DeviceInfoGetParams,
+  DeviceInfoGetTargets,
+  DeviceInfoGetTypes,
+} from '../../api/protocol-v2/DeviceInfoGet';
+export type { DeviceSessionGetParams } from '../../api/protocol-v2/DeviceSessionGet';
 
 // ── Shared response shapes (Protocol V2 file system) ────────────────────
 
@@ -68,10 +72,10 @@ export type PathInfoResult = {
 
 // ── Method signatures ─────────────────────────────────────────────────────
 
-export declare function getProtoVersion(
+export declare function protocolInfoRequest(
   connectId: string,
   params?: CommonParams
-): Response<ProtoVersion>;
+): Response<ProtocolInfo>;
 
 export declare function ping(
   connectId: string,
@@ -83,55 +87,46 @@ export declare function deviceReboot(
   params: CommonParams & DeviceRebootParams
 ): Response<Success>;
 
-export declare function deviceGetDeviceInfo(
+export declare function deviceInfoGet(
   connectId: string,
-  params?: CommonParams & DeviceGetDeviceInfoParams
+  params?: CommonParams & DeviceInfoGetParams
 ): Response<ProtocolV2DeviceInfo>;
 
-export declare function deviceGetOnboardingStatus(
+export declare function deviceStatusGet(
   connectId: string,
   params?: CommonParams
-): Response<OnboardingStatus>;
+): Response<DeviceStatus>;
+
+export declare function deviceSessionGet(
+  connectId: string,
+  params?: CommonParams & DeviceSessionGetParams
+): Response<DeviceSession>;
 
 export declare function deviceFirmwareUpdate(
   connectId: string,
   params: CommonParams & DeviceFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+): Response<Success | DeviceFirmwareUpdateStatus>;
 
 export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
-  params?: CommonParams
-): Response<DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+  params?: CommonParams & DeviceFirmwareUpdateStatusGetParams
+): Response<DeviceFirmwareUpdateStatus>;
 
-export declare function devReboot(
+export declare function deviceFactoryInfoSet(
   connectId: string,
-  params: CommonParams & DeviceRebootParams
+  params: CommonParams & DeviceFactoryInfoSetParams
 ): Response<Success>;
 
-export declare function devGetDeviceInfo(
-  connectId: string,
-  params?: CommonParams & DeviceGetDeviceInfoParams
-): Response<ProtocolV2DeviceInfo>;
-
-export declare function devFirmwareUpdate(
-  connectId: string,
-  params: CommonParams & DeviceFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus>;
-
-export declare function devGetFirmwareUpdateStatus(
+export declare function deviceFactoryInfoGet(
   connectId: string,
   params?: CommonParams
-): Response<DevFirmwareUpdateStatus>;
+): Response<DeviceFactoryInfo>;
 
-export declare function factoryDeviceInfoSettings(
+export declare function filesystemPermissionFix(
   connectId: string,
-  params: FactoryDeviceInfoSettingsParams
+  params?: CommonParams
 ): Response<Success>;
 
-export declare function factoryGetDeviceInfo(connectId: string): Response<FactoryDeviceInfo>;
-
-export declare function filesystemFixPermission(connectId: string): Response<Success>;
-
 export declare function fileRead(
   connectId: string,
   params: {

package/src/types/api/sessionCache.ts

@@ -0,0 +1,14 @@
+import type { Response } from '../params';
+
+export type ClearSessionCacheParams = {
+  deviceId?: string;
+  passphraseState?: string;
+};
+
+export type ClearSessionCachePayload = {
+  cleared: true;
+};
+
+export declare function clearSessionCache(
+  params?: ClearSessionCacheParams
+): Response<ClearSessionCachePayload>;