@onekeyfe/hd-core 1.2.0-alpha.8 → 1.2.0-alpha.81

package/src/api/FirmwareUpdateV4.ts

@@ -1,21 +1,27 @@
-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_BLE_FILE_READ_CHUNK_SIZE,
+  PROTOCOL_V2_BLE_FIRMWARE_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,
   getDeviceBLEFirmwareVersion,
   getDeviceBootloaderVersion,
   getDeviceFirmwareVersion,
+  getDeviceType,
   getFirmwareType,
   getLogger,
 } from '../utils';
 import { getSysResourceBinary } from './firmware/getBinary';
+import { normalizeFirmwarePreparationError } from './firmware/FirmwarePreparationError';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
@@ -24,47 +30,87 @@ import {
   ProtocolV2FirmwareTargetType,
 } from '../protocols/protocol-v2';
 import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
+import { isProtocolV2ResourceFileValid } from '../protocols/protocol-v2/resources';
 import {
-  PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
   getProtocolV2UnknownErrorText,
   isProtocolV2DeviceDisconnectedError,
 } from './protocol-v2/helpers';
+import { openFirmwareByteSource, writeFirmwareByteSource } from './firmware/FirmwareArtifactSource';
+import { resolveFirmwareUpdateHostBinding } from './firmware/FirmwareHostBinding';
+import {
+  assertFirmwareUpdatePreparedPlanBinding,
+  assertFirmwareUpdatePreparedPlanDeviceIdentity,
+} from './firmware/FirmwareUpdatePreparedPlan';
 
-import type { FirmwareUpdateV4Params } from '../types/api/firmwareUpdate';
+import type {
+  FirmwareArtifactReference,
+  FirmwareUpdateV4Params,
+  FirmwareUpdateV4Target,
+} from '../types/api/firmwareUpdate';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type { PROTO } from '../constants';
+import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../device/DeviceCommands';
 import type {
   Features,
   IFirmwareReleaseInfo,
   IProtocolV2FirmwareComponent,
-  IProtocolV2ResourceManifestPackage,
   IVersionArray,
 } from '../types';
+import type { FirmwareByteSource } from './firmware/FirmwareArtifactSource';
 
 const Log = getLogger(LoggerNames.Method);
 
+// Restored after a rebase dropped the declaration while keeping its use in
+// fileWriteChunk; without it that error branch throws ReferenceError instead of
+// the intended typed session error.
 const SESSION_ERROR = 'session not found';
-const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 60 * 1000;
+const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
+const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
-const PROTOCOL_V2_START_UPDATE_TIMEOUT = 60 * 1000;
-const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
+const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
+const PROTOCOL_V2_START_UPDATE_TIMEOUT = 3 * 60 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 8 * 60 * 1000;
+const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
 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_DEVICE_INFO_READY_TIMEOUT = 30 * 1000;
+const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
+const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
 const PROTOCOL_V2_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_NEO_UNSUPPORTED_TARGETS = new Set<FirmwareUpdateV4Target>(['se03', 'se04']);
+
+export function assertProtocolV2FirmwareTargetsSupported(
+  deviceType: EDeviceType | string | undefined,
+  params: FirmwareUpdateV4Params
+) {
+  const unsupportedTargets = new Set(
+    (params.targetsToUpdate ?? []).filter(target => PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS.has(target))
+  );
+  if (params.se03Binary) unsupportedTargets.add('se03');
+  if (params.se04Binary) unsupportedTargets.add('se04');
+
+  if (!unsupportedTargets.size || deviceType === EDeviceType.Pro2) return;
+
+  const targetList = Array.from(unsupportedTargets).join(', ');
+  const message =
+    deviceType === EDeviceType.Neo
+      ? `Neo only supports SE01 and SE02; unsupported firmware targets: ${targetList}`
+      : `Cannot safely update ${targetList} without a confirmed Pro2 device type`;
+  throw ERRORS.TypedError(HardwareErrorCode.DeviceNotSupportMethod, message);
+}
+
 const getProtocolV2DeviceTransferProgress = (
   bytesBeforeChunk: number,
   bytesAfterChunk: number,
@@ -82,11 +128,6 @@ const getProtocolV2DeviceTransferProgress = (
   return Math.min(Math.max(Math.ceil((bytesAfterChunk / totalBytes) * 100), 1), 99);
 };
 
-const formatProtocolV2TransferSpeed = (bytes: number, elapsedMs: number) => {
-  const safeElapsedMs = Math.max(elapsedMs, 1);
-  return (bytes / 1024 / (safeElapsedMs / 1000)).toFixed(2);
-};
-
 type ProtocolV2FirmwareUpdateStatusTarget = {
   target_id: number | string;
   status?: number | string;
@@ -94,17 +135,20 @@ 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'];
 };
-type ProtocolV2InstallTarget = ProtocolV2InstallItem & {
-  path: string;
+/** Protocol V2 resource file written independently to devicePath through FileWrite. */
+type ProtocolV2ResourceBundleBinary = {
+  name: string;
+  binary: ArrayBuffer;
+  devicePath: string;
+  version?: IVersionArray;
+  payloadHash?: string;
+  headerHash?: string;
 };
 
 type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
@@ -114,7 +158,36 @@ type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
 type ProtocolV2RemoteComponentTarget = {
   fileName: string;
   targetId: number;
-  kind: 'bootloader' | 'firmware' | 'resource';
+  kind: 'bootloader' | 'firmware';
+};
+
+type ProtocolV2InstallSource = {
+  fileName: string;
+  source: FirmwareByteSource;
+  targetId: number;
+  kind: ProtocolV2RemoteComponentTarget['kind'];
+};
+
+type ProtocolV2ResourceBundleSource = {
+  name: string;
+  source: FirmwareByteSource;
+  devicePath: string;
+  version?: IVersionArray;
+  payloadHash?: string;
+  headerHash?: string;
+};
+
+type ProtocolV2ExecutionPhaseKind =
+  | 'resource-sync'
+  | 'bootloader-install'
+  | 'bootloader-verify'
+  | 'component-install'
+  | 'final-verify';
+
+type ProtocolV2ExecutionPhase = {
+  kind: ProtocolV2ExecutionPhaseKind;
+  installSources: ProtocolV2InstallSource[];
+  resourceSources: ProtocolV2ResourceBundleSource[];
 };
 
 type ProtocolV2OkppHeader = {
@@ -167,18 +240,40 @@ 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_FIRMWARE_STAGING_PATHS = new Set(
+  Object.values(PROTOCOL_V2_REMOTE_COMPONENT_TARGETS).map(
+    target => `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${target.fileName}`
+  )
+);
+
+const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH = 'vol0:/loaders/bootloader/boot_resource.okpkg';
+const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH = `${PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH}.staging`;
+
+const resolveProtocolV2ResourceWritePath = (devicePath: string) => {
+  const normalizedPath = devicePath.replace(/^vol0:(?!\/)/i, 'vol0:/').toLowerCase();
+  return normalizedPath === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH
+    ? PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH
+    : devicePath;
+};
+
+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,27 +299,20 @@ const isProtocolV2ReconnectProbeError = (error: unknown) => {
   );
 };
 
-const isProtocolV2PollingTransientError = (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('devicefirmwareupdatestatusget')) ||
-    message.includes('device not found') ||
-    message.includes('transportnotfound')
+    message.includes('handler not registered') ||
+    message.includes('message handler not found') ||
+    message.includes('unsupported message')
   );
 };
 
