chore: sync hotfix/v6.5.2 to x

.skillshare/skills/1k-retrospective/references/case-studies.md

@@ -74,3 +74,9 @@ Cases are appended by AI after each bug fix. Do NOT reorder or delete entries 
 **Root Cause**: `swapTypeSwitchAction` remapped From/To when the Pro target equaled the restored FromToken, but `SwapHeaderContainer` synced the account from the pre-switch `fromToken.networkId` captured in the React closure.
 **Fix**: Return the settled FromToken from `swapTypeSwitchAction` and sync the account network from that value after the type switch leaves the Pro owner.
 **Catchable by**: Section 4: Logic moved between files carries its surrounding guard/condition and scope; Section 4: Data flow end-to-end after a state remapping
+## Case: BLE pairing dialog shown while device already paired and communicating
+**Date**: 2026-08-13 | **Platforms**: Desktop (macOS/Windows desktop BLE)
+**Symptom**: Creating a wallet over Bluetooth showed the "Pairing with your device" dialog mid-flow (OK-60091) even though the device was OS-paired and actively communicating on a live Noble session; the dialog's repair then re-scanned and "discovered" the very connectId the caller passed in.
+**Root Cause**: `getCompatibleConnectId` triggered the USB→BLE pairing repair purely from DB bookkeeping (device record missing `bleConnectId` — recreated that way by a USB wallet creation after wallet removal deleted the record), never recognizing the caller's incoming connectId as the live BLE endpoint. DB binding state is neither necessary nor sufficient evidence of OS pairing state.
+**Fix**: Before the dialog fallback, silently verify and persist the caller-held connectId, gated by runtime evidence: id differs from the record's USB identifiers, carried real device traffic within 60s (stamped by DEVICE.STATE/DEVICE.CONNECT, invalidated on DEVICE.DISCONNECT), probed with silentMode (no global error dialog from error constructors), a bounded 10s timeout, and the session's remembered protocol pinned (forced re-detection sends a V2 Ping into an active V1 session, which the device may not answer — SDK error 713); the probed deviceId must match before persisting.
+**Catchable by**: NEW — not covered (interactive dialog triggered from persistence bookkeeping instead of live transport evidence)

apps/cli/package.json

@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "@napi-rs/keyring": "^1.3.0",
-    "@onekeyfe/hd-common-connect-sdk": "1.1.34-alpha.0",
-    "@onekeyfe/hd-core": "1.1.34-alpha.0",
-    "@onekeyfe/hd-transport-usb": "1.1.34-alpha.0",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.176",
+    "@onekeyfe/hd-core": "1.2.0-alpha.176",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.176",
     "proper-lockfile": "^4.1.2"
   }
 }

apps/cli/src/__tests__/btc-signer-hardware.test.ts

