@onekeyfe/hd-core 1.2.0-alpha.5 → 1.2.0-alpha.50

package/src/api/FirmwareUpdateV4.ts

@@ -1,11 +1,13 @@
-import { ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
+import { EDeviceType, ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
 import {
   DeviceRebootType,
   PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
   PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
 } from '@onekeyfe/hd-transport';
+import { sha256 } from '@noble/hashes/sha256';
 
 import { FirmwareUpdateTipMessage, UI_REQUEST } from '../events/ui-request';
+import { validateProtocolV2FilesystemPath } from './helpers/filesystemValidation';
 import { validateParams } from './helpers/paramsValidator';
 import {
   LoggerNames,
@@ -25,20 +27,27 @@ import {
 } from '../protocols/protocol-v2';
 import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
 import {
-  PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
+  PROTOCOL_V2_RESOURCE_DEVICE_PATHS,
+  buildProtocolV2ResourceUpdatePlan,
+  isProtocolV2ResourceFileValid,
+  readProtocolV2ResourceInventory,
+} from '../protocols/protocol-v2/resources';
+import {
   getProtocolV2UnknownErrorText,
   isProtocolV2DeviceDisconnectedError,
 } from './protocol-v2/helpers';
 
-import type { FirmwareUpdateV4Params } from '../types/api/firmwareUpdate';
+import type { FirmwareUpdateV4Params, FirmwareUpdateV4Target } from '../types/api/firmwareUpdate';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
+import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { PROTO } from '../constants';
 import type { TypedResponseMessage } from '../device/DeviceCommands';
 import type {
   Features,
   IFirmwareReleaseInfo,
+  IProtocolV2BootResources,
   IProtocolV2FirmwareComponent,
-  IProtocolV2ResourceManifestPackage,
+  IProtocolV2Resource,
   IVersionArray,
 } from '../types';
 
@@ -46,24 +55,27 @@ const Log = getLogger(LoggerNames.Method);
 
 const SESSION_ERROR = 'session not found';
 const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 60 * 1000;
+const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 2 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
-const PROTOCOL_V2_START_UPDATE_TIMEOUT = 60 * 1000;
+const PROTOCOL_V2_START_UPDATE_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
 const PROTOCOL_V2_TARGET_STATUS_FAILED_MIN = 3;
 const PROTOCOL_V2_CONNECT_PROTOCOL = 'V2';
-const PROTOCOL_V2_FIRMWARE_STAGING_VOLUME = 'vol1:';
+const PROTOCOL_V2_FIRMWARE_STAGING_VOLUME = 'vol0:/';
 const PROTOCOL_V2_MIN_FILE_CHUNK_SIZE = 64;
 const PROTOCOL_V2_CONNECT_RETRY_COUNT = 10;
 const PROTOCOL_V2_CONNECT_POLL_INTERVAL = 500;
 const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
 const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 60 * 1000;
+const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
 const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
 const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
+const PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME = 'boot_resources.crate.okpkg';
 
 const getProtocolV2DeviceTransferProgress = (
   bytesBeforeChunk: number,
@@ -94,19 +106,30 @@ type ProtocolV2FirmwareUpdateStatusTarget = {
   path?: string;
 };
 
-type ProtocolV2FirmwareUpdateStartResponse =
-  | TypedResponseMessage<'Success'>
-  | TypedResponseMessage<'DeviceFirmwareUpdateStatus'>
-  | undefined;
+type ProtocolV2FirmwareUpdateStartResponse = TypedResponseMessage<'Success'>;
 
 type ProtocolV2TargetBinary = { fileName: string; binary: ArrayBuffer; targetId: number };
 type ProtocolV2InstallItem = ProtocolV2TargetBinary & {
-  kind: ProtocolV2RemoteComponentTarget['kind'];
+  kind: ProtocolV2RemoteComponentTarget['kind'] | 'boot_resources';
 };
 type ProtocolV2InstallTarget = ProtocolV2InstallItem & {
   path: string;
 };
 
+type ProtocolV2FileTransferParams = PROTO.FirmwareUpload & {
+  filePath: string;
+  processedSize?: number;
+  totalSize?: number;
+  onTransferredBytes?: (transferredBytes: number) => void;
+};
+
+/** RESC bundle okpkg written independently to devicePath through FileWrite. */
+type ProtocolV2ResourceBundleBinary = {
+  name: string;
+  binary: ArrayBuffer;
+  devicePath: string;
+};
+
 type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
   binary: ArrayBuffer;
 };
@@ -114,7 +137,7 @@ type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
 type ProtocolV2RemoteComponentTarget = {
   fileName: string;
   targetId: number;
-  kind: 'bootloader' | 'firmware' | 'resource';
+  kind: 'bootloader' | 'firmware';
 };
 
 type ProtocolV2OkppHeader = {
@@ -167,18 +190,24 @@ const PROTOCOL_V2_REMOTE_COMPONENT_TARGETS: Readonly<
     targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04,
     kind: 'firmware',
   },
-  CRATE: {
-    fileName: 'resource.bin',
-    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-    kind: 'resource',
-  },
 };
 
+const PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID = new Map<number, FirmwareUpdateV4Target>([
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, 'boot'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, 'app_v1'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2, 'app_v2'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR, 'coprocessor'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01, 'se01'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02, 'se02'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03, 'se03'],
+  [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04, 'se04'],
+]);
+
 const PROTOCOL_V2_ROMLOADER_UNSUPPORTED_MESSAGE =
   'FW_MGMT_TARGET_ROMLOADER is not accepted by the current Pro2 bootloader update request. Flash romloader with the loader-specific flow instead of firmwareUpdateV4.';
 
-// hd-transport 的历史 decode 行为会把单值 enum 输出为枚举名字符串；
-// Protocol V2 沿用这个 SDK 语义，内部比较前再映射回固件协议数值。
+// hd-transport historically decodes scalar enums as enum-name strings.
+// Map them back to firmware protocol values before internal comparisons.
 const PROTOCOL_V2_TARGET_ID_BY_DECODED_NAME = new Map<string, number>(
   Object.entries(ProtocolV2FirmwareTargetType).map(([key, value]) => [key, value])
 );
@@ -204,25 +233,12 @@ const isProtocolV2ReconnectProbeError = (error: unknown) => {
   );
 };
 
-const isProtocolV2PollingTransientError = (error: unknown) => {
-  const message = getProtocolV2UnknownErrorText(error).toLowerCase();
-  return (
-    isProtocolV2DeviceDisconnectedError(error) ||
-    isProtocolV2ReconnectProbeError(error) ||
-    message.includes('libusb_transfer_timed_out') ||
-    (message.includes('response timeout') && message.includes('devicefirmwareupdatestatusget')) ||
-    message.includes('device not found') ||
-    message.includes('transportnotfound')
-  );
-};
-
-const isProtocolV2StartUpdateTransientError = (error: unknown) => {
+const isProtocolV2FirmwareStatusEndpointUnavailable = (error: unknown) => {
   const message = getProtocolV2UnknownErrorText(error).toLowerCase();
   return (
-    isProtocolV2DeviceDisconnectedError(error) ||
-    isProtocolV2ReconnectProbeError(error) ||
-    message.includes('libusb_transfer_timed_out') ||
-    (message.includes('response timeout') && message.includes('devicefirmwareupdaterequest'))
+    message.includes('handler not registered') ||
+    message.includes('message handler not found') ||
+    message.includes('unsupported message')
   );
 };
 
@@ -263,25 +279,6 @@ const normalizeProtocolV2TargetStatus = (
 
 const normalizeProtocolV2Hex = (value?: string) => value?.replace(/^0x/i, '').toLowerCase();
 
-const versionArrayToNumber = (version?: IVersionArray) => {
-  if (!version) return undefined;
-  return version[0] * 0x10000 + version[1] * 0x100 + version[2];
-};
-
-const versionStringToArray = (version?: string | null): IVersionArray | undefined => {
-  if (!version) return undefined;
-  const parts = version.split('.').map(part => Number(part));
-  if (parts.length !== 3 || parts.some(part => !Number.isFinite(part))) return undefined;
-  return parts as IVersionArray;
-};
-
-const compareProtocolV2Versions = (current?: IVersionArray, target?: IVersionArray) => {
-  const currentNumber = versionArrayToNumber(current);
-  const targetNumber = versionArrayToNumber(target);
-  if (currentNumber === undefined || targetNumber === undefined) return undefined;
-  return currentNumber - targetNumber;
-};
-
 const bytesToHex = (bytes: Uint8Array) =>
   Array.from(bytes)
     .map(byte => byte.toString(16).padStart(2, '0'))
@@ -361,6 +358,32 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
   };
 };
 
