@onekeyfe/hardware-cli 1.1.26-alpha.106 → 1.1.26-alpha.4

package/src/chains.ts

@@ -11,6 +11,27 @@
 
 import type { CoreApi } from '@onekeyfe/hd-core';
 
+/**
+ * Extract params shared by every SDK method. Forwarded unconditionally:
+ *
+ * - `passphraseState` / `useEmptyPassphrase` — wallet selection.
+ * - `skipPassphraseCheck` — tells the SDK to skip its own
+ *   `checkPassphraseStateSafety` + error-114 gate so our interactive
+ *   `REQUEST_PASSPHRASE` handler can own the passphrase prompt flow.
+ *   `runCommand` always sets this to `true` via `getCommonParams`.
+ *
+ * All three are forwarded even when falsy/undefined — SDK treats missing
+ * and undefined identically. This avoids silent losses when inner calls
+ * (e.g. `resolveBatchGetAddress`) reconstruct a params object manually.
+ */
+function extractCommonParams(params: CommonCLIParams): Record<string, unknown> {
+  return {
+    passphraseState: params.passphraseState,
+    useEmptyPassphrase: params.useEmptyPassphrase,
+    skipPassphraseCheck: params.skipPassphraseCheck,
+  };
+}
+
 // Default BIP44 derivation paths per chain
 // Sources: developer-portal core-api-guide.mdx + chain-specific docs
 const DEFAULT_PATHS: Record<string, string> = {
@@ -30,7 +51,7 @@ const DEFAULT_PATHS: Record<string, string> = {
   nostr: "m/44'/1237'/0'/0/0",
   filecoin: "m/44'/461'/0'/0/0",
   kaspa: "m/44'/111111'/0'/0/0",
-  algo: "m/44'/283'/0'/0/0",
+  algo: "m/44'/283'/0'/0'/0'",
   conflux: "m/44'/503'/0'/0/0",
   nervos: "m/44'/309'/0'/0/0",
   alephium: "m/44'/1234'/0'/0/0",
@@ -83,12 +104,18 @@ function getDefaultPath(chain: string): string {
 /**
  * Common params passed to all SDK methods.
  * Reference: packages/core/src/types/api/export.ts (CommonParams)
+ *
+ * `skipPassphraseCheck` is CLI-internal plumbing — runCommand sets it to
+ * true so the interactive REQUEST_PASSPHRASE handler can own the prompt
+ * flow without the SDK rejecting with error 114 first. Exposed on the
+ * interface so inner helpers (batch flows, etc.) can forward it safely.
  */
 export interface CommonCLIParams {
   connectId?: string;
   deviceId?: string;
   passphraseState?: string;
   useEmptyPassphrase?: boolean;
+  skipPassphraseCheck?: boolean;
 }
 
 export interface GetAddressParams extends CommonCLIParams {
@@ -103,14 +130,17 @@ export async function resolveGetAddress(sdk: CoreApi, params: GetAddressParams)
   const showOnOneKey = params.showOnDevice ?? true;
   const connectId = params.connectId || '';
   const deviceId = params.deviceId || '';
+  const commonParams = extractCommonParams(params);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chainMethodMap: Record<string, () => Promise<any>> = {
-    evm: () => sdk.evmGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    btc: () => sdk.btcGetAddress(connectId, deviceId, { path, showOnOneKey, coin: 'btc' }),
-    sol: () => sdk.solGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    tron: () => sdk.tronGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    cosmos: () => sdk.cosmosGetAddress(connectId, deviceId, { path, showOnOneKey }),
+    evm: () => sdk.evmGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    btc: () =>
+      sdk.btcGetAddress(connectId, deviceId, { path, showOnOneKey, coin: 'btc', ...commonParams }),
+    sol: () => sdk.solGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    tron: () => sdk.tronGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    cosmos: () =>
+      sdk.cosmosGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
     // Cardano requires networkId, protocolMagic, derivationType
     cardano: () =>
       sdk.cardanoGetAddress(connectId, deviceId, {
@@ -119,6 +149,7 @@ export async function resolveGetAddress(sdk: CoreApi, params: GetAddressParams)
         protocolMagic: 764824073, // mainnet magic
         derivationType: 1, // Icarus
         showOnOneKey,
+        ...commonParams,
       }),
     // Polkadot requires network param
     polkadot: () =>
@@ -127,26 +158,57 @@ export async function resolveGetAddress(sdk: CoreApi, params: GetAddressParams)
         prefix: 0,
         network: 'polkadot',
         showOnOneKey,
+        ...commonParams,
+      }),
+    aptos: () => sdk.aptosGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    sui: () => sdk.suiGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    near: () => sdk.nearGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    xrp: () => sdk.xrpGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    stellar: () =>
+      sdk.stellarGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    ton: () => sdk.tonGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    filecoin: () =>
+      sdk.filecoinGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    kaspa: () =>
+      sdk.kaspaGetAddress(connectId, deviceId, {
+        path,
+        showOnOneKey,
+        prefix: 'kaspa',
+        ...commonParams,
+      }),
+    algo: () => sdk.algoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    conflux: () =>
+      sdk.confluxGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    nervos: () =>
+      sdk.nervosGetAddress(connectId, deviceId, {
+        path,
+        showOnOneKey,
+        network: 'ckb',
+        ...commonParams,
+      }),
+    alephium: () =>
+      sdk.alephiumGetAddress(connectId, deviceId, {
+        path,
+        showOnOneKey,
+        group: 0,
+        ...commonParams,
+      }),
+    neo: () => sdk.neoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    starcoin: () =>
+      sdk.starcoinGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    nem: () =>
+      sdk.nemGetAddress(connectId, deviceId, { path, showOnOneKey, network: 104, ...commonParams }),
+    dnx: () => sdk.dnxGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    scdo: () => sdk.scdoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    benfen: () =>
+      sdk.benfenGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+    nexa: () =>
+      sdk.nexaGetAddress(connectId, deviceId, {
+        path,
+        showOnOneKey,
+        prefix: 'nexa',
+        ...commonParams,
       }),
-    aptos: () => sdk.aptosGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    sui: () => sdk.suiGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    near: () => sdk.nearGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    xrp: () => sdk.xrpGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    stellar: () => sdk.stellarGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    ton: () => sdk.tonGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    filecoin: () => sdk.filecoinGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    kaspa: () => sdk.kaspaGetAddress(connectId, deviceId, { path, showOnOneKey, prefix: 'kaspa' }),
-    algo: () => sdk.algoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    conflux: () => sdk.confluxGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    nervos: () => sdk.nervosGetAddress(connectId, deviceId, { path, showOnOneKey, network: 'ckb' }),
-    alephium: () => sdk.alephiumGetAddress(connectId, deviceId, { path, showOnOneKey, group: 0 }),
-    neo: () => sdk.neoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    starcoin: () => sdk.starcoinGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    nem: () => sdk.nemGetAddress(connectId, deviceId, { path, showOnOneKey, network: 104 }),
-    dnx: () => sdk.dnxGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    scdo: () => sdk.scdoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    benfen: () => sdk.benfenGetAddress(connectId, deviceId, { path, showOnOneKey }),
-    nexa: () => sdk.nexaGetAddress(connectId, deviceId, { path, showOnOneKey, prefix: 'nexa' }),
   };
 
   const method = chainMethodMap[chain];
@@ -171,18 +233,20 @@ export async function resolveGetPublicKey(sdk: CoreApi, params: GetPublicKeyPara
   const path = params.path || getDefaultPath(chain);
   const connectId = params.connectId || '';
   const deviceId = params.deviceId || '';
+  const commonParams = extractCommonParams(params);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chainMethodMap: Record<string, () => Promise<any>> = {
-    evm: () => sdk.evmGetPublicKey(connectId, deviceId, { path }),
-    btc: () => sdk.btcGetPublicKey(connectId, deviceId, { path, coin: 'btc' }),
-    aptos: () => sdk.aptosGetPublicKey(connectId, deviceId, { path }),
-    cosmos: () => sdk.cosmosGetPublicKey(connectId, deviceId, { path }),
-    sui: () => sdk.suiGetPublicKey(connectId, deviceId, { path }),
-    starcoin: () => sdk.starcoinGetPublicKey(connectId, deviceId, { path }),
-    nostr: () => sdk.nostrGetPublicKey(connectId, deviceId, { path }),
-    benfen: () => sdk.benfenGetPublicKey(connectId, deviceId, { path }),
-    cardano: () => sdk.cardanoGetPublicKey(connectId, deviceId, { path, derivationType: 1 }),
+    evm: () => sdk.evmGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    btc: () => sdk.btcGetPublicKey(connectId, deviceId, { path, coin: 'btc', ...commonParams }),
+    aptos: () => sdk.aptosGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    cosmos: () => sdk.cosmosGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    sui: () => sdk.suiGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    starcoin: () => sdk.starcoinGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    nostr: () => sdk.nostrGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    benfen: () => sdk.benfenGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+    cardano: () =>
+      sdk.cardanoGetPublicKey(connectId, deviceId, { path, derivationType: 1, ...commonParams }),
   };
 
   const method = chainMethodMap[chain];
@@ -210,60 +274,125 @@ export async function resolveSignTransaction(sdk: CoreApi, params: SignTransacti
   const connectId = params.connectId || '';
   const deviceId = params.deviceId || '';
   const tx = params.transaction;
+  const commonParams = extractCommonParams(params);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chainMethodMap: Record<string, () => Promise<any>> = {
     // EVM: chainId is inside the transaction object, not top-level
-    evm: () => sdk.evmSignTransaction(connectId, deviceId, { path, transaction: tx as any }),
-    // BTC: requires inputs/outputs/refTxs/coin format
-    btc: () => sdk.btcSignTransaction(connectId, deviceId, { coin: 'btc', ...(tx as any) }),
-    sol: () => sdk.solSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    tron: () => sdk.tronSignTransaction(connectId, deviceId, { path, transaction: tx as any }),
+    evm: () =>
+      sdk.evmSignTransaction(connectId, deviceId, {
+        path,
+        transaction: tx as any,
+        ...commonParams,
+      }),
+    btc: () =>
+      sdk.btcSignTransaction(connectId, deviceId, { coin: 'btc', ...(tx as any), ...commonParams }),
+    sol: () =>
+      sdk.solSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    tron: () =>
+      sdk.tronSignTransaction(connectId, deviceId, {
+        path,
+        transaction: tx as any,
+        ...commonParams,
+      }),
     cosmos: () =>
-      sdk.cosmosSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    aptos: () => sdk.aptosSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    sui: () => sdk.suiSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    near: () => sdk.nearSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    // XRP: implementation reads path + transaction from payload despite type declaration
+      sdk.cosmosSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    aptos: () =>
+      sdk.aptosSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    sui: () =>
+      sdk.suiSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    near: () =>
+      sdk.nearSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
     // eslint-disable-next-line @typescript-eslint/ban-types
     xrp: () =>
       (sdk.xrpSignTransaction as (...args: unknown[]) => Promise<unknown>)(connectId, deviceId, {
         path,
         transaction: tx,
+        ...commonParams,
       }),
     stellar: () =>
       sdk.stellarSignTransaction(connectId, deviceId, {
         path,
         networkPassphrase: tx.networkPassphrase as string,
         transaction: tx.transaction as any,
+        ...commonParams,
       }),
-    // Polkadot: requires prefix param
     polkadot: () =>
       sdk.polkadotSignTransaction(connectId, deviceId, {
         path,
         rawTx: tx.rawTx as string,
         network: (tx.network as string) || 'polkadot',
         prefix: (tx.prefix as number) ?? 0,
+        ...commonParams,
       }),
     filecoin: () =>
-      sdk.filecoinSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    kaspa: () => sdk.kaspaSignTransaction(connectId, deviceId, { ...(tx as any) }),
-    algo: () => sdk.algoSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
+      sdk.filecoinSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    kaspa: () => sdk.kaspaSignTransaction(connectId, deviceId, { ...(tx as any), ...commonParams }),
+    algo: () =>
+      sdk.algoSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
     conflux: () =>
-      sdk.confluxSignTransaction(connectId, deviceId, { path, transaction: tx as any }),
-    nervos: () => sdk.nervosSignTransaction(connectId, deviceId, { ...(tx as any) }),
+      sdk.confluxSignTransaction(connectId, deviceId, {
+        path,
+        transaction: tx as any,
+        ...commonParams,
+      }),
+    nervos: () =>
+      sdk.nervosSignTransaction(connectId, deviceId, { ...(tx as any), ...commonParams }),
     alephium: () =>
-      sdk.alephiumSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    neo: () => sdk.neoSignTransaction(connectId, deviceId, { path, ...(tx as any) }),
-    dnx: () => sdk.dnxSignTransaction(connectId, deviceId, { path, ...(tx as any) }),
-    // SCDO: flat params (nonce, gasPrice, gasLimit, to, value, data), not wrapped
-    scdo: () => sdk.scdoSignTransaction(connectId, deviceId, { path, ...(tx as any) }),
+      sdk.alephiumSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    neo: () =>
+      sdk.neoSignTransaction(connectId, deviceId, { path, ...(tx as any), ...commonParams }),
+    dnx: () =>
+      sdk.dnxSignTransaction(connectId, deviceId, { path, ...(tx as any), ...commonParams }),
+    scdo: () =>
+      sdk.scdoSignTransaction(connectId, deviceId, { path, ...(tx as any), ...commonParams }),
     benfen: () =>
-      sdk.benfenSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
-    nexa: () => sdk.nexaSignTransaction(connectId, deviceId, { ...(tx as any) }),
-    cardano: () => sdk.cardanoSignTransaction(connectId, deviceId, { ...(tx as any) }),
+      sdk.benfenSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
+    nexa: () => sdk.nexaSignTransaction(connectId, deviceId, { ...(tx as any), ...commonParams }),
+    cardano: () =>
+      sdk.cardanoSignTransaction(connectId, deviceId, { ...(tx as any), ...commonParams }),
     starcoin: () =>
-      sdk.starcoinSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx as string }),
+      sdk.starcoinSignTransaction(connectId, deviceId, {
+        path,
+        rawTx: tx.rawTx as string,
+        ...commonParams,
+      }),
   };
 
   const method = chainMethodMap[chain];
@@ -286,6 +415,7 @@ export async function resolveSignMessage(sdk: CoreApi, params: SignMessageParams
   const path = params.path || getDefaultPath(chain);
   const connectId = params.connectId || '';
   const deviceId = params.deviceId || '';
+  const commonParams = extractCommonParams(params);
 
   // Most chains use `messageHex` (hex-encoded). CLI accepts either:
   // - Already hex-encoded string (starts with "0x" or matches /^[0-9a-fA-F]+$/)
@@ -296,39 +426,49 @@ export async function resolveSignMessage(sdk: CoreApi, params: SignMessageParams
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chainMethodMap: Record<string, () => Promise<any>> = {
-    evm: () => sdk.evmSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // BTC: uses messageHex, not message
-    btc: () => sdk.btcSignMessage(connectId, deviceId, { path, messageHex: msg, coin: 'btc' }),
-    sol: () => sdk.solSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // Tron: uses messageHex
-    tron: () => sdk.tronSignMessage(connectId, deviceId, { path, messageHex: msg }),
+    evm: () => sdk.evmSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+    btc: () =>
+      sdk.btcSignMessage(connectId, deviceId, {
+        path,
+        messageHex: msg,
+        coin: 'btc',
+        ...commonParams,
+      }),
+    sol: () => sdk.solSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+    tron: () =>
+      sdk.tronSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
     aptos: () =>
-      sdk.aptosSignMessage(connectId, deviceId, { path, payload: { message: msg } as any }),
-    sui: () => sdk.suiSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // Conflux: uses messageHex
-    conflux: () => sdk.confluxSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // Starcoin: uses messageHex
-    starcoin: () => sdk.starcoinSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // TON: tonSignMessage is transfer-signing, pass JSON params
+      sdk.aptosSignMessage(connectId, deviceId, {
+        path,
+        payload: { message: msg } as any,
+        ...commonParams,
+      }),
+    sui: () => sdk.suiSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+    conflux: () =>
+      sdk.confluxSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+    starcoin: () =>
+      sdk.starcoinSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
     ton: () => {
-      const tonParams = JSON.parse(msg);
-      return sdk.tonSignMessage(connectId, deviceId, { path, ...tonParams });
+      // TON expects structured params, parse from original raw input (not hex-encoded)
+      const tonParams = JSON.parse(raw);
+      return sdk.tonSignMessage(connectId, deviceId, { path, ...tonParams, ...commonParams });
     },
-    // Nostr: event must be a NostrEvent object (kind, content, tags, created_at)
     nostr: () => {
-      const event = JSON.parse(msg);
-      return sdk.nostrSignEvent(connectId, deviceId, { path, event });
+      // Nostr expects a JSON event object, parse from original raw input (not hex-encoded)
+      const event = JSON.parse(raw);
+      return sdk.nostrSignEvent(connectId, deviceId, { path, event, ...commonParams });
     },
-    // SCDO: uses messageHex
-    scdo: () => sdk.scdoSignMessage(connectId, deviceId, { path, messageHex: msg }),
-    // Alephium: requires messageType
+    scdo: () =>
+      sdk.scdoSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
     alephium: () =>
       sdk.alephiumSignMessage(connectId, deviceId, {
         path,
         messageHex: msg,
         messageType: 'alephium',
+        ...commonParams,
       }),
-    benfen: () => sdk.benfenSignMessage(connectId, deviceId, { path, messageHex: msg }),
+    benfen: () =>
+      sdk.benfenSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
     // Cardano: uses `message` field, requires networkId
     cardano: () =>
       sdk.cardanoSignMessage(connectId, deviceId, {
@@ -336,6 +476,7 @@ export async function resolveSignMessage(sdk: CoreApi, params: SignMessageParams
         message: msg,
         derivationType: 1,
         networkId: 1,
+        ...commonParams,
       }),
   };
 
@@ -361,16 +502,19 @@ export interface BatchGetAddressParams extends CommonCLIParams {
 }
 
 export async function resolveBatchGetAddress(sdk: CoreApi, params: BatchGetAddressParams) {
-  // #13 FIX: Collect per-item results with error handling for partial failures
+  // Spread `common` so every CommonCLIParams field (including
+  // skipPassphraseCheck) propagates to each inner resolveGetAddress
+  // call. Enumerating fields manually used to drop skipPassphraseCheck
+  // and cause error 114 on hidden-wallet batch calls.
+  const { bundle, ...common } = params;
   const results: Array<Record<string, unknown>> = [];
-  for (const item of params.bundle) {
+  for (const item of bundle) {
     try {
       const result = await resolveGetAddress(sdk, {
+        ...common,
         chain: item.chain,
         path: item.path,
         showOnDevice: item.showOnDevice ?? false,
-        connectId: params.connectId,
-        deviceId: params.deviceId,
       });
       results.push(result);
     } catch (err) {