@onekeyfe/hardware-cli 1.2.0-alpha.9 → 1.2.0-alpha.90

package/dist/cli.js

@@ -1,44 +1,24 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.program = void 0;
+exports.program = exports.runFirmwareUpdateV4WithRetry = exports.buildWallpaperUploadMetrics = exports.prepareSession = exports.getLegacyFirmwareConnectTimeout = void 0;
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const commander_1 = require("commander");
 const hd_core_1 = require("@onekeyfe/hd-core");
 const hd_shared_1 = require("@onekeyfe/hd-shared");
 const chains_1 = require("./chains");
+const deviceSelection_1 = require("./deviceSelection");
+const deviceStateCommands_1 = require("./deviceStateCommands");
 const sdk_1 = require("./sdk");
 const session_1 = require("./session");
-function extractPassphraseSession(payload) {
-    if (typeof payload === 'string') {
-        return { passphraseState: payload };
-    }
-    if (!payload || typeof payload !== 'object') {
-        return {};
-    }
-    const statePayload = payload;
-    let passphraseState;
-    if (typeof statePayload.passphrase_state === 'string') {
-        passphraseState = statePayload.passphrase_state;
-    }
-    else if (typeof statePayload.passphraseState === 'string') {
-        passphraseState = statePayload.passphraseState;
-    }
-    let sessionId;
-    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 commander_1.Command();
 exports.program = program;
+const { version: cliVersion } = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '../package.json'), 'utf8'));
 program
     .name('onekey-hw')
     .description('OneKey hardware wallet CLI for AI agent integration')
-    .version('1.1.26-alpha.1');
+    .version(cliVersion);
 // ============================================================
 // Global Options
 // ============================================================
@@ -56,50 +36,103 @@ program
     .description('Search for connected OneKey hardware wallet devices')
     .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) {
-            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;
-                        }
-                    }
-                }
-                catch {
-                    // Features fetch failed — device may need PIN, continue with basic info
-                }
-            }
-        }
-    }
     outputResult(globalOpts, result);
 }));
 program
     .command('get-features')
     .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;
-    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' },
-            });
+    const result = await (0, deviceStateCommands_1.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) => runCommand({}, async ({ sdk, globalOpts }) => {
+    const supportedScopes = ['runtime', 'settings', 'firmware'];
+    if (!supportedScopes.includes(opts.scope)) {
+        const error = new Error(`Unsupported device state scope: ${opts.scope}`);
+        error.code = 'INVALID_DEVICE_STATE_SCOPE';
+        throw error;
+    }
+    const result = await (0, deviceStateCommands_1.getCanonicalDeviceState)(sdk, globalOpts.connectId, opts.scope);
+    outputResult(globalOpts, result);
+}));
+program
+    .command('upload-wallpaper')
+    .description('Upload and activate a Pro2 wallpaper')
+    .requiredOption('--rgba <path>', '604x1024 raw RGBA 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}`);
+    }
+    let transferStartedAt;
+    let transferEndedAt;
+    let lastProgress = -1;
+    let lastPrintedProgress = -10;
+    let progressTotalBytes = 0;
+    let transferredBytes = 0;
+    const totalStartedAt = Date.now();
+    const onUiEvent = (message) => {
+        if (!message || typeof message !== 'object')
             return;
+        const event = message;
+        if (event.type !== hd_core_1.UI_REQUEST.DEVICE_PROGRESS || !event.payload)
+            return;
+        const progress = Number(event.payload.progress);
+        if (!Number.isFinite(progress))
+            return;
+        transferStartedAt ?? (transferStartedAt = Date.now());
+        lastProgress = Math.max(lastProgress, progress);
+        const totalBytes = Number(event.payload.totalBytes);
+        if (Number.isFinite(totalBytes) && totalBytes > 0)
+            progressTotalBytes = totalBytes;
+        const confirmedBytes = Number(event.payload.transferredBytes);
+        if (Number.isFinite(confirmedBytes) && confirmedBytes >= 0) {
+            transferredBytes = Math.max(transferredBytes, confirmedBytes);
         }
-        connectId = searchResult.payload[0].connectId ?? undefined;
+        const printableProgress = Math.floor(progress / 10) * 10;
+        if (printableProgress > lastPrintedProgress || progress >= 100) {
+            const rate = Number(event.payload.rateBytesPerSecond);
+            const rateText = Number.isFinite(rate) && rate > 0 ? ` ${(rate / 1024).toFixed(2)} KiB/s` : '';
+            process.stderr.write(`[onekey-hw] Wallpaper transfer: ${Math.round(progress)}%${rateText}\n`);
+            lastPrintedProgress = progress >= 100 ? 100 : printableProgress;
+        }
+        if (progress >= 100)
+            transferEndedAt ?? (transferEndedAt = Date.now());
+    };
+    sdk.on(hd_core_1.UI_EVENT, onUiEvent);
+    let result;
+    try {
+        result = await sdk.deviceUploadWallpaper(globalOpts.connectId, {
+            ...params,
+            width: 604,
+            height: 1024,
+            rgba,
+            fileName: opts.fileName,
+            chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
+        });
     }
