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

package/dist/apis/claw-cloud.mjs

@@ -69,6 +69,25 @@ 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/cloud-invoke/index.mjs

@@ -0,0 +1 @@
+import "./invoke.mjs";

package/dist/capabilities/cloud-invoke/invoke.mjs

@@ -0,0 +1,43 @@
+import { toErrorMessage as e } from "../../utils/error.mjs";
+import { clawLogger as t } from "../../utils/claw-logger.mjs";
+import { HonorAccount as n } from "../../honor-auth/vault/impl.mjs";
+import { createClawCloudClient as r } from "../../apis/claw-cloud.mjs";
+import { loadDeviceInfo as i } from "../../modules/device/device-info.mjs";
+import "../../modules/device/index.mjs";
+import "../../honor-auth/vault/index.mjs";
+import "../../apis/index.mjs";
+import { ToolError as a } from "../../tools/error.mjs";
+//#region src/capabilities/cloud-invoke/invoke.ts
+var o = t("capabilities");
+async function s(t) {
+	let s = await n.fromUser().current();
+	if (!s?.token || !s.userId) throw o.error("cloud invoke skipped: no current user"), new a("unauthorized", "missing current user token");
+	let c;
+	try {
+		c = await i();
+	} catch (e) {
+		throw o.error("cloud invoke failed to get device info", e), new a("ctx missing", "failed to get device info", { cause: e });
+	}
+	try {
+		let e = await r().invokeCloudTool(c, s, {
+			serviceId: t.toolId,
+			pluginParams: t.params ?? {},
+			...t.timeoutMs === void 0 ? {} : { timeoutMs: t.timeoutMs }
+		}), n = e.data, i = e.status >= 200 && e.status < 300, l = n?.code === "0", u = n?.code === "ICS-500";
+		if (!i || !l && !u) throw o.error("cloud invoke response not ok", null, {
+			status: e.status,
+			code: n?.code,
+			cnMessage: n?.cnMessage,
+			cpErrorCode: n?.data?.cpErrorCode
+		}), new a("api_failed", `code=${n?.code ?? "-"} cpErrorCode=${n?.data?.cpErrorCode ?? "-"} message=${n?.cnMessage ?? "-"}`);
+		return {
+			...n.data === void 0 ? {} : { pluginResponse: n.data },
+			code: e.data.code,
+			cnMessage: e.data.cnMessage
+		};
+	} catch (t) {
+		throw t instanceof a ? t : (o.error("cloud invoke failed", t), new a("network_error", e(t), { cause: t }));
+	}
+}
+//#endregion
+export { s as invokeCloudToolService };

package/dist/capabilities/node/invoke.mjs

