@onekeyfe/hardware-cli 1.2.0-alpha.67 → 1.2.0-alpha.69

package/dist/cli.d.ts

@@ -53,7 +53,7 @@ export declare function runFirmwareUpdateV4WithRetry({ sdk, globalOpts, params,
 }): Promise<unknown>;
 declare function buildFirmwareUpdateV4Params(opts: {
     chunkSize?: string;
-    resourceBundle?: string[];
+    resourceFile?: string[];
     romloader?: string;
     bootloader?: string;
     applicationP1?: string;
@@ -69,7 +69,7 @@ declare function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: "V2";
     chunkSize: number | undefined;
     forcedUpdateRes: boolean | undefined;
-    resourceBundleFiles: {
+    resourceFiles: {
         binary: ArrayBuffer;
         devicePath: string;
     }[] | undefined;

package/dist/cli.js

@@ -485,7 +485,7 @@ 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('--resource-file <spec...>', 'Resource 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')
@@ -957,15 +957,15 @@ async function resolveLegacyFirmwareConnectId(sdk, explicitConnectId, deviceName
         throw new Error(`BLE device has no connect ID: ${name}`);
     return connectId;
 }
-function parseResourceBundleParam(spec) {
+function parseResourceFileParam(spec) {
     const sep = spec.indexOf(':');
     if (sep <= 0 || sep === spec.length - 1) {
-        throw new Error(`Invalid --resource-bundle value: "${spec}". Expected <localPath>:<devicePath>`);
+        throw new Error(`Invalid --resource-file 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`);
+        throw new Error(`Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`);
     }
     return {
         binary: readBinaryParam(localPath),
@@ -974,7 +974,7 @@ function parseResourceBundleParam(spec) {
 }
 function getFirmwareUpdateV4TotalBytes(params) {
     return [
-        ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
+        ...(params.resourceFiles?.map(item => item.binary) ?? []),
         params.bootloaderBinary,
         params.applicationP1Binary,
         params.applicationP2Binary,
@@ -1209,7 +1209,7 @@ function buildFirmwareUpdateV4Params(opts) {
         connectProtocol: 'V2',
         chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
         forcedUpdateRes: opts.forcedUpdateRes,
-        resourceBundleFiles: opts.resourceBundle?.map(parseResourceBundleParam),
+        resourceFiles: opts.resourceFile?.map(parseResourceFileParam),
         romloaderBinary: opts.romloader ? readBinaryParam(opts.romloader) : undefined,
         bootloaderBinary: opts.bootloader ? readBinaryParam(opts.bootloader) : undefined,
         applicationP1Binary: opts.applicationP1 ? readBinaryParam(opts.applicationP1) : undefined,
@@ -1221,7 +1221,7 @@ function buildFirmwareUpdateV4Params(opts) {
         se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
     };
     const hasPayload = [
-        params.resourceBundleFiles,
+        params.resourceFiles,
         params.romloaderBinary,
         params.bootloaderBinary,
         params.applicationP1Binary,

package/dist/pinentry.d.ts

@@ -20,5 +20,6 @@ export declare function findPinentry(): string | null;
 export interface PinentryResult {
     value: string;
     passphraseOnDevice: boolean;
+    attachPinOnDevice?: boolean;
 }
 export declare function promptPassphraseViaPinentry(): Promise<PinentryResult>;

package/dist/sdk.d.ts

@@ -9,6 +9,7 @@
  *     but public SDK responses never expose new device session ids
  */
 import HardwareSDK from '@onekeyfe/hd-common-connect-sdk';
+import type { PinentryResult } from './pinentry';
 export interface SDKOptions {
     connectId?: string;
     passphraseState?: string;
@@ -16,6 +17,13 @@ export interface SDKOptions {
     debug?: boolean;
     transport?: 'usb' | 'ble';
 }
+/**
+ * Prompt user to select wallet type (aligns with app-monorepo flow):
+ *   1. Standard wallet (no passphrase)
+ *   2. Hidden wallet — enter passphrase via pinentry (secure OS dialog)
+ *   3. Hidden wallet — enter passphrase on device screen
+ */
+export declare function resolvePassphraseByChoice(choice: '1' | '2' | '3' | '4'): Promise<PinentryResult>;
 export declare function createSDK(opts: SDKOptions): Promise<typeof HardwareSDK>;
 /**
  * Release the SDK and clear the singleton. Must be called before the CLI

package/dist/sdk.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disposeSDK = exports.createSDK = void 0;
+exports.disposeSDK = exports.createSDK = exports.resolvePassphraseByChoice = void 0;
 const readline = __importStar(require("node:readline"));
 const hd_common_connect_sdk_1 = __importDefault(require("@onekeyfe/hd-common-connect-sdk"));
 const hd_core_1 = require("@onekeyfe/hd-core");
@@ -76,8 +76,15 @@ function resolvePassphraseByChoice(choice) {
         return Promise.resolve({ value: '', passphraseOnDevice: false });
     if (choice === '2')
         return (0, pinentry_1.promptPassphraseViaPinentry)();
+    if (choice === '4')
+        return Promise.resolve({
+            value: '',
+            passphraseOnDevice: false,
+            attachPinOnDevice: true,
+        });
     return Promise.resolve({ value: '', passphraseOnDevice: true });
 }
+exports.resolvePassphraseByChoice = resolvePassphraseByChoice;
 function promptPassphraseMode() {
     if (!process.stdin.isTTY) {
         return Promise.resolve({ value: '', passphraseOnDevice: true });
@@ -94,16 +101,17 @@ function promptPassphraseMode() {
                 '  1. Standard wallet (no passphrase)',
                 '  2. Hidden wallet — enter passphrase on this computer (pinentry)',
                 '  3. Hidden wallet — enter passphrase on device screen',
+                '  4. Attach PIN wallet — enter Attach PIN on device screen',
                 '',
             ].join('\n'));
             rl.question('Enter selection [1/2/3]: ', answer => {
                 const n = answer.trim();
-                if (n === '1' || n === '2' || n === '3') {
+                if (n === '1' || n === '2' || n === '3' || n === '4') {
                     rl.close();
                     resolvePassphraseByChoice(n).then(resolve);
                     return;
                 }
-                process.stderr.write('Invalid selection. Enter 1, 2, or 3.\n');
+                process.stderr.write('Invalid selection. Enter 1, 2, 3, or 4.\n');
                 prompt();
             });
         };
@@ -147,6 +155,7 @@ function registerEventHandlers(sdk) {
                     payload: {
                         value: result.value,
                         passphraseOnDevice: result.passphraseOnDevice,
+                        attachPinOnDevice: result.attachPinOnDevice,
                         save: false,
                     },
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.67",
+  "version": "1.2.0-alpha.69",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.67",
-    "@onekeyfe/hd-core": "1.2.0-alpha.67",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.67",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.67",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.69",
+    "@onekeyfe/hd-core": "1.2.0-alpha.69",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.69",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.69",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "5fea66e8c65a1fab2ccc099b2811c8749b2487e0"
+  "gitHead": "c6baed25917e3c3f027f83dfc23cde85400de558"
 }

package/src/__tests__/wallet-session.test.ts

@@ -1,4 +1,5 @@
 import { prepareSession } from '../cli';
+import { resolvePassphraseByChoice } from '../sdk';
 import { preloadSessionFromKeychain } from '../session';
 
 jest.mock('../session', () => ({
@@ -7,6 +8,14 @@ jest.mock('../session', () => ({
 }));
 
 describe('CLI wallet session', () => {
+  test('maps the Attach PIN choice to an on-device Attach PIN response', async () => {
+    await expect(resolvePassphraseByChoice('4')).resolves.toEqual({
+      value: '',
+      passphraseOnDevice: false,
+      attachPinOnDevice: true,
+    });
+  });
+
   test('uses the public wallet identity without persisting an internal session id', async () => {
     const sdk = {
       searchDevices: jest.fn().mockResolvedValue({

package/src/cli.ts

@@ -629,8 +629,8 @@ program
   .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'
+    '--resource-file <spec...>',
+    'Resource 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')
@@ -1253,18 +1253,16 @@ async function resolveLegacyFirmwareConnectId(
   return connectId;
 }
 
-function parseResourceBundleParam(spec: string): { binary: ArrayBuffer; devicePath: string } {
+function parseResourceFileParam(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>`
-    );
+    throw new Error(`Invalid --resource-file 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`
+      `Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`
     );
   }
   return {
@@ -1275,7 +1273,7 @@ function parseResourceBundleParam(spec: string): { binary: ArrayBuffer; devicePa
 
 function getFirmwareUpdateV4TotalBytes(params: ReturnType<typeof buildFirmwareUpdateV4Params>) {
   return [
-    ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
+    ...(params.resourceFiles?.map(item => item.binary) ?? []),
     params.bootloaderBinary,
     params.applicationP1Binary,
     params.applicationP2Binary,
@@ -1600,7 +1598,7 @@ export async function runFirmwareUpdateV4WithRetry({
 
 function buildFirmwareUpdateV4Params(opts: {
   chunkSize?: string;
-  resourceBundle?: string[];
+  resourceFile?: string[];
   romloader?: string;
   bootloader?: string;
   applicationP1?: string;
@@ -1617,7 +1615,7 @@ function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: 'V2' as const,
     chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
     forcedUpdateRes: opts.forcedUpdateRes,
-    resourceBundleFiles: opts.resourceBundle?.map(parseResourceBundleParam),
+    resourceFiles: opts.resourceFile?.map(parseResourceFileParam),
     romloaderBinary: opts.romloader ? readBinaryParam(opts.romloader) : undefined,
     bootloaderBinary: opts.bootloader ? readBinaryParam(opts.bootloader) : undefined,
     applicationP1Binary: opts.applicationP1 ? readBinaryParam(opts.applicationP1) : undefined,
@@ -1630,7 +1628,7 @@ function buildFirmwareUpdateV4Params(opts: {
   };
 
   const hasPayload = [
-    params.resourceBundleFiles,
+    params.resourceFiles,
     params.romloaderBinary,
     params.bootloaderBinary,
     params.applicationP1Binary,

package/src/pinentry.ts

@@ -73,6 +73,7 @@ export function findPinentry(): string | null {
 export interface PinentryResult {
   value: string;
   passphraseOnDevice: boolean;
+  attachPinOnDevice?: boolean;
 }
 
 // CLI-variant policy differs from app-monorepo: we fall back to on-device

package/src/sdk.ts

@@ -59,9 +59,15 @@ let sdkReadyPromise: Promise<typeof HardwareSDK> | null = null;
  *   2. Hidden wallet — enter passphrase via pinentry (secure OS dialog)
  *   3. Hidden wallet — enter passphrase on device screen
  */
-function resolvePassphraseByChoice(choice: '1' | '2' | '3'): Promise<PinentryResult> {
+export function resolvePassphraseByChoice(choice: '1' | '2' | '3' | '4'): Promise<PinentryResult> {
   if (choice === '1') return Promise.resolve({ value: '', passphraseOnDevice: false });
   if (choice === '2') return promptPassphraseViaPinentry();
+  if (choice === '4')
+    return Promise.resolve({
+      value: '',
+      passphraseOnDevice: false,
+      attachPinOnDevice: true,
+    });
   return Promise.resolve({ value: '', passphraseOnDevice: true });
 }
 
@@ -84,18 +90,19 @@ function promptPassphraseMode(): Promise<PinentryResult> {
           '  1. Standard wallet (no passphrase)',
           '  2. Hidden wallet — enter passphrase on this computer (pinentry)',
           '  3. Hidden wallet — enter passphrase on device screen',
+          '  4. Attach PIN wallet — enter Attach PIN on device screen',
           '',
         ].join('\n')
       );
 
       rl.question('Enter selection [1/2/3]: ', answer => {
-        const n = answer.trim() as '1' | '2' | '3';
-        if (n === '1' || n === '2' || n === '3') {
+        const n = answer.trim() as '1' | '2' | '3' | '4';
+        if (n === '1' || n === '2' || n === '3' || n === '4') {
           rl.close();
           resolvePassphraseByChoice(n).then(resolve);
           return;
         }
-        process.stderr.write('Invalid selection. Enter 1, 2, or 3.\n');
+        process.stderr.write('Invalid selection. Enter 1, 2, 3, or 4.\n');
         prompt();
       });
     };
@@ -143,6 +150,7 @@ function registerEventHandlers(sdk: typeof HardwareSDK): void {
             payload: {
               value: result.value,
               passphraseOnDevice: result.passphraseOnDevice,
+              attachPinOnDevice: result.attachPinOnDevice,
               save: false,
             },
           });