-    const result = await sdk.getFeatures(connectId || '');
-    outputResult(globalOpts, result);
+    finally {
+        sdk.off?.(hd_core_1.UI_EVENT, onUiEvent);
+    }
+    const endedAt = transferEndedAt ?? Date.now();
+    const totalBytes = Number(result?.payload?.size) || progressTotalBytes;
+    outputResult(globalOpts, {
+        ...result,
+        metrics: buildWallpaperUploadMetrics({
+            totalBytes,
+            transferredBytes: result?.success ? totalBytes : transferredBytes,
+            startedAt: transferStartedAt ?? totalStartedAt,
+            endedAt,
+            lastProgress,
+        }),
+    });
 }));
 // ============================================================
 // Signing Commands
@@ -414,6 +447,30 @@ program
         code: 'FIRMWARE_UPDATE_NOT_SUPPORTED',
     },
 }));
+program
+    .command('firmware-update-legacy')
+    .description('Update Classic/Pure firmware through the legacy protocol')
+    .requiredOption('--binary <path>', 'Local firmware binary path')
+    .option('--device-name <name>', 'BLE advertising name, for example K1514')
+    .option('--update-type <type>', 'Firmware component: firmware or ble', 'firmware')
+    .option('--no-reboot', 'Do not reboot the device after a successful update')
+    .action(opts => runCommand({}, async ({ sdk, globalOpts }) => {
+    if (opts.updateType !== 'firmware' && opts.updateType !== 'ble') {
+        throw new Error(`Unsupported --update-type: ${opts.updateType}. Use "firmware" or "ble".`);
+    }
+    const connectId = await resolveLegacyFirmwareConnectId(sdk, globalOpts.connectId, opts.deviceName);
+    const result = await sdk.firmwareUpdate(connectId, {
+        binary: readBinaryParam(opts.binary),
+        updateType: opts.updateType,
+        rebootOnSuccess: opts.reboot,
+        timeout: getLegacyFirmwareConnectTimeout(globalOpts.transport),
+    });
+    outputResult(globalOpts, result);
+}));
+function getLegacyFirmwareConnectTimeout(transport) {
+    return transport === 'usb' ? 90000 : undefined;
+}
+exports.getLegacyFirmwareConnectTimeout = getLegacyFirmwareConnectTimeout;
 program
     .command('firmware-update-ble')
     .description('Run Protocol V2 firmware update over BLE')
@@ -428,7 +485,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')
@@ -565,7 +621,7 @@ program
 const sessionCmd = program.command('session').description('Manage device passphrase session cache');
 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
     const searchResult = await sdk.searchDevices();
@@ -576,7 +632,14 @@ sessionCmd
         });
         return;
     }
-    const device = searchResult.payload[0];
+    const device = (0, deviceSelection_1.selectSearchDevice)(searchResult.payload, 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
     // device session, which a locked device will reject with an obscure
@@ -585,56 +648,33 @@ sessionCmd
         process.stderr.write('[onekey-hw] Device is locked. Unlocking (PIN required)...\n');
         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 (0, session_1.saveSessionToKeychain)(deviceId, passphraseState, sessionId);
-    }
     outputResult(globalOpts, {
         success: true,
         payload: {
             passphraseState,
             deviceId,
-            ...(sessionId ? { sessionId } : {}),
             ...(addrResult?.success ? { address: addrResult.payload.address } : {}),
         },
     });
