@onekeyfe/hardware-cli 1.2.0-alpha.28 → 1.2.0-alpha.29

package/dist/cli.d.ts

@@ -5,8 +5,8 @@ export declare function getLegacyFirmwareConnectTimeout(transport: 'usb' | 'ble'
  * 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 → openWalletSession (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.
  */

package/dist/cli.js

@@ -622,7 +622,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();
@@ -657,23 +657,18 @@ sessionCmd
         });
         return;
     }
-    const { deviceId, passphraseState, sessionId } = sessionResult.payload;
+    const { deviceId, passphraseState } = sessionResult.payload;
     // 4. Get address to verify + extract deviceId
     const addrResult = await sdk.evmGetAddress(connectId, deviceId, {
         path: "m/44'/60'/0'/0/0",
         showOnOneKey: false,
         passphraseState,
     });
-    // 5. Persist only the session id returned by the explicit wallet-session API.
-    if (sessionId) {
-        await (0, session_1.saveSessionToKeychain)(deviceId, passphraseState, sessionId);
-    }
     outputResult(globalOpts, {
         success: true,
         payload: {
             passphraseState,
             deviceId,
-            ...(sessionId ? { sessionId } : {}),
             ...(addrResult?.success ? { address: addrResult.payload.address } : {}),
         },
     });
@@ -761,8 +756,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 → openWalletSession (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.
  */
@@ -835,7 +830,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) {
@@ -853,13 +848,9 @@ globalOpts) {
         if (sessionResult.payload.walletType !== 'hidden') {
             return undefined;
         }
-        const { deviceId: sessionDeviceId, passphraseState, sessionId } = sessionResult.payload;
+        const { deviceId: sessionDeviceId, passphraseState } = sessionResult.payload;
         globalOpts.deviceId = sessionDeviceId;
         globalOpts.passphraseState = passphraseState;
-        if (sessionId) {
-            await (0, session_1.saveSessionToKeychain)(sessionDeviceId, passphraseState, sessionId);
-            await (0, session_1.preloadSessionFromKeychain)(sessionDeviceId);
-        }
         return passphraseState;
     }
     return undefined;

package/dist/sdk.d.ts

@@ -5,8 +5,8 @@
  * Passphrase flow aligns with app-monorepo CLI:
  *   - Standard wallet: --use-empty-passphrase, auto-respond
  *   - Hidden wallet: interactive 1/2/3 selection (standard / pinentry / on-device)