@@ -64,14 +64,16 @@ function makeDeps(overrides: { sdk?: Partial<CoreApi> } = {}): {
 } {
   const device = makeDevice();
   const sdk = {
-    getFeatures: jest.fn(async () => makeSuccess({ unlocked: true })),
+    getDeviceState: jest.fn(async () =>
+      makeSuccess({ status: { unlocked: true } }),
+    ),
     deviceUnlock: jest.fn(async () => makeSuccess({})),
     searchDevices: jest.fn(async () =>
       makeSuccess([
         {
           connectId: device.connectId,
           deviceId: device.deviceId,
-          features: { device_id: device.deviceId, session_id: 'session-123' },
+          sessionId: 'session-123',
         },
       ]),
     ),
@@ -101,8 +103,8 @@ function makeDeps(overrides: { sdk?: Partial<CoreApi> } = {}): {
       async () => sdk,
     ) as unknown as ISignerHardwareDeps['ensureSDKReady'],
     installPassphraseProvider,
-    resolvePassphraseStateByMode:
-      jest.fn() as unknown as ISignerHardwareDeps['resolvePassphraseStateByMode'],
+    resolvePassphraseSessionByMode:
+      jest.fn() as unknown as ISignerHardwareDeps['resolvePassphraseSessionByMode'],
     keychainFactory: () => ({
       get: jest.fn(async () => null),
       set: jest.fn(async () => undefined),

apps/cli/src/__tests__/device-search-command.test.ts

@@ -0,0 +1,36 @@
+import { formatSearchedDevice } from '../commands/device/device-search';
+
+describe('device search formatting', () => {
+  it('prefers the canonical display name over the transport name', () => {
+    expect(
+      formatSearchedDevice({
+        connectId: 'PRO2_USB',
+        name: 'Pro2 6136',
+        displayName: 'My Pro 2',
+        deviceType: 'pro2',
+      }),
+    ).toMatchObject({
+      name: 'My Pro 2',
+      model: 'pro2',
+    });
+  });
+
+  it('prefers serialNo while keeping the legacy uuid fallback', () => {
+    expect(
+      formatSearchedDevice({
+        serialNo: 'SERIAL-NO',
+        uuid: 'LEGACY-UUID',
+      }),
+    ).toMatchObject({
+      serial: 'SERIAL-NO',
+    });
+
+    expect(
+      formatSearchedDevice({
+        uuid: 'LEGACY-UUID',
+      }),
+    ).toMatchObject({
+      serial: 'LEGACY-UUID',
+    });
+  });
+});

apps/cli/src/__tests__/evm-signer-hardware.test.ts

@@ -7,7 +7,7 @@
  *   - passphrase mode 'none' → useEmptyPassphrase branch, no keychain reads
  *   - passphrase mode 'on_host' → keychain preload hits session cache
  *   - passphrase mode 'on_host' with deviceWasLocked → keychain skipped,
- *     resolvePassphraseStateByMode fallback, result re-persisted
+ *     resolvePassphraseSessionByMode fallback, result re-persisted
  *   - buildHardwareEvmTransaction + buildSignedTxFromSignatureEvm wired in
  *     for both EIP-1559 and legacy shapes
  *   - signMessage throws when path missing
@@ -45,9 +45,8 @@ const MOCK_SID_FROM_KEYCHAIN = 'sess_N1fKj3BvP4kRZ';
 const MOCK_STALE_PS = 'stalePsXyz7HkLm9';
 const MOCK_STALE_SID = 'staleSidAbc4JkRp';
 const MOCK_RESOLVED_PS = 'freshResolveWxYz23';
-// Returned by sdk.searchDevices() after a fresh getPassphraseState — this
-// is the session_id that persistPassphraseState must capture and write to
-// the keychain to replace the now-invalid stale one.
+// Returned by getPassphraseState after a fresh hidden-wallet resolve. The
+// session_id must be written with the matching passphraseState.
 const MOCK_FRESH_SID_AFTER_RESOLVE = 'sess_freshAfterUnlockK7';
 
 const DEVICE: DeviceInfo = {
@@ -71,7 +70,7 @@ function makeDeps(
     keychainGet: jest.Mock;
     keychainSet: jest.Mock;
     installPassphraseProvider: jest.Mock;
-    resolvePassphraseStateByMode: jest.Mock;
+    resolvePassphraseSessionByMode: jest.Mock;
     preloadSessionCache: jest.Mock;
     stderrWrite: jest.Mock;
   };
@@ -90,21 +89,16 @@ function makeDeps(
   });
 
   const sdk = {
-    getFeatures: jest.fn(async () =>
-      makeSuccess({ unlocked: overrides.unlocked ?? true }),
+    getDeviceState: jest.fn(async () =>
+      makeSuccess({ status: { unlocked: overrides.unlocked ?? true } }),
     ),
     deviceUnlock: jest.fn(async () => makeSuccess({})),
-    // searchDevices is invoked by persistPassphraseState to discover the
-    // session_id the device just minted for the freshly-resolved passphrase.
     searchDevices: jest.fn(async () =>
       makeSuccess([
         {
           connectId: DEVICE.connectId,
           deviceId: DEVICE.deviceId,
-          features: {
-            device_id: DEVICE.deviceId,
-            session_id: MOCK_FRESH_SID_AFTER_RESOLVE,
-          },
+          sessionId: MOCK_FRESH_SID_AFTER_RESOLVE,
         },
       ]),
     ),
@@ -125,17 +119,21 @@ function makeDeps(
   // passphraseState from the SDK is an opaque ASCII token (base58-ish,
   // not hex). The default here matches the real-world shape so the
   // keychain utf-8 round-trip stays honest under test.
-  const resolvePassphraseStateByMode =
-    overrides.resolveByMode ?? jest.fn(async () => MOCK_RESOLVED_PS);
+  const resolvePassphraseSessionByMode =
+    overrides.resolveByMode ??
+    jest.fn(async () => ({
+      passphraseState: MOCK_RESOLVED_PS,
+      sessionId: MOCK_FRESH_SID_AFTER_RESOLVE,
+    }));
   const preloadSessionCache = overrides.preloadSessionCache ?? jest.fn();
   const stderrWrite = jest.fn(() => true);
 
   const deps: ISignerHardwareDeps = {
     ensureSDKReady:
       ensureSDKReady as unknown as ISignerHardwareDeps['ensureSDKReady'],
     installPassphraseProvider,
-    resolvePassphraseStateByMode:
-      resolvePassphraseStateByMode as unknown as ISignerHardwareDeps['resolvePassphraseStateByMode'],
+    resolvePassphraseSessionByMode:
+      resolvePassphraseSessionByMode as unknown as ISignerHardwareDeps['resolvePassphraseSessionByMode'],
     keychainFactory: () => ({
       get: keychainGet,
       set: keychainSet,
@@ -152,7 +150,7 @@ function makeDeps(
       keychainGet,
       keychainSet,
       installPassphraseProvider,
-      resolvePassphraseStateByMode,
+      resolvePassphraseSessionByMode,
       preloadSessionCache,
       stderrWrite,
     },
@@ -229,7 +227,7 @@ describe('SignerHardware', () => {
 
       expect(addr).toEqual({ address: '0xabc', path: "m/44'/60'/0'/0/0" });
       expect(mocks.keychainGet).not.toHaveBeenCalled();
-      expect(mocks.resolvePassphraseStateByMode).not.toHaveBeenCalled();
+      expect(mocks.resolvePassphraseSessionByMode).not.toHaveBeenCalled();
       expect(mocks.preloadSessionCache).not.toHaveBeenCalled();
 
       const callArgs = mocks.sdk.evmGetAddress.mock.calls[0];
@@ -280,7 +278,7 @@ describe('SignerHardware', () => {
         MOCK_PS_FROM_KEYCHAIN,
         MOCK_SID_FROM_KEYCHAIN,
       );
-      expect(mocks.resolvePassphraseStateByMode).not.toHaveBeenCalled();
+      expect(mocks.resolvePassphraseSessionByMode).not.toHaveBeenCalled();
       const params = mocks.sdk.evmGetAddress.mock.calls[0][2];
       expect(params).toMatchObject({
         passphraseState: MOCK_PS_FROM_KEYCHAIN,
@@ -309,8 +307,9 @@ describe('SignerHardware', () => {
       await signer.getAddress('evm--1');
 
       expect(mocks.sdk.deviceUnlock).toHaveBeenCalledWith(DEVICE.connectId, {});
-      expect(mocks.resolvePassphraseStateByMode).toHaveBeenCalledWith(
+      expect(mocks.resolvePassphraseSessionByMode).toHaveBeenCalledWith(
         DEVICE.connectId,
+        DEVICE.deviceId,
         'on_host',
       );
 
@@ -328,8 +327,9 @@ describe('SignerHardware', () => {
         Buffer.from(MOCK_FRESH_SID_AFTER_RESOLVE, 'utf-8'),
       );
 
-      // searchDevices is the source of the fresh session_id post-resolve.
-      expect(mocks.sdk.searchDevices).toHaveBeenCalled();
+      // session_id now comes from the getPassphraseState payload directly.
+      // searchDevices may still run during signer init for connectId refresh,
+      // but it is no longer the source of the freshly resolved session_id.
 
       // After persisting, warm the SDK in-process cache with the new
       // (deviceId, freshPassphraseState, freshSessionId) triple so any
@@ -358,8 +358,9 @@ describe('SignerHardware', () => {
 
       await signer.getAddress('evm--1');
 
-      expect(mocks.resolvePassphraseStateByMode).toHaveBeenCalledWith(
+      expect(mocks.resolvePassphraseSessionByMode).toHaveBeenCalledWith(
         DEVICE.connectId,
+        DEVICE.deviceId,
         'on_host',
       );
       // Both keys must be written so the next process can preload a valid
@@ -376,7 +377,7 @@ describe('SignerHardware', () => {
 
     it('throws when hidden wallet resolve returns undefined instead of silently using standard wallet', async () => {
       const { deps } = makeDeps({
-        resolveByMode: jest.fn(async () => undefined),
+        resolveByMode: jest.fn(async () => ({})),
       });
       const signer = new SignerHardware({
         device: DEVICE,
@@ -563,10 +564,7 @@ describe('SignerHardware', () => {
               {
                 connectId: FRESH_CONNECT_ID,
                 deviceId: DEVICE.deviceId,
-                features: {
-                  device_id: DEVICE.deviceId,
-                  session_id: MOCK_FRESH_SID_AFTER_RESOLVE,
-                },
+                sessionId: MOCK_FRESH_SID_AFTER_RESOLVE,
               },
             ]),
           ),
@@ -620,7 +618,6 @@ describe('SignerHardware', () => {
               {
                 connectId: 'other-device-connect',
                 deviceId: 'other-device-id',
-                features: { device_id: 'other-device-id' },
               },
             ]),
           ),