@honor-claw/yoyo 2026.6.9-beta.2 → 2026.6.9-beta.20

package/dist/apis/claw-cloud.mjs

@@ -69,25 +69,6 @@ var o = class {
 			timeout: r?.timeoutMs ?? 3e4
 		});
 	}
-	async invokeCloudTool(e, n, r) {
-		let i = {
-			"x-trace-id": t(),
-			"x-jwt-token": n.token
-		}, a = {
-			pluginService: { serviceId: r.serviceId },
-			pluginParams: r.pluginParams,
-			device: {
-				deviceId: e.deviceId,
-				role: "yoyoclaw",
-				port: e.port
-			}
-		};
-		return this.httpClient.post("/icsplugin/execute", {
-			headers: i,
-			body: a,
-			timeout: r?.timeoutMs ?? 3e4
-		});
-	}
 	async exchangeToken(e, r) {
 		let i = t(), o = {
 			"Content-Type": "application/json",

package/dist/capabilities/admin/impl.mjs

@@ -1,8 +1,9 @@
-import { clawLogger as e } from "../../utils/claw-logger.mjs";
-import { AdminClientManager as t } from "./manager.mjs";
+import { toErrorMessage as e } from "../../utils/error.mjs";
+import { clawLogger as t } from "../../utils/claw-logger.mjs";
+import { AdminClientManager as n } from "./manager.mjs";
 //#region src/capabilities/admin/impl.ts
-var n = e("capabilities"), r = null, i = class {
-	manager = new t();
+var r = t("capabilities"), i = null, a = class {
+	manager = new n();
 	constructor() {
 		this.manager.init();
 	}
@@ -17,15 +18,15 @@ var n = e("capabilities"), r = null, i = class {
 	}
 	async pairApprove(e) {
 		let t = this.manager.getClient();
-		if (!t) return n.warn("admin client not available for auto pair"), !1;
+		if (!t) return r.warn("admin client not available for auto pair"), !1;
 		try {
-			let r = await t.devicePairApprove(e);
-			return r.ok ? (n.info("auto pair approve completed", { ok: !0 }), !0) : (n.warn("auto pair approve rejected", {
+			let n = await t.devicePairApprove(e);
+			return n.ok ? (r.info("auto pair approve completed", { ok: !0 }), !0) : (r.warn("auto pair approve rejected", {
 				ok: !1,
-				errorCode: r.error?.code
+				errorCode: n.error?.code
 			}), !1);
 		} catch (t) {
-			return n.error("auto pair approve failed, ignore...", t, { requestId: e }), !1;
+			return r.error("auto pair approve failed, ignore...", t, { requestId: e }), !1;
 		}
 	}
 	async setAgentFile(e, t, n) {
@@ -63,37 +64,56 @@ var n = e("capabilities"), r = null, i = class {
 		};
 	}
 	async getModelList() {
-		let e = this.manager.getClient();
-		if (!e) return {
+		let t = this.manager.getClient();
+		if (!t) return {
 			ok: !1,
 			error: "Admin gateway client not ready"
 		};
 		try {
 			return {
 				ok: !0,
-				data: { models: (await e.getModelList())?.models ?? [] }
+				data: { models: (await t.getModelList())?.models ?? [] }
 			};
-		} catch (e) {
-			let t = e instanceof Error ? e.message : String(e);
-			return n.error("fetchModelsList failed", e), {
+		} catch (t) {
+			let n = e(t);
+			return r.error("fetchModelsList failed", t), {
 				ok: !1,
-				error: `fetchModelsList error: ${t}`
+				error: `fetchModelsList error: ${n}`
+			};
+		}
+	}
+	async restart(t) {
+		let n = this.manager.getClient();
+		if (!n) return {
+			ok: !1,
+			error: "Admin gateway client not ready"
+		};
+		try {
+			return await n.restartGateway(t), r.info("plugin restart command dispatched via admin RPC", { reason: t }), {
+				ok: !0,
+				data: { dispatched: !0 }
+			};
+		} catch (t) {
+			let n = e(t);
+			return r.error("gateway restart RPC failed", t), {
+				ok: !1,
+				error: `gateway restart failed: ${n}`
 			};
 		}
 	}
 };
-function a() {
-	return r === null && (r = new i()), r;
-}
 function o() {
-	return a();
+	return i === null && (i = new a()), i;
 }
 function s() {
-	let e = a().ensureConnected();
-	return n.info("admin gateway connection started", { ready: e }), e;
+	return o();
 }
 function c() {
-	a().destroy(), n.info("admin gateway connection stopped");
+	let e = o().ensureConnected();
+	return r.info("admin gateway connection started", { ready: e }), e;
+}
+function l() {
+	o().destroy(), r.info("admin gateway connection stopped");
 }
 //#endregion
-export { s as startAdminConnection, c as stopAdminConnection, o as useAdminCapability };
+export { c as startAdminConnection, l as stopAdminConnection, s as useAdminCapability };

package/dist/capabilities/admin/manager.mjs

@@ -1,48 +1,50 @@
 import { clawLogger as e } from "../../utils/claw-logger.mjs";
-import { getGatewayAuthConfig as t } from "../../modules/configs/gateway.mjs";
+import { markAdminAuthenticated as t, markAdminAuthenticating as n, markAdminClosed as r, markAdminError as i, markAdminReconnecting as a } from "../../diagnose/connection/tracker.mjs";
+import { getGatewayAuthConfig as o } from "../../modules/configs/gateway.mjs";
 import "../../modules/configs/index.mjs";
-import n from "../../gateway/client/admin.mjs";
-import { StatusEventTypeE as r } from "../../modules/status/events.mjs";
-import { emitStatusEvent as i } from "../../modules/status/global.mjs";
+import s from "../../gateway/client/admin.mjs";
 //#region src/capabilities/admin/manager.ts
-var a = e("capabilities"), o = class {
+var c = e("capabilities"), l = class {
 	client = null;
 	ready = !1;
 	pendingReadyRequests = /* @__PURE__ */ new Map();
 	requestIdCounter = 0;
 	init() {
 		if (this.client !== null) return;
-		let e = t(), o = typeof e?.token == "string" ? e.token : "", s = typeof e?.password == "string" ? e.password : "";
-		this.client = new n({
-			token: o,
-			password: s,
+		let e = o(), l = typeof e?.token == "string" ? e.token : "", u = typeof e?.password == "string" ? e.password : "";
+		n(), this.client = new s({
+			token: l,
+			password: u,
 			onAuthenticated: () => {
-				a.info("admin gateway client authenticated"), this.ready = !0, this.resolveAllPending(!0);
+				c.info("admin gateway client authenticated"), t(), this.ready = !0, this.resolveAllPending(!0);
 			},
 			onClose: (e) => {
-				a.info("admin gateway client closed", { reason: e }), this.ready = !1;
+				c.info("admin gateway client closed", { reason: e }), r(e), this.ready = !1;
+			},
+			onReconnecting: (e, t) => {
+				c.info("admin gateway client reconnecting", {
+					reason: e,
+					retryCount: t
+				}), a(e, t), this.ready = !1;
 			},
 			onReconnectFailed: () => {
-				a.error("admin gateway client reconnect failed, notifying status tracker"), i({
-					type: r.ADMIN_CLIENT_RECONNECT_FAILED,
-					data: {}
-				});
+				c.error("admin gateway client reconnect failed"), i("网关管理通道连接重试超限");
 			}
 		});
 	}
 	destroy() {
-		this.client &&= (this.client.stop(), null), this.ready = !1, this.cancelAllPending(), a.info("admin client destroyed");
+		this.client &&= (this.client.stop(), null), this.ready = !1, this.cancelAllPending(), c.info("admin client destroyed");
 	}
 	getClient() {
 		return this.ready && this.client?.isAuthenticated() ? this.client : null;
 	}
 	ensureConnected() {
-		return this.client === null && (a.info("admin gateway client is null, initializing"), this.init()), this.ready || (a.info("admin gateway client not ready, connecting"), this.client?.connect()), this.client !== null && this.ready;
+		return this.client === null && (c.info("admin gateway client is null, initializing"), this.init()), this.ready || (c.info("admin gateway client not ready, connecting"), this.client?.connect()), this.client !== null && this.ready;
 	}
 	waitForReady(e = 5e3) {
 		return this.client !== null && this.ready ? Promise.resolve(!0) : new Promise((t) => {
 			let n = `req_${++this.requestIdCounter}`, r = setTimeout(() => {
-				this.pendingReadyRequests.delete(n), this.pendingReadyRequests.size === 0 && a.warn("admin gateway client waitForReady timeout, all requests rejected"), t(!1);
+				this.pendingReadyRequests.delete(n), this.pendingReadyRequests.size === 0 && c.warn("admin gateway client waitForReady timeout, all requests rejected"), t(!1);
 			}, e);
 			this.pendingReadyRequests.set(n, {
 				resolve: t,
@@ -60,4 +62,4 @@ var a = e("capabilities"), o = class {
 	}
 };
 //#endregion
-export { o as AdminClientManager };
+export { l as AdminClientManager };

package/dist/capabilities/node/directory.mjs

@@ -0,0 +1,10 @@
+import { listNodeDevices as e } from "./list.mjs";
+//#region src/capabilities/node/directory.ts
+async function t() {
+	return (await e()).devices;
+}
+async function n(t) {
+	return (await e({ deviceIdList: [t] })).devices.find((e) => e.deviceId === t);
+}
+//#endregion
+export { n as getDeviceWithStatus, t as listDevicesWithStatus };

package/dist/capabilities/node/index.mjs

@@ -1,3 +1,4 @@
 import "./list.mjs";
+import "./directory.mjs";
 import "./invoke.mjs";
 import "./types.mjs";

package/dist/capabilities/node/invoke.mjs

@@ -2,10 +2,12 @@ import { clawLogger as e } from "../../utils/claw-logger.mjs";
 import { buildEndpoint as t } from "../../cloud-channel/protocol/target.mjs";
 import { resolveEnabledYoyoAccountId as n } from "../../modules/configs/channel.mjs";
 import { ClawClient as r } from "../../connection/registry.mjs";
+import { getToolCallContext as i } from "../../messaging/trace/tool-context.mjs";
+import "../../messaging/trace/index.mjs";
 //#region src/capabilities/node/invoke.ts
-var i = e("capabilities");
-async function a(e) {
-	let i = {
+var a = e("capabilities");
+async function o(e) {
+	let a = i(e.toolCallId) ?? void 0, o = {
 		to: t("node", e.nodeId),
 		msgType: "nodeInvokeRequest",
 		data: { node: {
@@ -13,28 +15,31 @@ async function a(e) {
 			nodeId: e.nodeId,
 			name: e.name,
 			...e.params ? { params: { arguments: JSON.stringify(e.params) } } : {}
-		} }
-	}, a = n();
-	return r.forAccount(a).request(i, {
+		} },
+		...a ? { traceInfo: a } : {}
+	}, c = n();
+	return r.forAccount(c).request(o, {
 		timeoutMs: e.timeoutMs,
-		matchResult: o
+		matchResult: s(e.toolCallId)
 	});
 }
-function o(e) {
-	if (e.payload.msgType !== "nodeInvokeResult") return { matched: !1 };
-	let t = e.data?.node;
-	return !t || typeof t.runStatus != "number" || !t.nodeId || !t.toolCallId ? (i.warn("nodeInvokeResult missing required fields", { node: t }), {
-		matched: !0,
-		error: "missing required fields in invoke result"
-	}) : {
-		matched: !0,
-		result: {
-			nodeId: t.nodeId,
-			toolCallId: t.toolCallId,
-			runStatus: t.runStatus,
-			result: t.result
-		}
+function s(e) {
+	return (t) => {
+		if (t.payload.msgType !== "nodeInvokeResult") return { matched: !1 };
+		let n = t.data?.node;
+		return !n || n.toolCallId !== e ? { matched: !1 } : typeof n.runStatus != "number" || !n.nodeId ? (a.warn("nodeInvokeResult missing required fields", { node: n }), {
+			matched: !0,
+			error: "missing required fields in invoke result"
+		}) : {
+			matched: !0,
+			result: {
+				nodeId: n.nodeId,
+				toolCallId: e,
+				runStatus: n.runStatus,
+				result: n.result
+			}
+		};
 	};
 }
 //#endregion
-export { a as invokeNodeTool };
+export { o as invokeNodeTool };

package/dist/capabilities/node/list.mjs

@@ -8,32 +8,42 @@ import "../../modules/device/index.mjs";
 import "../../honor-auth/vault/index.mjs";
 import "../../apis/index.mjs";
 import { ToolError as o } from "../../tools/error.mjs";
+import { DeviceStatus as s } from "../../types.mjs";
 //#region src/capabilities/node/list.ts
-var s = t("capabilities");
-async function c(t) {
-	let c = await n.fromUser().current();
-	if (!c?.token || !c.userId) throw s.error("node device list skipped: no current user"), new o("unauthorized", "missing current user token");
-	let l;
+var c = t("capabilities");
+function l(e) {
+	return {
+		deviceId: e.deviceId,
+		...e.deviceName ? { deviceName: e.deviceName } : {},
+		deviceType: e.deviceType ?? "unknown",
+		deviceModel: e.deviceModel ?? "",
+		online: e.status === s.Online
+	};
+}
+async function u(t) {
+	let s = await n.fromUser().current();
+	if (!s?.token || !s.userId) throw c.error("node device list skipped: no current user"), new o("unauthorized", "missing current user token");
+	let u;
 	try {
-		l = await a();
+		u = await a();
 	} catch (e) {
-		throw s.error("node device list failed to get device info", e), new o("device_info", "failed to get device info", { cause: e });
+		throw c.error("node device list failed to get device info", e), new o("device_info", "failed to get device info", { cause: e });
 	}
 	try {
-		let e = await i().getDeviceList(l, c, { deviceIdList: t?.deviceIdList });
+		let e = await i().getDeviceList(u, s, { deviceIdList: t?.deviceIdList });
 		if (!r(e)) {
 			let t = e.data?.code, n = e.data?.cnMessage;
-			throw s.error("node device list response not ok", null, {
+			throw c.error("node device list response not ok", null, {
 				status: e.status,
 				code: t,
 				cnMessage: n
 			}), new o("api_failed", `code=${t} message=${n}`);
 		}
 		let n = e.data.data?.deviceList;
-		return { devices: Array.isArray(n) ? n : [] };
+		return { devices: Array.isArray(n) ? n.map(l) : [] };
 	} catch (t) {
-		throw t instanceof o ? t : (s.error("node device list failed", t), new o("network_error", e(t), { cause: t }));
+		throw t instanceof o ? t : (c.error("node device list failed", t), new o("network_error", e(t), { cause: t }));
 	}
 }
 //#endregion
-export { c as listNodeDevices };
+export { u as listNodeDevices };

package/dist/capabilities/routing/index.mjs

@@ -1,3 +1,4 @@
 import "./route.mjs";
 import "./list.mjs";
 import "./model-switch.mjs";
+import "./restart.mjs";

package/dist/capabilities/routing/restart.mjs

@@ -0,0 +1,17 @@
+import { clawLogger as e } from "../../utils/claw-logger.mjs";
+import { useAdminCapability as t } from "../admin/impl.mjs";
+import "../admin/index.mjs";
+//#region src/capabilities/routing/restart.ts
+var n = e("routing");
+async function r(e) {
+	let r = await t().restart(e);
+	return n.info("plugin restart command dispatched", {
+		ok: r.ok,
+		reason: e
+	}), r.ok ? { ok: !0 } : {
+		ok: !1,
+		error: r.error
+	};
+}
+//#endregion
+export { r as restartGateway };

package/dist/channel/directory.mjs

@@ -3,13 +3,13 @@ import "../capabilities/node/index.mjs";
 //#region src/channel/directory.ts
 async function t(t) {
 	try {
-		return i((await e()).devices.filter((e) => r(e)).map((e) => n(e)), t);
+		return r((await e()).devices.map((e) => n(e)), t);
 	} catch {
 		return [];
 	}
 }
 function n(e) {
-	let t = e.deviceId.trim(), n = e.deviceName?.trim() || t;
+	let t = e.deviceId, n = e.deviceName || t;
 	return {
 		kind: "user",
 		id: `device:${t}`,
@@ -18,10 +18,7 @@ function n(e) {
 		raw: { deviceId: t }
 	};
 }
-function r(e) {
-	return typeof e.deviceId == "string" && e.deviceId.trim().length > 0;
-}
-function i(e, t) {
+function r(e, t) {
 	let n = t.query?.trim().toLowerCase(), r = n ? e.filter((e) => [
 		e.id,
 		e.name,
@@ -29,10 +26,10 @@ function i(e, t) {
 	].filter((e) => typeof e == "string").some((e) => e.toLowerCase().includes(n))) : e;
 	return typeof t.limit == "number" && t.limit >= 0 ? r.slice(0, t.limit) : r;
 }
-var a = {
+var i = {
 	self: async () => null,
 	listPeers: async (e) => t(e),
 	listGroups: async () => []
 };
 //#endregion
-export { a as yoyoDirectory };
+export { i as yoyoDirectory };

package/dist/channel/messaging.mjs

@@ -1,33 +1,33 @@
 import { YOYO_CHANNEL_ID as e } from "../consts.mjs";
-import { buildChatTo as t, buildFrom as n, readChatIdFromTo as r, readDeviceIdFromTo as i } from "../messaging/target/address.mjs";
-import { buildChatId as a, looksLikeChatId as o } from "../messaging/target/chat-id.mjs";
+import { buildChatId as t, looksLikeChatId as n } from "../messaging/target/chat-id.mjs";
+import { buildChatTo as r, buildFrom as i, readChatIdFromTo as a, readDeviceIdFromTo as o } from "../messaging/target/address.mjs";
 import { resolveOutboundTarget as s } from "../messaging/target/outbound.mjs";
 import { buildChannelOutboundSessionRoute as c, stripChannelTargetPrefix as l } from "openclaw/plugin-sdk/channel-core";
 //#region src/channel/messaging.ts
 function u(t) {
 	let n = l(t, e).trim();
-	return d(t, n) ? n : void 0;
+	return d(n) ? n : void 0;
 }
-function d(e, t = e) {
-	let n = t.trim(), a = r(n);
-	if (a !== void 0) return a.length > 0 && o(a);
-	let s = i(n);
-	return s !== void 0 && s.trim().length > 0;
+function d(e) {
+	let t = a(e);
+	if (t !== void 0) return t.length > 0 && n(t);
+	let r = o(e);
+	return r !== void 0 && r.length > 0;
 }
-async function f(r, i, o) {
-	let s = await a(i, o);
+async function f(n, a, o) {
+	let s = await t(a, o);
 	return c({
-		cfg: r.cfg,
-		agentId: r.agentId,
+		cfg: n.cfg,
+		agentId: n.agentId,
 		channel: e,
-		accountId: i,
+		accountId: a,
 		peer: {
 			kind: "direct",
 			id: s
 		},
 		chatType: "direct",
-		from: n(s),
-		to: t(s)
+		from: i(s),
+		to: r(s)
 	});
 }
 async function p(e) {

package/dist/{commands → cli}/debug/clean-tools.mjs

@@ -1,7 +1,7 @@
 import { toErrorMessage as e } from "../../utils/error.mjs";
 import { cleanDeviceToolSetArtifacts as t } from "../../provisioning/toolset/cleanup.mjs";
 import "../../provisioning/toolset/index.mjs";
-//#region src/commands/debug/clean-tools.ts
+//#region src/cli/debug/clean-tools.ts
 function n(n) {
 	n.command("clean-tools").description("Wipe cached device toolset data (tools archive, device-toolsets.json, toolset-md5.json) and restore SKILL.md placeholder").action(async () => {
 		try {

package/dist/{commands → cli}/debug/impl.mjs

@@ -1,5 +1,5 @@
 import { registerCleanToolsCommand as e } from "./clean-tools.mjs";
-//#region src/commands/debug/impl.ts
+//#region src/cli/debug/impl.ts
 function t(t, n) {
 	e(n.command("debug").description("Internal debugging helpers for the yoyo plugin"));
 }

package/dist/{commands → cli}/env/impl.mjs

@@ -1,7 +1,7 @@
 import { withCommandRuntime as e } from "../../core/runtime.mjs";
 import { getEnvAndGray as t, resetEnv as n, updateEnv as r, updateGrayTag as i } from "../../modules/configs/plugin.mjs";
 import "../../modules/configs/index.mjs";
-//#region src/commands/env/impl.ts
+//#region src/cli/env/impl.ts
 var a = {
 	env: "environment variable",
 	manual: "manual config"

package/dist/{commands → cli}/index.mjs

@@ -7,13 +7,12 @@ import { registerLoginCommand as r } from "./login/impl.mjs";
 import "./login/index.mjs";
 import { registerLogoutCommand as i } from "./logout/impl.mjs";
 import "./logout/index.mjs";
-import { registerStatusCommand as a } from "./status/index.mjs";
-//#region src/commands/index.ts
-function o(o) {
-	o.registerCli((s) => {
-		let c = s.program.command("honor").description("Commands for honor yoyoclaw");
-		r(o, c), a(o, c), i(o, c), t(o, c), e() && n(o, c);
+//#region src/cli/index.ts
+function a(a) {
+	a.registerCli((o) => {
+		let s = o.program.command("honor").description("Commands for Honor yoyoclaw");
+		r(a, s), i(a, s), e() && (n(a, s), t(a, s));
 	}, { commands: ["honor"] });
 }
 //#endregion
-export { o as registerCommands };
+export { a as registerCliCommands };

package/dist/{commands → cli}/login/impl.mjs

@@ -5,10 +5,10 @@ import { patchYoyoChannelConfig as i, resolveEnabledYoyoAccountId as a, setAllYo
 import "../../modules/configs/index.mjs";
 import { performLogin as c } from "../../honor-auth/login/impl.mjs";
 import "../../honor-auth/index.mjs";
-//#region src/commands/login/impl.ts
+//#region src/cli/login/impl.ts
 var l = t("login-cli");
 function u(t, u) {
-	u.command("login").description("login to yoyoclaw and register devices").option("-u, --uid <userId>", "login with a specific user ID").option("--token <token>", "login with a specific token").action(async (u) => e(t.runtime, async () => {
+	u.command("login").description("login to Honor and register devices").option("-u, --uid <userId>", "login with a specific user ID").option("--token <token>", "login with a specific token").action(async (u) => e(t.runtime, async () => {
 		let { token: e } = u;
 		l.debug("login CLI command called");
 		let t = a(), d = await c({ token: e });

package/dist/cli/logout/impl.mjs

@@ -0,0 +1,29 @@
+import { withCommandRuntime as e } from "../../core/runtime.mjs";
+import { toErrorMessage as t } from "../../utils/error.mjs";
+import { clawLogger as n } from "../../utils/claw-logger.mjs";
+import { loadConfig as r, saveConfig as i } from "../../modules/configs/config-store.mjs";
+import { removeYoyoChannelAccount as a, resolveEnabledYoyoAccountId as o } from "../../modules/configs/channel.mjs";
+import "../../modules/configs/index.mjs";
+import { performLogout as s } from "../../honor-auth/logout.mjs";
+//#region src/cli/logout/impl.ts
+var c = n("logout-cli");
+function l(n, l) {
+	l.command("logout").description("Logout and clear user configuration").action(async () => e(n.runtime, async () => {
+		c.info("logout CLI command called");
+		let e = o();
+		try {
+			await s(e);
+			try {
+				await i(a(r(), e));
+			} catch (t) {
+				c.error("failed to remove channel account after logout", t, { userId: e });
+			}
+			console.log("✅ Logout successful, gateway will automatically stop the account connection");
+		} catch (e) {
+			let n = t(e);
+			console.error("🚫 Logout failed:", n);
+		}
+	}));
+}
+//#endregion
+export { l as registerLogoutCommand };

package/dist/cloud-channel/authorization/refresh-manager.mjs

@@ -34,14 +34,14 @@ var r = e("cloud-auth"), i = class {
 	}
 	async applyNewToken(e) {
 		let t = e?.accessToken;
-		if (typeof t != "string" || !t.trim()) return r.warn("updateAuthorization missing valid access token"), !1;
+		if (typeof t != "string" || t.length === 0) return r.warn("updateAuthorization missing valid access token"), !1;
 		try {
-			let n = Date.now(), i = t.trim(), a = await this.account.update({
-				accessToken: i,
+			let n = Date.now(), i = await this.account.update({
+				accessToken: t,
 				expire: e?.expire,
 				grantedAt: n
 			});
-			return r.info("cached new token to vault", { accountKey: a.userId }), !0;
+			return r.info("cached new token to vault", { accountKey: i.userId }), !0;
 		} catch (e) {
 			return r.error("failed to cache new token", e), !1;
 		}

package/dist/cloud-channel/dispatcher/impl.mjs

@@ -21,13 +21,10 @@ function s(e) {
 		send: u,
 		async request(e, t) {
 			let { matchResult: r, timeoutMs: i } = t, s = n();
-			if (!await u({
-				...e,
-				traceInfo: { traceId: s }
-			})) throw Error("send failed");
+			if (!await u(e)) throw Error("send failed");
 			return new Promise((e, t) => {
 				let n = setTimeout(() => {
-					l.has(s) && (l.delete(s), o.warn("request timeout", { traceId: s }), t(/* @__PURE__ */ Error("request timeout")));
+					l.has(s) && (l.delete(s), o.warn("request timeout", { requestId: s }), t(/* @__PURE__ */ Error("request timeout")));
 				}, a(i));
 				l.set(s, {
 					timeout: n,
@@ -38,25 +35,22 @@ function s(e) {
 			});
 		},
 		consume(e) {
-			let t = e.payload.traceInfo?.traceId;
-			if (!t) return;
-			let n = l.get(t);
-			if (n) {
+			for (let [t, n] of l) {
+				let r;
 				try {
-					let r = n.matchResult(e);
-					if (r.matched) {
-						if (l.delete(t), clearTimeout(n.timeout), "error" in r) {
-							n.reject(r.error);
-							return;
-						}
-						n.resolve(r.result);
-						return;
-					}
+					r = n.matchResult(e);
 				} catch (e) {
 					o.error("match request result failed", e);
+					continue;
+				}
+				if (r?.matched) {
+					if (l.delete(t), clearTimeout(n.timeout), "error" in r) {
+						n.reject(r.error);
+						return;
+					}
+					n.resolve(r.result);
 					return;
 				}
-				o.warn("response shape not matched, keep pending", { traceId: t });
 			}
 		},
 		destroy() {