+export const isProtocolV2FirmwareFingerprintValid = (
+  binary: ArrayBuffer | Uint8Array,
+  fingerprint: string | undefined
+) => {
+  const expectedFingerprint = normalizeProtocolV2Hex(fingerprint);
+  if (!expectedFingerprint) return true;
+  return bytesToHex(sha256(toProtocolV2Bytes(binary))) === expectedFingerprint;
+};
+
+export const assertProtocolV2ReconnectIdentity = (
+  expectedSerialNumber?: string,
+  actualSerialNumber?: string
+) => {
+  // Some Pro2 loader builds omit serial_no. Reconnect still uses the same BLE
+  // descriptor or requires a uniquely enumerated USB device before this check.
+  if (!expectedSerialNumber || !actualSerialNumber) {
+    return;
+  }
+  if (actualSerialNumber !== expectedSerialNumber) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      `Protocol V2 reconnect physical identity mismatch: expected ${expectedSerialNumber}, received ${actualSerialNumber}`
+    );
+  }
+};
+
 /**
  * FirmwareUpdateV4 is the complete Protocol V2 firmware update flow.
  *
@@ -370,9 +393,16 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
  * - completion waits for target status to finish, reboots to normal, then polls DeviceInfo
  */
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
+  private protocolV2ExpectedSerialNumber?: string;
+
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
+    this.unlockPolicy = 'unlock-before-run';
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
 
@@ -393,9 +423,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     validateParams(payload, [
       { name: 'chunkSize', type: 'number' },
-      { name: 'resourceBinaries', type: 'array', allowEmpty: true },
       { name: 'forcedUpdateRes', type: 'boolean' },
       { name: 'bootloaderBinary', type: 'buffer' },
+      { name: 'bootResourcesBinary', type: 'buffer' },
       { name: 'romloaderBinary', type: 'buffer' },
       { name: 'applicationP1Binary', type: 'buffer' },
       { name: 'applicationP2Binary', type: 'buffer' },
@@ -405,13 +435,16 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       { name: 'se03Binary', type: 'buffer' },
       { name: 'se04Binary', type: 'buffer' },
       { name: 'firmwareType', type: 'string' },
+      { name: 'targetsToUpdate', type: 'array', allowEmpty: true },
       { name: 'platform', type: 'string' },
+      { name: 'resourceBundleFiles', type: 'array', allowEmpty: true },
     ]);
 
     this.params = {
       chunkSize: payload.chunkSize,
       forcedUpdateRes: payload.forcedUpdateRes,
       bootloaderBinary: payload.bootloaderBinary,
+      bootResourcesBinary: payload.bootResourcesBinary,
       romloaderBinary: payload.romloaderBinary,
       applicationP1Binary: payload.applicationP1Binary,
       applicationP2Binary: payload.applicationP2Binary,
@@ -420,8 +453,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       se02Binary: payload.se02Binary,
       se03Binary: payload.se03Binary,
       se04Binary: payload.se04Binary,
-      resourceBinaries: payload.resourceBinaries,
+      resourceBundleFiles: payload.resourceBundleFiles,
       firmwareType: payload.firmwareType,
+      targetsToUpdate: payload.targetsToUpdate,
       platform: payload.platform,
     };
   }
@@ -429,10 +463,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private getProtocolV2FirmwareChunkSize() {
     const payloadChunkSize = Number(this.params?.chunkSize);
     const env = DataManager.getSettings('env');
-    const maxChunkSize =
-      this.params?.platform === 'native' || (env && DataManager.isBleConnect(env))
-        ? PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    const isBle = this.params?.platform === 'native' || (env && DataManager.isBleConnect(env));
+    let maxChunkSize = PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    if (isBle) {
+      maxChunkSize = PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+    }
     if (!Number.isFinite(payloadChunkSize) || payloadChunkSize <= 0) {
       return maxChunkSize;
     }
@@ -443,60 +478,99 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   async run() {
-    if (!this.device.isProtocolV2()) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'firmwareUpdateV4 requires a Protocol V2 device'
-      );
-    }
-
     Log.debug('FirmwareUpdateV4 strategy: Protocol V2');
     return this.runProtocolV2();
   }
 
   private async runProtocolV2() {
+    await this.captureProtocolV2PhysicalIdentity();
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
+    const needsRemoteResources =
+      !this.params.resourceBundleFiles?.length &&
+      !!this.params.targetsToUpdate?.includes('resource');
 
-    let resourceBinaryMap: ProtocolV2TargetBinary[] = [];
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
+    let bootResourcesInstallItem: ProtocolV2InstallItem | undefined;
     let installItems: ProtocolV2InstallItem[] | undefined;
+    let resourceBundles: ProtocolV2ResourceBundleBinary[] | undefined;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      resourceBinaryMap = await this.prepareResourceBinaries(firmwareType, deviceFeatures);
+      resourceBundles = this.prepareExplicitProtocolV2ResourceBundles();
       fwBinaryMap = this.collectExplicitTargetBinaries();
       bootloaderBinary = this.prepareBootloaderBinary();
-      if (!this.hasExplicitProtocolV2Payload(fwBinaryMap)) {
+      const needsRemoteFirmware = !this.hasExplicitProtocolV2Payload(fwBinaryMap);
+      const needsRemoteBootResources =
+        !this.params.bootResourcesBinary &&
+        !!this.params.targetsToUpdate?.includes('boot_resources');
+      if (needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) {
+        // Remote updates must use a freshly fetched config before any reboot or file write.
+        await DataManager.forceReloadData();
+      }
+      if (needsRemoteFirmware) {
         const remoteBinaries = await this.prepareRemoteProtocolV2Binaries(
           firmwareType,
           deviceFeatures
         );
-        resourceBinaryMap = remoteBinaries.resourceBinaryMap;
         bootloaderBinary = remoteBinaries.bootloaderBinary;
         fwBinaryMap = remoteBinaries.fwBinaryMap;
         installItems = remoteBinaries.installItems;
       }
-      this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
+      bootResourcesInstallItem = await this.prepareProtocolV2BootResources();
+      if (bootResourcesInstallItem) {
+        installItems = [
+          bootResourcesInstallItem,
+          ...(installItems ?? this.buildProtocolV2InstallItems({ bootloaderBinary, fwBinaryMap })),
+        ];
+      }
+      if (!needsRemoteResources) {
+        this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
+      }
     } catch (err) {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
     }
 
-    if (resourceBinaryMap.length === 0 && !bootloaderBinary && fwBinaryMap.length === 0) {
+    if (
+      !bootloaderBinary &&
+      fwBinaryMap.length === 0 &&
+      !installItems?.length &&
+      !resourceBundles?.length &&
+      !needsRemoteResources
+    ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.FirmwareUpdateDownloadFailed,
         'No firmware to update'
       );
     }
 
-    await this.enterProtocolV2BootloaderMode();
+    const enteredBootloader = await this.enterProtocolV2BootloaderMode();
+
+    if (needsRemoteResources) {
+      try {
+        resourceBundles = await this.prepareProtocolV2ResourceBundles();
+        this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
+      } catch (err) {
+        if (enteredBootloader) {
+          try {
+            await this.exitProtocolV2BootloaderToNormal();
+          } catch (restoreError) {
+            Log.warn(
+              '[FirmwareUpdateV4] failed to restore App mode after resource preparation error:',
+              restoreError
+            );
+          }
+        }
+        throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
+      }
+    }
 
     await this.executeProtocolV2Update({
-      resourceBinaryMap,
       fwBinaryMap,
       bootloaderBinary,
       ...(installItems ? { installItems } : undefined),
+      ...(resourceBundles?.length ? { resourceBundles } : undefined),
     });
 
     await this.exitProtocolV2BootloaderToNormal();
@@ -519,41 +593,36 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device features not available');
   }
 