-const isProtocolV2StartUpdateTransientError = (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'))
-  );
-};
+const isProtocolV2TerminalInstallStatusError = (error: unknown) =>
+  error instanceof HardwareError &&
+  (error.errorCode === HardwareErrorCode.FirmwareError ||
+    error.errorCode === HardwareErrorCode.FirmwareVerificationFailed ||
+    error.params?.firmwareUpdateCode === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
 
 const isProtocolV2TargetStatusFinished = (status: ProtocolV2FirmwareUpdateStatusTarget['status']) =>
   normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_FINISHED;
@@ -268,13 +356,6 @@ const versionArrayToNumber = (version?: IVersionArray) => {
   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);
@@ -361,6 +442,43 @@ 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,
+  expectedPath?: string,
+  actualPath?: string
+) => {
+  if (expectedSerialNumber && actualSerialNumber) {
+    if (actualSerialNumber !== expectedSerialNumber) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.DeviceNotFound,
+        `Protocol V2 reconnect physical identity mismatch: expected ${expectedSerialNumber}, received ${actualSerialNumber}`
+      );
+    }
+    return;
+  }
+
+  if (expectedPath && actualPath && expectedPath === actualPath) {
+    return;
+  }
+
+  throw ERRORS.TypedError(
+    HardwareErrorCode.DeviceNotFound,
+    `Protocol V2 reconnect physical identity unavailable: expected path ${
+      expectedPath ?? 'unknown'
+    }, received ${actualPath ?? 'unknown'}`
+  );
+};
+
 /**
  * FirmwareUpdateV4 is the complete Protocol V2 firmware update flow.
  *
@@ -370,9 +488,28 @@ 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;
+
+  private protocolV2ExpectedPath?: string;
+
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
+  private protocolV2PreparedSources: FirmwareByteSource[] = [];
+
+  private protocolV2ExecutionInLoader = false;
+
+  private protocolV2CompletedTargetVersions = new Map<number, number>();
+
+  private protocolV2LatestFinalFeatures?: Features;
+
+  private protocolV2FinalStatusVerified = false;
+
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
+    this.unlockPolicy = 'unlock-before-run';
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
 
@@ -393,7 +530,6 @@ 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: 'romloaderBinary', type: 'buffer' },
@@ -405,10 +541,64 @@ 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: 'expectedDeviceId', type: 'string' },
+      { name: 'resourceFiles', type: 'array', allowEmpty: true },
     ]);
+    if (
+      payload.expectedDeviceId !== undefined &&
+      (payload.expectedDeviceId.length === 0 || payload.expectedDeviceId.length > 160)
+    ) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.CallMethodInvalidParameter,
+        'Protocol V2 expected device identity is invalid'
+      );
+    }
+    const hostBinding =
+      payload.preparedPlan || payload.componentArtifacts || payload.resourceBundleArtifacts
+        ? resolveFirmwareUpdateHostBinding(payload.hostBindingGeneration)
+        : undefined;
+    if (hostBinding) {
+      assertFirmwareUpdatePreparedPlanBinding({
+        preparedPlan: payload.preparedPlan,
+        executor: 'v4',
+        platform: payload.platform,
+        scopeTargets: [
+          'boot',
+          'app_v1',
+          'app_v2',
+          'coprocessor',
+          'resource',
+          'se01',
+          'se02',
+          'se03',
+          'se04',
+        ],
+        bindings: [
+          ...Object.entries(payload.componentArtifacts ?? {}).flatMap(([target, artifact]) =>
+            artifact
+              ? [
+                  {
+                    target: target as Exclude<FirmwareUpdateV4Target, 'resource'>,
+                    artifact,
+                  },
+                ]
+              : []
+          ),
+          ...(payload.resourceBundleArtifacts ?? []).map(
+            (entry: { name: string; artifact: FirmwareArtifactReference }) => ({
+              target: 'resource' as const,
+              logicalName: entry.name,
+              artifact: entry.artifact,
+            })
+          ),
+        ],
+      });
+    }
 
     this.params = {
+      preparedPlan: payload.preparedPlan,
       chunkSize: payload.chunkSize,
       forcedUpdateRes: payload.forcedUpdateRes,
       bootloaderBinary: payload.bootloaderBinary,
@@ -420,19 +610,33 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       se02Binary: payload.se02Binary,
       se03Binary: payload.se03Binary,
       se04Binary: payload.se04Binary,
-      resourceBinaries: payload.resourceBinaries,
+      resourceFiles: payload.resourceFiles,
       firmwareType: payload.firmwareType,
+      targetsToUpdate: payload.targetsToUpdate,
+      expectedTargetVersions: payload.expectedTargetVersions,
       platform: payload.platform,
+      expectedDeviceId: payload.expectedDeviceId,
+      artifactReader: hostBinding?.artifactReader ?? payload.artifactReader,
+      componentArtifacts: payload.componentArtifacts,
+      resourceBundleArtifacts: payload.resourceBundleArtifacts,
     };
   }
 
-  private getProtocolV2FirmwareChunkSize() {
+  private getProtocolV2FirmwareChunkSize(direction: 'read' | 'write', filePath?: string) {
     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) {
+      if (direction === 'read') {
+        maxChunkSize = PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE;
+      } else {
+        // Firmware staging writes tolerate a larger BLE chunk than generic filesystem writes.
+        maxChunkSize = PROTOCOL_V2_FIRMWARE_STAGING_PATHS.has(filePath ?? '')
+          ? PROTOCOL_V2_BLE_FIRMWARE_FILE_CHUNK_SIZE
+          : PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+      }
+    }
     if (!Number.isFinite(payloadChunkSize) || payloadChunkSize <= 0) {
       return maxChunkSize;
     }
@@ -443,69 +647,401 @@ 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 currentDeviceType = this.device.getCurrentDeviceType();
+    const capabilityDeviceType =
+      currentDeviceType === EDeviceType.Pro2 || currentDeviceType === EDeviceType.Neo
+        ? currentDeviceType
+        : getDeviceType(deviceFeatures);
+    assertProtocolV2FirmwareTargetsSupported(capabilityDeviceType, this.params);
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
+    this.validateExpectedTargetVersions();
+
+    if (
+      (this.params.componentArtifacts && Object.keys(this.params.componentArtifacts).length > 0) ||
+      this.params.resourceBundleArtifacts?.length
+    ) {
+      return this.runProtocolV2PreparedArtifacts(deviceFeatures, firmwareType);
+    }
+    const hasExplicitResourceFiles = !!this.params.resourceFiles?.length;
+    const wantsResources = !!this.params.targetsToUpdate?.includes('resource');
+    const needsPreparedResources = !hasExplicitResourceFiles && wantsResources;
 
-    let resourceBinaryMap: ProtocolV2TargetBinary[] = [];
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
     let installItems: ProtocolV2InstallItem[] | undefined;
+    let resourceBundles: ProtocolV2ResourceBundleBinary[] | undefined;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      resourceBinaryMap = await this.prepareResourceBinaries(firmwareType, deviceFeatures);
+      resourceBundles = this.prepareExplicitProtocolV2ResourceFiles();
       fwBinaryMap = this.collectExplicitTargetBinaries();
       bootloaderBinary = this.prepareBootloaderBinary();
-      if (!this.hasExplicitProtocolV2Payload(fwBinaryMap)) {
+      const needsRemoteFirmware = !this.hasExplicitProtocolV2Payload(fwBinaryMap);
+      if (needsPreparedResources) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Protocol V2 resource manifest must be prepared by the external firmware host',
+          {
+            firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+          }
+        );
+      }
+      if (
+        needsRemoteFirmware &&
+        (this.params.artifactReader ||
+          DataManager.getSettings('firmwareManifestMode') === 'external-only')
+      ) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Protocol V2 firmware artifacts must be prepared by the external firmware host',
+          {
+            firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+          }
+        );
+      }
+      if (needsRemoteFirmware) {
+        // 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);
     } catch (err) {
-      throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
+      if (
+        typeof err === 'object' &&
+        err !== null &&
+        'params' in err &&
+        (err as HardwareError).params?.firmwareUpdateCode === 'FirmwareArtifactsNotPrepared'
+      ) {
+        throw err;
+      }
+      if (err instanceof HardwareError && err.errorCode === HardwareErrorCode.NetworkError) {
+        throw err;
+      }
+      throw normalizeFirmwarePreparationError(err);
     }
 
-    if (resourceBinaryMap.length === 0 && !bootloaderBinary && fwBinaryMap.length === 0) {
+    if (
+      !bootloaderBinary &&
+      fwBinaryMap.length === 0 &&
+      !installItems?.length &&
+      !resourceBundles?.length
+    ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.FirmwareUpdateDownloadFailed,
         'No firmware to update'
       );
     }
 
-    await this.enterProtocolV2BootloaderMode();
-
-    await this.executeProtocolV2Update({
-      resourceBinaryMap,
+    return this.executeProtocolV2Update({
       fwBinaryMap,
       bootloaderBinary,
       ...(installItems ? { installItems } : undefined),
+      ...(resourceBundles?.length ? { resourceBundles } : undefined),
+    });
+  }
+
+  private async openProtocolV2PreparedSource(artifact: FirmwareArtifactReference) {
+    const source = await openFirmwareByteSource({
+      artifact,
+      reader: this.params.artifactReader,
     });
+    if (!source) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Firmware artifact ${artifact.artifactRef} is not prepared`,
+        {
+          firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+        }
+      );
+    }
+    this.protocolV2PreparedSources.push(source);
+    return source;
+  }
 
-    await this.exitProtocolV2BootloaderToNormal();
+  private async openProtocolV2MemorySource(binary: ArrayBuffer) {
+    const source = await openFirmwareByteSource({ binary });
+    if (!source) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 firmware binary is empty'
+      );
+    }
+    this.protocolV2PreparedSources.push(source);
+    return source;
+  }
 
-    const versions = await this.waitForProtocolV2FinalFeatures();
-    this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
-    DevicePool.resetState();
+  private async closeProtocolV2PreparedSources() {
+    const sources = this.protocolV2PreparedSources.splice(0);
+    await Promise.all(sources.map(source => source.close().catch(() => undefined)));
+  }
 
-    return versions;
+  private async prepareProtocolV2InstallSources(
+    firmwareType: EFirmwareType,
+    features: Features
+  ): Promise<ProtocolV2InstallSource[]> {
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+    if (!release) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 firmware release is unavailable'
+      );
+    }
+    const componentArtifacts = this.params.componentArtifacts ?? {};
+    const requestedTargets = new Set(
+      this.params.targetsToUpdate ?? (Object.keys(componentArtifacts) as FirmwareUpdateV4Target[])
+    );
+    const installSources: ProtocolV2InstallSource[] = [];
+    const preparedTargets = new Set<FirmwareUpdateV4Target>();
+
+    for (const [key, component] of this.getRemoteComponentEntries(release)) {
+      const target = this.getRemoteComponentTarget(key, component);
+      const updateTarget = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId);
+      if (updateTarget && updateTarget !== 'resource' && requestedTargets.has(updateTarget)) {
+        const artifact = componentArtifacts[updateTarget];
+        if (!artifact) {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.RuntimeError,
+            `Protocol V2 ${updateTarget} artifact is not prepared`,
+            {
+              firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+              artifactName: updateTarget,
+            }
+          );
+        }
+        installSources.push({
+          ...target,
+          source: await this.openProtocolV2PreparedSource(artifact),
+        });
+        preparedTargets.add(updateTarget);
+      }
+    }
+
+    const unknownTarget = Array.from(requestedTargets).find(
+      target => target !== 'resource' && !preparedTargets.has(target)
+    );
+    if (unknownTarget) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Protocol V2 release does not contain requested target ${unknownTarget}`
+      );
+    }
+    return installSources;
+  }
+
+  private async prepareProtocolV2ResourceSources(
+    firmwareType: EFirmwareType,
+    features: Features
+  ): Promise<ProtocolV2ResourceBundleSource[]> {
+    const preparedArtifacts = this.params.resourceBundleArtifacts ?? [];
+    const resourceRequested =
+      this.params.targetsToUpdate?.includes('resource') || preparedArtifacts.length > 0;
+    if (!resourceRequested) {
+      return [];
+    }
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+    const descriptors = release?.resourceBundles ?? [];
+    const artifactByName = new Map(
+      preparedArtifacts.map(item => [item.name, item.artifact] as const)
+    );
+    const sources: ProtocolV2ResourceBundleSource[] = [];
+    for (const descriptor of descriptors) {
+      const artifact = artifactByName.get(descriptor.name);
+      if (!artifact) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `Protocol V2 resource bundle ${descriptor.name} is not prepared`,
+          {
+            firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+            artifactName: descriptor.name,
+          }
+        );
+      }
+      const devicePath = validateProtocolV2FilesystemPath(
+        descriptor.devicePath,
+        'resourceBundles[].devicePath'
+      );
+      sources.push({
+        name: descriptor.name,
+        source: await this.openProtocolV2PreparedSource(artifact),
+        devicePath,
+        version: descriptor.version,
+        payloadHash: descriptor.payloadHash,
+        headerHash: descriptor.headerHash,
+      });
+      artifactByName.delete(descriptor.name);
+    }
+    if (artifactByName.size > 0) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Protocol V2 release does not contain resource bundle ${artifactByName.keys().next().value}`
+      );
+    }
+    return sources;
+  }
+
+  private async runProtocolV2PreparedArtifacts(features: Features, firmwareType: EFirmwareType) {
+    try {
+      this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
+      const installSources = await this.prepareProtocolV2InstallSources(firmwareType, features);
+      const explicitResourceBundles = this.prepareExplicitProtocolV2ResourceFiles();
+      const resourceSources = explicitResourceBundles?.length
+        ? await Promise.all(
+            explicitResourceBundles.map(async bundle => ({
+              name: bundle.name,
+              source: await this.openProtocolV2MemorySource(bundle.binary),
+              devicePath: bundle.devicePath,
+              version: bundle.version,
+              payloadHash: bundle.payloadHash,
+              headerHash: bundle.headerHash,
+            }))
+          )
+        : await this.prepareProtocolV2ResourceSources(firmwareType, features);
+      if (installSources.length === 0 && resourceSources.length === 0) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.FirmwareUpdateDownloadFailed,
+          'No firmware to update'
+        );
+      }
+      this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
+
+      return await this.executeProtocolV2SourceUpdate({
+        installSources,
+        resourceSources,
+      });
+    } finally {
+      await this.closeProtocolV2PreparedSources();
+    }
+  }
+
+  private validateExpectedTargetVersions() {
+    const expected = this.params.expectedTargetVersions;
+    if (expected === undefined) return;
+    if (typeof expected !== 'object' || expected === null || Array.isArray(expected)) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 expected target versions are invalid'
+      );
+    }
+    for (const [target, version] of Object.entries(expected)) {
+      if (
+        !Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.values()).includes(
+          target as FirmwareUpdateV4Target
+        ) ||
+        typeof version !== 'string' ||
+        !/^\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?$/u.test(version) ||
+        version.length > 64
+      ) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Protocol V2 expected target version is invalid'
+        );
+      }
+    }
+  }
+
+  private getExpectedProtocolV2TargetVersion(targetId: number) {
+    const target = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(targetId);
+    const version = target ? this.params?.expectedTargetVersions?.[target] : undefined;
+    if (!version) return undefined;
+    const parts = version.split(/[+-]/u, 1)[0].split('.').map(Number);
+    if (
+      parts.length !== 3 ||
+      parts.some(part => !Number.isSafeInteger(part) || part < 0 || part > 0xff)
+    ) {
+      return undefined;
+    }
+    return parts[0] * 0x10000 + parts[1] * 0x100 + parts[2];
+  }
+
+  private assertExpectedProtocolV2Versions(targets?: readonly FirmwareUpdateV4Target[]) {
+    const expected = this.params?.expectedTargetVersions;
+    if (!expected) return;
+    const features = this.protocolV2LatestFinalFeatures;
+    const requestedTargets = this.getProtocolV2RequestedTargets();
+    const applicationTargets = requestedTargets.filter(
+      target => target === 'app_v1' || target === 'app_v2'
+    );
+    const visibleVersions: Partial<Record<FirmwareUpdateV4Target, string>> = {
+      boot: features ? getDeviceBootloaderVersion(features).join('.') : undefined,
+      coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
+      se01: features?.se01Version ?? undefined,
+      se02: features?.se02Version ?? undefined,
+      se03: features?.se03Version ?? undefined,
+      se04: features?.se04Version ?? undefined,
+    };
+    if (features && applicationTargets.length === 1) {
+      visibleVersions[applicationTargets[0]] = getDeviceFirmwareVersion(features).join('.');
+    }
+    const expectedEntries = (
+      Object.entries(expected) as Array<[FirmwareUpdateV4Target, string]>
+    ).filter(([target]) => !targets || targets.includes(target));
+    for (const [target, expectedVersion] of expectedEntries) {
+      const targetId = Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.entries()).find(
+        ([, mappedTarget]) => mappedTarget === target
+      )?.[0];
+      const statusVersion =
+        targetId === undefined ? undefined : this.protocolV2CompletedTargetVersions.get(targetId);
+      const observedVersion =
+        statusVersion === undefined
+          ? visibleVersions[target]
+          : `${Math.floor(statusVersion / 0x10000) % 0x100}.${
+              Math.floor(statusVersion / 0x100) % 0x100
+            }.${statusVersion % 0x100}`;
+      if (!observedVersion) {
+        if (this.protocolV2FinalStatusVerified) {
+          Log.warn(
+            `Protocol V2 target ${target} has no observable final version; completed target status is authoritative`
+          );
+        } else {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.FirmwareVerificationFailed,
+            `Protocol V2 target ${target} has no observable final version after status fallback`
+          );
+        }
+      } else if (observedVersion !== expectedVersion) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.FirmwareVerificationFailed,
+          `Protocol V2 target ${target} reached ${observedVersion}, expected ${expectedVersion}`
+        );
+      }
+    }
+  }
+
+  private getProtocolV2RequestedTargets(): FirmwareUpdateV4Target[] {
+    if (this.params.targetsToUpdate?.length) {
+      return [...new Set(this.params.targetsToUpdate)];
+    }
+    const targets = new Set<FirmwareUpdateV4Target>();
+    Object.keys(this.params.componentArtifacts ?? {}).forEach(target =>
+      targets.add(target as FirmwareUpdateV4Target)
+    );
+    if (this.params.resourceBundleArtifacts?.length || this.params.resourceFiles?.length) {
+      targets.add('resource');
+    }
+    if (this.params.bootloaderBinary) targets.add('boot');
+    if (this.params.applicationP1Binary) targets.add('app_v1');
+    if (this.params.applicationP2Binary) targets.add('app_v2');
+    if (this.params.coprocessorBinary) targets.add('coprocessor');
+    if (this.params.se01Binary) targets.add('se01');
+    if (this.params.se02Binary) targets.add('se02');
+    if (this.params.se03Binary) targets.add('se03');
+    if (this.params.se04Binary) targets.add('se04');
+    return Array.from(targets);
   }
 
   private async getProtocolV2DeviceFeatures(): Promise<Features> {
@@ -519,41 +1055,55 @@ 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),
+      this.protocolV2ExpectedPath,
+      this.device.originalDescriptor.path
+    );
+  }
+
+  private getProtocolV2DeviceInfoTimeout() {
+    return this.isBleReconnect()
+      ? this.payload.protocolV2DeviceInfoTimeoutMs ?? PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT
+      : PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT;
+  }
+
+  private async requestProtocolV2PhysicalIdentity() {
+    return requestProtocolV2DeviceInfo({
+      commands: this.device.getCommands(),
+      timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
     });
+  }
 
-    if (resourceUrl) {
-      const resource = (await getSysResourceBinary(resourceUrl)).binary;
-      return [
-        {
-          fileName: 'resource.bin',
-          binary: resource,
-          targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-        },
-      ];
+  private async captureProtocolV2PhysicalIdentity() {
+    const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
+    const serialNumber = this.getProtocolV2SerialNumber(deviceInfo);
+    const path = this.device.originalDescriptor?.path?.trim() || undefined;
+    if (this.params?.preparedPlan) {
+      assertFirmwareUpdatePreparedPlanDeviceIdentity({
+        preparedPlan: this.params.preparedPlan,
+        deviceIdentity: serialNumber,
+      });
+    } else if (this.params?.expectedDeviceId) {
+      assertProtocolV2ReconnectIdentity(this.params?.expectedDeviceId, serialNumber);
+    } else {
+      assertProtocolV2ReconnectIdentity(serialNumber, serialNumber, path, path);
     }
-    Log.warn('No resource url found');
-    return [];
+    this.protocolV2ExpectedSerialNumber = serialNumber;
+    this.protocolV2ExpectedPath = path;
+  }
+
+  private async verifyProtocolV2ReconnectIdentity() {
+    const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
+    this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
+    return deviceInfo;
   }
 
   private prepareBootloaderBinary(): ArrayBuffer | null {
@@ -562,25 +1112,20 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private hasExplicitProtocolV2Payload(fwBinaryMap: ProtocolV2TargetBinary[]) {
     return (
-      !!this.params.resourceBinaries?.length ||
+      !!this.params.resourceFiles?.length ||
       !!this.params.bootloaderBinary ||
       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,64 +1175,137 @@ 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;
+  private async downloadRemoteProtocolV2Component(
+    key: string,
+    component: IProtocolV2FirmwareComponent
+  ): Promise<ProtocolV2RemoteComponentBinary> {
+    const target = this.getRemoteComponentTarget(key, component);
+    if (!component.url) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Missing Protocol V2 firmware component url: ${key}/${component.target}`
+      );
     }
-    if (
-      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1 ||
-      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2
-    ) {
-      return release.version;
+
+    const { binary } = await getSysResourceBinary(component.url);
+    if (!isProtocolV2FirmwareFingerprintValid(binary, component.fingerprint)) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Protocol V2 firmware fingerprint mismatch: ${key}/${component.target}`
+      );
     }
-    return undefined;
+    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,
+    };
   }
 
-  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 async prepareRemoteProtocolV2Binaries(firmwareType: EFirmwareType, features: Features) {
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
 
-  private getProtocolV2ResourceFilePath(path: string) {
+    let bootloaderBinary: ArrayBuffer | null = null;
+    const fwBinaryMap: ProtocolV2TargetBinary[] = [];
+    const installItems: ProtocolV2InstallItem[] = [];
+
+    if (!release) {
+      return {
+        bootloaderBinary,
+        fwBinaryMap,
+        installItems,
+      };
+    }
+
+    const entries = this.getRemoteComponentEntries(release);
+    const targetsToUpdate = new Set(this.params.targetsToUpdate ?? []);
+
+    for (const [key, component] of entries) {
+      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 === 'bootloader') {
+          bootloaderBinary = remoteBinary.binary;
+          installItems.push({
+            fileName: remoteBinary.fileName,
+            binary: remoteBinary.binary,
+            targetId: remoteBinary.targetId,
+            kind: remoteBinary.kind,
+          });
+        } else {
+          const binaryEntry = {
+            fileName: remoteBinary.fileName,
+            binary: remoteBinary.binary,
+            targetId: remoteBinary.targetId,
+          };
+          fwBinaryMap.push(binaryEntry);
+          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
+        }
+      }
+    }
+
+    return {
+      bootloaderBinary,
+      fwBinaryMap,
+      installItems,
+    };
+  }
+
+  private prepareExplicitProtocolV2ResourceFiles(): ProtocolV2ResourceBundleBinary[] | undefined {
+    const files = this.params.resourceFiles ?? [];
+    if (!files?.length) return undefined;
+
+    const prepared = files.map((file, index) => {
+      const devicePath = validateProtocolV2FilesystemPath(
+        file.devicePath,
+        `resourceFiles[${index}].devicePath`
+      );
+      const descriptor = file as typeof file & Partial<{ size: number; fileHash: string }>;
+      if (descriptor.size !== undefined && descriptor.size !== file.binary.byteLength) {
+        throw new Error(`resourceFiles[${index}] size mismatch`);
+      }
+      if (
+        descriptor.fileHash &&
+        !isProtocolV2ResourceFileValid(file.binary, {
+          size: file.binary.byteLength,
+          fileHash: descriptor.fileHash,
+        })
+      ) {
+        throw new Error(`resourceFiles[${index}] SHA-256 mismatch`);
+      }
+      const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(file.binary));
+      return {
+        name: devicePath.split('/').pop() ?? devicePath,
+        binary: file.binary,
+        devicePath,
+        ...(header
+          ? {
+              version: header.version,
+              payloadHash: header.payloadHash,
+              headerHash: header.headerHash,
+            }
+          : {}),
+      };
+    });
+    if (new Set(prepared.map(file => file.devicePath)).size !== prepared.length) {
+      throw new Error('resourceFiles contain duplicate devicePath values');
+    }
+    return prepared;
+  }
+
+  private getProtocolV2ResourceFilePath(path: string) {
     if (path.startsWith('vol')) return path;
     if (path.startsWith('/')) return `vol0:${path}`;
     return `vol0:/${path}`;
@@ -709,7 +1327,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       return null;
     }
 
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    const chunkSize = this.getProtocolV2FirmwareChunkSize('read');
     const chunks: Uint8Array[] = [];
     let offset = 0;
     while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
@@ -738,202 +1356,81 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return parseProtocolV2OkppHeader(headerBytes);
   }
 
-  private async isProtocolV2ResourcePackageMatched(
-    pkg: IProtocolV2ResourceManifestPackage,
-    manifestVersion?: IVersionArray
-  ) {
+  /** Compare the downloaded and installed okpkg headers before transferring a resource. */
+  private async isProtocolV2ResourceBundleUpToDate(
+    bundle: Pick<
+      ProtocolV2ResourceBundleSource,
+      'name' | 'devicePath' | 'version' | 'payloadHash' | 'headerHash'
+    >
+  ): Promise<boolean> {
+    if (this.params?.forcedUpdateRes) return false;
+    if (!bundle.payloadHash || !bundle.headerHash) return false;
+
     try {
-      const header = await this.readProtocolV2DeviceFileHeader(pkg.path);
+      const header = await this.readProtocolV2DeviceFileHeader(bundle.devicePath);
       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;
+      if (bundle.version) {
+        const cmp = compareProtocolV2Versions(header.version, bundle.version);
+        if (cmp === undefined || cmp !== 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;
-
+      const expectedPayloadHash = normalizeProtocolV2Hex(bundle.payloadHash);
+      const expectedHeaderHash = normalizeProtocolV2Hex(bundle.headerHash);
+      if (!expectedPayloadHash || header.payloadHash !== expectedPayloadHash) return false;
+      if (!expectedHeaderHash || header.headerHash !== expectedHeaderHash) return false;
       return true;
     } catch (error) {
-      Log.log(`Protocol V2 resource package check failed for ${pkg.path}: `, error);
+      Log.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, 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';
-    if (safeKey === 'resource') {
-      return PROTOCOL_V2_REMOTE_COMPONENT_TARGETS.CRATE.fileName;
-    }
-    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;
+  private isProtocolV2BootloaderMode() {
+    if (typeof this.device.isBootloader === 'function') {
+      return !!this.device.isBootloader();
     }
-
-    const versionSatisfied = this.isProtocolV2ComponentVersionSatisfied(
-      release,
-      component,
-      target,
-      features
+    return (
+      this.device.features?.mode === 'bootloader' ||
+      (this.device.features?.mode == null && !!this.device.features?.bootloaderMode)
     );
-    if (versionSatisfied) {
-      Log.log(`[FirmwareUpdateV4] skip Protocol V2 component ${key}; version is up to date`);
-    }
-    return !versionSatisfied;
   }
 
-  private async downloadRemoteProtocolV2Component(
-    key: string,
-    component: IProtocolV2FirmwareComponent
-  ): Promise<ProtocolV2RemoteComponentBinary> {
-    const target = this.getRemoteComponentTarget(key, component);
-    if (!component.url) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        `Missing Protocol V2 firmware component url: ${key}/${component.target}`
-      );
-    }
-
-    const { binary } = await getSysResourceBinary(component.url);
-    return {
-      ...target,
-      binary,
-    };
-  }
-
-  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,
-      };
-    }
-
-    const entries = this.getRemoteComponentEntries(release);
-
-    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 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') {
-          bootloaderBinary = remoteBinary.binary;
-          installItems.push({
-            fileName: remoteBinary.fileName,
-            binary: remoteBinary.binary,
-            targetId: remoteBinary.targetId,
-            kind: remoteBinary.kind,
-          });
-        } else {
-          const binaryEntry = {
-            fileName: remoteBinary.fileName,
-            binary: remoteBinary.binary,
-            targetId: remoteBinary.targetId,
-          };
-          fwBinaryMap.push(binaryEntry);
-          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
-        }
-      }
+  private isProtocolV2RomloaderMode() {
+    const deviceType = this.device.getCurrentDeviceType();
+    if (
+      !this.device.isProtocolV2() ||
+      (deviceType !== EDeviceType.Pro2 && deviceType !== EDeviceType.Neo)
+    ) {
+      return false;
     }
-
-    return {
-      resourceBinaryMap,
-      bootloaderBinary,
-      fwBinaryMap,
-      installItems,
-    };
-  }
-
-  private isProtocolV2BootloaderMode() {
-    if (typeof this.device.isBootloader === 'function') {
-      return this.device.isBootloader();
+    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');
+      this.protocolV2ExecutionInLoader = true;
+      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');
+      this.protocolV2ExecutionInLoader = true;
+      this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
       return false;
     }
 
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.AutoRebootToBootloader);
       await this.protocolV2Reboot(DeviceRebootType.Bootloader);