@@ -644,8 +684,7 @@ sessionCmd
     .description('Clear cached device session')
     .action(() => runCommand({}, async ({ sdk, globalOpts }) => {
     const searchResult = await sdk.searchDevices();
-    const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-     searchResult?.payload?.[0];
+    const device = (0, deviceSelection_1.selectSearchDevice)(searchResult?.payload ?? [], globalOpts.connectId);
     const deviceId = device?.deviceId || device?.features?.device_id;
     if (deviceId) {
         await (0, session_1.clearSessionFromKeychain)(deviceId);
@@ -722,8 +761,8 @@ async function unlockWithRetry(sdk, connectId, maxAttempts = 3) {
  * 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.
  */
@@ -735,7 +774,7 @@ globalOpts) {
         return globalOpts.passphraseState;
     }
     // 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.
@@ -746,18 +785,22 @@ globalOpts) {
         searchResult.payload.length === 0) {
         return undefined;
     }
-    const device = searchResult.payload[0];
-    const connectId = device.connectId || globalOpts.connectId || '';
+    const device = (0, deviceSelection_1.selectSearchDevice)(searchResult.payload, globalOpts.connectId);
+    if (!device) {
+        throw new Error(`未找到指定的 BLE 设备: ${globalOpts.connectId}`);
+    }
+    const selectedDevice = device;
+    const connectId = selectedDevice.connectId || globalOpts.connectId || '';
     if (!globalOpts.connectId && connectId) {
         globalOpts.connectId = connectId;
     }
     // ── Step 2: Get features if searchDevices didn't populate them ──
     // 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 = device.features?.deviceId || device.deviceId || '';
-    let deviceType = (0, hd_core_1.getDeviceType)(device.features);
-    let unlocked = device.features?.unlocked;
-    let passphraseProtection = device.features?.passphraseProtection;
+    let deviceId = selectedDevice.features?.deviceId || selectedDevice.deviceId || '';
+    let deviceType = selectedDevice.features?.deviceType ?? selectedDevice.deviceType ?? hd_shared_1.EDeviceType.Unknown;
+    let unlocked = selectedDevice.features?.unlocked;
+    let passphraseProtection = selectedDevice.features?.passphraseProtection;
     if (!deviceId || unlocked == null || passphraseProtection == null) {
         try {
             const featResult = await sdk.getFeatures(connectId);
@@ -792,7 +835,7 @@ globalOpts) {
     if (passphraseProtection === false && deviceType !== hd_shared_1.EDeviceType.Pro2) {
         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) {
@@ -802,38 +845,22 @@ globalOpts) {
             return cached;
         }
     }
-    // ── 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 (0, session_1.saveSessionToKeychain)(deviceId, passphraseState, sessionId);
-                await (0, session_1.preloadSessionFromKeychain)(deviceId);
-            }
-        }
         return passphraseState;
     }
     return undefined;
 }