-  private async prepareResourceBinaries(firmwareType: EFirmwareType, features: Features) {
-    if (this.params.resourceBinaries?.length) {
-      this.params.resourceBinaries.forEach((binary, index) => {
-        if (!(binary instanceof ArrayBuffer)) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.CallMethodInvalidParameter,
-            `Parameter [resourceBinaries.${index}] is of type invalid and should be [buffer].`
-          );
-        }
-      });
+  private getProtocolV2SerialNumber(deviceInfo: ProtocolV2DeviceInfo) {
+    const serialNumber = deviceInfo.hw?.serial_no?.trim();
+    return serialNumber || undefined;
+  }
 
-      return this.params.resourceBinaries.map((binary, index) => ({
-        fileName: `resource-${index + 1}.bin`,
-        binary,
-        targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-      }));
-    }
-    const resourceUrl = DataManager.getSysResourcesLatestRelease({
-      features,
-      forcedUpdateRes: this.params.forcedUpdateRes,
-      firmwareType,
+  private assertProtocolV2DeviceInfoIdentity(deviceInfo: ProtocolV2DeviceInfo) {
+    assertProtocolV2ReconnectIdentity(
+      this.protocolV2ExpectedSerialNumber,
+      this.getProtocolV2SerialNumber(deviceInfo)
+    );
+  }
+
+  private async requestProtocolV2PhysicalIdentity() {
+    return requestProtocolV2DeviceInfo({
+      commands: this.device.getCommands(),
+      timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
     });
+  }
 
-    if (resourceUrl) {
-      const resource = (await getSysResourceBinary(resourceUrl)).binary;
-      return [
-        {
-          fileName: 'resource.bin',
-          binary: resource,
-          targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-        },
-      ];
-    }
-    Log.warn('No resource url found');
-    return [];
+  private async captureProtocolV2PhysicalIdentity() {
+    const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
+    const serialNumber = this.getProtocolV2SerialNumber(deviceInfo);
+    assertProtocolV2ReconnectIdentity(serialNumber, serialNumber);
+    this.protocolV2ExpectedSerialNumber = serialNumber;
+  }
+
+  private async verifyProtocolV2ReconnectIdentity() {
+    const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
+    this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
+    return deviceInfo;
   }
 
   private prepareBootloaderBinary(): ArrayBuffer | null {
@@ -562,25 +631,21 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private hasExplicitProtocolV2Payload(fwBinaryMap: ProtocolV2TargetBinary[]) {
     return (
-      !!this.params.resourceBinaries?.length ||
+      !!this.params.resourceBundleFiles?.length ||
       !!this.params.bootloaderBinary ||
+      !!this.params.bootResourcesBinary ||
       fwBinaryMap.length > 0
     );
   }
 
   private buildProtocolV2InstallItems({
-    resourceBinaryMap,
     bootloaderBinary,
     fwBinaryMap,
   }: {
-    resourceBinaryMap: ProtocolV2TargetBinary[];
     bootloaderBinary: ArrayBuffer | null;
     fwBinaryMap: ProtocolV2TargetBinary[];
   }): ProtocolV2InstallItem[] {
-    const installItems: ProtocolV2InstallItem[] = resourceBinaryMap.map(resource => ({
-      ...resource,
-      kind: 'resource',
-    }));
+    const installItems: ProtocolV2InstallItem[] = [];
 
     if (bootloaderBinary) {
       installItems.push({
@@ -630,203 +695,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return target;
   }
 
-  private getProtocolV2ComponentTargetVersion(
-    release: IFirmwareReleaseInfo,
-    component: IProtocolV2FirmwareComponent,
-    target: ProtocolV2RemoteComponentTarget
-  ) {
-    if (component.version) return component.version;
-    if (target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER) {
-      return release.bootloaderVersion;
-    }
-    if (
-      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1 ||
-      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2
-    ) {
-      return release.version;
-    }
-    return undefined;
-  }
-
-  private getProtocolV2ComponentCurrentVersion(
-    features: Features,
-    target: ProtocolV2RemoteComponentTarget
-  ) {
-    switch (target.targetId) {
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER:
-        return getDeviceBootloaderVersion(features);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1:
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2:
-        return getDeviceFirmwareVersion(features);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR:
-        return getDeviceBLEFirmwareVersion(features);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01:
-        return versionStringToArray(features.se01Version);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02:
-        return versionStringToArray(features.se02Version);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03:
-        return versionStringToArray(features.se03Version);
-      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04:
-        return versionStringToArray(features.se04Version);
-      default:
-        return undefined;
-    }
-  }
-
-  private isProtocolV2ComponentVersionSatisfied(
-    release: IFirmwareReleaseInfo,
-    component: IProtocolV2FirmwareComponent,
-    target: ProtocolV2RemoteComponentTarget,
-    features: Features
-  ) {
-    const targetVersion = this.getProtocolV2ComponentTargetVersion(release, component, target);
-    if (!targetVersion) return false;
-
-    const currentVersion = this.getProtocolV2ComponentCurrentVersion(features, target);
-    const compareResult = compareProtocolV2Versions(currentVersion, targetVersion);
-    return compareResult !== undefined && compareResult >= 0;
-  }
-
-  private getProtocolV2ResourceFilePath(path: string) {
-    if (path.startsWith('vol')) return path;
-    if (path.startsWith('/')) return `vol0:${path}`;
-    return `vol0:/${path}`;
-  }
-
-  private async readProtocolV2DeviceFileHeader(path: string) {
-    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    const filePath = this.getProtocolV2ResourceFilePath(path);
-    const pathInfoRes = await typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', {
-      path: filePath,
-    });
-    const fileSize = toProtocolV2FiniteNumber(pathInfoRes.message?.size);
-    if (
-      !pathInfoRes.message?.exist ||
-      pathInfoRes.message?.directory ||
-      fileSize === undefined ||
-      fileSize < PROTOCOL_V2_OKPP_HEADER_SIZE
-    ) {
-      return null;
-    }
-
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
-    const chunks: Uint8Array[] = [];
-    let offset = 0;
-    while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
-      const readLen = Math.min(chunkSize, PROTOCOL_V2_OKPP_HEADER_SIZE - offset);
-      const res = await typedCall('FilesystemFileRead', 'FilesystemFile', {
-        file: {
-          path: filePath,
-          offset,
-          total_size: 0,
-        },
-        chunk_len: readLen,
-        ui_percentage: undefined,
-      });
-      const data = toProtocolV2Bytes(res.message?.data);
-      if (data.byteLength === 0) return null;
-      chunks.push(data);
-      offset += data.byteLength;
-    }
-
-    const headerBytes = new Uint8Array(offset);
-    let cursor = 0;
-    chunks.forEach(chunk => {
-      headerBytes.set(chunk, cursor);
-      cursor += chunk.byteLength;
-    });
-    return parseProtocolV2OkppHeader(headerBytes);
-  }
-
-  private async isProtocolV2ResourcePackageMatched(
-    pkg: IProtocolV2ResourceManifestPackage,
-    manifestVersion?: IVersionArray
-  ) {
-    try {
-      const header = await this.readProtocolV2DeviceFileHeader(pkg.path);
-      if (!header) return false;
-
-      const expectedType = pkg.type ?? 'RESC';
-      const expectedVersion = pkg.version ?? manifestVersion;
-      if (header.type !== expectedType) return false;
-      if (expectedVersion && compareProtocolV2Versions(header.version, expectedVersion) !== 0) {
-        return false;
-      }
-
-      const expectedPayloadHash = normalizeProtocolV2Hex(pkg.payloadHash);
-      if (expectedPayloadHash && header.payloadHash !== expectedPayloadHash) return false;
-
-      const expectedHeaderHash = normalizeProtocolV2Hex(pkg.headerHash);
-      if (expectedHeaderHash && header.headerHash !== expectedHeaderHash) return false;
-
-      return true;
-    } catch (error) {
-      Log.log(`Protocol V2 resource package check failed for ${pkg.path}: `, error);
-      return false;
-    }
-  }
-
-  private async isProtocolV2ResourceManifestSatisfied(
-    manifest: IFirmwareReleaseInfo['resourceManifest']
-  ) {
-    if (!manifest?.packages?.length) return false;
-
-    for (const pkg of manifest.packages) {
-      if (!(await this.isProtocolV2ResourcePackageMatched(pkg, manifest.version))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private getProtocolV2ResourceManifest(
-    release: IFirmwareReleaseInfo,
-    component: IProtocolV2FirmwareComponent
-  ) {
-    return component.resourceManifest ?? release.resourceManifest;
-  }
-
-  private getProtocolV2ResourceComponentFileName(key: string) {
-    const safeKey = key.replace(/[^a-z0-9_-]/gi, '_') || 'resource';
-    return `resource-${safeKey}.bin`;
-  }
-
-  private async shouldInstallRemoteProtocolV2Component(
-    release: IFirmwareReleaseInfo,
-    key: string,
-    component: IProtocolV2FirmwareComponent,
-    target: ProtocolV2RemoteComponentTarget,
-    features: Features
-  ) {
-    if (target.kind === 'resource') {
-      if (
-        this.params.forcedUpdateRes ||
-        features.bootloaderMode ||
-        features.mode === 'bootloader'
-      ) {
-        return true;
-      }
-      const resourceMatched = await this.isProtocolV2ResourceManifestSatisfied(
-        this.getProtocolV2ResourceManifest(release, component)
-      );
-      if (resourceMatched) {
-        Log.log(`[FirmwareUpdateV4] skip Protocol V2 resource component ${key}; manifest matched`);
-      }
-      return !resourceMatched;
-    }
-
-    const versionSatisfied = this.isProtocolV2ComponentVersionSatisfied(
-      release,
-      component,
-      target,
-      features
-    );
-    if (versionSatisfied) {
-      Log.log(`[FirmwareUpdateV4] skip Protocol V2 component ${key}; version is up to date`);
-    }
-    return !versionSatisfied;
-  }
-
   private async downloadRemoteProtocolV2Component(
     key: string,
     component: IProtocolV2FirmwareComponent
@@ -840,6 +708,22 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     const { binary } = await getSysResourceBinary(component.url);
+    if (!isProtocolV2FirmwareFingerprintValid(binary, component.fingerprint)) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Protocol V2 firmware fingerprint mismatch: ${key}/${component.target}`
+      );
+    }
+    const expectedPayloadHash = normalizeProtocolV2Hex(component.payloadHash);
+    if (expectedPayloadHash) {
+      const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
+      if (!header || header.payloadHash !== expectedPayloadHash) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `Protocol V2 firmware payload hash mismatch: ${key}/${component.target}`
+        );
+      }
+    }
     return {
       ...target,
       binary,
@@ -849,14 +733,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async prepareRemoteProtocolV2Binaries(firmwareType: EFirmwareType, features: Features) {
     const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
 
-    const resourceBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
     const fwBinaryMap: ProtocolV2TargetBinary[] = [];
     const installItems: ProtocolV2InstallItem[] = [];
 
     if (!release) {
       return {
-        resourceBinaryMap,
         bootloaderBinary,
         fwBinaryMap,
         installItems,
@@ -864,27 +746,17 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     const entries = this.getRemoteComponentEntries(release);
+    const targetsToUpdate = new Set(this.params.targetsToUpdate ?? []);
 
     for (const [key, component] of entries) {
-      const target = this.getRemoteComponentTarget(key, component);
-      const shouldInstall = await this.shouldInstallRemoteProtocolV2Component(
-        release,
-        key,
-        component,
-        target,
-        features
-      );
-      if (shouldInstall) {
+      const targetName = component.target?.toUpperCase();
+      const target = PROTOCOL_V2_REMOTE_COMPONENT_TARGETS[targetName];
+      const updateTarget = target
+        ? PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId)
+        : undefined;
+      if (updateTarget && targetsToUpdate.has(updateTarget)) {
         const remoteBinary = await this.downloadRemoteProtocolV2Component(key, component);
-        if (remoteBinary.kind === 'resource') {
-          const binaryEntry = {
-            fileName: this.getProtocolV2ResourceComponentFileName(key),
-            binary: remoteBinary.binary,
-            targetId: remoteBinary.targetId,
-          };
-          resourceBinaryMap.push(binaryEntry);
-          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
-        } else if (remoteBinary.kind === 'bootloader') {
+        if (remoteBinary.kind === 'bootloader') {
           bootloaderBinary = remoteBinary.binary;
           installItems.push({
             fileName: remoteBinary.fileName,
@@ -905,23 +777,191 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     return {
-      resourceBinaryMap,
       bootloaderBinary,
       fwBinaryMap,
       installItems,
     };
   }
 
+  private validateProtocolV2BootResourcesBinary(
+    binary: ArrayBuffer,
+    resource?: IProtocolV2BootResources
+  ) {
+    if (resource && !isProtocolV2ResourceFileValid(binary, resource)) {
+      throw new Error('Pro2 boot resources file verification failed');
+    }
+    const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
+    if (!header || header.type !== 'CRAT') {
+      throw new Error('Invalid Pro2 boot resources CRATE header');
+    }
+    if (resource) {
+      const expectedPayloadHash = normalizeProtocolV2Hex(resource.payloadHash);
+      const expectedHeaderHash = normalizeProtocolV2Hex(resource.headerHash);
+      if (header.payloadHash !== expectedPayloadHash) {
+        throw new Error('Pro2 boot resources payload hash mismatch');
+      }
+      if (header.headerHash !== expectedHeaderHash) {
+        throw new Error('Pro2 boot resources header hash mismatch');
+      }
+    }
+  }
+
+  private async prepareProtocolV2BootResources(): Promise<ProtocolV2InstallItem | undefined> {
+    let binary = this.params.bootResourcesBinary;
+    let resource: IProtocolV2BootResources | undefined;
+
+    if (!binary) {
+      if (!this.params.targetsToUpdate?.includes('boot_resources')) {
+        return undefined;
+      }
+      resource = DataManager.getProtocolV2BootResources();
+      if (!resource) {
+        throw new Error('Missing Pro2 boot resources configuration');
+      }
+      Log.log('[FirmwareUpdateV4] downloading Pro2 boot resources CRATE');
+      ({ binary } = await getSysResourceBinary(resource.url));
+    }
+
+    this.validateProtocolV2BootResourcesBinary(binary, resource);
+    return {
+      fileName: PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME,
+      binary,
+      targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
+      kind: 'boot_resources',
+    };
+  }
+
+  private prepareExplicitProtocolV2ResourceBundles(): ProtocolV2ResourceBundleBinary[] | undefined {
+    if (!this.params.resourceBundleFiles?.length) return undefined;
+
+    return this.params.resourceBundleFiles.map((file, index) => {
+      const devicePath = validateProtocolV2FilesystemPath(
+        file.devicePath,
+        `resourceBundleFiles[${index}].devicePath`
+      );
+      return {
+        name: devicePath.split('/').pop() ?? devicePath,
+        binary: file.binary,
+        devicePath,
+      };
+    });
+  }
+
+  private async prepareProtocolV2ResourceBundles(): Promise<
+    ProtocolV2ResourceBundleBinary[] | undefined
+  > {
+    if (!this.params.targetsToUpdate?.includes('resource')) {
+      return undefined;
+    }
+
+    const resources = DataManager.getProtocolV2Resources();
+    if (!resources?.length) {
+      throw new Error('Missing Pro2 stable resource configuration');
+    }
+
+    const inventory = this.params.forcedUpdateRes
+      ? undefined
+      : await readProtocolV2ResourceInventory({
+          commands: this.device.getCommands(),
+          resources,
+          chunkSize: this.getProtocolV2FirmwareChunkSize(),
+          timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+        });
+    const plan = buildProtocolV2ResourceUpdatePlan({
+      resources,
+      inventory,
+      mode: 'bootloader-recovery',
+      forced: this.params.forcedUpdateRes,
+    });
+    Log.log(
+      `[FirmwareUpdateV4] Pro2 resource plan mode=bootloader-recovery status=${plan.status} count=${plan.resources.length}`
+    );
+
+    const bundles: ProtocolV2ResourceBundleBinary[] = [];
+    for (const resource of plan.resources) {
+      bundles.push(await this.downloadProtocolV2Resource(resource));
+    }
+    return bundles;
+  }
+
+  private async downloadProtocolV2Resource(
+    resource: IProtocolV2Resource
+  ): Promise<ProtocolV2ResourceBundleBinary> {
+    Log.log(`[FirmwareUpdateV4] downloading Pro2 resource ${resource.type}`);
+    const { binary } = await getSysResourceBinary(resource.url);
+    if (!isProtocolV2ResourceFileValid(binary, resource)) {
+      throw new Error(`Pro2 resource file verification failed: ${resource.type}`);
+    }
+    return {
+      name: `${resource.type}.okpkg`,
+      binary,
+      devicePath: PROTOCOL_V2_RESOURCE_DEVICE_PATHS[resource.type],
+    };
+  }
+
+  private async syncProtocolV2ResourceBundles(
+    bundles: ProtocolV2ResourceBundleBinary[],
+    firmwareSize: number
+  ): Promise<{ processedSize: number; totalSize: number }> {
+    const transferStartTime = Date.now();
+    const transferTransport = this.getProtocolV2FirmwareTransferTransport();
+
+    // Write directly to the device through FileWrite.
+    let totalSize = 0;
+    for (const b of bundles) totalSize += b.binary.byteLength;
+
+    const transferTotalSize = totalSize + firmwareSize;
+    let processedSize = 0;
+    for (const bundle of bundles) {
+      Log.log(
+        `[FirmwareUpdateV4] syncing RESC bundle ${bundle.name} -> ${bundle.devicePath} bytes=${bundle.binary.byteLength}`
+      );
+      processedSize = await this.protocolV2CommonUpdateProcess({
+        payload: bundle.binary,
+        filePath: bundle.devicePath,
+        processedSize,
+        totalSize: transferTotalSize,
+      });
+    }
+
+    const elapsedMs = Date.now() - transferStartTime;
+    Log.log(
+      `[FirmwareUpdateV4] RESC bundle sync finished transport=${transferTransport} bytes=${totalSize} elapsed=${(
+        elapsedMs / 1000
+      ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`
+    );
+    return { processedSize, totalSize: transferTotalSize };
+  }
+
   private isProtocolV2BootloaderMode() {
     if (typeof this.device.isBootloader === 'function') {
-      return this.device.isBootloader();
+      return !!this.device.isBootloader();
+    }
+    return (
+      this.device.features?.mode === 'bootloader' ||
+      (this.device.features?.mode == null && !!this.device.features?.bootloaderMode)
+    );
+  }
+
+  private isProtocolV2RomloaderMode() {
+    if (!this.device.isProtocolV2() || this.device.getCurrentDeviceType() !== EDeviceType.Pro2) {
+      return false;
+    }
+    if (typeof this.device.isRomloader === 'function') {
+      return this.device.isRomloader();
     }
-    return !!this.device.features?.bootloaderMode;
+    return this.device.features?.mode === 'romloader';
   }
 
   async enterProtocolV2BootloaderMode() {
+    // romloader is the first update environment and forwards targets to bootloader.
+    // It rejects DeviceRebootType.Bootloader, so reuse the current connection.
+    if (this.isProtocolV2RomloaderMode()) {
+      Log.debug('Protocol V2 device is in romloader mode; start firmware update directly');
+      return false;
+    }
     if (this.isProtocolV2BootloaderMode()) {
-      Log.debug('Protocol V2 device is already in bootloader mode, skip reboot to bootloader');
+      Log.debug('Protocol V2 device is already in bootloader mode, skip reboot');
       return false;
     }
 
@@ -955,12 +995,19 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           commands: this.device.getCommands(),
           timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
         });
-        const features = this.device.updateProtocolV2Features(deviceInfo);
-        if (features?.bootloaderMode) {
+        this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
+        const features = await this.device.probeProtocolV2RuntimeState(
+          deviceInfo,
+          PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+        );
+        if (features?.mode === 'bootloader') {
           return features;
         }
         lastError = new Error('Protocol V2 device is reachable but is not in bootloader mode');
       } catch (error) {
+        if (this.isProtocolV2ReconnectIdentityError(error)) {
+          throw error;
+        }
         lastError = error;
         Log.log('Protocol V2 bootloader mode not ready, polling reconnect: ', error);
       }
@@ -976,8 +1023,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   /**
-   * 收集按 DeviceFirmwareTargetType 拆分的显式目标二进制。
-   * 文件名仅用于 staging 路径展示，target_id 已显式给定。
+   * Collect explicit target binaries grouped by DeviceFirmwareTargetType.
+   * Filenames are display-only staging paths because target_id is explicit.
    */
   private collectExplicitTargetBinaries() {
     const entries: ProtocolV2TargetBinary[] = [];
@@ -1014,30 +1061,48 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private async executeProtocolV2Update({
-    resourceBinaryMap,
     fwBinaryMap,
     bootloaderBinary,
     installItems,
+    resourceBundles,
   }: {
-    resourceBinaryMap?: ProtocolV2TargetBinary[];
     fwBinaryMap?: ProtocolV2TargetBinary[];
     bootloaderBinary?: ArrayBuffer | null;
     installItems?: ProtocolV2InstallItem[];
+    resourceBundles?: ProtocolV2ResourceBundleBinary[];
   }) {
     const orderedInstallItems =
       installItems ??
       this.buildProtocolV2InstallItems({
-        resourceBinaryMap: resourceBinaryMap ?? [],
         bootloaderBinary: bootloaderBinary ?? null,
         fwBinaryMap: fwBinaryMap ?? [],
       });
-    let totalSize = 0;
-    let processedSize = 0;
-    let transferredSize = 0;
 
-    for (const item of orderedInstallItems) totalSize += item.binary.byteLength;
+    let firmwareSize = 0;
+    for (const item of orderedInstallItems) firmwareSize += item.binary.byteLength;
 
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
+
+    let processedSize = 0;
+    let totalSize = firmwareSize;
+    if (resourceBundles?.length) {
+      const resourceTransfer = await this.syncProtocolV2ResourceBundles(
+        resourceBundles,
+        firmwareSize
+      );
+      processedSize = resourceTransfer.processedSize;
+      totalSize = resourceTransfer.totalSize;
+    }
+
+    // Skip staging and installation when the update contains RESC bundles only.
+    if (orderedInstallItems.length === 0) {
+      Log.log('[FirmwareUpdateV4] no firmware targets to install (RESC bundles only)');
+      if (totalSize > 0) {
+        this.postProgressMessage(100, 'transferData');
+      }
+      return;
+    }
+    let transferredSize = processedSize;
     const transferStartTime = Date.now();
     const transferTransport = this.getProtocolV2FirmwareTransferTransport();
     const chunkSize = this.getProtocolV2FirmwareChunkSize();
@@ -1064,6 +1129,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           onTransferredBytes,
         });
         transferredSize = processedSize;
+        await this.verifyProtocolV2StagedFile(filePath, item.binary.byteLength);
 
         stagedInstallTargets.push({
           ...item,
@@ -1093,174 +1159,165 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
 
-    const firmwareTargets: Array<{ target_id: number; path: string }> = [];
-    const flushFirmwareTargets = async () => {
-      if (firmwareTargets.length === 0) return;
-      const targets = firmwareTargets.splice(0, firmwareTargets.length);
-      Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(targets)}`);
-      const startResponse = await this.protocolV2StartFirmwareUpdate({ targets });
-      await this.waitForProtocolV2FirmwareUpdateComplete(targets, startResponse);
-    };
-
-    for (const item of stagedInstallTargets) {
-      const target = {
-        target_id: item.targetId,
-        path: item.path,
-      };
-      if (item.kind === 'resource') {
-        await flushFirmwareTargets();
-        const resourceTargets = [target];
-        Log.log(
-          `[FirmwareUpdateV4] DeviceFirmwareUpdateRequest resources=${JSON.stringify(
-            resourceTargets
-          )}`
-        );
-        const startResponse = await this.protocolV2StartFirmwareUpdate({
-          targets: resourceTargets,
-        });
-        await this.waitForProtocolV2FirmwareUpdateComplete(resourceTargets, startResponse);
-      } else {
-        firmwareTargets.push(target);
-      }
-    }
-
-    await flushFirmwareTargets();
+    const allTargets = stagedInstallTargets.map(item => ({
+      target_id: item.targetId,
+      path: item.path,
+    }));
+    Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
+    await this.protocolV2StartFirmwareUpdate({ targets: allTargets });
+    await this.waitForProtocolV2FirmwareUpdateComplete(allTargets);
   }
 
   private getProtocolV2InstallItemStagingPath(item: ProtocolV2InstallItem) {
     return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
   }
 
-  private async queryProtocolV2FirmwareUpdateStatus() {
-    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    return typedCall(
-      'DeviceFirmwareUpdateStatusGet',
-      'DeviceFirmwareUpdateStatus',
-      {},
-      {
-        timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-      }
-    );
-  }
-
-  private async pingProtocolV2Device() {
+  private async verifyProtocolV2StagedFile(path: string, expectedSize: number) {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    await typedCall(
-      'Ping',
-      'Success',
-      { message: 'firmware-update' },
-      {
-        timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-      }
-    );
-  }
-
-  private isProtocolV2NormalModeFeatures(features?: Features | null) {
-    return !!features && !features.bootloaderMode && features.mode !== 'bootloader';
-  }
-
-  private async probeProtocolV2NormalMode() {
-    const deviceInfo = await requestProtocolV2DeviceInfo({
-      commands: this.device.getCommands(),
-      timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-      request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
-    });
-    const features = this.device.updateProtocolV2Features(deviceInfo);
-    if (this.isProtocolV2NormalModeFeatures(features)) {
-      Log.log('Protocol V2 firmware install finished; device is back in normal mode');
-      return true;
+    const response = await typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path });
+    const actualSize = toProtocolV2FiniteNumber(response.message?.size);
+    if (!response.message?.exist || response.message?.directory || actualSize !== expectedSize) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.EmmcFileWriteFirmwareError,
+        `staged file verification failed: path=${path} exist=${!!response.message
+          ?.exist} expected=${expectedSize} actual=${actualSize ?? 'unknown'}`
+      );
     }
-    return false;
   }
 
   private assertProtocolV2TargetStatus(
     statusTargets: ProtocolV2FirmwareUpdateStatusTarget[],
     expectedTargetIds: Set<number>
   ) {
+    Log.log(
+      `[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`
+    );
     const failedTarget = statusTargets.find(
       target =>
         expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
         isProtocolV2TargetStatusFailed(target.status)
     );
     if (failedTarget) {
+      const failedTargetDetails = JSON.stringify({
+        targetId: failedTarget.target_id,
+        status: failedTarget.status,
+        payloadVersion: failedTarget.payload_version,
+        path: failedTarget.path,
+      });
+      Log.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
       throw ERRORS.TypedError(
         HardwareErrorCode.FirmwareError,
-        `Protocol V2 firmware target ${failedTarget.target_id} failed`
+        `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${
+          failedTarget.status ?? 'unknown'
+        } payloadVersion=${failedTarget.payload_version ?? 'unknown'} path=${
+          failedTarget.path ?? 'unknown'
+        }`
       );
     }
 
-    const completedTargets = statusTargets.filter(
-      target =>
-        expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
-        isProtocolV2TargetStatusFinished(target.status)
+    const matchingTargets = statusTargets.filter(target =>
+      expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1)
     );
-    if (completedTargets.length === expectedTargetIds.size && expectedTargetIds.size > 0) {
+    const completedTargetIds = new Set<number>();
+    matchingTargets.forEach(target => {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      if (targetId !== undefined && isProtocolV2TargetStatusFinished(target.status)) {
+        completedTargetIds.add(targetId);
+      }
+    });
+    const allExpectedTargetsCompleted =
+      expectedTargetIds.size > 0 &&
+      Array.from(expectedTargetIds).every(targetId => completedTargetIds.has(targetId));
+    if (allExpectedTargetsCompleted) {
+      this.postProgressMessage(100, 'installingFirmware');
       return true;
     }
 
-    const inProgressTarget = statusTargets.find(
-      target =>
-        expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
+    if (expectedTargetIds.size > 0 && matchingTargets.length > 0) {
+      const hasInProgressTarget = matchingTargets.some(target =>
         isProtocolV2TargetStatusInProgress(target.status)
-    );
-    if (inProgressTarget) {
-      this.postProgressMessage(99, 'installingFirmware');
+      );
+      const completedProgress = Math.floor(
+        (completedTargetIds.size / expectedTargetIds.size) * 100
+      );
+      // The protocol exposes no per-target percentage, so report coarse progress by
+      // completed targets and use 1% once work starts to keep the UI responsive.
+      const progress = Math.min(99, Math.max(completedProgress, hasInProgressTarget ? 1 : 0));
+      this.postProgressMessage(progress, 'installingFirmware');
     }
 
     return false;
   }
 
   private async waitForProtocolV2FirmwareUpdateComplete(
-    targets: Array<{ target_id: number; path: string }>,
-    startResponse?: ProtocolV2FirmwareUpdateStartResponse
+    targets: Array<{ target_id: number; path: string }>
   ) {
     const expectedTargetIds = new Set(targets.map(target => target.target_id));
-    if (startResponse?.type === 'DeviceFirmwareUpdateStatus') {
-      const statusTargets = (startResponse.message.records ??
-        []) as ProtocolV2FirmwareUpdateStatusTarget[];
-      if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds)) {
-        return;
-      }
-    }
-
     const startTime = Date.now();
     let lastError: unknown;
 
     while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
       try {
-        const statusRes = await this.queryProtocolV2FirmwareUpdateStatus();
-        const statusTargets = (statusRes.message.records ??
-          []) as ProtocolV2FirmwareUpdateStatusTarget[];
-        if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds)) {
-          return;
-        }
-      } catch (error) {
-        lastError = error;
-        if (error instanceof HardwareError && error.errorCode === HardwareErrorCode.FirmwareError) {
-          throw error;
-        }
-        Log.log('Protocol V2 firmware install status polling failed: ', error);
-        if (isProtocolV2PollingTransientError(error)) {
-          try {
-            await this.reconnectProtocolV2Device();
-            if (await this.probeProtocolV2NormalMode()) {
+        await this.reconnectProtocolV2Device();
+        const deviceInfo = await this.verifyProtocolV2ReconnectIdentity();
+        try {
+          const statusResponse = await this.device.getCommands().typedCall(
+            'DeviceFirmwareUpdateStatusGet',
+            'DeviceFirmwareUpdateStatus',
+            {
+              fields: {
+                status: true,
+                payload_version: true,
+                path: true,
+              },
+            },
+            { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT }
+          );
+          if (
+            this.assertProtocolV2TargetStatus(
+              (statusResponse.message.records ?? []) as ProtocolV2FirmwareUpdateStatusTarget[],
+              expectedTargetIds
+            )
+          ) {
+            return;
+          }
+          lastError = new Error('Protocol V2 firmware targets are still installing');
+        } catch (error) {
+          if (
+            error instanceof HardwareError &&
+            error.errorCode === HardwareErrorCode.FirmwareError
+          ) {
+            throw error;
+          }
+          // App firmware does not register DeviceFirmwareUpdateStatusGet. Treat the
+          // missing endpoint as completion only after the runtime probe confirms App mode.
+          if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
+            if (await this.probeProtocolV2NormalMode(deviceInfo)) {
+              Log.log(
+                '[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot'
+              );
               return;
             }
-          } catch (reconnectError) {
-            lastError = reconnectError;
+            lastError = new Error(
+              'Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode'
+            );
+          } else {
+            lastError = error;
             Log.log(
-              'Protocol V2 firmware install reconnect/normal-mode probe failed: ',
-              reconnectError
+              '[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ',
+              error
             );
           }
-          try {
-            await this.pingProtocolV2Device();
-            Log.log('Protocol V2 firmware status unavailable, Ping is ready');
-          } catch (pingError) {
-            lastError = pingError;
-            Log.log('Protocol V2 firmware install Ping polling failed: ', pingError);
-          }
         }
+      } catch (error) {
+        lastError = error;
+        if (this.isProtocolV2ReconnectIdentityError(error)) {
+          throw error;
+        }
+        if (error instanceof HardwareError && error.errorCode === HardwareErrorCode.FirmwareError) {
+          throw error;
+        }
+        Log.log('Protocol V2 firmware install device readiness probe failed: ', error);
       }
       await wait(1000);
     }
@@ -1272,24 +1329,30 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private async exitProtocolV2BootloaderToNormal() {
-    this.postTipMessage(FirmwareUpdateTipMessage.SwitchFirmwareReconnectDevice);
-    try {
-      await this.reconnectProtocolV2Device();
-      if (await this.probeProtocolV2NormalMode()) {
-        Log.log('Protocol V2 device is already in normal mode, skip normal reboot');
-        return;
-      }
-    } catch (error) {
-      Log.log('Protocol V2 normal-mode probe before reboot failed: ', error);
-    }
+    await this.reconnectProtocolV2Device();
+    await this.verifyProtocolV2ReconnectIdentity();
+    // The connection may still be in bootloader. Request a Normal reboot directly;
+    // repeating it after an automatic App reboot is idempotent.
     await this.protocolV2Reboot(DeviceRebootType.Normal);
   }
 
+  private async probeProtocolV2NormalMode(deviceInfo: ProtocolV2DeviceInfo) {
+    const features = await this.device.probeProtocolV2RuntimeState(
+      deviceInfo,
+      PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+    );
+    return features.mode === 'normal' && !features.bootloaderMode;
+  }
+
   private async waitForProtocolV2FinalFeatures() {
     const features = await this.waitForProtocolV2ReconnectAndFeatures(
-      PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT
+      PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT
     );
 
+    return this.getProtocolV2VersionResult(features);
+  }
+
+  private getProtocolV2VersionResult(features: Features) {
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
     const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
     const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
@@ -1316,11 +1379,15 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         const deviceInfo = await requestProtocolV2DeviceInfo({
           commands: this.device.getCommands(),
           timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-          // 更新完成判定只需要各 target 版本号；scope 与请求内容保持一致
+          // Completion needs target versions only; keep scope aligned with the request.
           request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
         });
-        const features = this.device.updateProtocolV2Features(deviceInfo);
-        if (features.bootloaderMode || features.mode === 'bootloader') {
+        this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
+        const features = await this.device.probeProtocolV2RuntimeState(
+          deviceInfo,
+          PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+        );
+        if (features.mode !== 'normal' || features.bootloaderMode) {
           throw ERRORS.TypedError(
             HardwareErrorCode.DeviceNotFound,
             'Protocol V2 device is still in bootloader mode'
@@ -1328,6 +1395,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         }
         return features;
       } catch (error) {
+        if (this.isProtocolV2ReconnectIdentityError(error)) {
+          throw error;
+        }
         lastError = error;
         Log.log('Protocol V2 normal mode not ready, polling Ping: ', error);
         await wait(1000);
@@ -1362,45 +1432,93 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         },
         true
       );
-      await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, { throwOnRunPromiseError: true });
+      await this.ensureProtocolV2DeviceAcquired();
       this.device.commands.disposed = false;
       this.device.getCommands().mainId = this.device.mainId ?? '';
-      await this.device.initialize();
       return;
     }
 
-    // App 与 bootloader 序列号暂时可能不一致。V4 升级重连阶段只接受唯一枚举设备，
-    // 避免继续按旧 app connectId 查缓存导致反复输出 path mismatch 日志。
+    // Reinitialize every USB descriptor so DeviceInfo can provide the physical serial.
+    // Enumeration order is not stable and must never decide the reconnect target.
     const { deviceList } = await DevicePool.getDevices(devicesDescriptor, undefined, {
       connectProtocol: PROTOCOL_V2_CONNECT_PROTOCOL,
     });
-    if (deviceList.length !== 1) {
+    const expectedSerialNumber = this.protocolV2ExpectedSerialNumber?.trim();
+    const identityMatch = expectedSerialNumber
+      ? deviceList.find(
+          candidate => candidate.getCurrentSerialNo?.().trim() === expectedSerialNumber
+        )
+      : undefined;
+    const singleCandidate = deviceList.length === 1 ? deviceList.at(0) : undefined;
+    const singleCandidateSerialNumber = singleCandidate?.getCurrentSerialNo?.().trim();
+    const reconnectDevice =
+      identityMatch ??
+      (singleCandidate && (!expectedSerialNumber || !singleCandidateSerialNumber)
+        ? singleCandidate
+        : undefined);
+    if (!reconnectDevice) {
       throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
     }
 
     Log.debug(
-      'Protocol V2 firmware reconnect using single enumerated device:',
-      deviceList[0].getConnectId()
+      'Protocol V2 firmware reconnect using matched device:',
+      reconnectDevice.getConnectId()
     );
-    this.device.updateFromCache(deviceList[0]);
-    await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, { throwOnRunPromiseError: true });
+    this.device.updateFromCache(reconnectDevice);
+    await this.ensureProtocolV2DeviceAcquired();
     this.device.commands.disposed = false;
     this.device.getCommands().mainId = this.device.mainId ?? '';
-    await this.device.initialize();
   }
 
-  private async protocolV2CommonUpdateProcess({
+  /**
+   * After acquiring a USB session, polling reuses its command channel. Reacquire only
+   * after reboot or enumeration changes cause hasDeviceAcquire() to become false.
+   */
+  private async ensureProtocolV2DeviceAcquired() {
+    const commands = this.device.getCommands();
+    if (this.device.hasDeviceAcquire() && !commands.disposed) {
+      return;
+    }
+    await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, {
+      throwOnRunPromiseError: true,
+    });
+  }
+
+  private isProtocolV2ReconnectIdentityError(error: unknown) {
+    return this.normalizeErrorMessage(error).includes('Protocol V2 reconnect physical identity');
+  }
+
+  private async protocolV2CommonUpdateProcess(params: ProtocolV2FileTransferParams) {
+    let lastError: unknown;
+    for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
+      try {
+        return await this.protocolV2WriteWholeFile(params);
+      } catch (error) {
+        lastError = error;
+        Log.error(
+          `Protocol V2 file transfer failed path=${params.filePath} attempt=${attempt}/${PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT}; restarting from offset 0`,
+          error
+        );
+        if (attempt === PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
+          break;
+        }
+        await this.recoverProtocolV2FileTransfer();
+      }
+    }
+
+    throw ERRORS.TypedError(
+      HardwareErrorCode.EmmcFileWriteFirmwareError,
+      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`
+    );
+  }
+
+  private async protocolV2WriteWholeFile({
     payload,
     filePath,
     processedSize,
     totalSize,
     onTransferredBytes,
-  }: PROTO.FirmwareUpload & {
-    filePath: string;
-    processedSize?: number;
-    totalSize?: number;
-    onTransferredBytes?: (transferredBytes: number) => void;
-  }) {
+  }: ProtocolV2FileTransferParams) {
     const chunkSize = this.getProtocolV2FirmwareChunkSize();
     let offset = 0;
     const getUploadProgress = (fileOffset: number) => {
@@ -1421,7 +1539,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         totalSize ?? payload.byteLength
       );
 
-      const writeRes = await this.fileWriteWithRetry(
+      const writeRes = await this.fileWriteChunk(
         filePath,
         payload.byteLength,
         offset,
@@ -1429,12 +1547,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         overwrite,
         progress
       );
-      const processedByte = Number(writeRes.message.processed_byte);
-      const nextOffset =
-        Number.isFinite(processedByte) && processedByte > offset
-          ? processedByte
-          : offset + chunkLength;
-      if (nextOffset <= offset || nextOffset > payload.byteLength) {
+      const rawProcessedByte = writeRes.message.processed_byte;
+      const processedByte = Number(rawProcessedByte);
+      const nextOffset = rawProcessedByte === undefined ? offset + chunkLength : processedByte;
+      if (!Number.isFinite(nextOffset) || nextOffset <= offset || nextOffset > chunkEnd) {
         throw ERRORS.TypedError(
           HardwareErrorCode.EmmcFileWriteFirmwareError,
           `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`
@@ -1462,7 +1578,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return env ?? 'unknown';
   }
 
-  private async fileWriteWithRetry(
+  private async fileWriteChunk(
     filePath: string,
     totalFileSize: number,
     offset: number,
@@ -1470,57 +1586,38 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     overwrite: boolean,
     progress: number | null
   ): Promise<TypedResponseMessage<'FilesystemFile'>> {
-    const writeFunc = async () => {
-      const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-      const writeRes = await typedCall('FilesystemFileWrite', 'FilesystemFile', {
-        file: {
-          path: filePath,
-          offset,
-          total_size: totalFileSize,
-          data: chunk,
-        },
-        overwrite,
-        append: false,
-        ui_percentage: progress ?? undefined,
-      });
-      if (writeRes.type !== 'FilesystemFile') {
-        if ((writeRes as any).type === 'CallMethodError') {
-          if (((writeRes as any).message.error ?? '').indexOf(SESSION_ERROR) > -1) {
-            throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, SESSION_ERROR);
-          }
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const writeRes = await typedCall('FilesystemFileWrite', 'FilesystemFile', {
+      file: {
+        path: filePath,
+        offset,
+        total_size: totalFileSize,
+        data: chunk,
+      },
+      overwrite,
+      append: false,
+      ui_percentage: progress ?? undefined,
+    });
+    if (writeRes.type !== 'FilesystemFile') {
+      if ((writeRes as any).type === 'CallMethodError') {
+        if (((writeRes as any).message.error ?? '').indexOf(SESSION_ERROR) > -1) {
+          throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, SESSION_ERROR);
         }
-        throw ERRORS.TypedError(
-          HardwareErrorCode.EmmcFileWriteFirmwareError,
-          'transfer data error'
-        );
       }
-      return writeRes;
-    };
+      throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
+    }
+    return writeRes;
+  }
 
-    let retryCount = 10;
-    while (retryCount > 0) {
-      try {
-        const result = await writeFunc();
-        return result;
-      } catch (error) {
-        Log.error(`fileWrite error: `, error);
-        retryCount--;
-        if (retryCount === 0) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.EmmcFileWriteFirmwareError,
-            'transfer data error'
-          );
-        }
-        const env = DataManager.getSettings('env');
-        if (DataManager.isBleConnect(env)) {
-          await wait(3000);
-          await this.acquireProtocolV2BleDevice();
-          await this.device.initialize();
-        }
-        await wait(2000);
-      }
+  private async recoverProtocolV2FileTransfer() {
+    const env = DataManager.getSettings('env');
+    if (DataManager.isBleConnect(env)) {
+      await wait(3000);
     }
-    throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
+    await this.reconnectProtocolV2Device();
+    await this.verifyProtocolV2ReconnectIdentity();
+    await this.device.initialize();
+    await wait(2000);
   }
 
   private async acquireProtocolV2BleDevice() {
@@ -1538,35 +1635,16 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     targets: Array<{ target_id: number; path: string }>;
   }) {
     const commands = this.device.getCommands();
-    let response: ProtocolV2FirmwareUpdateStartResponse;
-    try {
-      response = await commands.typedCall(
-        'DeviceFirmwareUpdateRequest',
-        PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
-        {
-          targets,
-        },
-        {
-          intermediateTypes: ['DeviceFirmwareUpdateStatus'],
-          timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT,
-          onIntermediateResponse: (response: { type?: string }) => {
-            if (response.type === 'DeviceFirmwareUpdateStatus') {
-              this.postProgressMessage(99, 'installingFirmware');
-            }
-          },
-        }
-      );
-    } catch (error) {
-      if (isProtocolV2StartUpdateTransientError(error)) {
-        Log.log(
-          'Protocol V2 firmware update request did not return; continue status polling',
-          error
-        );
-      } else {
-        throw error;
-      }
-    }
+    const response: ProtocolV2FirmwareUpdateStartResponse = await commands.typedCall(
+      'DeviceFirmwareUpdateRequest',
+      'Success',
+      { targets },
+      { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT }
+    );
+    // Success acknowledges that the device accepted installation. End confirmation
+    // and begin status polling only after receiving this ACK.
     this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdating);
+    this.postProgressMessage(0, 'installingFirmware');
     return response;
   }
 
@@ -1576,9 +1654,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       const res = await typedCall('DeviceReboot', 'Success', {
         reboot_type: rebootType,
       });
+      this.device.markProtocolV2Reboot(rebootType);
       return res.message;
     } catch (error) {
       if (isProtocolV2DeviceDisconnectedError(error) || isProtocolV2ReconnectProbeError(error)) {
+        this.device.markProtocolV2Reboot(rebootType);
         return { message: 'Device rebooted successfully' };
       }
       throw error;