@alfe.ai/openclaw-chat 0.4.0 → 0.5.1

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { d as AlfePluginConfig, f as AlfeResolvedAccount, l as createAlfeChannelPlugin, o as plugin, u as AlfeChannelConfig } from "./plugin.cjs";
+import { _ as AlfeResolvedAccount, g as AlfePluginConfig, h as AlfeChannelConfig, m as createAlfeChannelPlugin, u as plugin } from "./plugin.cjs";
 
 //#region src/session-store.d.ts
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { d as AlfePluginConfig, f as AlfeResolvedAccount, l as createAlfeChannelPlugin, o as plugin, u as AlfeChannelConfig } from "./plugin.js";
+import { _ as AlfeResolvedAccount, g as AlfePluginConfig, h as AlfeChannelConfig, m as createAlfeChannelPlugin, u as plugin } from "./plugin.js";
 
 //#region src/session-store.d.ts
 

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as plugin, c as createAlfeChannelPlugin } from "./plugin2.js";
+import { c as plugin, f as createAlfeChannelPlugin } from "./plugin2.js";
 export { createAlfeChannelPlugin, plugin as default };

package/dist/plugin.cjs

@@ -3,10 +3,14 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_plugin = require("./plugin2.cjs");
+exports.__agentTurnQueueForTest = require_plugin.__agentTurnQueueForTest;
+exports.__resetAgentTurnQueueForTest = require_plugin.__resetAgentTurnQueueForTest;
+exports.__setActiveRunForTest = require_plugin.__setActiveRunForTest;
 exports.admitAgentEvent = require_plugin.admitAgentEvent;
 exports.buildA2ACompletePayload = require_plugin.buildA2ACompletePayload;
 exports.buildToolActivity = require_plugin.buildToolActivity;
 exports.default = require_plugin.plugin;
 exports.joinAssistantText = require_plugin.joinAssistantText;
+exports.resolveAbortTargetKeys = require_plugin.resolveAbortTargetKeys;
 exports.rewriteAssistantText = require_plugin.rewriteAssistantText;
 exports.stripLeakedToolSummary = require_plugin.stripLeakedToolSummary;

package/dist/plugin.d.cts

@@ -402,6 +402,35 @@ interface PluginApi {
     priority?: number;
   }): void;
 }
+declare function enqueueAgentTurn(task: () => Promise<void>, opts?: {
+  coalesceKey?: string;
+  onSuperseded?: () => void;
+}): Promise<void>;
+/**
+ * Test-only: reset the agent-turn backlog between unit tests. Not used at
+ * runtime (the backlog lives for the process lifetime of one daemon).
+ */
+declare function __resetAgentTurnQueueForTest(): void;
+/** Test-only accessor for the coalescing queue (see __tests__/queue.test.ts). */
+declare const __agentTurnQueueForTest: {
+  enqueue: typeof enqueueAgentTurn;
+  backlogLength: () => number;
+};
+interface ActiveRunRef {
+  requestSessionKey: string;
+  routeSessionKey: string | null;
+}
+/** Test-only: set/clear the active-run ref for handleChatAbort unit tests. */
+declare function __setActiveRunForTest(ref: ActiveRunRef | null): void;
+/**
+ * Ordered session keys to try when aborting for `abortSessionKey`. Pure, so it
+ * unit-tests without the OpenClaw SDK. The resolved route key (what the run
+ * registered under) is preferred; the raw request key is a best-effort
+ * fallback. An abort with NO sessionKey targets the single active run. A
+ * sessionKey that does NOT match the running turn yields no candidates — we
+ * never abort another session's run on a shared daemon.
+ */
+declare function resolveAbortTargetKeys(active: ActiveRunRef | null, abortSessionKey: string | undefined): string[];
 declare const plugin: {
   id: string;
   name: string;
@@ -411,4 +440,4 @@ declare const plugin: {
   deactivate(api: PluginApi): Promise<void>;
 };
 //#endregion
-export { joinAssistantText as a, stripLeakedToolSummary as c, AlfePluginConfig as d, AlfeResolvedAccount as f, buildToolActivity as i, createAlfeChannelPlugin as l, admitAgentEvent as n, plugin as o, buildA2ACompletePayload as r, rewriteAssistantText as s, RunEventGate as t, AlfeChannelConfig as u };
+export { AlfeResolvedAccount as _, __setActiveRunForTest as a, buildToolActivity as c, resolveAbortTargetKeys as d, rewriteAssistantText as f, AlfePluginConfig as g, AlfeChannelConfig as h, __resetAgentTurnQueueForTest as i, joinAssistantText as l, createAlfeChannelPlugin as m, RunEventGate as n, admitAgentEvent as o, stripLeakedToolSummary as p, __agentTurnQueueForTest as r, buildA2ACompletePayload as s, ActiveRunRef as t, plugin as u };

package/dist/plugin.d.ts

@@ -402,6 +402,35 @@ interface PluginApi {
     priority?: number;
   }): void;
 }
