@onekeyfe/hardware-cli 1.2.0-alpha.34 → 1.2.0-alpha.36

package/dist/cli.js

@@ -633,7 +633,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
@@ -678,8 +685,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);

package/dist/deviceSelection.d.ts

@@ -1,3 +1,3 @@
 export declare function selectSearchDevice<T extends {
-    connectId?: string;
+    connectId?: string | null;
 }>(devices: T[], preferredConnectId?: string): T | undefined;

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.34",
+  "version": "1.2.0-alpha.36",
   "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.34",
-    "@onekeyfe/hd-core": "1.2.0-alpha.34",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.34",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.34",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.36",
+    "@onekeyfe/hd-core": "1.2.0-alpha.36",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.36",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.36",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "07f10b4c9fab177da7c36d976ec18b075492b57f"
+  "gitHead": "94f0fec6ea1dfd4ffea2dae8ea2b0b4a2a6cf2be"
 }

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

@@ -808,7 +808,17 @@ sessionCmd
         });
         return;
       }
-      const device = searchResult.payload[0] as SearchDevice & { features?: Features };
+      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
@@ -860,8 +870,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);

package/src/deviceSelection.ts

@@ -1,4 +1,4 @@
-export function selectSearchDevice<T extends { connectId?: string }>(
+export function selectSearchDevice<T extends { connectId?: string | null }>(
   devices: T[],
   preferredConnectId?: string
 ): T | undefined {

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,
             },
           });