+exports.prepareSession = prepareSession;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function outputResult(_globalOpts, result) {
     console.log(JSON.stringify(result, null, 2));
@@ -843,8 +870,8 @@ function outputResult(_globalOpts, result) {
         !result.success) {
         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.
 }
 async function runCommand(options, handler) {
     const globalOpts = program.opts();
@@ -877,9 +904,7 @@ async function runCommand(options, handler) {
         // promise reference. Idempotent, safe to call even if init failed.
         await (0, sdk_1.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). */
 function respondAndExit(result) {
@@ -904,24 +929,35 @@ function readBinaryParam(path) {
     const buffer = (0, node_fs_1.readFileSync)(path);
     return new Uint8Array(buffer).buffer;
 }
-function parseResourceBundleParam(spec) {
-    const sep = spec.indexOf(':');
-    if (sep <= 0 || sep === spec.length - 1) {
-        throw new Error(`Invalid --resource-bundle value: "${spec}". Expected <localPath>:<devicePath>`);
+async function resolveLegacyFirmwareConnectId(sdk, explicitConnectId, deviceName) {
+    if (explicitConnectId && !deviceName)
+        return explicitConnectId;
+    const searchResult = await sdk.searchDevices();
+    if (!searchResult?.success || !Array.isArray(searchResult.payload)) {
+        throw new Error('Unable to scan BLE devices');
     }
-    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`);
+    const devices = searchResult.payload;
+    const normalizedName = deviceName?.trim().toLowerCase();
+    const matches = normalizedName
+        ? devices.filter(device => device.name?.trim().toLowerCase() === normalizedName)
+        : 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');
     }
-    return {
-        binary: readBinaryParam(localPath),
-        devicePath,
-    };
+    if (matches.length > 1) {
+        throw new Error(normalizedName
+            ? `Multiple BLE devices found by name: ${deviceName}`
+            : 'Multiple Classic/Pure BLE devices found; specify --device-name');
+    }
+    const [{ connectId, name }] = matches;
+    if (!connectId)
+        throw new Error(`BLE device has no connect ID: ${name}`);
+    return connectId;
 }
 function getFirmwareUpdateV4TotalBytes(params) {
     return [
-        ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
         params.bootloaderBinary,
         params.applicationP1Binary,
         params.applicationP2Binary,
@@ -965,6 +1001,17 @@ function formatFirmwareBytes(bytes) {
         return '';
     return `${(bytes / 1024).toFixed(1)} KiB`;
 }
+function buildWallpaperUploadMetrics({ totalBytes, transferredBytes, startedAt, endedAt, lastProgress, }) {
+    const elapsedMs = Math.max(endedAt - startedAt, 0);
+    return {
+        totalBytes,
+        transferredBytes,
+        totalSeconds: Number((elapsedMs / 1000).toFixed(2)),
+        transferKiBPerSecond: elapsedMs > 0 ? Number((transferredBytes / 1024 / (elapsedMs / 1000)).toFixed(2)) : null,
+        lastProgress,
+    };
+}
+exports.buildWallpaperUploadMetrics = buildWallpaperUploadMetrics;
 function maybePrintFirmwareProgress({ progressType, progress, payload, lastPrintedProgress, }) {
     const printableProgress = Math.floor(progress / 10) * 10;
     if (printableProgress <= lastPrintedProgress && progress < 100) {
@@ -1011,135 +1058,140 @@ async function runFirmwareUpdateV4WithRetry({ sdk, globalOpts, params, retries,
     const totalBytes = getFirmwareUpdateV4TotalBytes(params);
     const maxAttempts = Math.max((retries ?? 2) + 1, 1);
     let currentSdk = sdk;
-    let lastResult;
     let retried = false;
-    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
-        let progressEvents = 0;
-        let lastProgress = -1;
-        let transferStartedAt;
-        let transferEndedAt;
-        let installProgressEvents = 0;
-        let lastInstallProgress = -1;
-        let installStartedAt;
-        let installEndedAt;
-        let lastPrintedTransferProgress = -10;
-        let lastPrintedInstallProgress = -10;
-        const totalStartedAt = Date.now();
-        const connectId = retried && globalOpts.transport === 'usb' && globalOpts.connectId
-            ? undefined
-            : globalOpts.connectId;
-        const onUiEvent = (message) => {
-            if (!message || typeof message !== 'object')
-                return;
-            const messageType = message.type;
-            const payload = getFirmwareUpdatePayload(message);
-            if (messageType === hd_core_1.UI_REQUEST.FIRMWARE_TIP) {
-                const tipMessage = payload?.data?.message;
-                if (typeof tipMessage === 'string') {
-                    process.stderr.write(`[onekey-hw] Firmware: ${tipMessage}\n`);
-                }
-                return;
-            }
-            if (messageType === hd_core_1.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 (messageType !== hd_core_1.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 ?? (transferStartedAt = Date.now());
-                lastPrintedTransferProgress = maybePrintFirmwareProgress({
-                    progressType: 'transfer',
-                    progress,
-                    payload,
-                    lastPrintedProgress: lastPrintedTransferProgress,
-                });
-                if (progress >= 100) {
-                    transferEndedAt ?? (transferEndedAt = Date.now());
-                }
-                return;
-            }
-            if (payload.progressType === 'installingFirmware') {
-                installProgressEvents += 1;
-                lastInstallProgress = Math.max(lastInstallProgress, progress);
-                installStartedAt ?? (installStartedAt = Date.now());
-                lastPrintedInstallProgress = maybePrintFirmwareProgress({
-                    progressType: 'install',
-                    progress,
-                    payload,
-                    lastPrintedProgress: lastPrintedInstallProgress,
-                });
-                if (progress >= 100) {
-                    installEndedAt ?? (installEndedAt = Date.now());
-                }
+    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;
             }
-        };
-        currentSdk.on(hd_core_1.UI_EVENT, onUiEvent);
-        try {
-            lastResult = await currentSdk.firmwareUpdateV4(connectId, params);
-        }
-        finally {
-            currentSdk.off?.(hd_core_1.UI_EVENT, onUiEvent);
+            retried = true;
+            process.stderr.write(`[onekey-hw] Protocol V2 USB probe was transient; retrying read-only probe (${attempt}/${maxAttempts})...\n`);
+            await (0, sdk_1.disposeSDK)();
+            await new Promise(resolve => {
+                setTimeout(resolve, 3000);
+            });
+            currentSdk = await (0, sdk_1.createSDK)(globalOpts);
+            if (globalOpts.connectId)
+                connectId = undefined;
         }
-        if (installStartedAt !== undefined && installEndedAt === undefined) {
-            installEndedAt = Date.now();
+    }
+    let progressEvents = 0;
+    let lastProgress = -1;
+    let transferStartedAt;
+    let transferEndedAt;
+    let installProgressEvents = 0;
+    let lastInstallProgress = -1;
+    let installStartedAt;
+    let installEndedAt;
+    let lastPrintedTransferProgress = -10;
+    let lastPrintedInstallProgress = -10;
+    const totalStartedAt = Date.now();
+    const onUiEvent = (message) => {
+        if (!message || typeof message !== 'object')
+            return;
+        const messageType = message.type;
+        const payload = getFirmwareUpdatePayload(message);
+        if (messageType === hd_core_1.UI_REQUEST.FIRMWARE_TIP) {
+            const tipMessage = payload?.data?.message;
+            if (typeof tipMessage === 'string') {
+                process.stderr.write(`[onekey-hw] Firmware: ${tipMessage}\n`);
+            }
+            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.payload ?? {});
-            lastResult = {
-                ...lastResult,
-                payload: {
-                    ...payload,
-                    metrics,
-                },
-            };
+        if (messageType === hd_core_1.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 !== hd_core_1.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 ?? (transferStartedAt = Date.now());
+            lastPrintedTransferProgress = maybePrintFirmwareProgress({
+                progressType: 'transfer',
+                progress,
+                payload,
+                lastPrintedProgress: lastPrintedTransferProgress,
+            });
+            if (progress >= 100) {
+                transferEndedAt ?? (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 ?? (installStartedAt = Date.now());
+            lastPrintedInstallProgress = maybePrintFirmwareProgress({
+                progressType: 'install',
+                progress,
+                payload,
+                lastPrintedProgress: lastPrintedInstallProgress,
+            });
+            if (progress >= 100) {
+                installEndedAt ?? (installEndedAt = Date.now());
+            }
         }
-        retried = true;
-        process.stderr.write(`[onekey-hw] Protocol V2 USB probe was transient; retrying firmwareUpdateV4 (${attempt}/${maxAttempts})...\n`);
-        await (0, sdk_1.disposeSDK)();
-        await new Promise(resolve => {
-            setTimeout(resolve, 3000);
-        });
-        currentSdk = await (0, sdk_1.createSDK)(globalOpts);
+    };
+    currentSdk.on(hd_core_1.UI_EVENT, onUiEvent);
+    let result;
+    try {
+        result = await currentSdk.firmwareUpdateV4(connectId, params);
+    }
+    finally {
+        currentSdk.off?.(hd_core_1.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.payload ?? {});
+        return {
+            ...result,
+            payload: {
+                ...payload,
+                metrics,
+            },
+        };
     }
-    return lastResult;
+    return result;
 }
+exports.runFirmwareUpdateV4WithRetry = runFirmwareUpdateV4WithRetry;
 function buildFirmwareUpdateV4Params(opts) {
     const params = {
         platform: 'desktop',
         connectProtocol: 'V2',
         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,
@@ -1151,7 +1203,6 @@ function buildFirmwareUpdateV4Params(opts) {
         se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
     };
     const hasPayload = [
-        params.resourceBundleFiles,
         params.romloaderBinary,
         params.bootloaderBinary,
         params.applicationP1Binary,