@mearl/client 2.9.3 → 2.9.5

package/dist/check.js

@@ -1,4 +1,4 @@
-import { UnifiedClient } from './unified.js';
+import { UnifiedClient, normalizeBrowserSelector, } from './unified.js';
 function formatError(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -16,7 +16,7 @@ function redactServerUrl(serverUrl) {
     }
 }
 function browserMatches(browser, selector) {
-    const normalized = selector.trim().toLowerCase();
+    const normalized = normalizeBrowserSelector(selector);
     return (browser.browserId.toLowerCase() === normalized ||
         browser.originalBrowserId?.toLowerCase() === normalized ||
         browser.name.toLowerCase() === normalized ||
@@ -26,7 +26,7 @@ function findBrowsers(browsers, selector) {
     const exact = browsers.filter(browser => browserMatches(browser, selector));
     if (exact.length > 0)
         return exact;
-    const normalized = selector.trim().toLowerCase();
+    const normalized = normalizeBrowserSelector(selector);
     return browsers.filter(browser => browser.browserId.toLowerCase().includes(normalized) ||
         browser.originalBrowserId?.toLowerCase().includes(normalized) ||
         browser.name.toLowerCase().includes(normalized) ||

package/dist/commands.d.ts

@@ -336,15 +336,15 @@ export declare const COMMANDS: readonly [{
     readonly examples: ["send_mtop_request --payload '{\"api\":\"mtop.trade.order.detail\",\"data\":{\"orderId\":\"123\"}}'"];
 }, {
     readonly name: "tdbank_account";
-    readonly description: "TDBank 账号操作：获取当前账号、账号列表、切换账号、快速借用并切换账号";
+    readonly description: "TDBank 账号操作：获取扫码登录二维码、当前账号、账号列表、切换账号、快速借用并切换账号";
     readonly params: [{
         readonly name: "tabId";
         readonly type: "number";
-        readonly description: "CDP 模式下可指定用于读取 Cookie 的标签页 ID";
+        readonly description: "login 首次不传；后续传上次响应的 tabId；无法恢复待扫码状态时会返回新的 tabId；其他操作在 CDP 模式下用于读取 Cookie";
     }, {
         readonly name: "operation";
-        readonly type: "\"current\" | \"list\" | \"switch\" | \"borrow\"";
-        readonly description: "操作类型，默认 list";
+        readonly type: "\"current\" | \"list\" | \"login\" | \"switch\" | \"borrow\"";
+        readonly description: "操作类型，默认 current";
     }, {
         readonly name: "refresh";
         readonly type: "boolean";
@@ -360,17 +360,25 @@ export declare const COMMANDS: readonly [{
     }, {
         readonly name: "havanaId";
         readonly type: "string | number";
-        readonly description: "switch 时也可直接指定 havanaId";
+        readonly description: "switch 时直接指定 havanaId；TDBank 方式需配合 site，免密方式需配合 ssoKey";
     }, {
         readonly name: "site";
         readonly type: "string | number";
-        readonly description: "直接指定 havanaId 时必填";
+        readonly description: "TDBank 方式直接指定 havanaId 时必填";
+    }, {
+        readonly name: "ssoKey";
+        readonly type: "string";
+        readonly description: "switch 免密方式的秘钥；必须同时传 havanaId，site 固定为 taobao";
     }, {
         readonly name: "query";
         readonly type: "string";
         readonly description: "borrow 时输入要借用的账号 loginId/关键词";
+    }, {
+        readonly name: "identityId";
+        readonly type: "string | number";
+        readonly description: "login 返回 identity_required 后，传用户明确选择的 identityId";
     }];
-    readonly examples: ["tdbank_account --payload '{\"operation\":\"current\"}'", "tdbank_account --payload '{\"operation\":\"list\",\"refresh\":true}'", "tdbank_account --payload '{\"operation\":\"switch\",\"accountId\":12345}'", "tdbank_account --payload '{\"operation\":\"borrow\",\"query\":\"test_account\"}'"];
+    readonly examples: ["tdbank_account --payload '{\"operation\":\"login\"}'", "tdbank_account --payload '{\"operation\":\"login\",\"tabId\":12345}'", "tdbank_account --payload '{\"operation\":\"login\",\"tabId\":12345,\"identityId\":\"10001\"}'", "tdbank_account --payload '{\"operation\":\"current\"}'", "tdbank_account --payload '{\"operation\":\"list\",\"refresh\":true}'", "tdbank_account --payload '{\"operation\":\"switch\",\"accountId\":12345}'", "tdbank_account --payload '{\"operation\":\"switch\",\"havanaId\":\"1234567890\",\"ssoKey\":\"<secret>\"}'", "tdbank_account --payload '{\"operation\":\"borrow\",\"query\":\"test_account\"}'"];
 }, {
     readonly name: "browser_list";
     readonly description: "列出所有浏览器及其连接状态、类型和托管实例信息；AgentBay 可包含镜像与持久化 Context";

package/dist/commands.js

@@ -236,29 +236,47 @@ export const COMMANDS = [
     },
     {
         name: 'tdbank_account',
-        description: 'TDBank 账号操作：获取当前账号、账号列表、切换账号、快速借用并切换账号',
+        description: 'TDBank 账号操作：获取扫码登录二维码、当前账号、账号列表、切换账号、快速借用并切换账号',
         params: [
             {
                 name: 'tabId',
                 type: 'number',
-                description: 'CDP 模式下可指定用于读取 Cookie 的标签页 ID',
+                description: 'login 首次不传；后续传上次响应的 tabId；无法恢复待扫码状态时会返回新的 tabId；其他操作在 CDP 模式下用于读取 Cookie',
             },
             {
                 name: 'operation',
-                type: '"current" | "list" | "switch" | "borrow"',
-                description: '操作类型，默认 list',
+                type: '"current" | "list" | "login" | "switch" | "borrow"',
+                description: '操作类型，默认 current',
             },
             { name: 'refresh', type: 'boolean', description: 'list 时是否强制刷新账号列表' },
             { name: 'pageIndex', type: 'number', description: 'list 时的页码，默认 1' },
             { name: 'accountId', type: 'string | number', description: 'switch 时使用账号列表中的 id' },
-            { name: 'havanaId', type: 'string | number', description: 'switch 时也可直接指定 havanaId' },
-            { name: 'site', type: 'string | number', description: '直接指定 havanaId 时必填' },
+            {
+                name: 'havanaId',
+                type: 'string | number',
+                description: 'switch 时直接指定 havanaId；TDBank 方式需配合 site，免密方式需配合 ssoKey',
+            },
+            { name: 'site', type: 'string | number', description: 'TDBank 方式直接指定 havanaId 时必填' },
+            {
+                name: 'ssoKey',
+                type: 'string',
+                description: 'switch 免密方式的秘钥；必须同时传 havanaId，site 固定为 taobao',
+            },
             { name: 'query', type: 'string', description: 'borrow 时输入要借用的账号 loginId/关键词' },
+            {
+                name: 'identityId',
+                type: 'string | number',
+                description: 'login 返回 identity_required 后，传用户明确选择的 identityId',
+            },
         ],
         examples: [
+            `tdbank_account --payload '{"operation":"login"}'`,
+            `tdbank_account --payload '{"operation":"login","tabId":12345}'`,
+            `tdbank_account --payload '{"operation":"login","tabId":12345,"identityId":"10001"}'`,
             `tdbank_account --payload '{"operation":"current"}'`,
             `tdbank_account --payload '{"operation":"list","refresh":true}'`,
             `tdbank_account --payload '{"operation":"switch","accountId":12345}'`,
+            `tdbank_account --payload '{"operation":"switch","havanaId":"1234567890","ssoKey":"<secret>"}'`,
             `tdbank_account --payload '{"operation":"borrow","query":"test_account"}'`,
         ],
     },

package/dist/generated-browser-action-protocol.d.ts

@@ -112,14 +112,16 @@ export interface SendMtopRequestParams {
     ttid?: string;
 }
 export interface TdbankAccountParams {
-    operation?: 'current' | 'list' | 'switch' | 'borrow';
+    operation?: 'current' | 'list' | 'login' | 'switch' | 'borrow';
     pageIndex?: number;
     refresh?: boolean;
     query?: string;
     accountId?: string | number;
     havanaId?: string | number;
     site?: string | number;
+    ssoKey?: string;
     tabId?: number;
+    identityId?: string | number;
 }
 export type BrowserStatus = 'connected' | 'running_disconnected' | 'stopped';
 export interface BrowserSource {

package/dist/unified.d.ts

@@ -23,6 +23,7 @@ interface BrowserTarget {
     connector?: string;
 }
 export declare function decodeBrowserTarget(selector: string | undefined): BrowserTarget | undefined;
+export declare function normalizeBrowserSelector(selector: string): string;
 export declare class UnifiedClient {
     private readonly options;
     private defaultBrowser;

package/dist/unified.js

@@ -6,7 +6,7 @@ import { loadCloudServerConfig, loadLocalConnectorId } from './unifiedConfig.js'
 const RESPONSE_GRACE_MS = 1_000;
 const GLOBAL_BROWSER_PREFIX = 'mearl:';
 function encodeBrowserTarget(target) {
-    const browser = encodeURIComponent(target.browser);
+    const browser = encodeURIComponent(target.browser).replace(/%3A/g, ':');
     return target.connector
         ? `${GLOBAL_BROWSER_PREFIX}remote:${encodeURIComponent(target.connector)}:${browser}`
         : `${GLOBAL_BROWSER_PREFIX}local:${browser}`;
@@ -21,14 +21,18 @@ export function decodeBrowserTarget(selector) {
     if (!selector?.startsWith(GLOBAL_BROWSER_PREFIX))
         return undefined;
     try {
-        const parts = selector.slice(GLOBAL_BROWSER_PREFIX.length).split(':');
-        if (parts[0] === 'local' && parts.length === 2) {
-            const browser = decodeURIComponent(parts[1]);
+        const target = selector.slice(GLOBAL_BROWSER_PREFIX.length);
+        if (target.startsWith('local:')) {
+            const browser = decodeURIComponent(target.slice('local:'.length));
             return browser ? { browser } : undefined;
         }
-        if (parts[0] === 'remote' && parts.length === 3) {
-            const connector = decodeURIComponent(parts[1]);
-            const browser = decodeURIComponent(parts[2]);
+        if (target.startsWith('remote:')) {
+            const remoteTarget = target.slice('remote:'.length);
+            const separator = remoteTarget.indexOf(':');
+            if (separator < 0)
+                return undefined;
+            const connector = decodeURIComponent(remoteTarget.slice(0, separator));
+            const browser = decodeURIComponent(remoteTarget.slice(separator + 1));
             return connector && browser ? { connector, browser } : undefined;
         }
     }
@@ -37,6 +41,10 @@ export function decodeBrowserTarget(selector) {
     }
     return undefined;
 }
+export function normalizeBrowserSelector(selector) {
+    const decodedTarget = decodeBrowserTarget(selector);
+    return (decodedTarget ? encodeBrowserTarget(decodedTarget) : selector.trim()).toLowerCase();
+}
 function decorateBrowser(browser, source) {
     const safeBrowser = omitTransientBrowserSecrets(browser);
     const originalBrowserId = String(browser.browserId);
@@ -57,7 +65,7 @@ function decorateBrowser(browser, source) {
     };
 }
 function browserMatches(browser, selector) {
-    const normalized = selector.trim().toLowerCase();
+    const normalized = normalizeBrowserSelector(selector);
     return (browser.browserId.toLowerCase() === normalized ||
         browser.originalBrowserId?.toLowerCase() === normalized ||
         browser.name.toLowerCase() === normalized ||
@@ -70,7 +78,7 @@ function findBrowsers(browsers, selector, connectedOnly = true) {
     const exact = candidates.filter(browser => browserMatches(browser, selector));
     if (exact.length > 0)
         return exact;
-    const normalized = selector.trim().toLowerCase();
+    const normalized = normalizeBrowserSelector(selector);
     return candidates.filter(browser => browser.browserId.toLowerCase().includes(normalized) ||
         browser.originalBrowserId?.toLowerCase().includes(normalized) ||
         browser.name.toLowerCase().includes(normalized) ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/client",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Unified Mearl SDK & CLI for local and remote browsers",
   "type": "module",
   "main": "dist/index.js",
@@ -55,7 +55,7 @@
     "commander": "^15.0.0",
     "fastest-levenshtein": "^1.0.16",
     "ws": "^8.18.0",
-    "@mearl/cloud-types": "2.9.3"
+    "@mearl/cloud-types": "2.9.5"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",