@alfe.ai/openclaw-chat 0.1.6 → 0.2.1

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { a as AlfeResolvedAccount, i as AlfePluginConfig, n as createAlfeChannelPlugin, r as AlfeChannelConfig, t as plugin } from "./plugin.cjs";
+import { a as AlfeChannelConfig, i as createAlfeChannelPlugin, n as plugin, o as AlfePluginConfig, s as AlfeResolvedAccount } from "./plugin.cjs";
 
 //#region src/session-store.d.ts
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as AlfeResolvedAccount, i as AlfePluginConfig, n as createAlfeChannelPlugin, r as AlfeChannelConfig, t as plugin } from "./plugin.js";
+import { a as AlfeChannelConfig, i as createAlfeChannelPlugin, n as plugin, o as AlfePluginConfig, s as AlfeResolvedAccount } from "./plugin.js";
 
 //#region src/session-store.d.ts
 

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as createAlfeChannelPlugin, t as plugin } from "./plugin2.js";
+import { i as createAlfeChannelPlugin, n as plugin } from "./plugin2.js";
 export { createAlfeChannelPlugin, plugin as default };

package/dist/plugin.cjs

@@ -1,2 +1,8 @@
+Object.defineProperties(exports, {
+	__esModule: { value: true },
+	[Symbol.toStringTag]: { value: "Module" }
+});
 const require_plugin = require("./plugin2.cjs");
-module.exports = require_plugin.plugin;
+exports.buildA2ACompletePayload = require_plugin.buildA2ACompletePayload;
+exports.default = require_plugin.plugin;
+exports.stripLeakedToolSummary = require_plugin.stripLeakedToolSummary;

package/dist/plugin.d.cts

@@ -274,6 +274,28 @@ interface PluginServiceContext {
   stateDir: string;
   logger: PluginLogger;
 }