+declare function enqueueAgentTurn(task: () => Promise<void>, opts?: {
+  coalesceKey?: string;
+  onSuperseded?: () => void;
+}): Promise<void>;
+/**
+ * Test-only: reset the agent-turn backlog between unit tests. Not used at
+ * runtime (the backlog lives for the process lifetime of one daemon).
+ */
+declare function __resetAgentTurnQueueForTest(): void;
+/** Test-only accessor for the coalescing queue (see __tests__/queue.test.ts). */
+declare const __agentTurnQueueForTest: {
+  enqueue: typeof enqueueAgentTurn;
+  backlogLength: () => number;
+};
+interface ActiveRunRef {
+  requestSessionKey: string;
+  routeSessionKey: string | null;
+}
+/** Test-only: set/clear the active-run ref for handleChatAbort unit tests. */
+declare function __setActiveRunForTest(ref: ActiveRunRef | null): void;
+/**
+ * Ordered session keys to try when aborting for `abortSessionKey`. Pure, so it
+ * unit-tests without the OpenClaw SDK. The resolved route key (what the run
+ * registered under) is preferred; the raw request key is a best-effort
+ * fallback. An abort with NO sessionKey targets the single active run. A
+ * sessionKey that does NOT match the running turn yields no candidates — we
+ * never abort another session's run on a shared daemon.
+ */
+declare function resolveAbortTargetKeys(active: ActiveRunRef | null, abortSessionKey: string | undefined): string[];
 declare const plugin: {
   id: string;
   name: string;
@@ -411,4 +440,4 @@ declare const plugin: {
   deactivate(api: PluginApi): Promise<void>;
 };
 //#endregion
-export { joinAssistantText as a, stripLeakedToolSummary as c, AlfePluginConfig as d, AlfeResolvedAccount as f, buildToolActivity as i, createAlfeChannelPlugin as l, admitAgentEvent as n, plugin as o, buildA2ACompletePayload as r, rewriteAssistantText as s, RunEventGate as t, AlfeChannelConfig as u };
+export { AlfeResolvedAccount as _, __setActiveRunForTest as a, buildToolActivity as c, resolveAbortTargetKeys as d, rewriteAssistantText as f, AlfePluginConfig as g, AlfeChannelConfig as h, __resetAgentTurnQueueForTest as i, joinAssistantText as l, createAlfeChannelPlugin as m, RunEventGate as n, admitAgentEvent as o, stripLeakedToolSummary as p, __agentTurnQueueForTest as r, buildA2ACompletePayload as s, ActiveRunRef as t, plugin as u };

package/dist/plugin.js

@@ -1,2 +1,2 @@
-import { a as plugin, i as joinAssistantText, n as buildA2ACompletePayload, o as rewriteAssistantText, r as buildToolActivity, s as stripLeakedToolSummary, t as admitAgentEvent } from "./plugin2.js";
-export { admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, rewriteAssistantText, stripLeakedToolSummary };
+import { a as buildA2ACompletePayload, c as plugin, d as stripLeakedToolSummary, i as admitAgentEvent, l as resolveAbortTargetKeys, n as __resetAgentTurnQueueForTest, o as buildToolActivity, r as __setActiveRunForTest, s as joinAssistantText, t as __agentTurnQueueForTest, u as rewriteAssistantText } from "./plugin2.js";
+export { __agentTurnQueueForTest, __resetAgentTurnQueueForTest, __setActiveRunForTest, admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, resolveAbortTargetKeys, rewriteAssistantText, stripLeakedToolSummary };

package/dist/plugin2.cjs

@@ -1186,6 +1186,37 @@ function buildA2ACompletePayload(params) {
 	};
 }
 let dispatchInbound = null;
