@onekeyfe/hardware-cli 1.2.0-alpha.17 → 1.2.0-alpha.170

package/src/cli.ts

@@ -1,7 +1,8 @@
 import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
 import { Command } from 'commander';
 import { UI_EVENT, UI_REQUEST, getDeviceType } from '@onekeyfe/hd-core';
-import { EDeviceType } from '@onekeyfe/hd-shared';
+import { EDeviceType, isSameOnekeyBleName } from '@onekeyfe/hd-shared';
 
 import {
   resolveBatchGetAddress,
@@ -11,65 +12,30 @@ import {
   resolveSignTransaction,
 } from './chains';
 import { selectSearchDevice } from './deviceSelection';
+import { getCanonicalDeviceState, getCompatibleFeatures } from './deviceStateCommands';
 import { createSDK, disposeSDK } from './sdk';
-import {
-  clearSessionFromKeychain,
-  preloadSessionFromKeychain,
-  saveSessionToKeychain,
-} from './session';
+import { clearSessionFromKeychain, preloadSessionFromKeychain } from './session';
 
 import type {
+  DeviceStateScope,
   EthereumSignTypedDataMessage,
   EthereumSignTypedDataTypes,
   Features,
-  IDeviceType,
   SearchDevice,
 } from '@onekeyfe/hd-core';
 
 /** SearchDevice enriched with features fetched after discovery */
 type EnrichedSearchDevice = SearchDevice & { features?: Features };
 
-function extractPassphraseSession(payload: unknown): {
-  passphraseState?: string;
-  sessionId?: string;
-} {
-  if (typeof payload === 'string') {
-    return { passphraseState: payload };
-  }
-  if (!payload || typeof payload !== 'object') {
-    return {};
-  }
-
-  const statePayload = payload as {
-    passphrase_state?: unknown;
-    passphraseState?: unknown;
-    session_id?: unknown;
-    sessionId?: unknown;
-  };
-
-  let passphraseState: string | undefined;
-  if (typeof statePayload.passphrase_state === 'string') {
-    passphraseState = statePayload.passphrase_state;
-  } else if (typeof statePayload.passphraseState === 'string') {
-    passphraseState = statePayload.passphraseState;
-  }
-
-  let sessionId: string | undefined;
-  if (typeof statePayload.session_id === 'string') {
-    sessionId = statePayload.session_id;
-  } else if (typeof statePayload.sessionId === 'string') {
-    sessionId = statePayload.sessionId;
-  }
-
-  return { passphraseState, sessionId };
-}
-
 const program = new Command();
+const { version: cliVersion } = JSON.parse(
+  readFileSync(resolve(__dirname, '../package.json'), 'utf8')
+) as { version: string };
 
 program
   .name('onekey-hw')
   .description('OneKey hardware wallet CLI for AI agent integration')
-  .version('1.1.26-alpha.1');
+  .version(cliVersion);
 
 // ============================================================
 // Global Options
@@ -95,28 +61,6 @@ program
   .action(() =>
     runCommand({}, async ({ sdk, globalOpts }) => {
       const result = await sdk.searchDevices();
-
-      // USB 下自动读取 features 成本低；BLE 搜索阶段只做枚举，避免批量连接导致超时。
-      if (globalOpts.transport !== 'ble' && result?.success && Array.isArray(result.payload)) {
-        for (const device of result.payload as EnrichedSearchDevice[]) {
-          if (device.connectId) {
-            try {
-              const features = await sdk.getFeatures(device.connectId);
-              if (features?.success && features.payload) {
-                device.features = features.payload;
-                device.name = features.payload.label || features.payload.bleName || device.name;
-                const devType = features.payload.deviceType?.toLowerCase();
-                if (devType) {
-                  device.deviceType = devType as IDeviceType;
-                }
-              }
-            } catch {
-              // Features fetch failed — device may need PIN, continue with basic info
-            }
-          }
-        }
-      }
-
       outputResult(globalOpts, result);
     })
   );
@@ -126,24 +70,28 @@ program
   .description('Get device features (firmware, unlock state, passphrase protection, etc.)')
   .action(() =>
     runCommand({}, async ({ sdk, globalOpts }) => {
-      // Resolve connectId: explicit flag wins, else pick the first attached device
-      let { connectId } = globalOpts as { connectId?: string };
-      if (!connectId) {
-        const searchResult = await sdk.searchDevices();
-        if (
-          !searchResult?.success ||
-          !Array.isArray(searchResult.payload) ||
-          searchResult.payload.length === 0
-        ) {
-          outputResult(globalOpts, {
-            success: false,
-            payload: { error: 'No device found', code: 'NO_DEVICE' },
-          });
-          return;
-        }
-        connectId = (searchResult.payload[0] as EnrichedSearchDevice).connectId ?? undefined;
+      const result = await getCompatibleFeatures(sdk, globalOpts.connectId);
+      outputResult(globalOpts, result);
+    })
+  );
+
+program
+  .command('get-state')
+  .description('Get canonical device state for Protocol V1 and Protocol V2 devices')
+  .option('--scope <scope>', 'State refresh scope: runtime, settings, or firmware', 'runtime')
+  .action((opts: { scope: string }) =>
+    runCommand({}, async ({ sdk, globalOpts }) => {
+      const supportedScopes: DeviceStateScope[] = ['runtime', 'settings', 'firmware'];
+      if (!supportedScopes.includes(opts.scope as DeviceStateScope)) {
+        const error = new Error(`Unsupported device state scope: ${opts.scope}`);
+        (error as Error & { code?: string }).code = 'INVALID_DEVICE_STATE_SCOPE';
+        throw error;
       }
-      const result = await sdk.getFeatures(connectId || '');
+      const result = await getCanonicalDeviceState(
+        sdk,
+        globalOpts.connectId,
+        opts.scope as DeviceStateScope
+      );
       outputResult(globalOpts, result);
     })
   );
@@ -151,18 +99,12 @@ program
 program
   .command('upload-wallpaper')
   .description('Upload and activate a Pro2 wallpaper')
-  .requiredOption('--rgba <path>', '604x1024 raw RGBA file')
+  .requiredOption('--jpeg <path>', '604x1024 JPEG file')
   .option('--file-name <name>', 'Device wallpaper file name', 'wallpaper-cli')
   .option('--chunk-size <bytes>', 'Transfer chunk size in bytes')
   .action(opts =>
     runCommand({}, async ({ sdk, globalOpts, params }) => {
-      const rgba = readBinaryParam(opts.rgba);
-      const expectedBytes = 604 * 1024 * 4;
-      if (rgba.byteLength !== expectedBytes) {
-        throw new Error(
-          `Invalid RGBA size: expected ${expectedBytes} bytes, received ${rgba.byteLength}`
-        );
-      }
+      const jpegBase64 = readFileSync(opts.jpeg).toString('base64');
 
       let transferStartedAt: number | undefined;
       let transferEndedAt: number | undefined;
@@ -211,9 +153,7 @@ program
       try {
         result = await sdk.deviceUploadWallpaper(globalOpts.connectId, {
           ...params,
-          width: 604,
-          height: 1024,
-          rgba,
+          jpegBase64,
           fileName: opts.fileName,
           chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
         });
@@ -680,10 +620,6 @@ program
   .command('firmware-update-v4')
   .description('Run Protocol V2 firmware update through sdk.firmwareUpdateV4')
   .option('--chunk-size <bytes>', 'Transfer chunk size in bytes')
-  .option(
-    '--resource-bundle <spec...>',
-    'RESC bundle direct-write spec: <localPath>:<devicePath>, e.g. wallpaper.okpkg:vol0:/bundles/images/wallpaper.okpkg'
-  )
   .option('--romloader <path>', 'FW_MGMT_TARGET_ROMLOADER binary path')
   .option('--bootloader <path>', 'FW_MGMT_TARGET_BOOTLOADER binary path')
   .option('--application-p1 <path>', 'FW_MGMT_TARGET_APPLICATION_P1 binary path')
@@ -693,6 +629,7 @@ program
   .option('--se02 <path>', 'FW_MGMT_TARGET_SE02 binary path')
   .option('--se03 <path>', 'FW_MGMT_TARGET_SE03 binary path')
   .option('--se04 <path>', 'FW_MGMT_TARGET_SE04 binary path')
+  .option('--resource-archive <path>', 'Complete signed Protocol V2 resource ZIP path')
   .option('--forced-update-res', 'Force resource update')
   .option('--retries <count>', 'Retry count for transient Protocol V2 USB probe failures')
   .action(opts =>
@@ -848,7 +785,7 @@ const sessionCmd = program.command('session').description('Manage device passphr
 
 sessionCmd
   .command('connect')
-  .description('Connect device and establish passphrase session (cached for subsequent commands)')
+  .description('Connect device and select a hidden wallet for this invocation')
   .action(() =>
     runCommand({}, async ({ sdk, globalOpts }) => {
       // 1. Search for device
@@ -860,7 +797,17 @@ sessionCmd
         });
         return;
       }
-      const device = searchResult.payload[0] as EnrichedSearchDevice;
+      const device = selectSearchDevice(
+        searchResult.payload as Array<SearchDevice & { features?: Features }>,
+        globalOpts.connectId
+      );
+      if (!device) {
+        outputResult(globalOpts, {
+          success: false,
+          payload: { error: 'No matching device found', code: 'NO_DEVICE' },
+        });
+        return;
+      }
       const connectId = device.connectId || globalOpts.connectId;
 
       // 2. Unlock if locked — getPassphraseState below talks to a live
@@ -871,62 +818,35 @@ sessionCmd
         await unlockWithRetry(sdk, connectId);
       }
 
-      // 3. Get passphraseState (triggers 1/2/3 selection)
-      const psResult = await sdk.getPassphraseState(connectId, {
-        initSession: true,
-        useEmptyPassphrase: false,
+      // 3. Open a hidden wallet session (triggers 1/2/3 selection).
+      const sessionResult = await sdk.openWalletSession(connectId, {
+        mode: 'select-hidden',
       });
-      if (!psResult.success) {
-        outputResult(globalOpts, psResult);
+      if (!sessionResult.success) {
+        outputResult(globalOpts, sessionResult);
         return;
       }
-      const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(
-        psResult.payload
-      );
-      if (!passphraseState) {
+      if (sessionResult.payload.walletType !== 'hidden') {
         outputResult(globalOpts, {
           success: false,
-          payload: { error: 'getPassphraseState did not return passphraseState' },
+          payload: { error: 'Hidden wallet selection did not return a hidden wallet session' },
         });
         return;
       }
+      const { deviceId, passphraseState } = sessionResult.payload;
 
       // 4. Get address to verify + extract deviceId
-      const addrResult = await sdk.evmGetAddress(connectId, device.deviceId || '', {
+      const addrResult = await sdk.evmGetAddress(connectId, deviceId, {
         path: "m/44'/60'/0'/0/0",
         showOnOneKey: false,
         passphraseState,
       });
 
-      // 5. Fetch the now-active session_id via getFeatures.
-      //
-      // IMPORTANT: pass `passphraseState` here. Without it, the SDK's
-      // connectStateChange guard (core/index.ts) would see the payload's
-      // passphraseState flip from mnNy → undefined, clear the cached Device,
-      // and call Initialize again with no passphrase_state / no session_id.
-      // That Initialize resets the device to the standard wallet and returns
-      // a *standard-wallet* session_id — which we'd then save in the keychain
-      // paired with the hidden-wallet passphraseState. On the next CLI run
-      // the mismatch would trigger PassphraseRequest (1/2/3 again).
-      const featResult = await sdk.getFeatures(connectId, {
-        passphraseState,
-        skipPassphraseCheck: true,
-      });
-      const featPayload = featResult?.success ? featResult.payload : undefined;
-      const deviceId = featPayload?.deviceId || device.deviceId || '';
-      const sessionId = passphraseSessionId || featPayload?.sessionId || '';
-
-      // 6. Save to keychain
-      if (passphraseState && deviceId && sessionId) {
-        await saveSessionToKeychain(deviceId, passphraseState, sessionId);
-      }
-
       outputResult(globalOpts, {
         success: true,
         payload: {
           passphraseState,
           deviceId,
-          ...(sessionId ? { sessionId } : {}),
           ...(addrResult?.success ? { address: addrResult.payload.address } : {}),
         },
       });
@@ -939,8 +859,10 @@ sessionCmd
   .action(() =>
     runCommand({}, async ({ sdk, globalOpts }) => {
       const searchResult = await sdk.searchDevices();
-      const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-        (searchResult?.payload as any)?.[0];
+      const device = selectSearchDevice(
+        (searchResult?.payload as Array<SearchDevice & { features?: Features }>) ?? [],
+        globalOpts.connectId
+      );
       const deviceId = device?.deviceId || device?.features?.device_id;
       if (deviceId) {
         await clearSessionFromKeychain(deviceId);
@@ -1035,12 +957,12 @@ async function unlockWithRetry(
  * Prepare passphrase session before SDK calls.
  *
  * 1. If --use-empty-passphrase or --passphrase-state provided → use as-is
- * 2. Try keychain → preloadSessionCache → use cached session
- * 3. Keychain miss → getPassphraseState (triggers 1/2/3 prompt) → save to keychain
+ * 2. Try a legacy keychain entry → preloadSessionCache → use cached session
+ * 3. Keychain miss → openWalletSession (triggers 1/2/3 prompt)
  *
  * After this, globalOpts.passphraseState is set and getCommonParams will include it.
  */
-async function prepareSession(
+export async function prepareSession(
   sdk: typeof import('@onekeyfe/hd-common-connect-sdk').default,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   globalOpts: Record<string, any>
@@ -1051,7 +973,7 @@ async function prepareSession(
   }
 
   // Errors from the SDK calls below (PIN cancelled, transport broken,
-  // getPassphraseState rejection) intentionally propagate to runCommand's
+  // openWalletSession rejection) intentionally propagate to runCommand's
   // catch block, which renders them as structured `{ success: false,
   // payload: { error, code } }` output instead of silently falling through
   // to a confusing downstream error 112 / 114.
@@ -1070,6 +992,7 @@ async function prepareSession(
     searchResult.payload as Array<{
       connectId?: string;
       deviceId?: string;
+      deviceType?: string;
       features?: {
         deviceId?: string | null;
         deviceType?: string;
@@ -1088,6 +1011,7 @@ async function prepareSession(
   const selectedDevice = device as {
     connectId?: string;
     deviceId?: string;
+    deviceType?: string;
     features?: {
       deviceId?: string | null;
       deviceType?: string;
@@ -1105,7 +1029,8 @@ async function prepareSession(
   // getFeatures failures here are non-fatal — we fall through to Step 3
   // which will fail with a clearer error if the device is truly unreachable.
   let deviceId = selectedDevice.features?.deviceId || selectedDevice.deviceId || '';
-  let deviceType = getDeviceType(selectedDevice.features as Features | undefined);
+  let deviceType =
+    selectedDevice.features?.deviceType ?? selectedDevice.deviceType ?? EDeviceType.Unknown;
   let unlocked = selectedDevice.features?.unlocked;
   let passphraseProtection = selectedDevice.features?.passphraseProtection;
 
@@ -1146,7 +1071,7 @@ async function prepareSession(
     return undefined;
   }
 
-  // ── Step 5: Try keychain session reuse ───────────────────────────
+  // ── Step 5: Try legacy keychain session reuse ────────────────────
   // Only attempt if device was already unlocked — locking invalidates
   // all passphrase sessions, so cached session_id is useless after unlock.
   if (!wasLocked && deviceId) {
@@ -1157,40 +1082,19 @@ async function prepareSession(
     }
   }
 
-  // ── Step 6: Keychain miss → getPassphraseState (triggers 1/2/3 prompt) ──
-  const psResult = await sdk.getPassphraseState(connectId, {
-    initSession: true,
-    useEmptyPassphrase: false,
+  // ── Step 6: Keychain miss → openWalletSession (triggers 1/2/3 prompt) ──
+  const sessionResult = await sdk.openWalletSession(connectId, {
+    mode: 'select-hidden',
   });
 
-  if (psResult.success && psResult.payload) {
-    const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(
-      psResult.payload
-    );
-    if (!passphraseState) {
+  if (sessionResult.success && sessionResult.payload) {
+    if (sessionResult.payload.walletType !== 'hidden') {
       return undefined;
     }
+    const { deviceId: sessionDeviceId, passphraseState } = sessionResult.payload;
+    globalOpts.deviceId = sessionDeviceId;
     globalOpts.passphraseState = passphraseState;
 
-    // Save session to keychain for next invocation.
-    //
-    // Pass passphraseState to keep connectStateChange=false — otherwise
-    // Initialize would be re-run without passphrase_state, resetting the
-    // device to the standard wallet and returning a mismatched session_id.
-    // See the matching comment in `session connect`.
-    if (deviceId) {
-      const featAfter = await sdk.getFeatures(connectId, {
-        passphraseState,
-        skipPassphraseCheck: true,
-      });
-      const sessionId =
-        passphraseSessionId || (featAfter?.success ? featAfter.payload?.sessionId : undefined);
-      if (sessionId) {
-        await saveSessionToKeychain(deviceId, passphraseState, sessionId);
-        await preloadSessionFromKeychain(deviceId);
-      }
-    }
-
     return passphraseState;
   }
   return undefined;
@@ -1207,8 +1111,8 @@ function outputResult(_globalOpts: Record<string, any>, result: unknown): void {
   ) {
     process.exitCode = 1;
   }
-  // No process.exit here — runCommand() below handles dispose + exit so SDK
-  // async cleanup (USB release, event listener teardown) finishes first.
+  // No process.exit here — runCommand() waits for SDK cleanup, then lets Node
+  // exit naturally so leaked USB handles remain observable.
 }
 
 /**
@@ -1220,7 +1124,7 @@ function outputResult(_globalOpts: Record<string, any>, result: unknown): void {
  *   3. run the handler (which calls outputResult on success)
  *   4. report uncaught errors as a structured failure result
  *   5. dispose SDK
- *   6. drain event loop and process.exit with the right code
+ *   6. let Node exit naturally after all SDK resources are released
  *
  * This fixes three previous bugs:
  *   - Most signing commands skipped prepareSession, so keychain sessions
@@ -1272,9 +1176,7 @@ async function runCommand(
     // promise reference. Idempotent, safe to call even if init failed.
     await disposeSDK();
   }
-  // SDK event listeners can keep the event loop alive after dispose.
-  // setImmediate lets any trailing stdout/stderr writes flush first.
-  setImmediate(() => process.exit(process.exitCode ?? 0));
+  // disposeSDK awaits transport cleanup; let Node exit naturally so leaks remain visible.
 }
 
 /** For commands that don't touch the SDK at all (e.g. firmware-update stubs). */
@@ -1315,52 +1217,37 @@ async function resolveLegacyFirmwareConnectId(
   }
 
   const devices = searchResult.payload as EnrichedSearchDevice[];
-  const normalizedName = deviceName?.trim().toLowerCase();
-  const matches = normalizedName
-    ? devices.filter(device => device.name?.trim().toLowerCase() === normalizedName)
+  const requestedName = deviceName?.trim();
+  const matches = requestedName
+    ? devices.filter(
+        device =>
+          isSameOnekeyBleName(device.name, requestedName) ||
+          device.name?.trim().toLowerCase() === requestedName.toLowerCase()
+      )
     : devices.filter(device => device.deviceType?.toLowerCase() === 'classic');
 
   if (matches.length === 0) {
     throw new Error(
-      normalizedName ? `BLE device not found by name: ${deviceName}` : 'No Classic/Pure BLE device found'
+      requestedName
+        ? `BLE device not found by name: ${deviceName}`
+        : 'No Classic/Pure BLE device found'
     );
   }
   if (matches.length > 1) {
     throw new Error(
-      normalizedName
+      requestedName
         ? `Multiple BLE devices found by name: ${deviceName}`
         : 'Multiple Classic/Pure BLE devices found; specify --device-name'
     );
   }
 
-  const connectId = matches[0].connectId;
-  if (!connectId) throw new Error(`BLE device has no connect ID: ${matches[0].name}`);
+  const [{ connectId, name }] = matches;
+  if (!connectId) throw new Error(`BLE device has no connect ID: ${name}`);
   return connectId;
 }
 
-function parseResourceBundleParam(spec: string): { binary: ArrayBuffer; devicePath: string } {
-  const sep = spec.indexOf(':');
-  if (sep <= 0 || sep === spec.length - 1) {
-    throw new Error(
-      `Invalid --resource-bundle value: "${spec}". Expected <localPath>:<devicePath>`
-    );
-  }
-  const localPath = spec.slice(0, sep);
-  const devicePath = spec.slice(sep + 1);
-  if (!devicePath.startsWith('vol')) {
-    throw new Error(
-      `Invalid --resource-bundle device path: "${devicePath}". Expected a vol*:/... path`
-    );
-  }
-  return {
-    binary: readBinaryParam(localPath),
-    devicePath,
-  };
-}
-
 function getFirmwareUpdateV4TotalBytes(params: ReturnType<typeof buildFirmwareUpdateV4Params>) {
   return [
-    ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
     params.bootloaderBinary,
     params.applicationP1Binary,
     params.applicationP2Binary,
@@ -1429,9 +1316,7 @@ export function buildWallpaperUploadMetrics({
     transferredBytes,
     totalSeconds: Number((elapsedMs / 1000).toFixed(2)),
     transferKiBPerSecond:
-      elapsedMs > 0
-        ? Number((transferredBytes / 1024 / (elapsedMs / 1000)).toFixed(2))
-        : null,
+      elapsedMs > 0 ? Number((transferredBytes / 1024 / (elapsedMs / 1000)).toFixed(2)) : null,
     lastProgress,
   };
 }
@@ -1532,7 +1417,7 @@ function buildFirmwareUpdateV4Metrics({
   };
 }
 
-async function runFirmwareUpdateV4WithRetry({
+export async function runFirmwareUpdateV4WithRetry({
   sdk,
   globalOpts,
   params,
@@ -1546,152 +1431,147 @@ async function runFirmwareUpdateV4WithRetry({
   const totalBytes = getFirmwareUpdateV4TotalBytes(params);
   const maxAttempts = Math.max((retries ?? 2) + 1, 1);
   let currentSdk = sdk;
-  let lastResult: unknown;
   let retried = false;
-
-  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
-    let progressEvents = 0;
-    let lastProgress = -1;
-    let transferStartedAt: number | undefined;
-    let transferEndedAt: number | undefined;
-    let installProgressEvents = 0;
-    let lastInstallProgress = -1;
-    let installStartedAt: number | undefined;
-    let installEndedAt: number | undefined;
-    let lastPrintedTransferProgress = -10;
-    let lastPrintedInstallProgress = -10;
-    const totalStartedAt = Date.now();
-    const connectId =
-      retried && globalOpts.transport === 'usb' && globalOpts.connectId
-        ? undefined
-        : globalOpts.connectId;
-
-    const onUiEvent = (message: unknown) => {
-      if (!message || typeof message !== 'object') return;
-      const messageType = (message as { type?: string }).type;
-      const payload = getFirmwareUpdatePayload(message);
-
-      if (messageType === UI_REQUEST.FIRMWARE_TIP) {
-        const tipMessage = (payload?.data as { message?: unknown } | undefined)?.message;
-        if (typeof tipMessage === 'string') {
-          process.stderr.write(`[onekey-hw] Firmware: ${tipMessage}\n`);
-        }
-        return;
-      }
-
-      if (messageType === UI_REQUEST.REQUEST_BUTTON) {
-        const code = typeof payload?.code === 'string' ? ` (${payload.code})` : '';
-        process.stderr.write(
-          `[onekey-hw] Please confirm the firmware update on your device${code}.\n`
-        );
-        return;
+  let attempt = 1;
+  let { connectId } = globalOpts;
+
+  if (globalOpts.transport === 'usb') {
+    for (; attempt <= maxAttempts; attempt += 1) {
+      const probeResult = await currentSdk.getDeviceState(connectId, {
+        scope: 'runtime',
+        connectProtocol: 'V2',
+        retryCount: 0,
+      });
+      if (isSuccessResult(probeResult)) break;
+      if (attempt >= maxAttempts || !isProtocolV2UsbProbeTransientResult(probeResult)) {
+        return probeResult;
       }
 
-      if (messageType !== UI_REQUEST.FIRMWARE_PROGRESS || !payload) return;
-      const progress = Number(payload.progress);
-      if (!Number.isFinite(progress)) return;
-
-      if (payload.progressType === 'transferData') {
-        progressEvents += 1;
-        lastProgress = Math.max(lastProgress, progress);
-        transferStartedAt ??= Date.now();
-        lastPrintedTransferProgress = maybePrintFirmwareProgress({
-          progressType: 'transfer',
-          progress,
-          payload,
-          lastPrintedProgress: lastPrintedTransferProgress,
-        });
-        if (progress >= 100) {
-          transferEndedAt ??= Date.now();
-        }
-        return;
-      }
+      retried = true;
+      process.stderr.write(
+        `[onekey-hw] Protocol V2 USB probe was transient; retrying read-only probe (${attempt}/${maxAttempts})...\n`
+      );
+      await disposeSDK();
+      await new Promise(resolve => {
+        setTimeout(resolve, 3000);
+      });
+      currentSdk = await createSDK(globalOpts);
+      if (globalOpts.connectId) connectId = undefined;
+    }
+  }
 
-      if (payload.progressType === 'installingFirmware') {
-        installProgressEvents += 1;
-        lastInstallProgress = Math.max(lastInstallProgress, progress);
-        installStartedAt ??= Date.now();
-        lastPrintedInstallProgress = maybePrintFirmwareProgress({
-          progressType: 'install',
-          progress,
-          payload,
-          lastPrintedProgress: lastPrintedInstallProgress,
-        });
-        if (progress >= 100) {
-          installEndedAt ??= Date.now();
-        }
+  let progressEvents = 0;
+  let lastProgress = -1;
+  let transferStartedAt: number | undefined;
+  let transferEndedAt: number | undefined;
+  let installProgressEvents = 0;
+  let lastInstallProgress = -1;
+  let installStartedAt: number | undefined;
+  let installEndedAt: number | undefined;
+  let lastPrintedTransferProgress = -10;
+  let lastPrintedInstallProgress = -10;
+  const totalStartedAt = Date.now();
+
+  const onUiEvent = (message: unknown) => {
+    if (!message || typeof message !== 'object') return;
+    const messageType = (message as { type?: string }).type;
+    const payload = getFirmwareUpdatePayload(message);
+
+    if (messageType === UI_REQUEST.FIRMWARE_TIP) {
+      const tipMessage = (payload?.data as { message?: unknown } | undefined)?.message;
+      if (typeof tipMessage === 'string') {
+        process.stderr.write(`[onekey-hw] Firmware: ${tipMessage}\n`);
       }
-    };
-
-    currentSdk.on(UI_EVENT, onUiEvent);
-    try {
-      lastResult = await currentSdk.firmwareUpdateV4(connectId, params);
-    } finally {
-      currentSdk.off?.(UI_EVENT, onUiEvent);
-    }
-    if (installStartedAt !== undefined && installEndedAt === undefined) {
-      installEndedAt = Date.now();
+      return;
     }
 
-    const metrics = buildFirmwareUpdateV4Metrics({
-      attempt,
-      maxAttempts,
-      totalBytes,
-      totalStartedAt,
-      transferStartedAt,
-      transferEndedAt,
-      installStartedAt,
-      installEndedAt,
-      progressEvents,
-      lastProgress,
-      installProgressEvents,
-      lastInstallProgress,
-      retried,
-    });
-
-    if (lastResult && typeof lastResult === 'object') {
-      const payload = ((lastResult as { payload?: unknown }).payload ?? {}) as Record<
-        string,
-        unknown
-      >;
-      lastResult = {
-        ...(lastResult as Record<string, unknown>),
-        payload: {
-          ...payload,
-          metrics,
-        },
-      };
+    if (messageType === UI_REQUEST.REQUEST_BUTTON) {
+      const code = typeof payload?.code === 'string' ? ` (${payload.code})` : '';
+      process.stderr.write(
+        `[onekey-hw] Please confirm the firmware update on your device${code}.\n`
+      );
+      return;
     }
 
-    if (isSuccessResult(lastResult)) {
-      return lastResult;
+    if (messageType !== UI_REQUEST.FIRMWARE_PROGRESS || !payload) return;
+    const progress = Number(payload.progress);
+    if (!Number.isFinite(progress)) return;
+
+    if (payload.progressType === 'transferData') {
+      progressEvents += 1;
+      lastProgress = Math.max(lastProgress, progress);
+      transferStartedAt ??= Date.now();
+      lastPrintedTransferProgress = maybePrintFirmwareProgress({
+        progressType: 'transfer',
+        progress,
+        payload,
+        lastPrintedProgress: lastPrintedTransferProgress,
+      });
+      if (progress >= 100) {
+        transferEndedAt ??= Date.now();
+      }
+      return;
     }
 
-    if (
-      attempt >= maxAttempts ||
-      globalOpts.transport !== 'usb' ||
-      !isProtocolV2UsbProbeTransientResult(lastResult)
-    ) {
-      return lastResult;
+    if (payload.progressType === 'installingFirmware') {
+      installProgressEvents += 1;
+      lastInstallProgress = Math.max(lastInstallProgress, progress);
+      installStartedAt ??= Date.now();
+      lastPrintedInstallProgress = maybePrintFirmwareProgress({
+        progressType: 'install',
+        progress,
+        payload,
+        lastPrintedProgress: lastPrintedInstallProgress,
+      });
+      if (progress >= 100) {
+        installEndedAt ??= Date.now();
+      }
     }
+  };
 
-    retried = true;
-    process.stderr.write(
-      `[onekey-hw] Protocol V2 USB probe was transient; retrying firmwareUpdateV4 (${attempt}/${maxAttempts})...\n`
-    );
-    await disposeSDK();
-    await new Promise(resolve => {
-      setTimeout(resolve, 3000);
-    });
-    currentSdk = await createSDK(globalOpts);
+  currentSdk.on(UI_EVENT, onUiEvent);
+  let result: unknown;
+  try {
+    result = await currentSdk.firmwareUpdateV4(connectId, params);
+  } finally {
+    currentSdk.off?.(UI_EVENT, onUiEvent);
+  }
+  if (installStartedAt !== undefined && installEndedAt === undefined) {
+    installEndedAt = Date.now();
+  }
+
+  const metrics = buildFirmwareUpdateV4Metrics({
+    attempt,
+    maxAttempts,
+    totalBytes,
+    totalStartedAt,
+    transferStartedAt,
+    transferEndedAt,
+    installStartedAt,
+    installEndedAt,
+    progressEvents,
+    lastProgress,
+    installProgressEvents,
+    lastInstallProgress,
+    retried,
+  });
+
+  if (result && typeof result === 'object') {
+    const payload = ((result as { payload?: unknown }).payload ?? {}) as Record<string, unknown>;
+    return {
+      ...(result as Record<string, unknown>),
+      payload: {
+        ...payload,
+        metrics,
+      },
+    };
   }
 
-  return lastResult;
+  return result;
 }
 
 function buildFirmwareUpdateV4Params(opts: {
   chunkSize?: string;
-  resourceBundle?: string[];
   romloader?: string;
   bootloader?: string;
   applicationP1?: string;
@@ -1701,6 +1581,7 @@ function buildFirmwareUpdateV4Params(opts: {
   se02?: string;
   se03?: string;
   se04?: string;
+  resourceArchive?: string;
   forcedUpdateRes?: boolean;
 }) {
   const params = {
@@ -1708,7 +1589,6 @@ function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: 'V2' as const,
     chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
     forcedUpdateRes: opts.forcedUpdateRes,
-    resourceBundleFiles: opts.resourceBundle?.map(parseResourceBundleParam),
     romloaderBinary: opts.romloader ? readBinaryParam(opts.romloader) : undefined,
     bootloaderBinary: opts.bootloader ? readBinaryParam(opts.bootloader) : undefined,
     applicationP1Binary: opts.applicationP1 ? readBinaryParam(opts.applicationP1) : undefined,
@@ -1718,10 +1598,10 @@ function buildFirmwareUpdateV4Params(opts: {
     se02Binary: opts.se02 ? readBinaryParam(opts.se02) : undefined,
     se03Binary: opts.se03 ? readBinaryParam(opts.se03) : undefined,
     se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
+    resourceArchiveBinary: opts.resourceArchive ? readBinaryParam(opts.resourceArchive) : undefined,
   };
 
   const hasPayload = [
-    params.resourceBundleFiles,
     params.romloaderBinary,
     params.bootloaderBinary,
     params.applicationP1Binary,
@@ -1731,10 +1611,13 @@ function buildFirmwareUpdateV4Params(opts: {
     params.se02Binary,
     params.se03Binary,
     params.se04Binary,
+    params.resourceArchiveBinary,
   ].some(Boolean);
 
   if (!hasPayload) {
-    const err = new Error('firmware-update-v4 requires at least one binary path');
+    const err = new Error(
+      'firmware-update-v4 requires at least one firmware binary or resource archive path'
+    );
     (err as Error & { code?: string }).code = 'MISSING_FIRMWARE_BINARY';
     throw err;
   }