+declare function stripLeakedToolSummary(text: string): string;
+/**
+ * Build the `a2a-complete` notify payload. ALWAYS fired for an A2A turn —
+ * even when the dispatch produced no relayable text — so the chat service can
+ * emit an explicit terminal/stop frame instead of the thread dead-ending
+ * silently. `terminated`/`reason` are set when there's nothing to relay
+ * (`empty_turn`) or the agent ended the thread via end_conversation
+ * (`resolved`).
+ */
+declare function buildA2ACompletePayload<A>(params: {
+  conversationId: string;
+  fullText: string;
+  a2a: A;
+  resolved: boolean;
+}): {
+  conversationId: string;
+  fullText: string;
+  a2a: A;
+  resolved: boolean;
+  terminated?: boolean;
+  reason?: string;
+};
 interface PluginApi {
   logger: PluginLogger;
   registrationMode?: 'full' | 'setup-only' | 'setup-runtime' | 'cli-metadata';
@@ -306,4 +328,4 @@ declare const plugin: {
   deactivate(api: PluginApi): Promise<void>;
 };
 //#endregion
-export { AlfeResolvedAccount as a, AlfePluginConfig as i, createAlfeChannelPlugin as n, AlfeChannelConfig as r, plugin as t };
+export { AlfeChannelConfig as a, createAlfeChannelPlugin as i, plugin as n, AlfePluginConfig as o, stripLeakedToolSummary as r, AlfeResolvedAccount as s, buildA2ACompletePayload as t };

package/dist/plugin.d.ts

@@ -274,6 +274,28 @@ interface PluginServiceContext {
   stateDir: string;
   logger: PluginLogger;
 }
+declare function stripLeakedToolSummary(text: string): string;
+/**
+ * Build the `a2a-complete` notify payload. ALWAYS fired for an A2A turn —
+ * even when the dispatch produced no relayable text — so the chat service can
+ * emit an explicit terminal/stop frame instead of the thread dead-ending
+ * silently. `terminated`/`reason` are set when there's nothing to relay
+ * (`empty_turn`) or the agent ended the thread via end_conversation
+ * (`resolved`).
+ */
+declare function buildA2ACompletePayload<A>(params: {
+  conversationId: string;
+  fullText: string;
+  a2a: A;
+  resolved: boolean;
+}): {
+  conversationId: string;
+  fullText: string;
+  a2a: A;
+  resolved: boolean;
+  terminated?: boolean;
+  reason?: string;
+};
 interface PluginApi {
   logger: PluginLogger;
   registrationMode?: 'full' | 'setup-only' | 'setup-runtime' | 'cli-metadata';
@@ -306,4 +328,4 @@ declare const plugin: {
   deactivate(api: PluginApi): Promise<void>;
 };
 //#endregion
-export { AlfeResolvedAccount as a, AlfePluginConfig as i, createAlfeChannelPlugin as n, AlfeChannelConfig as r, plugin as t };
+export { AlfeChannelConfig as a, createAlfeChannelPlugin as i, plugin as n, AlfePluginConfig as o, stripLeakedToolSummary as r, AlfeResolvedAccount as s, buildA2ACompletePayload as t };

package/dist/plugin.js

@@ -1,2 +1,2 @@
-import { t as plugin } from "./plugin2.js";
-export { plugin as default };
+import { n as plugin, r as stripLeakedToolSummary, t as buildA2ACompletePayload } from "./plugin2.js";
+export { buildA2ACompletePayload, plugin as default, stripLeakedToolSummary };

package/dist/plugin2.cjs

@@ -382,6 +382,31 @@ async function listSessions(filters, limit = 50) {
 }
 //#endregion
 //#region src/a2a-tools.ts
+let conversationEndRequested = false;
+let a2aTurnArmed = false;
+/**
+* Clear the end signal AND arm the gate. Call immediately before an A2A
+* dispatch. Arming is what permits `end_conversation` to set the flag for the
+* duration of this turn.
+*/
+function resetA2AEndSignal() {
+	conversationEndRequested = false;
+	a2aTurnArmed = true;
+}
+/**
+* Clear the end signal AND disarm the gate. Call after an A2A dispatch (in a
+* `finally`, so it also runs on error). Disarming closes the gate so a later
+* NON-A2A turn invoking `end_conversation` can't set a flag the next A2A turn
+* would read.
+*/
+function disarmA2AEndSignal() {
+	conversationEndRequested = false;
+	a2aTurnArmed = false;
+}
+/** True if `end_conversation` was invoked since the last reset. */
+function isA2AEndSignalled() {
+	return conversationEndRequested;
+}
 function ok(result) {
 	return { content: [{
 		type: "text",
@@ -478,6 +503,7 @@ function buildA2ATools(chatClient, log) {
 			handler: (params) => {
 				const summary = params.summary;
 				log.info(`end_conversation tool called${summary ? `: ${summary}` : ""}`);
+				if (a2aTurnArmed) conversationEndRequested = true;
 				return Promise.resolve({
 					status: "conversation_ended",
 					summary
@@ -604,6 +630,99 @@ function validateAttachmentUrl(input, opts = {}) {
 */
 const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const pkg = require$1("../package.json");
+function asString(v) {
+	return typeof v === "string" && v.length > 0 ? v : void 0;
+}
+/**
+* Extract a thinking delta from an OpenClaw `thinking`-stream event.
+* OpenClaw thinking events carry the reasoning text on one of a few
+* fields depending on version; we accept `text` / `delta` / `content`.
+* Returns null when there's nothing to forward.
+*/
+function buildThinkingActivity(data) {
+	const text = asString(data.delta) ?? asString(data.text) ?? asString(data.content) ?? asString(data.message?.text);
+	if (!text) return null;
+	return {
+		kind: "thinking",
+		text,
+		delta: true
+	};
+}
+/**
+* Extract structured tool status from an OpenClaw `tool`-stream event.
+* We send the emoji-free raw `name` plus a lifecycle `status` and let the
+* web render the `🛠️ <Label>: <summary> ✓/✗` row — never OpenClaw's raw
+* `(+N steps)` string. `summary` carries OpenClaw's short detail when the
+* event already provides one (title/summary/label/description), trimmed.
+*/
+function buildToolActivity(data) {
+	const toolCallId = asString(data.toolCallId) ?? asString(data.id) ?? asString(data.callId);
+	const name = asString(data.name) ?? asString(data.tool) ?? asString(data.toolName);
+	if (!toolCallId || !name) return null;
+	const phase = asString(data.phase) ?? asString(data.state) ?? asString(data.status);
+	const rawStatus = (phase ?? "").toLowerCase();
+	let status;
+	if (rawStatus === "error" || rawStatus === "failed" || data.error != null || data.isError === true) status = "failed";
+	else if (rawStatus === "end" || rawStatus === "done" || rawStatus === "success" || rawStatus === "complete") status = "done";
+	else status = "running";
+	const summaryRaw = asString(data.summary) ?? asString(data.title) ?? asString(data.label) ?? asString(data.description);
+	const summary = summaryRaw ? summaryRaw.slice(0, 200) : void 0;
+	return {
+		kind: "tool",
+		toolCallId,
+		name,
+		...phase ? { phase } : {},
+		status,
+		...summary ? { summary } : {}
+	};
+}
+/**
+* Workstream C, item 5: strip OpenClaw's leaked tool-summary console line
+* from assistant `responseText` before it's stored / notified as a chat
+* bubble. OpenClaw upstream composes a `⚠️ 🛠️ … (+N steps) failed` summary
+* into the assistant text for a non-zero-exit tool run; `failed` there is a
+* TOOL exit status, not a chat-level failure, and it now has a proper
+* structured tool row (see buildToolActivity). This is a BOUNDED, clearly
+* scoped strip of that one known pattern — it must not touch normal prose.
+*
+* Pattern anatomy (per the plan + observed string):
+*   ⚠️ 🛠️ <pipeline text> (+8 steps) failed
+*   ⚠️ 🛠️ <pipeline text> (+1 step) failed
+* We match a line that LEADS with OpenClaw's warning/tool emoji (`⚠️` or
+* `🛠️`) — REQUIRED, because OpenClaw always generates the leaked line with
+* it — and contains the `(+<N> step[s])` marker followed by a trailing
+* `failed`/`succeeded`/`done` word. The emoji requirement keeps legitimate
+* assistant prose that merely ends in "(+3 steps) done." from being
+* stripped. Only whole matching lines are removed; everything else is
+* intact. Per-line, line-anchored, non-global.
+*/
+const LEAKED_TOOL_SUMMARY_LINE = /^\s*(?:⚠️|🛠️).*\(\+\d+\s+steps?\)\s*(?:failed|succeeded|done)\.?\s*$/iu;
+function stripLeakedToolSummary(text) {
+	if (!text.includes("step")) return text;
+	return text.split("\n").filter((line) => !LEAKED_TOOL_SUMMARY_LINE.test(line)).join("\n").replace(/\n{3,}/g, "\n\n").trim();
+}
+/**
+* Build the `a2a-complete` notify payload. ALWAYS fired for an A2A turn —
+* even when the dispatch produced no relayable text — so the chat service can
+* emit an explicit terminal/stop frame instead of the thread dead-ending
+* silently. `terminated`/`reason` are set when there's nothing to relay
+* (`empty_turn`) or the agent ended the thread via end_conversation
+* (`resolved`).
+*/
+function buildA2ACompletePayload(params) {
+	const hasText = params.fullText.trim().length > 0;
+	const terminal = params.resolved || !hasText;
+	return {
+		conversationId: params.conversationId,
+		fullText: params.fullText,
+		a2a: params.a2a,
+		resolved: params.resolved,
+		...terminal ? {
+			terminated: true,
+			reason: params.resolved ? "resolved" : "empty_turn"
+		} : {}
+	};
+}
 let dispatchInbound = null;
 /**
 * Resolve OpenClaw SDK functions from the running process.
@@ -707,6 +826,12 @@ async function downloadAttachments(attachments, log) {
 	}
 	return results;
 }
+let agentTurnQueue = Promise.resolve();
+function enqueueAgentTurn(task) {
+	const run = agentTurnQueue.then(task, task);
+	agentTurnQueue = run.then(() => void 0, () => void 0);
+	return run;
+}
 async function handleAgentRequest(request, log) {
 	const runtime = pluginRuntime;
 	if (!runtime) {
@@ -731,16 +856,48 @@ async function handleAgentRequest(request, log) {
 	let resolvedOpenClawKey = null;
 	const unsubscribe = runtime.events.onAgentEvent((evt) => {
 		if (!evt.sessionKey) return;
-		if (evt.stream !== "assistant") return;
-		resolvedOpenClawKey ??= evt.sessionKey;
+		if (evt.stream === "assistant" || evt.stream === "thinking" || evt.stream === "tool") resolvedOpenClawKey ??= evt.sessionKey;
 		if (evt.sessionKey !== resolvedOpenClawKey) return;
-		chatClient?.sendEvent("chat", {
-			runId: evt.runId,
-			sessionKey: legacySessionKey,
-			seq: evt.seq,
-			state: "delta",
-			message: evt.data
-		});
+		if (evt.stream === "assistant") {
+			chatClient?.sendEvent("chat", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "delta",
+				message: evt.data
+			});
+			return;
+		}
+		if (evt.stream === "thinking") {
+			const activity = buildThinkingActivity(evt.data);
+			if (activity) chatClient?.sendEvent("chat-activity", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "activity",
+				activity: {
+					...activity,
+					ts: evt.ts,
+					seq: evt.seq
+				}
+			});
+			return;
+		}
+		if (evt.stream === "tool") {
+			const activity = buildToolActivity(evt.data);
+			if (activity) chatClient?.sendEvent("chat-activity", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "activity",
+				activity: {
+					...activity,
+					ts: evt.ts,
+					seq: evt.seq
+				}
+			});
+			return;
+		}
 	});
 	try {
 		const downloadedFiles = rawAttachments?.length ? await downloadAttachments(rawAttachments, log) : [];
@@ -756,7 +913,7 @@ async function handleAgentRequest(request, log) {
 		const userLabel = displayName ?? userId ?? senderId;
 		const conversationLabel = conversationType === "group" ? shortConvId ? `[${channelLabel}] Group (${shortConvId})` : `[${channelLabel}] Group` : shortConvId ? `[${channelLabel}] ${userLabel} (${shortConvId})` : `[${channelLabel}] ${userLabel}`;
 		let a2aResponseBuffer = "";
-		let a2aResolved = false;
+		if (isA2A) resetA2AEndSignal();
 		resolvedOpenClawKey = (await dispatchInbound({
 			cfg,
 			runtime: { channel: runtime.channel },
@@ -796,19 +953,17 @@ async function handleAgentRequest(request, log) {
 						`This is an agent-to-agent conversation with ${a2a.sourceAgentName}.`,
 						"Rules:",
 						"- Only respond if you have new information, a question, or an action to coordinate.",
-						"- If the conversation is complete, call the end_conversation() tool OR end your message with [RESOLVED].",
+						"- When the discussion is complete, call the end_conversation() tool AND end your final message with the literal token [RESOLVED] (uppercase, in square brackets, as the last thing in the message).",
+						"- Do NOT write the word \"resolved\" in prose unless you mean to end — only the exact token [RESOLVED] ends the thread.",
 						"- Do NOT respond just to acknowledge — that creates infinite loops."
 					].join("\n")
 				} : {}
 			},
 			deliver: async (payload) => {
-				const responseText = payload.text ?? "";
+				const responseText = stripLeakedToolSummary(payload.text ?? "");
 				const mediaUrls = [...payload.mediaUrl ? [payload.mediaUrl] : [], ...payload.mediaUrls ?? []];
 				await addMessage(sessionId, "assistant", responseText);
-				if (isA2A) {
-					a2aResponseBuffer += responseText;
-					if (responseText.includes("\"status\":\"conversation_ended\"") || responseText.includes("\"status\": \"conversation_ended\"")) a2aResolved = true;
-				}
+				if (isA2A) a2aResponseBuffer += responseText;
 				chatClient?.notify("agent-message", {
 					conversationId: conversationId ?? legacySessionKey,
 					text: responseText,
@@ -824,12 +979,15 @@ async function handleAgentRequest(request, log) {
 				log.error(`Dispatch error (${info.kind}): ${err instanceof Error ? err.message : String(err)}`);
 			}
 		})).route.sessionKey;
-		if (isA2A && a2aResponseBuffer) chatClient?.notify("a2a-complete", {
-			conversationId: conversationId ?? legacySessionKey,
-			fullText: a2aResponseBuffer,
-			a2a,
-			resolved: a2aResolved
-		});
+		if (isA2A) {
+			const a2aResolved = isA2AEndSignalled();
+			chatClient?.notify("a2a-complete", buildA2ACompletePayload({
+				conversationId: conversationId ?? legacySessionKey,
+				fullText: a2aResponseBuffer,
+				a2a,
+				resolved: a2aResolved
+			}));
+		}
 		chatClient?.sendResponse(request.id, true, { sessionKey: resolvedOpenClawKey });
 		log.info(`Agent dispatch complete: sessionKey=${resolvedOpenClawKey}`);
 	} catch (err) {
@@ -838,6 +996,7 @@ async function handleAgentRequest(request, log) {
 		chatClient?.sendResponse(request.id, false, { message: errMsg });
 	} finally {
 		unsubscribe();
+		if (isA2A) disarmA2AEndSignal();
 	}
 }
 async function handleSessionsList(request, log) {
@@ -930,7 +1089,7 @@ const plugin = {
 							apiKey,
 							onRequest: (request) => {
 								const handle = async () => {
-									if (request.method === "agent") await handleAgentRequest(request, log);
+									if (request.method === "agent") await enqueueAgentTurn(() => handleAgentRequest(request, log));
 									else if (request.method === "sessions.list") await handleSessionsList(request, log);
 									else if (request.method === "sessions.get") await handleSessionsGet(request, log);
 									else chatClient?.sendResponse(request.id, false, { message: `Unknown method: ${request.method}` });
@@ -1065,6 +1224,12 @@ const plugin = {
 	}
 };
 //#endregion
+Object.defineProperty(exports, "buildA2ACompletePayload", {
+	enumerable: true,
+	get: function() {
+		return buildA2ACompletePayload;
+	}
+});
 Object.defineProperty(exports, "createAlfeChannelPlugin", {
 	enumerable: true,
 	get: function() {
@@ -1077,3 +1242,9 @@ Object.defineProperty(exports, "plugin", {
 		return plugin;
 	}
 });
+Object.defineProperty(exports, "stripLeakedToolSummary", {
+	enumerable: true,
+	get: function() {
+		return stripLeakedToolSummary;
+	}
+});

package/dist/plugin2.d.cts

@@ -1,2 +1,2 @@
-import { t as plugin } from "./plugin.cjs";
-export { plugin as default };
+import { n as plugin, r as stripLeakedToolSummary, t as buildA2ACompletePayload } from "./plugin.cjs";
+export { buildA2ACompletePayload, plugin as default, stripLeakedToolSummary };

package/dist/plugin2.d.ts

@@ -1,2 +1,2 @@
-import { t as plugin } from "./plugin.js";
-export { plugin as default };
+import { n as plugin, r as stripLeakedToolSummary, t as buildA2ACompletePayload } from "./plugin.js";
+export { buildA2ACompletePayload, plugin as default, stripLeakedToolSummary };

package/dist/plugin2.js

@@ -382,6 +382,31 @@ async function listSessions(filters, limit = 50) {
 }
 //#endregion
 //#region src/a2a-tools.ts
+let conversationEndRequested = false;
+let a2aTurnArmed = false;
+/**
+* Clear the end signal AND arm the gate. Call immediately before an A2A
+* dispatch. Arming is what permits `end_conversation` to set the flag for the
+* duration of this turn.
+*/
+function resetA2AEndSignal() {
+	conversationEndRequested = false;
+	a2aTurnArmed = true;
+}
+/**
+* Clear the end signal AND disarm the gate. Call after an A2A dispatch (in a
+* `finally`, so it also runs on error). Disarming closes the gate so a later
+* NON-A2A turn invoking `end_conversation` can't set a flag the next A2A turn
+* would read.
+*/
+function disarmA2AEndSignal() {
+	conversationEndRequested = false;
+	a2aTurnArmed = false;
+}
+/** True if `end_conversation` was invoked since the last reset. */
+function isA2AEndSignalled() {
+	return conversationEndRequested;
+}
 function ok(result) {
 	return { content: [{
 		type: "text",
@@ -478,6 +503,7 @@ function buildA2ATools(chatClient, log) {
 			handler: (params) => {
 				const summary = params.summary;
 				log.info(`end_conversation tool called${summary ? `: ${summary}` : ""}`);
+				if (a2aTurnArmed) conversationEndRequested = true;
 				return Promise.resolve({
 					status: "conversation_ended",
 					summary
@@ -604,6 +630,99 @@ function validateAttachmentUrl(input, opts = {}) {
 */
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
+function asString(v) {
+	return typeof v === "string" && v.length > 0 ? v : void 0;
+}
+/**
+* Extract a thinking delta from an OpenClaw `thinking`-stream event.
+* OpenClaw thinking events carry the reasoning text on one of a few
+* fields depending on version; we accept `text` / `delta` / `content`.
+* Returns null when there's nothing to forward.
+*/
+function buildThinkingActivity(data) {
+	const text = asString(data.delta) ?? asString(data.text) ?? asString(data.content) ?? asString(data.message?.text);
+	if (!text) return null;
+	return {
+		kind: "thinking",
+		text,
+		delta: true
+	};
+}
+/**
+* Extract structured tool status from an OpenClaw `tool`-stream event.
+* We send the emoji-free raw `name` plus a lifecycle `status` and let the
+* web render the `🛠️ <Label>: <summary> ✓/✗` row — never OpenClaw's raw
+* `(+N steps)` string. `summary` carries OpenClaw's short detail when the
+* event already provides one (title/summary/label/description), trimmed.
+*/
+function buildToolActivity(data) {
+	const toolCallId = asString(data.toolCallId) ?? asString(data.id) ?? asString(data.callId);
+	const name = asString(data.name) ?? asString(data.tool) ?? asString(data.toolName);
+	if (!toolCallId || !name) return null;
+	const phase = asString(data.phase) ?? asString(data.state) ?? asString(data.status);
+	const rawStatus = (phase ?? "").toLowerCase();
+	let status;
+	if (rawStatus === "error" || rawStatus === "failed" || data.error != null || data.isError === true) status = "failed";
+	else if (rawStatus === "end" || rawStatus === "done" || rawStatus === "success" || rawStatus === "complete") status = "done";
+	else status = "running";
+	const summaryRaw = asString(data.summary) ?? asString(data.title) ?? asString(data.label) ?? asString(data.description);
+	const summary = summaryRaw ? summaryRaw.slice(0, 200) : void 0;
+	return {
+		kind: "tool",
+		toolCallId,
+		name,
+		...phase ? { phase } : {},
+		status,
+		...summary ? { summary } : {}
+	};
+}
+/**
+* Workstream C, item 5: strip OpenClaw's leaked tool-summary console line
+* from assistant `responseText` before it's stored / notified as a chat
+* bubble. OpenClaw upstream composes a `⚠️ 🛠️ … (+N steps) failed` summary
+* into the assistant text for a non-zero-exit tool run; `failed` there is a
+* TOOL exit status, not a chat-level failure, and it now has a proper
+* structured tool row (see buildToolActivity). This is a BOUNDED, clearly
+* scoped strip of that one known pattern — it must not touch normal prose.
+*
+* Pattern anatomy (per the plan + observed string):
+*   ⚠️ 🛠️ <pipeline text> (+8 steps) failed
+*   ⚠️ 🛠️ <pipeline text> (+1 step) failed
+* We match a line that LEADS with OpenClaw's warning/tool emoji (`⚠️` or
+* `🛠️`) — REQUIRED, because OpenClaw always generates the leaked line with
+* it — and contains the `(+<N> step[s])` marker followed by a trailing
+* `failed`/`succeeded`/`done` word. The emoji requirement keeps legitimate
+* assistant prose that merely ends in "(+3 steps) done." from being
+* stripped. Only whole matching lines are removed; everything else is
+* intact. Per-line, line-anchored, non-global.
+*/
+const LEAKED_TOOL_SUMMARY_LINE = /^\s*(?:⚠️|🛠️).*\(\+\d+\s+steps?\)\s*(?:failed|succeeded|done)\.?\s*$/iu;
+function stripLeakedToolSummary(text) {
+	if (!text.includes("step")) return text;
+	return text.split("\n").filter((line) => !LEAKED_TOOL_SUMMARY_LINE.test(line)).join("\n").replace(/\n{3,}/g, "\n\n").trim();
+}
+/**
+* Build the `a2a-complete` notify payload. ALWAYS fired for an A2A turn —
+* even when the dispatch produced no relayable text — so the chat service can
+* emit an explicit terminal/stop frame instead of the thread dead-ending
+* silently. `terminated`/`reason` are set when there's nothing to relay
+* (`empty_turn`) or the agent ended the thread via end_conversation
+* (`resolved`).
+*/
+function buildA2ACompletePayload(params) {
+	const hasText = params.fullText.trim().length > 0;
+	const terminal = params.resolved || !hasText;
+	return {
+		conversationId: params.conversationId,
+		fullText: params.fullText,
+		a2a: params.a2a,
+		resolved: params.resolved,
+		...terminal ? {
+			terminated: true,
+			reason: params.resolved ? "resolved" : "empty_turn"
+		} : {}
+	};
+}
 let dispatchInbound = null;
 /**
 * Resolve OpenClaw SDK functions from the running process.
@@ -707,6 +826,12 @@ async function downloadAttachments(attachments, log) {
 	}
 	return results;
 }
+let agentTurnQueue = Promise.resolve();
+function enqueueAgentTurn(task) {
+	const run = agentTurnQueue.then(task, task);
+	agentTurnQueue = run.then(() => void 0, () => void 0);
+	return run;
+}
 async function handleAgentRequest(request, log) {
 	const runtime = pluginRuntime;
 	if (!runtime) {
@@ -731,16 +856,48 @@ async function handleAgentRequest(request, log) {
 	let resolvedOpenClawKey = null;
 	const unsubscribe = runtime.events.onAgentEvent((evt) => {
 		if (!evt.sessionKey) return;
-		if (evt.stream !== "assistant") return;
-		resolvedOpenClawKey ??= evt.sessionKey;
+		if (evt.stream === "assistant" || evt.stream === "thinking" || evt.stream === "tool") resolvedOpenClawKey ??= evt.sessionKey;
 		if (evt.sessionKey !== resolvedOpenClawKey) return;
-		chatClient?.sendEvent("chat", {
-			runId: evt.runId,
-			sessionKey: legacySessionKey,
-			seq: evt.seq,
-			state: "delta",
-			message: evt.data
-		});
+		if (evt.stream === "assistant") {
+			chatClient?.sendEvent("chat", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "delta",
+				message: evt.data
+			});
+			return;
+		}
+		if (evt.stream === "thinking") {
+			const activity = buildThinkingActivity(evt.data);
+			if (activity) chatClient?.sendEvent("chat-activity", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "activity",
+				activity: {
+					...activity,
+					ts: evt.ts,
+					seq: evt.seq
+				}
+			});
+			return;
+		}
+		if (evt.stream === "tool") {
+			const activity = buildToolActivity(evt.data);
+			if (activity) chatClient?.sendEvent("chat-activity", {
+				runId: evt.runId,
+				sessionKey: legacySessionKey,
+				seq: evt.seq,
+				state: "activity",
+				activity: {
+					...activity,
+					ts: evt.ts,
+					seq: evt.seq
+				}
+			});
+			return;
+		}
 	});
 	try {
 		const downloadedFiles = rawAttachments?.length ? await downloadAttachments(rawAttachments, log) : [];
@@ -756,7 +913,7 @@ async function handleAgentRequest(request, log) {
 		const userLabel = displayName ?? userId ?? senderId;
 		const conversationLabel = conversationType === "group" ? shortConvId ? `[${channelLabel}] Group (${shortConvId})` : `[${channelLabel}] Group` : shortConvId ? `[${channelLabel}] ${userLabel} (${shortConvId})` : `[${channelLabel}] ${userLabel}`;
 		let a2aResponseBuffer = "";
-		let a2aResolved = false;
+		if (isA2A) resetA2AEndSignal();
 		resolvedOpenClawKey = (await dispatchInbound({
 			cfg,
 			runtime: { channel: runtime.channel },
@@ -796,19 +953,17 @@ async function handleAgentRequest(request, log) {
 						`This is an agent-to-agent conversation with ${a2a.sourceAgentName}.`,
 						"Rules:",
 						"- Only respond if you have new information, a question, or an action to coordinate.",
-						"- If the conversation is complete, call the end_conversation() tool OR end your message with [RESOLVED].",
+						"- When the discussion is complete, call the end_conversation() tool AND end your final message with the literal token [RESOLVED] (uppercase, in square brackets, as the last thing in the message).",
+						"- Do NOT write the word \"resolved\" in prose unless you mean to end — only the exact token [RESOLVED] ends the thread.",
 						"- Do NOT respond just to acknowledge — that creates infinite loops."
 					].join("\n")
 				} : {}
 			},
 			deliver: async (payload) => {
-				const responseText = payload.text ?? "";
+				const responseText = stripLeakedToolSummary(payload.text ?? "");
 				const mediaUrls = [...payload.mediaUrl ? [payload.mediaUrl] : [], ...payload.mediaUrls ?? []];
 				await addMessage(sessionId, "assistant", responseText);
-				if (isA2A) {
-					a2aResponseBuffer += responseText;
-					if (responseText.includes("\"status\":\"conversation_ended\"") || responseText.includes("\"status\": \"conversation_ended\"")) a2aResolved = true;
-				}
+				if (isA2A) a2aResponseBuffer += responseText;
 				chatClient?.notify("agent-message", {
 					conversationId: conversationId ?? legacySessionKey,
 					text: responseText,
@@ -824,12 +979,15 @@ async function handleAgentRequest(request, log) {
 				log.error(`Dispatch error (${info.kind}): ${err instanceof Error ? err.message : String(err)}`);
 			}
 		})).route.sessionKey;
-		if (isA2A && a2aResponseBuffer) chatClient?.notify("a2a-complete", {
-			conversationId: conversationId ?? legacySessionKey,
-			fullText: a2aResponseBuffer,
-			a2a,
-			resolved: a2aResolved
-		});
+		if (isA2A) {
+			const a2aResolved = isA2AEndSignalled();
+			chatClient?.notify("a2a-complete", buildA2ACompletePayload({
+				conversationId: conversationId ?? legacySessionKey,
+				fullText: a2aResponseBuffer,
+				a2a,
+				resolved: a2aResolved
+			}));
+		}
 		chatClient?.sendResponse(request.id, true, { sessionKey: resolvedOpenClawKey });
 		log.info(`Agent dispatch complete: sessionKey=${resolvedOpenClawKey}`);
 	} catch (err) {
@@ -838,6 +996,7 @@ async function handleAgentRequest(request, log) {
 		chatClient?.sendResponse(request.id, false, { message: errMsg });
 	} finally {
 		unsubscribe();
+		if (isA2A) disarmA2AEndSignal();
 	}
 }
 async function handleSessionsList(request, log) {
@@ -930,7 +1089,7 @@ const plugin = {
 							apiKey,
 							onRequest: (request) => {
 								const handle = async () => {
-									if (request.method === "agent") await handleAgentRequest(request, log);
+									if (request.method === "agent") await enqueueAgentTurn(() => handleAgentRequest(request, log));
 									else if (request.method === "sessions.list") await handleSessionsList(request, log);
 									else if (request.method === "sessions.get") await handleSessionsGet(request, log);
 									else chatClient?.sendResponse(request.id, false, { message: `Unknown method: ${request.method}` });
@@ -1065,4 +1224,4 @@ const plugin = {
 	}
 };
 //#endregion
-export { createAlfeChannelPlugin as n, plugin as t };
+export { createAlfeChannelPlugin as i, plugin as n, stripLeakedToolSummary as r, buildA2ACompletePayload as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/openclaw-chat",
-  "version": "0.1.6",
+  "version": "0.2.1",
   "description": "OpenClaw chat plugin for Alfe — web widget and mobile app channels",
   "type": "module",
   "main": "./dist/plugin.js",
@@ -27,8 +27,8 @@
     "openclaw.plugin.json"
   ],
   "dependencies": {
-    "@alfe.ai/agent-api-client": "^0.2.0",
-    "@alfe.ai/chat": "^0.0.9",
+    "@alfe.ai/agent-api-client": "^0.2.2",
+    "@alfe.ai/chat": "^0.0.10",
     "@alfe.ai/config": "^0.0.9"
   },
   "peerDependencies": {