+let abortEmbeddedAgentRun = null;
+let resolveActiveRunSessionId = null;
+let resolveRouteEnvelope = null;
+/**
+* Load the OpenClaw SDK surfaces from a single resolver anchor. Returns true
+* once the critical `dispatchInboundDirectDmWithRuntime` is resolved. The abort
+* primitives + route resolver are best-effort — an older openclaw without them
+* degrades `chat.abort` to a logged no-op (Stop still seals the UI) rather than
+* a hard failure.
+*/
+function loadOpenClawSdk(req, log, anchor) {
+	let resolvedDispatch = false;
+	try {
+		const channelInbound = req("openclaw/plugin-sdk/channel-inbound");
+		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
+			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
+			resolvedDispatch = true;
+		}
+	} catch {}
+	try {
+		const harness = req("openclaw/plugin-sdk/agent-harness");
+		if (harness.abortEmbeddedAgentRun) abortEmbeddedAgentRun = harness.abortEmbeddedAgentRun;
+		if (harness.resolveActiveEmbeddedRunSessionId) resolveActiveRunSessionId = harness.resolveActiveEmbeddedRunSessionId;
+	} catch {}
+	try {
+		const envelope = req("openclaw/plugin-sdk/inbound-envelope");
+		if (envelope.resolveInboundRouteEnvelopeBuilderWithRuntime) resolveRouteEnvelope = envelope.resolveInboundRouteEnvelopeBuilderWithRuntime;
+	} catch {}
+	if (resolvedDispatch) log.info(`Resolved OpenClaw SDK from ${anchor} (hard-abort=${abortEmbeddedAgentRun && resolveActiveRunSessionId ? "available" : "unavailable"})`);
+	return resolvedDispatch;
+}
 /**
 * Resolve OpenClaw SDK functions from the running process.
 *
@@ -1197,21 +1228,11 @@ let dispatchInbound = null;
 function resolveOpenClawSdk(log) {
 	const anchors = [require$1.main?.filename, process.argv[1]].filter(Boolean);
 	for (const anchor of anchors) try {
-		const channelInbound = (0, node_module.createRequire)(anchor)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${anchor}`);
-			return;
-		}
+		if (loadOpenClawSdk((0, node_module.createRequire)(anchor), log, anchor)) return;
 	} catch {}
 	try {
 		const derivedPath = (0, node_path.join)((0, node_path.resolve)((0, node_path.dirname)(process.execPath), ".."), "lib", "node_modules", "openclaw", "package.json");
-		const channelInbound = (0, node_module.createRequire)(derivedPath)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${derivedPath}`);
-			return;
-		}
+		if (loadOpenClawSdk((0, node_module.createRequire)(derivedPath), log, derivedPath)) return;
 	} catch {}
 	log.warn("OpenClaw SDK not resolvable — chat dispatch will not work");
 }
@@ -1288,11 +1309,111 @@ 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;
+let agentTurnBacklog = [];
+let agentTurnDraining = false;
+function enqueueAgentTurn(task, opts) {
+	return new Promise((resolve, reject) => {
+		const entry = {
+			run: task,
+			coalesceKey: opts?.coalesceKey,
+			onSuperseded: opts?.onSuperseded ?? (() => void 0),
+			resolve,
+			reject
+		};
+		if (entry.coalesceKey) {
+			const survivors = [];
+			for (const queued of agentTurnBacklog) if (queued.coalesceKey === entry.coalesceKey) {
+				try {
+					queued.onSuperseded();
+				} catch {}
+				queued.resolve();
+			} else survivors.push(queued);
+			agentTurnBacklog = survivors;
+		}
+		agentTurnBacklog.push(entry);
+		drainAgentTurns();
+	});
+}
+async function drainAgentTurns() {
+	if (agentTurnDraining) return;
+	agentTurnDraining = true;
+	try {
+		while (agentTurnBacklog.length > 0) {
+			const entry = agentTurnBacklog.shift();
+			if (!entry) break;
+			try {
+				await entry.run();
+				entry.resolve();
+			} catch (err) {
+				entry.reject(err);
+			}
+		}
+	} finally {
+		agentTurnDraining = false;
+	}
+}
+/**
+* Test-only: reset the agent-turn backlog between unit tests. Not used at
+* runtime (the backlog lives for the process lifetime of one daemon).
+*/
+function __resetAgentTurnQueueForTest() {
+	agentTurnBacklog = [];
+	agentTurnDraining = false;
+}
+/** Test-only accessor for the coalescing queue (see __tests__/queue.test.ts). */
+const __agentTurnQueueForTest = {
+	enqueue: enqueueAgentTurn,
+	backlogLength: () => agentTurnBacklog.length
+};
+let activeRun = null;
+/** Test-only: set/clear the active-run ref for handleChatAbort unit tests. */
+function __setActiveRunForTest(ref) {
+	activeRun = ref;
+}
+/**
+* Ordered session keys to try when aborting for `abortSessionKey`. Pure, so it
+* unit-tests without the OpenClaw SDK. The resolved route key (what the run
+* registered under) is preferred; the raw request key is a best-effort
+* fallback. An abort with NO sessionKey targets the single active run. A
+* sessionKey that does NOT match the running turn yields no candidates — we
+* never abort another session's run on a shared daemon.
+*/
+function resolveAbortTargetKeys(active, abortSessionKey) {
+	const keys = [];
+	if (active && (!abortSessionKey || active.requestSessionKey === abortSessionKey)) {
+		if (active.routeSessionKey) keys.push(active.routeSessionKey);
+		if (!keys.includes(active.requestSessionKey)) keys.push(active.requestSessionKey);
+	} else if (abortSessionKey) keys.push(abortSessionKey);
+	return keys;
+}
+/**
+* `chat.abort` handler — genuinely cancels the RUNNING turn on the daemon.
+*
+* Invoked OUT-OF-BAND (never through the serialised agent-turn queue) so it
+* executes immediately while a turn is mid-flight. Resolves the live run's
+* sessionId from the target session key and fires the run handle's
+* AbortController via `abortEmbeddedAgentRun`. The in-flight dispatch then
+* settles (AbortError), so `handleAgentRequest` sends its RPC response and the
+* chat service seals the UI. When the abort primitives are unavailable (older
+* openclaw), this degrades to a logged no-op: the UI is still sealed by the
+* chat service's optimistic idle broadcast, but the turn completes server-side.
+*/
+function handleChatAbort(request, log) {
+	const { sessionKey } = request.params;
+	const targetKeys = resolveAbortTargetKeys(activeRun, sessionKey);
+	let aborted = false;
+	if (abortEmbeddedAgentRun && resolveActiveRunSessionId) {
+		for (const key of targetKeys) {
+			const sessionId = resolveActiveRunSessionId(key);
+			if (sessionId && abortEmbeddedAgentRun(sessionId)) {
+				aborted = true;
+				log.info(`chat.abort: hard-aborted running turn (sessionId=${sessionId}, key=${key})`);
+				break;
+			}
+		}
+		if (!aborted) log.info(`chat.abort: no active run to abort (candidates=${String(targetKeys.length)})`);
+	} else log.warn("chat.abort: OpenClaw abort primitives unavailable — cannot hard-abort the running turn");
+	chatClient?.sendResponse(request.id, true, { aborted });
 }
 async function handleAgentRequest(request, log) {
 	const runtime = pluginRuntime;
@@ -1320,6 +1441,7 @@ async function handleAgentRequest(request, log) {
 		sessionKey: null
 	};
 	let lastThinkingLen = 0;
+	let sawStructuredThinking = false;
 	const turnThinking = {
 		text: "",
 		ts: 0
@@ -1376,20 +1498,22 @@ async function handleAgentRequest(request, log) {
 			const { visible, thinking } = splitThinkTags(raw);
 			if (thinking.length > lastThinkingLen) {
 				const thinkingDelta = thinking.slice(lastThinkingLen);
-				chatClient?.sendEvent("chat-activity", {
-					runId: evt.runId,
-					sessionKey: legacySessionKey,
-					seq: evt.seq,
-					state: "activity",
-					activity: {
-						kind: "thinking",
-						text: thinkingDelta,
-						delta: true,
-						ts: evt.ts,
-						seq: evt.seq
-					}
-				});
-				recordThinking(thinkingDelta, evt.ts);
+				if (!sawStructuredThinking) {
+					chatClient?.sendEvent("chat-activity", {
+						runId: evt.runId,
+						sessionKey: legacySessionKey,
+						seq: evt.seq,
+						state: "activity",
+						activity: {
+							kind: "thinking",
+							text: thinkingDelta,
+							delta: true,
+							ts: evt.ts,
+							seq: evt.seq
+						}
+					});
+					recordThinking(thinkingDelta, evt.ts);
+				}
 				lastThinkingLen = thinking.length;
 			}
 			const message = visible === raw && thinking.length === 0 ? evt.data : rewriteAssistantText(evt.data, visible);
@@ -1403,6 +1527,7 @@ async function handleAgentRequest(request, log) {
 			return;
 		}
 		if (evt.stream === "thinking") {
+			sawStructuredThinking = true;
 			const activity = buildThinkingActivity(evt.data);
 			if (activity) {
 				chatClient?.sendEvent("chat-activity", {
@@ -1473,19 +1598,37 @@ async function handleAgentRequest(request, log) {
 		const conversationLabel = conversationType === "group" ? shortConvId ? `[${channelLabel}] Group (${shortConvId})` : `[${channelLabel}] Group` : shortConvId ? `[${channelLabel}] ${userLabel} (${shortConvId})` : `[${channelLabel}] ${userLabel}`;
 		let a2aResponseBuffer = "";
 		if (isA2A) resetA2AEndSignal();
+		const peer = conversationType === "group" ? {
+			kind: "group",
+			id: conversationId ?? senderId
+		} : {
+			kind: "direct",
+			id: conversationId ? `${senderId}:conv:${conversationId}` : senderId
+		};
+		let routeSessionKey = null;
+		if (resolveRouteEnvelope) try {
+			routeSessionKey = resolveRouteEnvelope({
+				cfg,
+				channel: "alfe",
+				accountId: "default",
+				peer,
+				runtime: runtime.channel,
+				sessionStore: cfg.session?.store
+			}).route.sessionKey;
+		} catch (err) {
+			log.debug(`Route precompute failed (abort will use raw key): ${err instanceof Error ? err.message : String(err)}`);
+		}
+		activeRun = {
+			requestSessionKey: legacySessionKey,
+			routeSessionKey
+		};
 		runGate.sessionKey = (await dispatchInbound({
 			cfg,
 			runtime: { channel: runtime.channel },
 			channel: "alfe",
 			channelLabel,
 			accountId: "default",
-			peer: conversationType === "group" ? {
-				kind: "group",
-				id: conversationId ?? senderId
-			} : {
-				kind: "direct",
-				id: conversationId ? `${senderId}:conv:${conversationId}` : senderId
-			},
+			peer,
 			senderId,
 			senderAddress: senderId,
 			recipientAddress: "agent",
@@ -1554,6 +1697,7 @@ async function handleAgentRequest(request, log) {
 		log.error(`Agent dispatch failed: ${errMsg}`);
 		chatClient?.sendResponse(request.id, false, { message: errMsg });
 	} finally {
+		activeRun = null;
 		unsubscribe();
 		clearAllToolUpdates();
 		try {
@@ -1662,7 +1806,20 @@ const plugin = {
 							apiKey,
 							onRequest: (request) => {
 								const handle = async () => {
-									if (request.method === "agent") await enqueueAgentTurn(() => handleAgentRequest(request, log));
+									if (request.method === "agent") {
+										const params = request.params;
+										const coalesceKey = params.coalesce === "replace" && typeof params.sessionKey === "string" ? params.sessionKey : void 0;
+										await enqueueAgentTurn(() => handleAgentRequest(request, log), coalesceKey ? {
+											coalesceKey,
+											onSuperseded: () => {
+												log.info(`Agent turn superseded before start (coalesce=replace): ${coalesceKey}`);
+												chatClient?.sendResponse(request.id, true, {
+													superseded: true,
+													sessionKey: coalesceKey
+												});
+											}
+										} : void 0);
+									} else if (request.method === "chat.abort") handleChatAbort(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}` });
@@ -1795,6 +1952,24 @@ const plugin = {
 	}
 };
 //#endregion
+Object.defineProperty(exports, "__agentTurnQueueForTest", {
+	enumerable: true,
+	get: function() {
+		return __agentTurnQueueForTest;
+	}
+});
+Object.defineProperty(exports, "__resetAgentTurnQueueForTest", {
+	enumerable: true,
+	get: function() {
+		return __resetAgentTurnQueueForTest;
+	}
+});
+Object.defineProperty(exports, "__setActiveRunForTest", {
+	enumerable: true,
+	get: function() {
+		return __setActiveRunForTest;
+	}
+});
 Object.defineProperty(exports, "admitAgentEvent", {
 	enumerable: true,
 	get: function() {
@@ -1831,6 +2006,12 @@ Object.defineProperty(exports, "plugin", {
 		return plugin;
 	}
 });
+Object.defineProperty(exports, "resolveAbortTargetKeys", {
+	enumerable: true,
+	get: function() {
+		return resolveAbortTargetKeys;
+	}
+});
 Object.defineProperty(exports, "rewriteAssistantText", {
 	enumerable: true,
 	get: function() {

package/dist/plugin2.d.cts

@@ -1,2 +1,2 @@
-import { a as joinAssistantText, c as stripLeakedToolSummary, i as buildToolActivity, n as admitAgentEvent, o as plugin, r as buildA2ACompletePayload, s as rewriteAssistantText, t as RunEventGate } from "./plugin.cjs";
-export { RunEventGate, admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, rewriteAssistantText, stripLeakedToolSummary };
+import { a as __setActiveRunForTest, c as buildToolActivity, d as resolveAbortTargetKeys, f as rewriteAssistantText, i as __resetAgentTurnQueueForTest, l as joinAssistantText, n as RunEventGate, o as admitAgentEvent, p as stripLeakedToolSummary, r as __agentTurnQueueForTest, s as buildA2ACompletePayload, t as ActiveRunRef, u as plugin } from "./plugin.cjs";
+export { ActiveRunRef, RunEventGate, __agentTurnQueueForTest, __resetAgentTurnQueueForTest, __setActiveRunForTest, admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, resolveAbortTargetKeys, rewriteAssistantText, stripLeakedToolSummary };

package/dist/plugin2.d.ts

@@ -1,2 +1,2 @@
-import { a as joinAssistantText, c as stripLeakedToolSummary, i as buildToolActivity, n as admitAgentEvent, o as plugin, r as buildA2ACompletePayload, s as rewriteAssistantText, t as RunEventGate } from "./plugin.js";
-export { RunEventGate, admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, rewriteAssistantText, stripLeakedToolSummary };
+import { a as __setActiveRunForTest, c as buildToolActivity, d as resolveAbortTargetKeys, f as rewriteAssistantText, i as __resetAgentTurnQueueForTest, l as joinAssistantText, n as RunEventGate, o as admitAgentEvent, p as stripLeakedToolSummary, r as __agentTurnQueueForTest, s as buildA2ACompletePayload, t as ActiveRunRef, u as plugin } from "./plugin.js";
+export { ActiveRunRef, RunEventGate, __agentTurnQueueForTest, __resetAgentTurnQueueForTest, __setActiveRunForTest, admitAgentEvent, buildA2ACompletePayload, buildToolActivity, plugin as default, joinAssistantText, resolveAbortTargetKeys, rewriteAssistantText, stripLeakedToolSummary };

package/dist/plugin2.js

@@ -1186,6 +1186,37 @@ function buildA2ACompletePayload(params) {
 	};
 }
 let dispatchInbound = null;
+let abortEmbeddedAgentRun = null;
+let resolveActiveRunSessionId = null;
+let resolveRouteEnvelope = null;
+/**
+* Load the OpenClaw SDK surfaces from a single resolver anchor. Returns true
+* once the critical `dispatchInboundDirectDmWithRuntime` is resolved. The abort
+* primitives + route resolver are best-effort — an older openclaw without them
+* degrades `chat.abort` to a logged no-op (Stop still seals the UI) rather than
+* a hard failure.
+*/
+function loadOpenClawSdk(req, log, anchor) {
+	let resolvedDispatch = false;
+	try {
+		const channelInbound = req("openclaw/plugin-sdk/channel-inbound");
+		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
+			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
+			resolvedDispatch = true;
+		}
+	} catch {}
+	try {
+		const harness = req("openclaw/plugin-sdk/agent-harness");
+		if (harness.abortEmbeddedAgentRun) abortEmbeddedAgentRun = harness.abortEmbeddedAgentRun;
+		if (harness.resolveActiveEmbeddedRunSessionId) resolveActiveRunSessionId = harness.resolveActiveEmbeddedRunSessionId;
+	} catch {}
+	try {
+		const envelope = req("openclaw/plugin-sdk/inbound-envelope");
+		if (envelope.resolveInboundRouteEnvelopeBuilderWithRuntime) resolveRouteEnvelope = envelope.resolveInboundRouteEnvelopeBuilderWithRuntime;
+	} catch {}
+	if (resolvedDispatch) log.info(`Resolved OpenClaw SDK from ${anchor} (hard-abort=${abortEmbeddedAgentRun && resolveActiveRunSessionId ? "available" : "unavailable"})`);
+	return resolvedDispatch;
+}
 /**
 * Resolve OpenClaw SDK functions from the running process.
 *
@@ -1197,21 +1228,11 @@ let dispatchInbound = null;
 function resolveOpenClawSdk(log) {
 	const anchors = [require.main?.filename, process.argv[1]].filter(Boolean);
 	for (const anchor of anchors) try {
-		const channelInbound = createRequire(anchor)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${anchor}`);
-			return;
-		}
+		if (loadOpenClawSdk(createRequire(anchor), log, anchor)) return;
 	} catch {}
 	try {
 		const derivedPath = join(resolve(dirname(process.execPath), ".."), "lib", "node_modules", "openclaw", "package.json");
-		const channelInbound = createRequire(derivedPath)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${derivedPath}`);
-			return;
-		}
+		if (loadOpenClawSdk(createRequire(derivedPath), log, derivedPath)) return;
 	} catch {}
 	log.warn("OpenClaw SDK not resolvable — chat dispatch will not work");
 }
@@ -1288,11 +1309,111 @@ 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;
+let agentTurnBacklog = [];
+let agentTurnDraining = false;
+function enqueueAgentTurn(task, opts) {
+	return new Promise((resolve, reject) => {
+		const entry = {
+			run: task,
+			coalesceKey: opts?.coalesceKey,
+			onSuperseded: opts?.onSuperseded ?? (() => void 0),
+			resolve,
+			reject
+		};
+		if (entry.coalesceKey) {
+			const survivors = [];
+			for (const queued of agentTurnBacklog) if (queued.coalesceKey === entry.coalesceKey) {
+				try {
+					queued.onSuperseded();
+				} catch {}
+				queued.resolve();
+			} else survivors.push(queued);
+			agentTurnBacklog = survivors;
+		}
+		agentTurnBacklog.push(entry);
+		drainAgentTurns();
+	});
+}
+async function drainAgentTurns() {
+	if (agentTurnDraining) return;
+	agentTurnDraining = true;
+	try {
+		while (agentTurnBacklog.length > 0) {
+			const entry = agentTurnBacklog.shift();
+			if (!entry) break;
+			try {
+				await entry.run();
+				entry.resolve();
+			} catch (err) {
+				entry.reject(err);
+			}
+		}
+	} finally {
+		agentTurnDraining = false;
+	}
+}
+/**
+* Test-only: reset the agent-turn backlog between unit tests. Not used at
+* runtime (the backlog lives for the process lifetime of one daemon).
+*/
+function __resetAgentTurnQueueForTest() {
+	agentTurnBacklog = [];
+	agentTurnDraining = false;
+}
+/** Test-only accessor for the coalescing queue (see __tests__/queue.test.ts). */
+const __agentTurnQueueForTest = {
+	enqueue: enqueueAgentTurn,
+	backlogLength: () => agentTurnBacklog.length
+};
+let activeRun = null;
+/** Test-only: set/clear the active-run ref for handleChatAbort unit tests. */
+function __setActiveRunForTest(ref) {
+	activeRun = ref;
+}
+/**
+* Ordered session keys to try when aborting for `abortSessionKey`. Pure, so it
+* unit-tests without the OpenClaw SDK. The resolved route key (what the run
+* registered under) is preferred; the raw request key is a best-effort
+* fallback. An abort with NO sessionKey targets the single active run. A
+* sessionKey that does NOT match the running turn yields no candidates — we
+* never abort another session's run on a shared daemon.
+*/
+function resolveAbortTargetKeys(active, abortSessionKey) {
+	const keys = [];
+	if (active && (!abortSessionKey || active.requestSessionKey === abortSessionKey)) {
+		if (active.routeSessionKey) keys.push(active.routeSessionKey);
+		if (!keys.includes(active.requestSessionKey)) keys.push(active.requestSessionKey);
+	} else if (abortSessionKey) keys.push(abortSessionKey);
+	return keys;
+}
+/**
+* `chat.abort` handler — genuinely cancels the RUNNING turn on the daemon.
+*
+* Invoked OUT-OF-BAND (never through the serialised agent-turn queue) so it
+* executes immediately while a turn is mid-flight. Resolves the live run's
+* sessionId from the target session key and fires the run handle's
+* AbortController via `abortEmbeddedAgentRun`. The in-flight dispatch then
+* settles (AbortError), so `handleAgentRequest` sends its RPC response and the
+* chat service seals the UI. When the abort primitives are unavailable (older
+* openclaw), this degrades to a logged no-op: the UI is still sealed by the
+* chat service's optimistic idle broadcast, but the turn completes server-side.
+*/
+function handleChatAbort(request, log) {
+	const { sessionKey } = request.params;
+	const targetKeys = resolveAbortTargetKeys(activeRun, sessionKey);
+	let aborted = false;
+	if (abortEmbeddedAgentRun && resolveActiveRunSessionId) {
+		for (const key of targetKeys) {
+			const sessionId = resolveActiveRunSessionId(key);
+			if (sessionId && abortEmbeddedAgentRun(sessionId)) {
+				aborted = true;
+				log.info(`chat.abort: hard-aborted running turn (sessionId=${sessionId}, key=${key})`);
+				break;
+			}
+		}
+		if (!aborted) log.info(`chat.abort: no active run to abort (candidates=${String(targetKeys.length)})`);
+	} else log.warn("chat.abort: OpenClaw abort primitives unavailable — cannot hard-abort the running turn");
+	chatClient?.sendResponse(request.id, true, { aborted });
 }
 async function handleAgentRequest(request, log) {
 	const runtime = pluginRuntime;
@@ -1320,6 +1441,7 @@ async function handleAgentRequest(request, log) {
 		sessionKey: null
 	};
 	let lastThinkingLen = 0;
+	let sawStructuredThinking = false;
 	const turnThinking = {
 		text: "",
 		ts: 0
@@ -1376,20 +1498,22 @@ async function handleAgentRequest(request, log) {
 			const { visible, thinking } = splitThinkTags(raw);
 			if (thinking.length > lastThinkingLen) {
 				const thinkingDelta = thinking.slice(lastThinkingLen);
-				chatClient?.sendEvent("chat-activity", {
-					runId: evt.runId,
-					sessionKey: legacySessionKey,
-					seq: evt.seq,
-					state: "activity",
-					activity: {
-						kind: "thinking",
-						text: thinkingDelta,
-						delta: true,
-						ts: evt.ts,
-						seq: evt.seq
-					}
-				});
-				recordThinking(thinkingDelta, evt.ts);
+				if (!sawStructuredThinking) {
+					chatClient?.sendEvent("chat-activity", {
+						runId: evt.runId,
+						sessionKey: legacySessionKey,
+						seq: evt.seq,
+						state: "activity",
+						activity: {
+							kind: "thinking",
+							text: thinkingDelta,
+							delta: true,
+							ts: evt.ts,
+							seq: evt.seq
+						}
+					});
+					recordThinking(thinkingDelta, evt.ts);
+				}
 				lastThinkingLen = thinking.length;
 			}
 			const message = visible === raw && thinking.length === 0 ? evt.data : rewriteAssistantText(evt.data, visible);
@@ -1403,6 +1527,7 @@ async function handleAgentRequest(request, log) {
 			return;
 		}
 		if (evt.stream === "thinking") {
+			sawStructuredThinking = true;
 			const activity = buildThinkingActivity(evt.data);
 			if (activity) {
 				chatClient?.sendEvent("chat-activity", {
@@ -1473,19 +1598,37 @@ async function handleAgentRequest(request, log) {
 		const conversationLabel = conversationType === "group" ? shortConvId ? `[${channelLabel}] Group (${shortConvId})` : `[${channelLabel}] Group` : shortConvId ? `[${channelLabel}] ${userLabel} (${shortConvId})` : `[${channelLabel}] ${userLabel}`;
 		let a2aResponseBuffer = "";
 		if (isA2A) resetA2AEndSignal();
+		const peer = conversationType === "group" ? {
+			kind: "group",
+			id: conversationId ?? senderId
+		} : {
+			kind: "direct",
+			id: conversationId ? `${senderId}:conv:${conversationId}` : senderId
+		};
+		let routeSessionKey = null;
+		if (resolveRouteEnvelope) try {
+			routeSessionKey = resolveRouteEnvelope({
+				cfg,
+				channel: "alfe",
+				accountId: "default",
+				peer,
+				runtime: runtime.channel,
+				sessionStore: cfg.session?.store
+			}).route.sessionKey;
+		} catch (err) {
+			log.debug(`Route precompute failed (abort will use raw key): ${err instanceof Error ? err.message : String(err)}`);
+		}
+		activeRun = {
+			requestSessionKey: legacySessionKey,
+			routeSessionKey
+		};
 		runGate.sessionKey = (await dispatchInbound({
 			cfg,
 			runtime: { channel: runtime.channel },
 			channel: "alfe",
 			channelLabel,
 			accountId: "default",
-			peer: conversationType === "group" ? {
-				kind: "group",
-				id: conversationId ?? senderId
-			} : {
-				kind: "direct",
-				id: conversationId ? `${senderId}:conv:${conversationId}` : senderId
-			},
+			peer,
 			senderId,
 			senderAddress: senderId,
 			recipientAddress: "agent",
@@ -1554,6 +1697,7 @@ async function handleAgentRequest(request, log) {
 		log.error(`Agent dispatch failed: ${errMsg}`);
 		chatClient?.sendResponse(request.id, false, { message: errMsg });
 	} finally {
+		activeRun = null;
 		unsubscribe();
 		clearAllToolUpdates();
 		try {
@@ -1662,7 +1806,20 @@ const plugin = {
 							apiKey,
 							onRequest: (request) => {
 								const handle = async () => {
-									if (request.method === "agent") await enqueueAgentTurn(() => handleAgentRequest(request, log));
+									if (request.method === "agent") {
+										const params = request.params;
+										const coalesceKey = params.coalesce === "replace" && typeof params.sessionKey === "string" ? params.sessionKey : void 0;
+										await enqueueAgentTurn(() => handleAgentRequest(request, log), coalesceKey ? {
+											coalesceKey,
+											onSuperseded: () => {
+												log.info(`Agent turn superseded before start (coalesce=replace): ${coalesceKey}`);
+												chatClient?.sendResponse(request.id, true, {
+													superseded: true,
+													sessionKey: coalesceKey
+												});
+											}
+										} : void 0);
+									} else if (request.method === "chat.abort") handleChatAbort(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}` });
@@ -1795,4 +1952,4 @@ const plugin = {
 	}
 };
 //#endregion
-export { plugin as a, createAlfeChannelPlugin as c, joinAssistantText as i, buildA2ACompletePayload as n, rewriteAssistantText as o, buildToolActivity as r, stripLeakedToolSummary as s, admitAgentEvent as t };
+export { buildA2ACompletePayload as a, plugin as c, stripLeakedToolSummary as d, createAlfeChannelPlugin as f, admitAgentEvent as i, resolveAbortTargetKeys as l, __resetAgentTurnQueueForTest as n, buildToolActivity as o, __setActiveRunForTest as r, joinAssistantText as s, __agentTurnQueueForTest as t, rewriteAssistantText as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/openclaw-chat",
-  "version": "0.4.0",
+  "version": "0.5.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/chat": "^0.0.14",
     "@alfe.ai/agent-api-client": "^0.5.0",
+    "@alfe.ai/chat": "^0.0.14",
     "@alfe.ai/config": "^0.3.0"
   },
   "peerDependencies": {