-      this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
       await wait(1000);
       await this.waitForProtocolV2BootloaderMode();
+      this.protocolV2ExecutionInLoader = true;
+      this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
       return true;
     } catch (error) {
       if (error instanceof HardwareError) {
@@ -950,20 +1447,32 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   ) {
     const startTime = Date.now();
     let lastError: unknown;
+    let shouldReconnect = true;
 
     while (Date.now() - startTime < timeout) {
       try {
-        await this.reconnectProtocolV2Device();
+        if (shouldReconnect) {
+          await this.reconnectProtocolV2Device();
+          shouldReconnect = false;
+        }
         const deviceInfo = await requestProtocolV2DeviceInfo({
           commands: this.device.getCommands(),
-          timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+          timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
         });
-        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;
+        }
+        shouldReconnect = true;
         lastError = error;
         Log.log('Protocol V2 bootloader mode not ready, polling reconnect: ', error);
       }
@@ -979,8 +1488,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[] = [];
@@ -1016,261 +1525,602 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return entries;
   }
 
+  private buildProtocolV2ExecutionPhases({
+    installSources,
+    resourceSources,
+  }: {
+    installSources: ProtocolV2InstallSource[];
+    resourceSources: ProtocolV2ResourceBundleSource[];
+  }): ProtocolV2ExecutionPhase[] {
+    const phases: ProtocolV2ExecutionPhase[] = [];
+    const bootloaderSources = installSources.filter(source => source.kind === 'bootloader');
+    if (bootloaderSources.length > 0) {
+      phases.push(
+        {
+          kind: 'bootloader-install',
+          installSources: bootloaderSources,
+          resourceSources: [],
+        },
+        {
+          kind: 'bootloader-verify',
+          installSources: [],
+          resourceSources: [],
+        }
+      );
+    }
+    if (resourceSources.length > 0) {
+      phases.push({
+        kind: 'resource-sync',
+        installSources: [],
+        resourceSources,
+      });
+    }
+    const componentSources = installSources.filter(source => source.kind !== 'bootloader');
+    if (componentSources.length > 0) {
+      phases.push({
+        kind: 'component-install',
+        installSources: componentSources,
+        resourceSources: [],
+      });
+    }
+    phases.push({
+      kind: 'final-verify',
+      installSources: [],
+      resourceSources: [],
+    });
+    return phases;
+  }
+
+  private async executeProtocolV2Phases({
+    installSources,
+    resourceSources,
+  }: {
+    installSources: ProtocolV2InstallSource[];
+    resourceSources: ProtocolV2ResourceBundleSource[];
+  }) {
+    const phases = this.buildProtocolV2ExecutionPhases({
+      installSources,
+      resourceSources,
+    });
+    for (const phase of phases) {
+      if (phase.kind === 'final-verify') {
+        return this.completeProtocolV2FinalVerification();
+      }
+      if (phase.kind === 'resource-sync') {
+        await this.enterProtocolV2BootloaderMode();
+        await this.executeProtocolV2TransferPhase(phase);
+      } else if (phase.kind === 'bootloader-install' || phase.kind === 'component-install') {
+        await this.enterProtocolV2BootloaderMode();
+        await this.executeProtocolV2TransferPhase(phase);
+        await this.exitProtocolV2BootloaderToNormal();
+      } else if (phase.kind === 'bootloader-verify') {
+        await this.waitForProtocolV2FinalFeatures();
+        this.assertExpectedProtocolV2Versions(['boot']);
+      }
+    }
+    throw ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      'Protocol V2 execution has no final verification phase'
+    );
+  }
+
+  private async executeProtocolV2SourceUpdate({
+    installSources,
+    resourceSources,
+  }: {
+    installSources: ProtocolV2InstallSource[];
+    resourceSources: ProtocolV2ResourceBundleSource[];
+  }) {
+    return this.executeProtocolV2Phases({
+      installSources,
+      resourceSources,
+    });
+  }
+
   private async executeProtocolV2Update({
-    resourceBinaryMap,
     fwBinaryMap,
     bootloaderBinary,
     installItems,
+    resourceBundles,
   }: {
-    resourceBinaryMap?: ProtocolV2TargetBinary[];
     fwBinaryMap?: ProtocolV2TargetBinary[];
     bootloaderBinary?: ArrayBuffer | null;
     installItems?: ProtocolV2InstallItem[];
+    resourceBundles?: ProtocolV2ResourceBundleBinary[];
   }) {
-    const orderedInstallItems =
+    const memoryInstallItems =
       installItems ??
       this.buildProtocolV2InstallItems({
-        resourceBinaryMap: resourceBinaryMap ?? [],
-        bootloaderBinary: bootloaderBinary ?? null,
         fwBinaryMap: fwBinaryMap ?? [],
+        bootloaderBinary: bootloaderBinary ?? null,
       });
-    let totalSize = 0;
-    let processedSize = 0;
-    let transferredSize = 0;
-
-    for (const item of orderedInstallItems) totalSize += item.binary.byteLength;
-
-    this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
-    const transferStartTime = Date.now();
-    const transferTransport = this.getProtocolV2FirmwareTransferTransport();
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
-    const onTransferredBytes = (bytes: number) => {
-      transferredSize = bytes;
-    };
-    Log.log(
-      `[FirmwareUpdateV4] transfer started transport=${transferTransport} total=${totalSize} bytes chunk=${chunkSize} bytes`
-    );
-
-    const stagedInstallTargets: ProtocolV2InstallTarget[] = [];
-
     try {
-      for (const item of orderedInstallItems) {
-        const filePath = this.getProtocolV2InstallItemStagingPath(item);
-        Log.log(
-          `[FirmwareUpdateV4] staging ${item.kind} via FilesystemFileWrite target=${item.targetId} path=${filePath} source=${item.fileName} bytes=${item.binary.byteLength}`
-        );
-        processedSize = await this.protocolV2CommonUpdateProcess({
-          payload: item.binary,
-          filePath,
-          processedSize,
-          totalSize,
-          onTransferredBytes,
-        });
-        transferredSize = processedSize;
+      const installSources = await Promise.all(
+        memoryInstallItems.map(async item => ({
+          fileName: item.fileName,
+          source: await this.openProtocolV2MemorySource(item.binary),
+          targetId: item.targetId,
+          kind: item.kind,
+        }))
+      );
+      const resourceSources = await Promise.all(
+        (resourceBundles ?? []).map(async bundle => ({
+          name: bundle.name,
+          source: await this.openProtocolV2MemorySource(bundle.binary),
+          devicePath: bundle.devicePath,
+          version: bundle.version,
+          payloadHash: bundle.payloadHash,
+          headerHash: bundle.headerHash,
+        }))
+      );
+      return await this.executeProtocolV2Phases({
+        installSources,
+        resourceSources,
+      });
+    } finally {
+      await this.closeProtocolV2PreparedSources();
+    }
+  }
 
-        stagedInstallTargets.push({
-          ...item,
-          path: filePath,
-        });
+  private async executeProtocolV2TransferPhase({
+    installSources,
+    resourceSources,
+  }: ProtocolV2ExecutionPhase) {
+    let totalSize = installSources.reduce((total, item) => total + item.source.size, 0);
+    const resourcesToSync: ProtocolV2ResourceBundleSource[] = [];
+    for (const resource of resourceSources) {
+      if (await this.isProtocolV2ResourceBundleUpToDate(resource)) {
+        Log.log(`[FirmwareUpdateV4] skip RESC bundle ${resource.name}; already up to date`);
+      } else {
+        resourcesToSync.push(resource);
+        totalSize += resource.source.size;
       }
+    }
 
-      if (totalSize > 0) {
-        this.postProgressMessage(100, 'transferData');
-      }
+    this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
+    let processedSize = 0;
+    for (const resource of resourcesToSync) {
+      // The bootloader keeps its live resource package mounted. FatFs rejects
+      // replacing an open file, so early boot promotes this staging file before mounting it.
+      const writePath = resolveProtocolV2ResourceWritePath(resource.devicePath);
+      processedSize = await this.protocolV2SourceUpdateProcess({
+        source: resource.source,
+        filePath: writePath,
+        processedSize,
+        totalSize,
+      });
+      await this.verifyProtocolV2StagedFile(writePath, resource.source.size);
+    }
 
-      const elapsedMs = Date.now() - transferStartTime;
-      Log.log(
-        `[FirmwareUpdateV4] transfer finished transport=${transferTransport} bytes=${totalSize} elapsed=${(
-          elapsedMs / 1000
-        ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`
-      );
-    } catch (error) {
-      const elapsedMs = Date.now() - transferStartTime;
-      Log.warn(
-        `[FirmwareUpdateV4] transfer failed transport=${transferTransport} bytes=${transferredSize}/${totalSize} elapsed=${(
-          elapsedMs / 1000
-        ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(transferredSize, elapsedMs)} KB/s`
-      );
-      throw error;
+    const stagedInstallTargets: Array<{ targetId: number; path: string }> = [];
+    for (const item of installSources) {
+      const filePath = this.getProtocolV2InstallItemStagingPath(item);
+      processedSize = await this.protocolV2SourceUpdateProcess({
+        source: item.source,
+        filePath,
+        processedSize,
+        totalSize,
+      });
+      await this.verifyProtocolV2StagedFile(filePath, item.source.size);
+      stagedInstallTargets.push({
+        targetId: item.targetId,
+        path: filePath,
+      });
     }
 
-    this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
+    if (totalSize > 0) {
+      this.postProgressMessage(100, 'transferData');
+    }
+    if (stagedInstallTargets.length === 0) {
+      return;
+    }
 
-    const allTargets = stagedInstallTargets.map(item => ({
+    this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
+    const targets = stagedInstallTargets.map(item => ({
       target_id: item.targetId,
       path: item.path,
     }));
-    Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
-    const startResponse = await this.protocolV2StartFirmwareUpdate({ targets: allTargets });
-    await this.waitForProtocolV2FirmwareUpdateComplete(allTargets, startResponse);
+    await this.protocolV2StartFirmwareUpdate({ targets });
+    await this.waitForProtocolV2FirmwareUpdateComplete(targets);
   }
 
-  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() {
-    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    await typedCall(
-      'Ping',
-      'Success',
-      { message: 'firmware-update' },
-      {
-        timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+  private async protocolV2SourceUpdateProcess({
+    source,
+    filePath,
+    processedSize,
+    totalSize,
+  }: {
+    source: FirmwareByteSource;
+    filePath: string;
+    processedSize: number;
+    totalSize: number;
+  }) {
+    let lastError: unknown;
+    for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
+      try {
+        const transferStartedAt = Date.now();
+        await writeFirmwareByteSource({
+          source,
+          chunkSize: this.getProtocolV2FirmwareChunkSize('write', filePath),
+          write: async ({ data, sourceOffset, length, first }) => {
+            const chunkEnd = sourceOffset + length;
+            const deviceProgress = getProtocolV2DeviceTransferProgress(
+              processedSize + sourceOffset,
+              processedSize + chunkEnd,
+              totalSize
+            );
+            const response = await this.fileWriteChunk(
+              filePath,
+              source.size,
+              sourceOffset,
+              data,
+              first,
+              deviceProgress
+            );
+            const rawProcessedByte = response.message.processed_byte;
+            const nextOffset = rawProcessedByte === undefined ? chunkEnd : Number(rawProcessedByte);
+            if (!Number.isFinite(nextOffset) || nextOffset !== chunkEnd) {
+              throw ERRORS.TypedError(
+                HardwareErrorCode.EmmcFileWriteFirmwareError,
+                `invalid processed_byte ${rawProcessedByte} for offset ${sourceOffset}`
+              );
+            }
+            const transferredBytes = processedSize + chunkEnd;
+            const elapsedMs = Math.max(Date.now() - transferStartedAt, 0);
+            this.postProgressMessage(
+              Math.min(Math.ceil((transferredBytes / totalSize) * 100), 99),
+              'transferData',
+              {
+                transferredBytes,
+                totalBytes: totalSize,
+                rateBytesPerSecond:
+                  elapsedMs > 0 ? Math.round((chunkEnd / elapsedMs) * 1000) : undefined,
+                elapsedMs,
+              }
+            );
+            return length;
+          },
+        });
+        return processedSize + source.size;
+      } catch (error) {
+        lastError = error;
+        if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
+          await this.recoverProtocolV2FileTransfer();
+        }
       }
+    }
+    throw ERRORS.TypedError(
+      HardwareErrorCode.EmmcFileWriteFirmwareError,
+      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`
     );
   }
 
-  private isProtocolV2NormalModeFeatures(features?: Features | null) {
-    return !!features && !features.bootloaderMode && features.mode !== 'bootloader';
+  private getProtocolV2InstallItemStagingPath(item: Pick<ProtocolV2InstallItem, 'fileName'>) {
+    return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
   }
 
-  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;
+  private async verifyProtocolV2StagedFile(path: string, expectedSize: number) {
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    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>
+    expectedTargetIds: Set<number>,
+    expectedPaths = new Map<number, string>()
   ) {
+    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)
+    );
+    const seenTargetIds = new Set<number>();
+    for (const target of matchingTargets) {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      if (
+        targetId === undefined ||
+        seenTargetIds.has(targetId) ||
+        (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))
+      ) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `Protocol V2 install status conflicts with target ${target.target_id}`,
+          {
+            firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
+          }
+        );
+      }
+      seenTargetIds.add(targetId);
+    }
+    const completedTargets = matchingTargets.filter(target =>
+      isProtocolV2TargetStatusFinished(target.status)
     );
-    if (completedTargets.length === expectedTargetIds.size && expectedTargetIds.size > 0) {
+    const completedTargetIds = new Set<number>();
+    completedTargets.forEach(target => {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      if (targetId !== undefined) {
+        completedTargetIds.add(targetId);
+      }
+    });
+    if (completedTargetIds.size === expectedTargetIds.size && expectedTargetIds.size > 0) {
+      for (const target of completedTargets) {
+        const targetId = normalizeProtocolV2TargetId(target.target_id);
+        const payloadVersion = toProtocolV2FiniteNumber(target.payload_version);
+        if (targetId === undefined) {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.RuntimeError,
+            'Protocol V2 completed target identity is invalid'
+          );
+        }
+        const expectedVersion = this.getExpectedProtocolV2TargetVersion(targetId);
+        if (expectedVersion !== undefined && payloadVersion !== undefined) {
+          if (payloadVersion !== expectedVersion) {
+            throw ERRORS.TypedError(
+              HardwareErrorCode.FirmwareVerificationFailed,
+              `Protocol V2 target ${targetId} reached payload version ${payloadVersion}, expected ${expectedVersion}`
+            );
+          }
+        }
+        if (payloadVersion !== undefined) {
+          this.protocolV2CompletedTargetVersions.set(targetId, payloadVersion);
+        }
+      }
+      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
+  private getProtocolV2MissingTargetIds(
+    statusTargets: ProtocolV2FirmwareUpdateStatusTarget[],
+    expectedTargetIds: Set<number>
   ) {
-    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 reportedTargetIds = new Set<number>();
+    statusTargets.forEach(target => {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      if (targetId !== undefined) {
+        reportedTargetIds.add(targetId);
       }
-    }
+    });
+    return Array.from(expectedTargetIds).filter(targetId => !reportedTargetIds.has(targetId));
+  }
 
+  private async waitForProtocolV2FirmwareUpdateComplete(
+    targets: Array<{ target_id: number; path: string }>
+  ) {
+    this.protocolV2FinalStatusVerified = false;
+    const expectedTargetIds = new Set(targets.map(target => target.target_id));
+    const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
     const startTime = Date.now();
     let lastError: unknown;
+    let shouldReconnect = true;
+    let deviceInfo: ProtocolV2DeviceInfo | undefined;
+    let missingTargetStatusSince: number | undefined;
+    let missingTargetStatusKey: string | undefined;
+    const resetMissingTargetStatusGrace = () => {
+      missingTargetStatusSince = undefined;
+      missingTargetStatusKey = undefined;
+    };
 
     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;
+        if (shouldReconnect) {
+          await this.reconnectProtocolV2Device();
+          deviceInfo = await this.verifyProtocolV2ReconnectIdentity();
+          shouldReconnect = false;
         }
-      } 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()) {
+        const currentDeviceInfo = deviceInfo;
+        try {
+          const statusResponse = await this.device.getCommands().typedCall(
+            'DeviceFirmwareUpdateStatusGet',
+            'DeviceFirmwareUpdateStatus',
+            {
+              fields: {
+                status: true,
+                payload_version: true,
+                path: true,
+              },
+            },
+            { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT }
+          );
+          const statusTargets = (statusResponse.message.records ??
+            []) as ProtocolV2FirmwareUpdateStatusTarget[];
+          if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
+            this.protocolV2FinalStatusVerified = true;
+            return;
+          }
+
+          if (
+            statusTargets.length === 0 &&
+            currentDeviceInfo &&
+            (await this.probeProtocolV2NormalMode(currentDeviceInfo))
+          ) {
+            Log.log(
+              '[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete'
+            );
+            this.postProgressMessage(100, 'installingFirmware');
+            return;
+          }
+
+          const missingTargetIds = this.getProtocolV2MissingTargetIds(
+            statusTargets,
+            expectedTargetIds
+          );
+          if (missingTargetIds.length > 0) {
+            const now = Date.now();
+            const missingKey = missingTargetIds.join(',');
+            if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
+              missingTargetStatusSince = now;
+              missingTargetStatusKey = missingKey;
+            } else if (
+              now - missingTargetStatusSince >=
+              PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT
+            ) {
+              const reportedTargetIds = statusTargets
+                .map(target => normalizeProtocolV2TargetId(target.target_id))
+                .filter((targetId): targetId is number => targetId !== undefined);
+              throw ERRORS.TypedError(
+                HardwareErrorCode.FirmwareError,
+                `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(
+                  ','
+                )}`
+              );
+            }
+            lastError = new Error(
+              `Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`
+            );
+          } else {
+            resetMissingTargetStatusGrace();
+            lastError = new Error('Protocol V2 firmware targets are still installing');
+          }
+        } catch (error) {
+          if (isProtocolV2TerminalInstallStatusError(error)) {
+            throw error;
+          }
+          // Only consecutive full status dumps can prove that a record is absent.
+          // A reboot or transport interruption starts a fresh grace window.
+          resetMissingTargetStatusGrace();
+          // App firmware does not register DeviceFirmwareUpdateStatusGet. Treat the
+          // missing endpoint as completion only after the runtime probe confirms App mode.
+          if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
+            if (!currentDeviceInfo) {
+              throw ERRORS.TypedError(
+                HardwareErrorCode.RuntimeError,
+                'Protocol V2 device identity is unavailable during install polling'
+              );
+            }
+            if (await this.probeProtocolV2NormalMode(currentDeviceInfo)) {
+              Log.log(
+                '[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot'
+              );
+              this.postProgressMessage(100, 'installingFirmware');
               return;
             }
-          } catch (reconnectError) {
-            lastError = reconnectError;
+            lastError = new Error(
+              'Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode'
+            );
+          } else {
+            shouldReconnect = true;
+            deviceInfo = undefined;
+            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 (isProtocolV2TerminalInstallStatusError(error)) {
+          throw error;
+        }
+        if (
+          error instanceof HardwareError &&
+          error.params?.firmwareUpdateCode === 'FirmwareInstallStatusUnavailable'
+        ) {
+          throw error;
+        }
+        shouldReconnect = true;
+        deviceInfo = undefined;
+        resetMissingTargetStatusGrace();
+        Log.log('Protocol V2 firmware install device readiness probe failed: ', error);
       }
       await wait(1000);
     }
 
     throw ERRORS.TypedError(
       HardwareErrorCode.RuntimeError,
-      `Protocol V2 firmware update status timeout: ${this.normalizeErrorMessage(lastError)}`
+      `Protocol V2 firmware update status not complete within ${
+        PROTOCOL_V2_INSTALL_TIMEOUT / 1000
+      }s: ${this.normalizeErrorMessage(lastError)}`
     );
   }
 
   private async exitProtocolV2BootloaderToNormal() {
-    this.postTipMessage(FirmwareUpdateTipMessage.SwitchFirmwareReconnectDevice);
+    await this.reconnectProtocolV2Device();
+    const deviceInfo = await this.verifyProtocolV2ReconnectIdentity();
     try {
-      await this.reconnectProtocolV2Device();
-      if (await this.probeProtocolV2NormalMode()) {
-        Log.log('Protocol V2 device is already in normal mode, skip normal reboot');
+      if (await this.probeProtocolV2NormalMode(deviceInfo)) {
+        Log.log('[FirmwareUpdateV4] device already returned to App mode; skip Normal reboot');
         return;
       }
     } catch (error) {
-      Log.log('Protocol V2 normal-mode probe before reboot failed: ', error);
+      Log.log('[FirmwareUpdateV4] unable to confirm App mode before Normal reboot: ', error);
     }
     await this.protocolV2Reboot(DeviceRebootType.Normal);
+    this.protocolV2ExecutionInLoader = false;
+  }
+
+  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('.');
+    this.protocolV2LatestFinalFeatures = features;
     if (firmwareVersion === '0.0.0') {
       Log.warn(
         'Protocol V2 firmware update finished but app firmware version is still 0.0.0. This is allowed for Pro2 debug BLE-only update flows.'
@@ -1284,32 +2134,55 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
+  private async completeProtocolV2FinalVerification() {
+    if (this.protocolV2ExecutionInLoader || this.isProtocolV2BootloaderMode()) {
+      await this.exitProtocolV2BootloaderToNormal();
+    }
+    const versions = await this.waitForProtocolV2FinalFeatures();
+    this.assertExpectedProtocolV2Versions();
+    this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
+    DevicePool.resetState();
+    return versions;
+  }
+
   private async waitForProtocolV2ReconnectAndFeatures(timeout: number) {
     const startTime = Date.now();
     let lastError: unknown;
+    let shouldReconnect = true;
 
     while (Date.now() - startTime < timeout) {
       try {
-        await this.reconnectProtocolV2Device();
+        if (shouldReconnect) {
+          await this.reconnectProtocolV2Device();
+          shouldReconnect = false;
+        }
         const deviceInfo = await requestProtocolV2DeviceInfo({
           commands: this.device.getCommands(),
-          timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-          // 更新完成判定只需要各 target 版本号；scope 与请求内容保持一致
+          timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
+          // 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') {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.DeviceNotFound,
-            'Protocol V2 device is still in bootloader mode'
-          );
+        this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
+        const features = await this.device.probeProtocolV2RuntimeState(
+          deviceInfo,
+          PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+        );
+        if (features.mode === 'normal' && !features.bootloaderMode) {
+          return features;
         }
-        return features;
+        lastError = ERRORS.TypedError(
+          HardwareErrorCode.DeviceNotFound,
+          'Protocol V2 device is still in bootloader mode'
+        );
       } catch (error) {
+        if (this.isProtocolV2ReconnectIdentityError(error)) {
+          throw error;
+        }
+        shouldReconnect = true;
         lastError = error;
         Log.log('Protocol V2 normal mode not ready, polling Ping: ', error);
-        await wait(1000);
       }
+      await wait(1000);
     }
 
     throw ERRORS.TypedError(
@@ -1333,114 +2206,74 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
       devicesDescriptor.length === 1
     ) {
+      const descriptor = devicesDescriptor[0];
+      if (!this.protocolV2ExpectedSerialNumber && descriptor.path !== this.protocolV2ExpectedPath) {
+        throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
+      }
       this.device.updateDescriptor(
         {
-          ...devicesDescriptor[0],
+          ...descriptor,
           protocolType: PROTOCOL_V2_CONNECT_PROTOCOL,
         },
         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 expectedPath = this.protocolV2ExpectedPath?.trim();
+    const reconnectDevice = deviceList.find(candidate => {
+      const candidateSerialNumber = candidate.getCurrentSerialNo?.().trim();
+      if (expectedSerialNumber && candidateSerialNumber) {
+        return candidateSerialNumber === expectedSerialNumber;
+      }
+      return !!expectedPath && candidate.getConnectId() === expectedPath;
+    });
+    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({
-    payload,
-    filePath,
-    processedSize,
-    totalSize,
-    onTransferredBytes,
-  }: PROTO.FirmwareUpload & {
-    filePath: string;
-    processedSize?: number;
-    totalSize?: number;
-    onTransferredBytes?: (transferredBytes: number) => void;
-  }) {
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
-    let offset = 0;
-    const getUploadProgress = (fileOffset: number) => {
-      if (totalSize !== undefined && processedSize !== undefined) {
-        return Math.min(Math.ceil(((processedSize + fileOffset) / totalSize) * 100), 99);
-      }
-      return Math.min(Math.ceil((fileOffset / payload.byteLength) * 100), 99);
-    };
-
-    while (offset < payload.byteLength) {
-      const chunkEnd = Math.min(offset + chunkSize, payload.byteLength);
-      const chunkLength = chunkEnd - offset;
-      const chunk = payload.slice(offset, chunkEnd);
-      const overwrite = offset === 0;
-      const progress = getProtocolV2DeviceTransferProgress(
-        (processedSize ?? 0) + offset,
-        (processedSize ?? 0) + chunkEnd,
-        totalSize ?? payload.byteLength
-      );
-
-      const writeRes = await this.fileWriteWithRetry(
-        filePath,
-        payload.byteLength,
-        offset,
-        chunk,
-        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) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.EmmcFileWriteFirmwareError,
-          `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`
-        );
-      }
-      offset = nextOffset;
-      onTransferredBytes?.((processedSize ?? 0) + offset);
-      this.postProgressMessage(getUploadProgress(offset), 'transferData');
+  /**
+   * 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;
     }
-
-    return totalSize !== undefined ? (processedSize ?? 0) + payload.byteLength : 0;
+    await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, {
+      throwOnRunPromiseError: true,
+    });
   }
 
-  private getProtocolV2FirmwareTransferTransport() {
-    const env = DataManager.getSettings('env');
-    if (env && DataManager.isBleConnect(env)) {
-      return 'BLE';
-    }
-    if (
-      env &&
-      (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env) || env === 'web')
-    ) {
-      return 'WebUSB';
-    }
-    return env ?? 'unknown';
+  private isProtocolV2ReconnectIdentityError(error: unknown) {
+    // A serial can be temporarily unavailable while Loader starts, and BLE has no stable path.
+    // Keep polling unless the device explicitly reports a different serial.
+    return this.normalizeErrorMessage(error).includes(
+      'Protocol V2 reconnect physical identity mismatch'
+    );
   }
 
-  private async fileWriteWithRetry(
+  private async fileWriteChunk(
     filePath: string,
     totalFileSize: number,
     offset: number,
@@ -1448,9 +2281,11 @@ 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', {
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const writeRes = await typedCall(
+      'FilesystemFileWrite',
+      'FilesystemFile',
+      {
         file: {
           path: filePath,
           offset,
@@ -1460,45 +2295,32 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         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'
-        );
+      },
+      {
+        writeWithResponse: false,
+        onWriteCompleted: () => undefined,
       }
-      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();
+    );
+    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);
         }
-        await wait(2000);
       }
+      throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
+    }
+    return writeRes;
+  }
+
+  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() {
@@ -1516,35 +2338,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;
   }
 
@@ -1554,9 +2357,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;