- *   - Session caching: passphraseState + sessionId stored in OS keychain,
- *     preloaded via preloadSessionCache on next invocation
+ *   - Legacy session caching: existing OS keychain entries may still be preloaded,
+ *     but public SDK responses never expose new device session ids
  */
 import HardwareSDK from '@onekeyfe/hd-common-connect-sdk';
 export interface SDKOptions {

package/dist/sdk.js

@@ -6,8 +6,8 @@
  * Passphrase flow aligns with app-monorepo CLI:
  *   - Standard wallet: --use-empty-passphrase, auto-respond
  *   - Hidden wallet: interactive 1/2/3 selection (standard / pinentry / on-device)
- *   - Session caching: passphraseState + sessionId stored in OS keychain,
- *     preloaded via preloadSessionCache on next invocation
+ *   - Legacy session caching: existing OS keychain entries may still be preloaded,
+ *     but public SDK responses never expose new device session ids
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/session.d.ts

@@ -1,21 +1,14 @@
 /**
  * Passphrase session management for hd-cli.
  *
- * Aligns with app-monorepo's CLI pattern:
- *   Login:   openWalletSession → passphraseState + sessionId → keychain
- *   Command: keychain → preloadSessionCache → SDK call (no passphrase prompt)
- *   Stale:   error 112 → clear keychain → re-prompt → retry
- *   Logout:  keychain delete
+ * Existing keychain entries remain readable for compatibility, but the public
+ * SDK no longer exposes new device session ids for persistence.
  */
 /**
  * Load passphraseState + sessionId from keychain and call preloadSessionCache.
  * Non-fatal: returns the loaded passphraseState or undefined.
  */
 export declare function preloadSessionFromKeychain(deviceId: string): Promise<string | undefined>;
-/**
- * Save passphraseState + sessionId to keychain for next CLI invocation.
- */
-export declare function saveSessionToKeychain(deviceId: string, passphraseState: string, sessionId: string): Promise<void>;
 /**
  * Clear cached session from keychain.
  */

package/dist/session.js

@@ -2,14 +2,11 @@
 /**
  * Passphrase session management for hd-cli.
  *
- * Aligns with app-monorepo's CLI pattern:
- *   Login:   openWalletSession → passphraseState + sessionId → keychain
- *   Command: keychain → preloadSessionCache → SDK call (no passphrase prompt)
- *   Stale:   error 112 → clear keychain → re-prompt → retry
- *   Logout:  keychain delete
+ * Existing keychain entries remain readable for compatibility, but the public
+ * SDK no longer exposes new device session ids for persistence.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearSessionFromKeychain = exports.saveSessionToKeychain = exports.preloadSessionFromKeychain = void 0;
+exports.clearSessionFromKeychain = exports.preloadSessionFromKeychain = void 0;
 const hd_core_1 = require("@onekeyfe/hd-core");
 const storage_1 = require("./storage");
 // Keychain key format: scoped by deviceId for multi-device support
@@ -50,22 +47,6 @@ async function preloadSessionFromKeychain(deviceId) {
     return undefined;
 }
 exports.preloadSessionFromKeychain = preloadSessionFromKeychain;
-/**
- * Save passphraseState + sessionId to keychain for next CLI invocation.
- */
-async function saveSessionToKeychain(deviceId, passphraseState, sessionId) {
-    try {
-        const storage = getStorage();
-        await Promise.all([
-            storage.set(psKey(deviceId), Buffer.from(passphraseState, 'utf-8')),
-            storage.set(sidKey(deviceId), Buffer.from(sessionId, 'utf-8')),
-        ]);
-    }
-    catch {
-        // Non-fatal — session still works in-memory for this invocation
-    }
-}
-exports.saveSessionToKeychain = saveSessionToKeychain;
 /**
  * Clear cached session from keychain.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.28",
+  "version": "1.2.0-alpha.29",
   "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.28",
-    "@onekeyfe/hd-core": "1.2.0-alpha.28",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.28",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.28",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.29",
+    "@onekeyfe/hd-core": "1.2.0-alpha.29",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.29",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.29",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "b7c7f9f53c4d745f127d03e0b173e8b759bf8e15"
+  "gitHead": "4a4019e439cc472f89fd15ab47e84ef0ed43166a"
 }

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

@@ -1,14 +1,13 @@
 import { prepareSession } from '../cli';
-import { preloadSessionFromKeychain, saveSessionToKeychain } from '../session';
+import { preloadSessionFromKeychain } from '../session';
 
 jest.mock('../session', () => ({
   clearSessionFromKeychain: jest.fn(),
   preloadSessionFromKeychain: jest.fn(),
-  saveSessionToKeychain: jest.fn(),
 }));
 
 describe('CLI wallet session', () => {
-  test('persists the session returned by openWalletSession without reading it from features', async () => {
+  test('uses the public wallet identity without persisting an internal session id', async () => {
     const sdk = {
       searchDevices: jest.fn().mockResolvedValue({
         success: true,
@@ -34,7 +33,6 @@ describe('CLI wallet session', () => {
           walletType: 'hidden',
           deviceId: 'device-id',
           passphraseState: 'wallet-state',
-          sessionId: 'wallet-session-id',
           resumed: false,
         },
       }),
@@ -48,11 +46,6 @@ describe('CLI wallet session', () => {
       mode: 'select-hidden',
     });
     expect(sdk.getFeatures).not.toHaveBeenCalled();
-    expect(saveSessionToKeychain).toHaveBeenCalledWith(
-      'device-id',
-      'wallet-state',
-      'wallet-session-id'
-    );
     expect(globalOpts).toMatchObject({
       connectId: 'pro2-connect-id',
       deviceId: 'device-id',

package/src/cli.ts

@@ -14,11 +14,7 @@ import {
 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,
@@ -800,7 +796,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
@@ -838,7 +834,7 @@ sessionCmd
         });
         return;
       }
-      const { deviceId, passphraseState, sessionId } = sessionResult.payload;
+      const { deviceId, passphraseState } = sessionResult.payload;
 
       // 4. Get address to verify + extract deviceId
       const addrResult = await sdk.evmGetAddress(connectId, deviceId, {
@@ -847,17 +843,11 @@ sessionCmd
         passphraseState,
       });
 
-      // 5. Persist only the session id returned by the explicit wallet-session API.
-      if (sessionId) {
-        await saveSessionToKeychain(deviceId, passphraseState, sessionId);
-      }
-
       outputResult(globalOpts, {
         success: true,
         payload: {
           passphraseState,
           deviceId,
-          ...(sessionId ? { sessionId } : {}),
           ...(addrResult?.success ? { address: addrResult.payload.address } : {}),
         },
       });
@@ -966,8 +956,8 @@ 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 → openWalletSession (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.
  */
@@ -1080,7 +1070,7 @@ export 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) {
@@ -1100,15 +1090,10 @@ export async function prepareSession(
     if (sessionResult.payload.walletType !== 'hidden') {
       return undefined;
     }
-    const { deviceId: sessionDeviceId, passphraseState, sessionId } = sessionResult.payload;
+    const { deviceId: sessionDeviceId, passphraseState } = sessionResult.payload;
     globalOpts.deviceId = sessionDeviceId;
     globalOpts.passphraseState = passphraseState;
 
-    if (sessionId) {
-      await saveSessionToKeychain(sessionDeviceId, passphraseState, sessionId);
-      await preloadSessionFromKeychain(sessionDeviceId);
-    }
-
     return passphraseState;
   }
   return undefined;

package/src/sdk.ts

@@ -5,8 +5,8 @@
  * Passphrase flow aligns with app-monorepo CLI:
  *   - Standard wallet: --use-empty-passphrase, auto-respond
  *   - Hidden wallet: interactive 1/2/3 selection (standard / pinentry / on-device)
- *   - Session caching: passphraseState + sessionId stored in OS keychain,
- *     preloaded via preloadSessionCache on next invocation
+ *   - Legacy session caching: existing OS keychain entries may still be preloaded,
+ *     but public SDK responses never expose new device session ids
  */
 
 import * as readline from 'node:readline';

package/src/session.ts

@@ -1,11 +1,8 @@
 /**
  * Passphrase session management for hd-cli.
  *
- * Aligns with app-monorepo's CLI pattern:
- *   Login:   openWalletSession → passphraseState + sessionId → keychain
- *   Command: keychain → preloadSessionCache → SDK call (no passphrase prompt)
- *   Stale:   error 112 → clear keychain → re-prompt → retry
- *   Logout:  keychain delete
+ * Existing keychain entries remain readable for compatibility, but the public
+ * SDK no longer exposes new device session ids for persistence.
  */
 
 import { preloadSessionCache } from '@onekeyfe/hd-core';
@@ -55,25 +52,6 @@ export async function preloadSessionFromKeychain(deviceId: string): Promise<stri
   return undefined;
 }
 
-/**
- * Save passphraseState + sessionId to keychain for next CLI invocation.
- */
-export async function saveSessionToKeychain(
-  deviceId: string,
-  passphraseState: string,
-  sessionId: string
-): Promise<void> {
-  try {
-    const storage = getStorage();
-    await Promise.all([
-      storage.set(psKey(deviceId), Buffer.from(passphraseState, 'utf-8')),
-      storage.set(sidKey(deviceId), Buffer.from(sessionId, 'utf-8')),
-    ]);
-  } catch {
-    // Non-fatal — session still works in-memory for this invocation
-  }
-}
-
 /**
  * Clear cached session from keychain.
  */