@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.12 → 1.1.26-alpha.13

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { IHardwareWallet, IConnector, TransportType, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, DeviceDescriptor, DeviceChangeEvent, ConnectionType, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType, DeviceManagementKit } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
+import { ContextModule } from '@ledgerhq/context-module';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
@@ -39,6 +40,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
+    private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;
     private _lastCancelReason;
     private static _createDeviceBusyError;
@@ -132,6 +134,16 @@ declare class LedgerAdapter implements IHardwareWallet {
     private static _throwIfAborted;
     /** Actual work done under the job queue — connection, fingerprint, call, and recovery. */
     private _runConnectorCall;
+    /**
+     * Stuck-app recovery: pause for the device's UI transition, then retry once.
+     *
+     * Caller has already cleared the session + reset connector. We wait so Stax
+     * finishes its post-CloseApp animation, then go through ensureConnected +
+     * fingerprint check + call exactly once. Caller decides what to do on a
+     * second stuck-app hit.
+     */
+    private _retryAfterStuckApp;
+    private _sleepAbortable;
     /**
      * Clear stale session, reconnect, and retry the call.
      *
@@ -446,8 +458,14 @@ type SignerEthBuilderFn = (args: {
     dmk: DeviceManagementKit;
     sessionId: string;
 }) => {
+    withContextModule?(contextModule: ContextModule): {
+        build(): SignerEth$1;
+    };
     build(): SignerEth$1;
 } | Promise<{
+    withContextModule?(contextModule: ContextModule): {
+        build(): SignerEth$1;
+    };
     build(): SignerEth$1;
 }>;
 /**
@@ -463,6 +481,8 @@ declare class SignerManager {
     invalidate(_sessionId: string): void;
     clearAll(): void;
     private static _defaultBuilder;
+    private static _createContextModule;
+    static wrapBlindSigningReportNonBlocking<T extends ContextModule>(contextModule: T): T;
 }
 
 type BtcWallet = Parameters<SignerBtc$1['getWalletAddress']>[0];

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { IHardwareWallet, IConnector, TransportType, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, DeviceDescriptor, DeviceChangeEvent, ConnectionType, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType, DeviceManagementKit } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
+import { ContextModule } from '@ledgerhq/context-module';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
@@ -39,6 +40,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
+    private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;
     private _lastCancelReason;
     private static _createDeviceBusyError;
@@ -132,6 +134,16 @@ declare class LedgerAdapter implements IHardwareWallet {
     private static _throwIfAborted;
     /** Actual work done under the job queue — connection, fingerprint, call, and recovery. */
     private _runConnectorCall;
+    /**
+     * Stuck-app recovery: pause for the device's UI transition, then retry once.
+     *
+     * Caller has already cleared the session + reset connector. We wait so Stax
+     * finishes its post-CloseApp animation, then go through ensureConnected +
+     * fingerprint check + call exactly once. Caller decides what to do on a
+     * second stuck-app hit.
+     */
+    private _retryAfterStuckApp;
+    private _sleepAbortable;
     /**
      * Clear stale session, reconnect, and retry the call.
      *
@@ -446,8 +458,14 @@ type SignerEthBuilderFn = (args: {
     dmk: DeviceManagementKit;
     sessionId: string;
 }) => {
+    withContextModule?(contextModule: ContextModule): {
+        build(): SignerEth$1;
+    };
     build(): SignerEth$1;
 } | Promise<{
+    withContextModule?(contextModule: ContextModule): {
+        build(): SignerEth$1;
+    };
     build(): SignerEth$1;
 }>;
 /**
@@ -463,6 +481,8 @@ declare class SignerManager {
     invalidate(_sessionId: string): void;
     clearAll(): void;
     private static _defaultBuilder;
+    private static _createContextModule;
+    static wrapBlindSigningReportNonBlocking<T extends ContextModule>(contextModule: T): T;
 }
 
 type BtcWallet = Parameters<SignerBtc$1['getWalletAddress']>[0];

package/dist/index.js

@@ -69,7 +69,7 @@ var LOCKED_ERROR_CODES = /* @__PURE__ */ new Set(["5515", "21781", "6982", "2701
 var USER_REJECTED_CODES = /* @__PURE__ */ new Set(["6985", "27013"]);
 var WRONG_APP_CODES = /* @__PURE__ */ new Set(["6e00", "28160", "6d00", "27904", "6a83", "27267"]);
 var APP_NOT_INSTALLED_CODES = /* @__PURE__ */ new Set(["6807", "26631"]);
-var STEP_BLIND_SIGN_FALLBACK = "signer.eth.steps.blindSignTransactionFallback";
+var STEP_BLIND_SIGN_TRANSACTION_FALLBACK = "signer.eth.steps.blindSignTransactionFallback";
 function getEthAppErrorCode(err) {
   if (!err || typeof err !== "object") return null;
   const e = err;
@@ -134,13 +134,8 @@ function mapBtcAppError(hex) {
       return null;
   }
 }
-function mapEthAppError(ethCode, lastStep) {
+function mapEthAppErrorCode(ethCode) {
   switch (ethCode) {
-    case "6a80":
-      if (lastStep === STEP_BLIND_SIGN_FALLBACK) {
-        return import_hwk_adapter_core.HardwareErrorCode.EvmBlindSigningRequired;
-      }
-      return null;
     case "6984":
       return import_hwk_adapter_core.HardwareErrorCode.EvmClearSignPluginMissing;
     case "6a84":
@@ -153,6 +148,14 @@ function mapEthAppError(ethCode, lastStep) {
       return null;
   }
 }
+function classifyEthAppError(err) {
+  const ethCode = getEthAppErrorCode(err);
+  if (!ethCode) return null;
+  if (ethCode === "6a80") {
+    return hasBlindSignFallbackStep(err) ? import_hwk_adapter_core.HardwareErrorCode.EvmBlindSigningRequired : null;
+  }
+  return mapEthAppErrorCode(ethCode);
+}
 var ERROR_TAG = {
   // SDK-mint
   DeviceNotAdvertising: "DeviceNotAdvertisingError",
@@ -239,6 +242,22 @@ var CONNECTION_LEVEL_TAGS = /* @__PURE__ */ new Set([
   ERROR_TAG.ReconnectionFailed,
   ERROR_TAG.WebHIDDisconnect
 ]);
+var DEVICE_NOT_FOUND_TAGS = /* @__PURE__ */ new Set([
+  ERROR_TAG.NoAccessibleDevice,
+  ERROR_TAG.UnknownDevice,
+  ERROR_TAG.DeviceNotInitialized
+]);
+var DEVICE_BUSY_TAGS = /* @__PURE__ */ new Set([ERROR_TAG.OpeningConnection]);
+var DEVICE_DISCONNECTED_TAGS = /* @__PURE__ */ new Set([
+  ERROR_TAG.DeviceNotRecognized,
+  ERROR_TAG.DeviceSessionNotFound,
+  ERROR_TAG.DeviceSessionRefresher,
+  ERROR_TAG.DeviceDisconnectedBeforeSendingApdu,
+  ERROR_TAG.DeviceDisconnectedWhileSending,
+  ERROR_TAG.Disconnect,
+  ERROR_TAG.ReconnectionFailed,
+  ERROR_TAG.WebHIDDisconnect
+]);
 function isConnectionLevelError(err) {
   if (!err || typeof err !== "object") return false;
   const tag = err._tag;
@@ -260,6 +279,35 @@ function hasStatusCode(err, codeSet) {
   if (e.error != null && e._tag && hasStatusCode(e.error, codeSet)) return true;
   return false;
 }
+function hasBlindSignFallbackStep(err) {
+  if (!err || typeof err !== "object") return false;
+  const e = err;
+  if (e._lastStep === STEP_BLIND_SIGN_TRANSACTION_FALLBACK) return true;
+  if (Array.isArray(e._deviceActionSteps) && e._deviceActionSteps.includes(STEP_BLIND_SIGN_TRANSACTION_FALLBACK)) {
+    return true;
+  }
+  if (e.originalError != null && hasBlindSignFallbackStep(e.originalError)) return true;
+  if (e.error != null && e._tag && hasBlindSignFallbackStep(e.error)) return true;
+  return false;
+}
+function isDeviceNotFoundError(err) {
+  if (!err || typeof err !== "object") return false;
+  const tag = err._tag;
+  if (tag && DEVICE_NOT_FOUND_TAGS.has(tag)) return true;
+  const e = err;
+  if (e.originalError != null && isDeviceNotFoundError(e.originalError)) return true;
+  if (e.error != null && e._tag && isDeviceNotFoundError(e.error)) return true;
+  return false;
+}
+function isDeviceBusyError(err) {
+  if (!err || typeof err !== "object") return false;
+  const tag = err._tag;
+  if (tag && DEVICE_BUSY_TAGS.has(tag)) return true;
+  const e = err;
+  if (e.originalError != null && isDeviceBusyError(e.originalError)) return true;
+  if (e.error != null && e._tag && isDeviceBusyError(e.error)) return true;
+  return false;
+}
 function isUserRejectedError(err) {
   if (!err || typeof err !== "object") return false;
   const e = err;
@@ -292,8 +340,8 @@ function isAppNotInstalledError(err) {
 function isDeviceDisconnectedError(err) {
   if (!err || typeof err !== "object") return false;
   const e = err;
-  if (e._tag === ERROR_TAG.DeviceNotRecognized || e._tag === ERROR_TAG.DeviceSessionNotFound)
-    return true;
+  const tag = e._tag;
+  if (typeof tag === "string" && DEVICE_DISCONNECTED_TAGS.has(tag)) return true;
   if (typeof e.message === "string") {
     const msg = e.message.toLowerCase();
     if (msg.includes("disconnected") || msg.includes("not found") || msg.includes("no device") || msg.includes("unplugged"))
@@ -339,8 +387,10 @@ function mapLedgerError(err, opts) {
   let code;
   if (isDeviceLockedError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.DeviceLocked;
-  } else if (isDeviceNotAdvertisingError(err)) {
+  } else if (isDeviceNotAdvertisingError(err) || isDeviceNotFoundError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.DeviceNotFound;
+  } else if (isDeviceBusyError(err)) {
+    code = import_hwk_adapter_core.HardwareErrorCode.DeviceBusy;
   } else if (isBlePairingFailureError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.BlePairingTimeout;
   } else if (isUserRejectedError(err)) {
@@ -354,9 +404,7 @@ function mapLedgerError(err, opts) {
   } else if (isTimeoutError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.OperationTimeout;
   } else {
-    const ethCode = getEthAppErrorCode(err);
-    const lastStep = err && typeof err === "object" ? err._lastStep : void 0;
-    const ethMapped = ethCode ? mapEthAppError(ethCode, lastStep) : null;
+    const ethMapped = classifyEthAppError(err);
     const apduHex = ethMapped ? null : extractApduHex(err);
     const chainMapped = apduHex ? mapSolanaAppError(apduHex) ?? mapTronAppError(apduHex) ?? mapBtcAppError(apduHex) : null;
     code = ethMapped ?? chainMapped ?? import_hwk_adapter_core.HardwareErrorCode.UnknownError;
@@ -544,6 +592,17 @@ var _LedgerAdapter = class _LedgerAdapter {
     await this._ensureDevicePermission();
     debugLog(`[LedgerAdapter] searchDevices() entry, cacheBefore=${this._discoveredDevices.size}`);
     const devices = await this.connector.searchDevices();
+    debugLog(
+      "[DMK] adapter.searchDevices raw:",
+      devices.map((device) => ({
+        id: device?.deviceId,
+        deviceId: device?.deviceId,
+        connectId: device?.connectId,
+        deviceName: device?.name,
+        "device.name": device?.name,
+        model: device?.model
+      }))
+    );
     this._discoveredDevices.clear();
     for (const d of devices) {
       if (d.connectId) {
@@ -1185,7 +1244,39 @@ var _LedgerAdapter = class _LedgerAdapter {
           this.connector.reset?.();
         } catch {
         }
-        throw err;
+        debugLog(
+          "[LedgerAdapter] stuck-app retry: method=",
+          method,
+          "delayMs=",
+          _LedgerAdapter.STUCK_APP_RETRY_DELAY_MS,
+          "_tag=",
+          err?._tag
+        );
+        try {
+          const retryResult = await this._retryAfterStuckApp(
+            resolvedConnectId,
+            method,
+            effectiveParams,
+            signal,
+            err,
+            fingerprint
+          );
+          debugLog("[LedgerAdapter] stuck-app retry succeeded: method=", method);
+          return retryResult;
+        } catch (retryErr) {
+          if (signal.aborted) throw retryErr;
+          if (isStuckAppStateError(retryErr)) {
+            debugLog("[LedgerAdapter] stuck-app retry exhausted (2nd 6901): method=", method);
+            throw err;
+          }
+          debugLog(
+            "[LedgerAdapter] stuck-app retry threw non-stuck error: method=",
+            method,
+            "retryErrTag=",
+            retryErr?._tag
+          );
+          throw retryErr;
+        }
       }
       if (isDeviceLockedError(err) || isDeviceNotAdvertisingError(err) || isDeviceDisconnectedError(err)) {
         let lastErr = err;
@@ -1259,6 +1350,54 @@ var _LedgerAdapter = class _LedgerAdapter {
       throw err;
     }
   }
+  /**
+   * Stuck-app recovery: pause for the device's UI transition, then retry once.
+   *
+   * Caller has already cleared the session + reset connector. We wait so Stax
+   * finishes its post-CloseApp animation, then go through ensureConnected +
+   * fingerprint check + call exactly once. Caller decides what to do on a
+   * second stuck-app hit.
+   */
+  async _retryAfterStuckApp(resolvedConnectId, method, params, signal, originalErr, fingerprint) {
+    await this._sleepAbortable(_LedgerAdapter.STUCK_APP_RETRY_DELAY_MS, signal);
+    const retryTargetConnectId = isLedgerBleConnectionType(this.connector.connectionType) ? resolvedConnectId : void 0;
+    const retryConnectId = await this.ensureConnected(retryTargetConnectId, signal);
+    const retrySessionId = this._sessions.get(retryConnectId);
+    if (!retrySessionId) throw originalErr;
+    if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId) {
+      const fp = await this._abortable(
+        signal,
+        this._verifyDeviceFingerprintWithSession(
+          retrySessionId,
+          fingerprint.deviceId,
+          fingerprint.chain
+        )
+      );
+      if (!fp.success) {
+        throw Object.assign(new Error(formatDeviceMismatchError(fp.expected, fp.actual)), {
+          code: import_hwk_adapter_core2.HardwareErrorCode.DeviceMismatch
+        });
+      }
+    }
+    return this._abortable(signal, this.connector.call(retrySessionId, method, params));
+  }
+  _sleepAbortable(ms, signal) {
+    return new Promise((resolve, reject) => {
+      if (signal.aborted) {
+        reject(signal.reason ?? new Error("Aborted"));
+        return;
+      }
+      const timer = setTimeout(() => {
+        signal.removeEventListener("abort", onAbort);
+        resolve();
+      }, ms);
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(signal.reason ?? new Error("Aborted"));
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+    });
+  }
   /**
    * Clear stale session, reconnect, and retry the call.
    *
@@ -1436,6 +1575,10 @@ var _LedgerAdapter = class _LedgerAdapter {
 // Layer 2 retry budget after connection-class error. Each round delegates
 // to Layer 1 (which owns the unlock prompt). Layer 2 never emits UI itself.
 _LedgerAdapter.MAX_BUSINESS_RETRY_BUDGET = 3;
+// Stuck-app (APDU 0x6901) retry pause. Ledger Stax often returns 6901 when
+// OpenAppCommand lands mid-transition right after CloseApp; a short wait
+// lets the device finish its UI animation before we retry once.
+_LedgerAdapter.STUCK_APP_RETRY_DELAY_MS = 500;
 // Layer 1 confirm budget. After N failed Confirm cycles (user keeps clicking
 // Confirm but device never shows up / never unlocks), throw DeviceNotFound
 // instead of looping forever.
@@ -1443,7 +1586,7 @@ _LedgerAdapter.MAX_DOCONNECT_CONFIRMS = 3;
 var LedgerAdapter = _LedgerAdapter;
 
 // src/connector/LedgerConnectorBase.ts
-var import_hwk_adapter_core11 = require("@onekeyfe/hwk-adapter-core");
+var import_hwk_adapter_core12 = require("@onekeyfe/hwk-adapter-core");
 
 // src/device/LedgerDeviceManager.ts
 var LedgerDeviceManager = class {
@@ -1704,6 +1847,7 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = IDLE_WATCHDOG_
   return new Promise((resolve, reject) => {
     let settled = false;
     let lastStep;
+    const observedSteps = [];
     let sub;
     let timer = null;
     const cancelAction = () => {
@@ -1763,7 +1907,12 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = IDLE_WATCHDOG_
         }
         armIdleWatchdog();
         const step = state?.intermediateValue?.step;
-        if (step) lastStep = step;
+        if (step) {
+          lastStep = step;
+          if (observedSteps[observedSteps.length - 1] !== step) {
+            observedSteps.push(step);
+          }
+        }
         if (state.status === import_device_management_kit.DeviceActionStatus.Completed) {
           settled = true;
           if (timer) clearTimeout(timer);
@@ -1775,7 +1924,7 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = IDLE_WATCHDOG_
           if (timer) clearTimeout(timer);
           onInteraction?.("interaction-complete");
           sub?.unsubscribe();
-          rejectWithLastStep(state.error, lastStep, reject);
+          rejectWithStepContext(state.error, lastStep, observedSteps, reject);
         } else if (state.status === import_device_management_kit.DeviceActionStatus.Pending && onInteraction) {
           const interaction = state.intermediateValue?.requiredUserInteraction;
           if (interaction && interaction !== "none") {
@@ -1792,7 +1941,7 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = IDLE_WATCHDOG_
           settled = true;
           if (timer) clearTimeout(timer);
           sub?.unsubscribe();
-          rejectWithLastStep(err, lastStep, reject);
+          rejectWithStepContext(err, lastStep, observedSteps, reject);
         }
       },
       complete: () => {
@@ -1805,15 +1954,25 @@ function deviceActionToPromise(action, onInteraction, timeoutMs = IDLE_WATCHDOG_
     });
   });
 }
-function rejectWithLastStep(err, lastStep, reject) {
-  if (err && typeof err === "object" && lastStep) {
+function rejectWithStepContext(err, lastStep, observedSteps, reject) {
+  if (err && typeof err === "object" && (lastStep || observedSteps.length > 0)) {
     try {
-      Object.defineProperty(err, "_lastStep", {
-        value: lastStep,
-        configurable: true,
-        enumerable: false,
-        writable: true
-      });
+      if (lastStep) {
+        Object.defineProperty(err, "_lastStep", {
+          value: lastStep,
+          configurable: true,
+          enumerable: false,
+          writable: true
+        });
+      }
+      if (observedSteps.length > 0) {
+        Object.defineProperty(err, "_deviceActionSteps", {
+          value: [...observedSteps],
+          configurable: true,
+          enumerable: false,
+          writable: true
+        });
+      }
     } catch {
     }
   }
@@ -1879,7 +2038,8 @@ var SignerManager = class _SignerManager {
   async getOrCreate(sessionId) {
     debugLog("[DMK] SignerManager.getOrCreate:", { sessionId });
     const builder = await this._builderFn({ dmk: this._dmk, sessionId });
-    return new SignerEth(builder.build());
+    const builderWithContext = builder.withContextModule ? builder.withContextModule(_SignerManager._createContextModule()) : builder;
+    return new SignerEth(builderWithContext.build());
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   invalidate(_sessionId) {
@@ -1888,10 +2048,24 @@ var SignerManager = class _SignerManager {
   clearAll() {
   }
   static _defaultBuilder() {
-    return (args) => {
-      const contextModule = new import_context_module.ContextModuleBuilder({}).removeDefaultLoaders().build();
-      return new import_device_signer_kit_ethereum.SignerEthBuilder(args).withContextModule(contextModule);
+    return (args) => new import_device_signer_kit_ethereum.SignerEthBuilder(args);
+  }
+  static _createContextModule() {
+    const contextModule = new import_context_module.ContextModuleBuilder({}).removeDefaultLoaders().build();
+    return _SignerManager.wrapBlindSigningReportNonBlocking(contextModule);
+  }
+  static wrapBlindSigningReportNonBlocking(contextModule) {
+    const report = contextModule.report.bind(contextModule);
+    contextModule.report = async (params) => {
+      try {
+        void report(params).catch((err) => {
+          debugLog("[DMK] ContextModule.report failed:", err);
+        });
+      } catch (err) {
+        debugLog("[DMK] ContextModule.report failed:", err);
+      }
     };
+    return contextModule;
   }
 };
 
@@ -2461,14 +2635,15 @@ async function _createSolSigner(ctx, sessionId) {
 }
 
 // src/connector/chains/tron.ts
-var import_hwk_adapter_core10 = require("@onekeyfe/hwk-adapter-core");
+var import_hwk_adapter_core11 = require("@onekeyfe/hwk-adapter-core");
 var import_hw_app_trx = __toESM(require("@ledgerhq/hw-app-trx"));
 
 // src/connector/chains/legacyChainCall.ts
-var import_hwk_adapter_core9 = require("@onekeyfe/hwk-adapter-core");
+var import_hwk_adapter_core10 = require("@onekeyfe/hwk-adapter-core");
 
 // src/app/AppManager.ts
 var import_device_management_kit2 = require("@ledgerhq/device-management-kit");
+var import_hwk_adapter_core9 = require("@onekeyfe/hwk-adapter-core");
 var APP_NAME_MAP = {
   ETH: "Ethereum",
   BTC: "Bitcoin",
@@ -2573,9 +2748,11 @@ var AppManager = class {
     });
     if (!(0, import_device_management_kit2.isSuccessCommandResult)(result)) {
       const { statusCode } = result;
+      const hasStatusCode2 = statusCode != null && statusCode !== "";
       debugLog("[AppManager] openApp failed:", appName, "statusCode:", statusCode);
       throw Object.assign(new Error(`Failed to open "${appName}"`), {
         _tag: ERROR_TAG.OpenAppCommand,
+        code: hasStatusCode2 ? void 0 : import_hwk_adapter_core9.HardwareErrorCode.AppNotInstalled,
         errorCode: String(statusCode ?? ""),
         statusCode,
         appName
@@ -2631,14 +2808,14 @@ async function withLegacyChainCall(ctx, sessionId, options, action) {
   const onAppOpenPrompt = () => {
     openAppPromptShown = true;
     ctx.emit("ui-event", {
-      type: import_hwk_adapter_core9.EConnectorInteraction.ConfirmOpenApp,
+      type: import_hwk_adapter_core10.EConnectorInteraction.ConfirmOpenApp,
       payload: { sessionId }
     });
   };
   const closeOpenAppUiIfShown = () => {
     if (openAppPromptShown) {
       ctx.emit("ui-event", {
-        type: import_hwk_adapter_core9.EConnectorInteraction.InteractionComplete,
+        type: import_hwk_adapter_core10.EConnectorInteraction.InteractionComplete,
         payload: { sessionId }
       });
       openAppPromptShown = false;
@@ -2659,7 +2836,7 @@ async function withLegacyChainCall(ctx, sessionId, options, action) {
     let confirmEmitted = false;
     if (needsConfirmation) {
       ctx.emit("ui-event", {
-        type: import_hwk_adapter_core9.EConnectorInteraction.ConfirmOnDevice,
+        type: import_hwk_adapter_core10.EConnectorInteraction.ConfirmOnDevice,
         payload: { sessionId }
       });
       confirmEmitted = true;
@@ -2669,7 +2846,7 @@ async function withLegacyChainCall(ctx, sessionId, options, action) {
     } finally {
       if (confirmEmitted || openAppPromptShown) {
         ctx.emit("ui-event", {
-          type: import_hwk_adapter_core9.EConnectorInteraction.InteractionComplete,
+          type: import_hwk_adapter_core10.EConnectorInteraction.InteractionComplete,
           payload: { sessionId }
         });
         openAppPromptShown = false;
@@ -2757,7 +2934,7 @@ async function tronSignTransaction(ctx, sessionId, params) {
   if (!params.rawTxHex) {
     throw Object.assign(
       new Error("TRON signing requires a protobuf-encoded raw transaction hex (rawTxHex)."),
-      { code: import_hwk_adapter_core10.HardwareErrorCode.InvalidParams }
+      { code: import_hwk_adapter_core11.HardwareErrorCode.InvalidParams }
     );
   }
   const path = normalizePath(params.path);
@@ -2801,6 +2978,9 @@ var METHOD_PREFIX_TO_APP_NAME = {
   sol: "Solana",
   tron: "Tron"
 };
+var HARDWARE_ERROR_CODE_VALUES = new Set(
+  Object.values(import_hwk_adapter_core12.HardwareErrorCode).filter((value) => typeof value === "number")
+);
 async function defaultLedgerKitImporter(pkg) {
   switch (pkg) {
     case "@ledgerhq/device-management-kit":
@@ -2922,6 +3102,21 @@ var LedgerConnectorBase = class {
       descriptor: d,
       connectId: this._resolveConnectId(d)
     }));
+    debugLog(
+      "[DMK] connector.searchDevices() raw descriptors:",
+      resolvedDescriptors.map(({ descriptor: d, connectId }) => ({
+        id: d?.path,
+        path: d?.path,
+        connectId,
+        deviceName: d?.name,
+        "device.name": d?.bleName,
+        localName: d?.localName,
+        bleName: d?.bleName,
+        model: d?.type,
+        transport: d?.transport,
+        rssi: d?.rssi
+      }))
+    );
     const bleConnectIdCounts = /* @__PURE__ */ new Map();
     for (const item of resolvedDescriptors) {
       if (isLedgerBleDescriptor(this.connectionType, item.descriptor)) {
@@ -2929,7 +3124,7 @@ var LedgerConnectorBase = class {
           debugLog(`[DMK] connector.searchDevices() invalid BLE connectId=${item.connectId}`);
           throw Object.assign(
             new Error("Ledger BLE connectId must be the 4-character BLE identifier"),
-            { code: import_hwk_adapter_core11.HardwareErrorCode.DeviceNotFound }
+            { code: import_hwk_adapter_core12.HardwareErrorCode.DeviceNotFound }
           );
         }
         bleConnectIdCounts.set(item.connectId, (bleConnectIdCounts.get(item.connectId) ?? 0) + 1);
@@ -2946,7 +3141,7 @@ var LedgerConnectorBase = class {
       );
       throw Object.assign(
         new Error(`Duplicate Ledger BLE connectId detected: ${duplicateBleConnectId}`),
-        { code: import_hwk_adapter_core11.HardwareErrorCode.DeviceNotFound }
+        { code: import_hwk_adapter_core12.HardwareErrorCode.DeviceNotFound }
       );
     }
     const result = resolvedDescriptors.map(({ descriptor: d, connectId }) => {
@@ -2992,7 +3187,7 @@ var LedgerConnectorBase = class {
             `Ledger BLE connect did not return within ${HANG_CEILING_MS / 6e4}min \u2014 DMK hang fallback.`
           );
           err._tag = ERROR_TAG.BlePairingTimeout;
-          err.code = import_hwk_adapter_core11.HardwareErrorCode.BlePairingTimeout;
+          err.code = import_hwk_adapter_core12.HardwareErrorCode.BlePairingTimeout;
           reject(err);
         }, HANG_CEILING_MS);
       });
@@ -3054,7 +3249,7 @@ var LedgerConnectorBase = class {
           "Ledger Bluetooth pairing failed. Make sure the device is unlocked and nearby, then try again."
         );
         wrapped._tag = ERROR_TAG.BleGattBondingFailed;
-        wrapped.code = import_hwk_adapter_core11.HardwareErrorCode.BlePairingTimeout;
+        wrapped.code = import_hwk_adapter_core12.HardwareErrorCode.BlePairingTimeout;
         wrapped.originalError = err;
         throw wrapped;
       }
@@ -3137,7 +3332,7 @@ var LedgerConnectorBase = class {
     this._unwatchSessionState(sessionId);
     this._signerManager?.invalidate(sessionId);
     this._cancellers.get(sessionId)?.({
-      code: import_hwk_adapter_core11.HardwareErrorCode.DeviceDisconnected,
+      code: import_hwk_adapter_core12.HardwareErrorCode.DeviceDisconnected,
       tag: "DeviceDisconnected",
       message: "Device disconnected"
     });
@@ -3154,14 +3349,14 @@ var LedgerConnectorBase = class {
     } catch (err) {
       if (isAppStuckByApdu(err)) {
         throw Object.assign(new Error("Ledger app is unresponsive"), {
-          code: import_hwk_adapter_core11.HardwareErrorCode.DeviceAppStuck,
+          code: import_hwk_adapter_core12.HardwareErrorCode.DeviceAppStuck,
           _tag: ERROR_TAG.DeviceAppStuck,
           originalError: err
         });
       }
       if (isTransportStuck(err)) {
         throw Object.assign(new Error("Device communication interrupted, please retry"), {
-          code: import_hwk_adapter_core11.HardwareErrorCode.TransportError,
+          code: import_hwk_adapter_core12.HardwareErrorCode.TransportError,
           _tag: ERROR_TAG.DeviceTransportStuck,
           originalError: err
         });
@@ -3399,15 +3594,21 @@ var LedgerConnectorBase = class {
     };
   }
   _wrapError(err, opts) {
-    const mapped = mapLedgerError(err, opts);
     const src = err && typeof err === "object" ? err : {};
+    const hasSerializedCode = typeof src.code === "number" && HARDWARE_ERROR_CODE_VALUES.has(src.code);
+    const mapped = hasSerializedCode ? {
+      code: src.code,
+      message: typeof src.message === "string" ? src.message : "Unknown Ledger error",
+      appName: typeof src.appName === "string" ? src.appName : opts?.defaultAppName
+    } : mapLedgerError(err, opts);
     const error = new Error(mapped.message);
     Object.assign(error, {
       code: mapped.code,
       appName: mapped.appName,
       _tag: src._tag,
       errorCode: src.errorCode,
-      _lastStep: src._lastStep
+      _lastStep: src._lastStep,
+      _deviceActionSteps: src._deviceActionSteps
     });
     Object.defineProperty(error, "originalError", {
       value: err,