@@ -12,7 +12,7 @@ async function a(e) {
 			toolCallId: e.toolCallId,
 			nodeId: e.nodeId,
 			name: e.name,
-			params: e.params
+			...e.params ? { params: { arguments: JSON.stringify(e.params) } } : {}
 		} }
 	}, a = n();
 	return r.forAccount(a).request(i, {

package/dist/capabilities/routing/model-switch.mjs

@@ -14,7 +14,7 @@ async function s(e) {
 		senderId: e.deviceId,
 		chatId: s,
 		accountId: e.accountId,
-		traceId: e.traceId,
+		traceInfo: e.traceInfo,
 		content: `/model ${e.provider}/${e.model}`,
 		resources: [],
 		silent: !0

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

@@ -11,10 +11,10 @@ function s(e) {
 		let a = e.replyTo, l = !!a, u = l && a ? a.from : e.to;
 		if (!u) return o.warn("missing 'to' and no replyTo", { msgType: e.msgType }), !1;
 		if (l && a && !a.payload.traceInfo) return o.warn("replyTo missing traceInfo", { msgType: e.msgType }), !1;
-		let d = e.traceInfo ?? (l && a ? a.payload.traceInfo : {
-			traceId: n(),
+		let d = {
+			...e.traceInfo ?? (l && a ? a.payload.traceInfo : { traceId: n() }),
 			timestamp: Date.now()
-		}), { deviceId: f, port: p } = await r(), m = i(t("yoyoclaw", f, p), u, e.msgType, d, e.data, e.bizExtInfo);
+		}, { deviceId: f, port: p } = await r(), m = i(t("yoyoclaw", f, p), u, e.msgType, d, e.data, e.bizExtInfo);
 		return c.send(s.serialize(m), e.silent);
 	};
 	return {
@@ -23,10 +23,7 @@ function s(e) {
 			let { matchResult: r, timeoutMs: i } = t, s = n();
 			if (!await u({
 				...e,
-				traceInfo: {
-					traceId: s,
-					timestamp: Date.now()
-				}
+				traceInfo: { traceId: s }
 			})) throw Error("send failed");
 			return new Promise((e, t) => {
 				let n = setTimeout(() => {

package/dist/cloud-channel/handlers/context/handler.mjs

@@ -42,7 +42,7 @@ async function f(e, n) {
 		deviceId: n.from.deviceId,
 		provider: r,
 		model: a,
-		traceId: n.payload.traceInfo.traceId
+		traceInfo: n.payload.traceInfo
 	});
 	return {
 		ok: !0,

package/dist/cloud-channel/log-summary.mjs

@@ -2,13 +2,13 @@
 function e(e) {
 	let { payload: t, data: n, from: r } = e, i = {
 		msgType: t.msgType,
-		traceId: t.traceInfo.traceId,
-		from: r.role
+		from: r.role,
+		...t.traceInfo
 	};
 	switch (t.msgType) {
 		case "agentReply": {
 			let e = n?.agentMessage;
-			e && (i.period = e.period, i.messageId = e.id, e.turnId && (i.turnId = e.turnId), e.isFinish && (i.isFinish = e.isFinish));
+			e && (i.period = e.period, i.messageId = e.id, e.isFinish && (i.isFinish = e.isFinish));
 			break;
 		}
 		case "nodeInvokeRequest": {

package/dist/core/prompt/builder.mjs

@@ -1,19 +1,24 @@
 import { resolveAgentPromptContribution as e } from "./agent.mjs";
-import { resolveSkillPromptContribution as t } from "./skill.mjs";
+import { resolveCloudToolPromptContribution as t } from "./cloud-tool.mjs";
+import { resolveSkillPromptContribution as n } from "./skill.mjs";
 //#region src/core/prompt/builder.ts
-function n(e) {
+function r(e) {
 	let t = e.filter((e) => !!e);
 	return t.length > 0 ? t.join("\n\n") : void 0;
 }
-function r(e) {
-	let t = n(e.map((e) => e.prependSystemContext)), r = n(e.map((e) => e.prependContext));
+function i(e) {
+	let t = r(e.map((e) => e.prependSystemContext)), n = r(e.map((e) => e.prependContext));
 	return {
 		...t ? { prependSystemContext: t } : {},
-		...r ? { prependContext: r } : {}
+		...n ? { prependContext: n } : {}
 	};
 }
-async function i() {
-	return r([e(), await t()]);
+async function a() {
+	return i([
+		e(),
+		t(),
+		await n()
+	]);
 }
 //#endregion
-export { i as resolvePromptBuildContribution };
+export { a as resolvePromptBuildContribution };

package/dist/core/prompt/cloud-tool.mjs

@@ -0,0 +1,7 @@
+//#region src/core/prompt/cloud-tool.ts
+var e = "## Skill 使用云工具调用规则\n\n当已读取的 SKILL.md frontmatter 包含 allowed-tools 声明时：\n\n1. 根据用户意图从 allowed-tools 选择工具。\n2. 调用前必须读取当前 skill 目录下对应的 mcptools/<name>.json。\n3. 从 JSON 的 id 获取 toolId，按 inputSchema 提取 params。\n4. 调用 cloud_invoke，传入 { toolId, params }。\n\n不得猜测 toolId，不得使用未在 allowed-tools 中声明的工具。\n明确属于 yoyo-phone-control 等设备控制 Skill（走 node_invoke 通道）的工具，不得通过 cloud_invoke 调用。";
+function t() {
+	return { prependSystemContext: e };
+}
+//#endregion
+export { t as resolveCloudToolPromptContribution };

package/dist/messaging/dispatchers/command/impl.mjs

@@ -1,54 +1,46 @@
 import { clawLogger as e } from "../../../utils/claw-logger.mjs";
-import { classifyAndFormatModelError as t } from "../stream/error.mjs";
-import { createStreamSession as n, finishStreamSession as r, pushFinalVisibleText as i, pushStreamDelta as a } from "../stream/session.mjs";
+import { captureErrorPayload as t } from "../stream/error.mjs";
+import { createStreamSession as n, finishStreamSession as r, pushStreamDelta as i } from "../stream/session.mjs";
 //#region src/messaging/dispatchers/command/impl.ts
-var o = e("dispatcher");
-function s(e) {
-	let s = n(e);
+var a = e("dispatcher");
+function o(e) {
+	let o = n(e), s = !1;
 	return {
 		dispatcherOptions: {
 			deliver: async (e, n) => {
-				let r = t(e);
-				if (r) {
-					o.warn("model api error", {
-						sender: s.target.deviceId,
-						turnId: s.turnId,
-						kind: r.kind,
-						rawTextLength: r.rawText.length
-					}), await a(s, r.userMessage);
-					return;
-				}
-				let c = e.text ?? "";
-				if (c) {
-					if (n.kind === "final") {
-						await i(s, c);
-						return;
-					}
-					s.hasPushedAnswerText || await i(s, c);
-				}
+				if (a.info("command reply deliver received", {
+					sender: o.target.deviceId,
+					turnId: o.traceInfo.turnId,
+					payload: e,
+					info: n
+				}), t(o, e)) return;
+				let r = e.text ?? "";
+				if (!r) return;
+				let c = s ? `\n${r}` : r;
+				s = !0, await i(o, c);
 			},
 			onSkip: (e, t) => {
-				t.reason !== "silent" && o.debug("command reply skipped", {
-					sender: s.target.deviceId,
-					turnId: s.turnId,
+				t.reason !== "silent" && a.debug("command reply skipped", {
+					sender: o.target.deviceId,
+					turnId: o.traceInfo.turnId,
 					reason: t.reason
 				});
 			},
 			onError: (e, t) => {
-				o.warn("command reply dispatcher error", {
-					sender: s.target.deviceId,
-					turnId: s.turnId,
+				a.warn("command reply dispatcher error", {
+					sender: o.target.deviceId,
+					turnId: o.traceInfo.turnId,
 					kind: t.kind,
 					error: e
 				});
 			},
 			onIdle: async () => {
-				await r(s);
+				await r(o);
 			}
 		},
-		replyOptions: { abortSignal: s.abortController.signal },
-		session: s
+		replyOptions: { abortSignal: o.abortController.signal },
+		session: o
 	};
 }
 //#endregion
-export { s as createCommandDispatcher };
+export { o as createCommandDispatcher };

package/dist/messaging/dispatchers/stream/controller.mjs

@@ -1,16 +1,16 @@
 import { clawLogger as e } from "../../../utils/claw-logger.mjs";
-import { classifyAndFormatModelError as t } from "./error.mjs";
+import { captureErrorPayload as t } from "./error.mjs";
 import { resolveAnswerPartialDelta as n, resolveThinkingDelta as r } from "./resolvers.mjs";
 import { getToolUseTraceSteps as i } from "./tool/trace-store.mjs";
-import { finishStreamSession as a, finishThinking as o, pushFinalVisibleText as s, pushStreamDelta as c, pushThinkingDelta as l, pushToolEvent as u, resetAnswerSnapshot as d } from "./session.mjs";
-import { buildToolResultEvent as f, buildToolStartEvent as p } from "./tool/event-builder.mjs";
+import { finishStreamSession as a, finishThinking as o, pushFinalVisibleText as s, pushStreamDelta as c, pushThinkingDelta as l, pushToolEvent as u } from "./session.mjs";
+import { buildToolResultEvent as d, buildToolStartEvent as f } from "./tool/event-builder.mjs";
 import "./tool/index.mjs";
 //#region src/messaging/dispatchers/stream/controller.ts
-var m = e("dispatcher");
-function h(e, t) {
+var p = e("dispatcher");
+function m(e, t) {
 	return e ?? `no-id:${t}`;
 }
-var g = class {
+var h = class {
 	session;
 	includeThinking;
 	includeToolCalls;
@@ -25,8 +25,8 @@ var g = class {
 	}
 	emitToolStart(e) {
 		if (!this.includeToolCalls || !e.name) return;
-		let t = h(e.toolCallId, e.name);
-		this.emittedToolStartKeys.has(t) || (this.emittedToolStartKeys.add(t), u(this.session, p(e)), this.pendingToolKeys.add(t), m.debug("tool start emitted", {
+		let t = m(e.toolCallId, e.name);
+		this.emittedToolStartKeys.has(t) || (this.emittedToolStartKeys.add(t), u(this.session, f(e)), this.pendingToolKeys.add(t), p.debug("tool start emitted", {
 			sessionKey: this.session.sessionKey,
 			toolName: e.name,
 			hasToolCallId: !!e.toolCallId,
@@ -34,7 +34,7 @@ var g = class {
 		}));
 	}
 	emitToolResult(e) {
-		this.includeToolCalls && (u(this.session, f(e)), this.pendingToolKeys.delete(h(e.toolCallId, e.toolName)), this.pendingToolKeys.size === 0 && (d(this.session), this.flushPendingReplyPayloads()));
+		this.includeToolCalls && (u(this.session, d(e)), this.pendingToolKeys.delete(m(e.toolCallId, e.toolName)), this.pendingToolKeys.size === 0 && this.flushPendingReplyPayloads());
 	}
 	onToolStart = (e) => {
 		e.phase && e.phase !== "start" || e.name && this.emitToolStart({
@@ -87,24 +87,17 @@ var g = class {
 		this.includeThinking && o(this.session);
 	};
 	deliver = async (e, n) => {
-		if (n.kind === "tool") return;
-		let r = t(e);
-		if (r) {
-			m.warn("model api error", {
-				sender: this.session.target.deviceId,
-				turnId: this.session.turnId,
-				kind: r.kind,
-				rawTextLength: r.rawText.length
-			}), await c(this.session, r.userMessage);
-			return;
-		}
-		let i = e.text ?? "";
-		(n.kind === "final" || !this.session.hasPushedAnswerText) && await s(this.session, i);
+		p.info("user message reply deliver received", {
+			sender: this.session.target.deviceId,
+			turnId: this.session.traceInfo.turnId,
+			payload: e,
+			info: n
+		}), n.kind !== "tool" && (t(this.session, e) || n.kind === "final" && await s(this.session, e.text ?? ""));
 	};
 	onError = (e) => {
-		m.warn("reply dispatcher error", {
+		p.warn("reply dispatcher error", {
 			sender: this.session.target.deviceId,
-			turnId: this.session.turnId,
+			turnId: this.session.traceInfo.turnId,
 			error: e instanceof Error ? e.message : String(e)
 		});
 	};
@@ -132,4 +125,4 @@ var g = class {
 	}
 };
 //#endregion
-export { g as StreamingController };
+export { h as StreamingController };

package/dist/messaging/dispatchers/stream/error.mjs

@@ -1,56 +1,252 @@
+import { clawLogger as e } from "../../../utils/claw-logger.mjs";
+import { isReplyPayloadNonTerminalToolErrorWarning as t } from "openclaw/plugin-sdk/reply-payload";
 //#region src/messaging/dispatchers/stream/error.ts
-var e = {
-	context_overflow: "当前会话内容过长，请使用 /new 开启新会话。",
-	auth: "模型 API 凭证失效，请联系管理员。",
+var n = e("dispatcher"), r = new Set([
+	"delivery_error",
+	"tool_error",
+	"no_visible_reply",
+	"runtime_error"
+]), i = {
+	context_overflow: "当前会话内容过长，请使用 /reset 开启新会话。",
+	auth: "模型服务认证失败，请检查模型凭证配置。",
 	model_not_found: "当前模型不可用，请切换模型后重试。",
-	billing: "模型服务余额不足，请处理后重试。",
+	billing: "模型服务额度不足，请检查账户状态。",
 	rate_limit: "请求过于频繁，请稍候再试。",
 	overloaded: "模型服务繁忙，请稍候再试。",
+	network: "模型服务连接异常，请检查网络后重试。",
 	timeout: "模型响应超时，请稍候重试。",
-	unknown: "模型响应失败，请稍候重试。"
-}, t = [
+	server_error: "模型服务暂时异常，请稍候重试。",
+	format: "模型服务无法处理当前请求，请调整请求或切换模型后重试。",
+	conversation_state: "当前会话状态异常，请重试或使用 /reset 重置会话。",
+	tool_error: "工具执行失败，请调整操作后重试。",
+	delivery_error: "回复已生成，但消息发送失败，请重试。",
+	no_visible_reply: "任务已完成，但没有生成可展示的回复，请重试。",
+	runtime_error: "请求处理异常，请稍候重试。"
+}, a = [
 	{
-		kind: "context_overflow",
-		test: /context (length|window)|too (many tokens|large|long)/i
+		kind: "delivery_error",
+		patterns: [/generated a reply but could not deliver it/i, /could not deliver .* to this chat/i]
 	},
 	{
-		kind: "auth",
-		test: /unauthori[sz]ed|forbidden|invalid api key|authentication/i
+		kind: "no_visible_reply",
+		patterns: [
+			/did not produce a visible reply/i,
+			/produced no visible reply/i,
+			/completion agent did not produce a visible reply/i
+		]
+	},
+	{
+		kind: "conversation_state",
+		patterns: [
+			/provider rejected the conversation state/i,
+			/roles must alternate/i,
+			/incorrect role information/i,
+			/invalid_replay_transcript/i,
+			/session history looks corrupted/i,
+			/message ordering conflict/i
+		]
+	},
+	{
+		kind: "context_overflow",
+		patterns: [
+			/context (?:length|window).*(?:exceed|overflow|limit|too (?:large|long))/i,
+			/maximum context length/i,
+			/context[_ ]window[_ ]exceeded/i,
+			/context overflow/i,
+			/prompt (?:is )?too long/i,
+			/request_too_large/i,
+			/request (?:size )?exceeds?.*(?:context|maximum size)/i,
+			/exceeds? (?:the )?model(?:'s)? maximum context/i,
+			/model token limit/i,
+			/上下文(?:过长|超出|长度超)/,
+			/超出最大上下文/
+		]
 	},
 	{
 		kind: "model_not_found",
-		test: /model (not found|does not exist|unavailable)/i
+		patterns: [
+			/model .* not found/i,
+			/model .* does not exist/i,
+			/no such model/i,
+			/configured model is unavailable/i,
+			/model .* (?:renamed|retired)/i
+		]
 	},
 	{
 		kind: "billing",
-		test: /billing|payment|required quota|insufficient quota|credits?/i
+		patterns: [
+			/\b402\b/,
+			/payment required/i,
+			/billing error/i,
+			/insufficient (?:credits?|balance|quota)/i,
+			/credit balance/i,
+			/spend(?:ing)? limit/i,
+			/run out of credits/i
+		]
 	},
 	{
 		kind: "rate_limit",
-		test: /rate limit|too many requests|quota exceeded|tpm|rpm/i
+		patterns: [
+			/\b429\b/,
+			/rate[_ -]?limit/i,
+			/too many (?:concurrent )?requests/i,
+			/quota exceeded/i,
+			/resource[_ ]exhausted/i,
+			/throttl/i,
+			/\b(?:tpm|rpm)\b/i,
+			/tokens per minute/i
+		]
 	},
 	{
 		kind: "overloaded",
-		test: /overloaded|high demand|capacity|temporarily unavailable/i
+		patterns: [
+			/overloaded(?:_error)?/i,
+			/model .* at capacity/i,
+			/high demand/i,
+			/high load/i
+		]
+	},
+	{
+		kind: "auth",
+		patterns: [
+			/\b401\b/,
+			/\b403\b/,
+			/unauthori[sz]ed/i,
+			/forbidden/i,
+			/incorrect api key/i,
+			/invalid[_ ]?api[_ ]?key/i,
+			/invalid token/i,
+			/authentication failed/i,
+			/authentication refresh failed/i,
+			/token has expired/i,
+			/oauth .* (?:expired|failed)/i,
+			/missing api key/i,
+			/no api key found/i,
+			/missing the required .* scopes/i
+		]
+	},
+	{
+		kind: "runtime_error",
+		patterns: [
+			/cli .* timed out/i,
+			/app-server .* closed/i,
+			/auto-compaction could not recover/i,
+			/something went wrong while processing your request/i,
+			/authentication refresh is already in progress/i,
+			/browser oauth did not complete/i,
+			/no space left on device/i,
+			/disk (?:is )?full/i,
+			/\benospc\b/i,
+			/^llm request failed\.?$/i,
+			/llm request failed with an unknown error/i
+		]
+	},
+	{
+		kind: "network",
+		patterns: [
+			/network(?: connection)? error/i,
+			/network connection was interrupted/i,
+			/network request failed/i,
+			/connection refused/i,
+			/connection reset/i,
+			/connection aborted/i,
+			/socket hang up/i,
+			/fetch failed/i,
+			/dns lookup/i,
+			/provider endpoint is unreachable/i,
+			/proxy or tunnel configuration blocked/i,
+			/\beconn(?:refused|reset|aborted)\b/i,
+			/\benet(?:unreach|reset)\b/i,
+			/\behost(?:unreach|down)\b/i,
+			/\benotfound\b/i,
+			/\beai_again\b/i,
+			/\bepipe\b/i,
+			/\bund_err_/i
+		]
 	},
 	{
 		kind: "timeout",
-		test: /timeout|timed out|etimedout|econnreset|socket hang up/i
+		patterns: [
+			/timed out/i,
+			/\btimeout\b/i,
+			/deadline exceeded/i,
+			/\betimedout\b/i,
+			/\besockettimedout\b/i
+		]
+	},
+	{
+		kind: "server_error",
+		patterns: [
+			/internal server error/i,
+			/provider returned .* internal error/i,
+			/ai service returned an internal error/i,
+			/\bserver_error\b/i,
+			/\binternal_error\b/i,
+			/bad gateway/i,
+			/upstream error/i,
+			/service temporarily unavailable/i,
+			/provider returned an html error page/i,
+			/\b50[0234]\b/
+		]
+	},
+	{
+		kind: "format",
+		patterns: [
+			/provider rejected the request schema or tool payload/i,
+			/invalid request format/i,
+			/invalid_request/i,
+			/tool call id .* must be/i,
+			/tool_use\.id/i,
+			/conversation must end with a user message/i,
+			/does not support assistant message prefill/i,
+			/invalid streaming response/i,
+			/unexpected event order/i,
+			/malformed streaming fragment/i
+		]
+	},
+	{
+		kind: "tool_error",
+		patterns: [
+			/^\s*⚠️\s*(?:🛠️\s*)?.*\b(?:tool|exec|command)\b.*\b(?:failed|error)\b/i,
+			/\btool (?:execution )?(?:failed|error)\b/i,
+			/\b(?:exec|command) failed\b/i
+		]
 	}
 ];
-function n(t, n) {
+function o(e, t) {
 	return {
-		kind: t,
-		rawText: n,
-		userMessage: e[t]
+		kind: e,
+		rawText: t,
+		userMessage: e === "unknown" ? t : i[e]
 	};
 }
-function r(e) {
+function s(e) {
+	for (let { kind: t, patterns: n } of a) if (n.some((t) => t.test(e))) return t;
+	return "unknown";
+}
+function c(e) {
 	if (e.isError !== !0) return null;
-	let r = (e.text ?? "").trim();
-	if (!r) return n("unknown", r);
-	for (let { kind: e, test: i } of t) if (i.test(r)) return n(e, r);
-	return n("unknown", r);
+	if (t(e)) return n.warn("error payload discarded", {
+		kind: "tool_error",
+		payload: e
+	}), null;
+	let i = e.text?.trim();
+	if (!i) return n.warn("error payload without text discarded", { payload: e }), null;
+	let a = s(i);
+	if (r.has(a)) return n.warn("error payload discarded", {
+		kind: a,
+		payload: e
+	}), null;
+	let c = o(a, i);
+	return n.error("reply error payload detected", i, {
+		kind: a,
+		payload: e
+	}), c;
+}
+function l(e, t) {
+	if (t.isError !== !0) return !1;
+	let n = c(t);
+	return n && (e.error = n), !0;
 }
 //#endregion
-export { r as classifyAndFormatModelError };
+export { l as captureErrorPayload };

package/dist/messaging/dispatchers/stream/resolvers.mjs

@@ -1,20 +1,24 @@
 //#region src/messaging/dispatchers/stream/resolvers.ts
 function e(e, t) {
-	if (t.delta) return typeof t.text == "string" ? (e.answerSnapshot = t.text, e.latestAnswerSnapshot = t.text) : (e.answerSnapshot += t.delta, e.latestAnswerSnapshot = e.answerSnapshot), t.delta;
-	if (typeof t.text != "string" || t.text.length === 0) return "";
-	if (t.replace || !t.text.startsWith(e.answerSnapshot)) return e.latestAnswerSnapshot = t.text, "";
-	let n = t.text.slice(e.answerSnapshot.length);
-	return e.answerSnapshot = t.text, e.latestAnswerSnapshot = t.text, n;
+	return t.length < e.length || !t.startsWith(e);
 }
-function t(e, t) {
-	let n = t.text ?? "";
-	if (!n) return "";
-	if (t.isReasoningSnapshot) {
-		if (!n.startsWith(e.thinkingSnapshot)) return e.thinkingSnapshot = n, "";
-		let t = n.slice(e.thinkingSnapshot.length);
-		return e.thinkingSnapshot = n, t;
+function t(t, n) {
+	if (n.delta) return typeof n.text == "string" ? t.answerSnapshot = n.text : t.answerSnapshot += n.delta, n.delta;
+	if (typeof n.text != "string" || n.text.length === 0) return "";
+	if (n.replace) return t.answerSnapshot = n.text, "";
+	if (e(t.answerSnapshot, n.text)) return t.answerSnapshot = n.text, n.text;
+	let r = n.text.slice(t.answerSnapshot.length);
+	return t.answerSnapshot = n.text, r;
+}
+function n(t, n) {
+	let r = n.text ?? "";
+	if (!r) return "";
+	if (n.isReasoningSnapshot) {
+		if (e(t.thinkingSnapshot, r)) return t.thinkingSnapshot = r, r;
+		let n = r.slice(t.thinkingSnapshot.length);
+		return t.thinkingSnapshot = r, n;
 	}
-	return e.thinkingSnapshot += n, n;
+	return t.thinkingSnapshot += r, r;
 }
 //#endregion
-export { e as resolveAnswerPartialDelta, t as resolveThinkingDelta };
+export { t as resolveAnswerPartialDelta, n as resolveThinkingDelta };