@abraca/mcp 1.8.0 → 1.8.1

package/dist/abracadabra-mcp.cjs

@@ -3761,7 +3761,7 @@ const propertyKeyTypes = new Set([
 	"number",
 	"symbol"
 ]);
-function escapeRegex(str) {
+function escapeRegex$1(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function clone(inst, def, params) {
@@ -4472,7 +4472,7 @@ const $ZodCheckUpperCase = /* @__PURE__ */ $constructor("$ZodCheckUpperCase", (i
 });
 const $ZodCheckIncludes = /* @__PURE__ */ $constructor("$ZodCheckIncludes", (inst, def) => {
 	$ZodCheck.init(inst, def);
-	const escapedRegex = escapeRegex(def.includes);
+	const escapedRegex = escapeRegex$1(def.includes);
 	const pattern = new RegExp(typeof def.position === "number" ? `^.{${def.position}}${escapedRegex}` : escapedRegex);
 	def.pattern = pattern;
 	inst._zod.onattach.push((inst) => {
@@ -4495,7 +4495,7 @@ const $ZodCheckIncludes = /* @__PURE__ */ $constructor("$ZodCheckIncludes", (ins
 });
 const $ZodCheckStartsWith = /* @__PURE__ */ $constructor("$ZodCheckStartsWith", (inst, def) => {
 	$ZodCheck.init(inst, def);
-	const pattern = new RegExp(`^${escapeRegex(def.prefix)}.*`);
+	const pattern = new RegExp(`^${escapeRegex$1(def.prefix)}.*`);
 	def.pattern ?? (def.pattern = pattern);
 	inst._zod.onattach.push((inst) => {
 		const bag = inst._zod.bag;
@@ -4517,7 +4517,7 @@ const $ZodCheckStartsWith = /* @__PURE__ */ $constructor("$ZodCheckStartsWith",
 });
 const $ZodCheckEndsWith = /* @__PURE__ */ $constructor("$ZodCheckEndsWith", (inst, def) => {
 	$ZodCheck.init(inst, def);
-	const pattern = new RegExp(`.*${escapeRegex(def.suffix)}$`);
+	const pattern = new RegExp(`.*${escapeRegex$1(def.suffix)}$`);
 	def.pattern ?? (def.pattern = pattern);
 	inst._zod.onattach.push((inst) => {
 		const bag = inst._zod.bag;
@@ -5549,7 +5549,7 @@ const $ZodEnum = /* @__PURE__ */ $constructor("$ZodEnum", (inst, def) => {
 	const values = getEnumValues(def.entries);
 	const valuesSet = new Set(values);
 	inst._zod.values = valuesSet;
-	inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex(o) : o.toString()).join("|")})$`);
+	inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex$1(o) : o.toString()).join("|")})$`);
 	inst._zod.parse = (payload, _ctx) => {
 		const input = payload.value;
 		if (valuesSet.has(input)) return payload;
@@ -5567,7 +5567,7 @@ const $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
 	if (def.values.length === 0) throw new Error("Cannot create literal schema with no valid values");
 	const values = new Set(def.values);
 	inst._zod.values = values;
-	inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$`);
+	inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex$1(o) : o ? escapeRegex$1(o.toString()) : String(o)).join("|")})$`);
 	inst._zod.parse = (payload, _ctx) => {
 		const input = payload.value;
 		if (values.has(input)) return payload;
@@ -19969,6 +19969,47 @@ function signChallenge(challengeB64, privateKey) {
 	return toBase64url(sign(challenge, privateKey));
 }
 
+//#endregion
+//#region packages/mcp/src/mentions.ts
+/**
+* Mention parsing for chat messages.
+*
+* Recognizes `@alias` tokens (case-insensitive, word-boundary) so the agent
+* can decide whether a group-chat message is directed at it.
+*/
+/** Escape regex metacharacters in an alias string. */
+function escapeRegex(s) {
+	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/**
+* Build a regex that matches `@<alias>` for any of the given aliases.
+* Requires a non-word char (or start) before `@` and a word boundary after the alias
+* so `@Claude` matches but `email@claudesomething` does not.
+*/
+function buildMentionRegex(aliases) {
+	const cleaned = aliases.map((a) => a.trim()).filter((a) => a.length > 0);
+	if (cleaned.length === 0) return null;
+	const alt = cleaned.map(escapeRegex).join("|");
+	return new RegExp(`(?:^|[^\\w@])@(?:${alt})\\b`, "i");
+}
+/** Returns true if `text` contains `@alias` for any alias (case-insensitive). */
+function containsMention(text, aliases) {
+	const re = buildMentionRegex(aliases);
+	if (!re) return false;
+	return re.test(text);
+}
+/**
+* Remove `@alias` tokens from the text. Leaves surrounding whitespace tidy so
+* the cleaned prompt reads naturally (e.g. `"@Claude help"` → `"help"`).
+*/
+function stripMention(text, aliases) {
+	const cleaned = aliases.map((a) => a.trim()).filter((a) => a.length > 0);
+	if (cleaned.length === 0) return text;
+	const alt = cleaned.map(escapeRegex).join("|");
+	const re = new RegExp(`(^|\\s)@(?:${alt})\\b[,:]?\\s*`, "gi");
+	return text.replace(re, (_m, lead) => lead ? " " : "").replace(/\s{2,}/g, " ").trim();
+}
+
 //#endregion
 //#region packages/mcp/src/server.ts
 /**
@@ -19979,7 +20020,10 @@ function signChallenge(challengeB64, privateKey) {
 * Use switchSpace(docId) to change the active space.
 */
 const IDLE_TIMEOUT_MS = 300 * 1e3;
-var AbracadabraMCPServer = class {
+var AbracadabraMCPServer = class AbracadabraMCPServer {
+	static {
+		this.TOOL_HISTORY_MAX = 20;
+	}
 	constructor(config) {
 		this._serverInfo = null;
 		this._rootDocId = null;
@@ -19996,6 +20040,7 @@ var AbracadabraMCPServer = class {
 		this._typingInterval = null;
 		this._lastChatChannel = null;
 		this._signFn = null;
+		this._toolHistory = [];
 		this.config = config;
 		this.client = new _abraca_dabra.AbracadabraClient({
 			url: config.url,
@@ -20008,6 +20053,14 @@ var AbracadabraMCPServer = class {
 	get agentColor() {
 		return this.config.agentColor || "hsl(270, 80%, 60%)";
 	}
+	get triggerMode() {
+		return this.config.triggerMode ?? "mention+task";
+	}
+	get mentionAliases() {
+		const explicit = this.config.mentionAliases?.filter((a) => a.trim().length > 0);
+		if (explicit && explicit.length > 0) return explicit;
+		return [this.agentName];
+	}
 	get serverInfo() {
 		return this._serverInfo;
 	}
@@ -20048,7 +20101,7 @@ var AbracadabraMCPServer = class {
 				await this.client.loginWithKey(keypair.publicKeyB64, signFn);
 			} else throw err;
 		}
-		console.error(`[abracadabra-mcp] Authenticated as ${this.agentName} (${keypair.publicKeyB64.slice(0, 12)}...)`);
+		console.error(`[abracadabra-mcp] Authenticated as ${this.agentName} (pubkey=${keypair.publicKeyB64})`);
 		this._serverInfo = await this.client.serverInfo();
 		let initialDocId = this._serverInfo.index_doc_id ?? null;
 		try {
@@ -20115,6 +20168,8 @@ var AbracadabraMCPServer = class {
 		provider.awareness.setLocalStateField("status", null);
 		provider.awareness.setLocalStateField("activeToolCall", null);
 		provider.awareness.setLocalStateField("statusContext", null);
+		provider.awareness.setLocalStateField("turnId", null);
+		provider.awareness.setLocalStateField("toolHistory", []);
 		const conn = {
 			doc,
 			provider,
@@ -20238,6 +20293,7 @@ var AbracadabraMCPServer = class {
 	_observeRootAwareness(provider) {
 		const selfId = provider.awareness.clientID;
 		provider.awareness.on("change", () => {
+			if (this.triggerMode === "mention") return;
 			const states = provider.awareness.getStates();
 			for (const [clientId, state] of states) {
 				if (clientId === selfId) continue;
@@ -20250,6 +20306,7 @@ var AbracadabraMCPServer = class {
 				const user = state["user"];
 				const senderName = user && typeof user === "object" && typeof user.name === "string" ? user.name : "Unknown";
 				console.error(`[abracadabra-mcp] Handling ai:task id=${id} from ${senderName}: ${text.slice(0, 80)}`);
+				this._beginTurn();
 				this.setAutoStatus("thinking");
 				this._dispatchAiTask({
 					id,
@@ -20312,9 +20369,28 @@ var AbracadabraMCPServer = class {
 			if (data.sender_id && data.sender_id === this._userId) return;
 			const channel = data.channel;
 			const docId = channel?.startsWith("group:") ? channel.slice(6) : "";
-			if (channel?.startsWith("dm:")) {
+			const isDM = channel?.startsWith("dm:") ?? false;
+			const isGroup = channel?.startsWith("group:") ?? false;
+			if (isDM) {
 				const parts = channel.split(":");
-				if (parts.length === 3 && parts[1] !== this._userId && parts[2] !== this._userId) return;
+				if (parts.length === 3 && parts[1] !== this._userId && parts[2] !== this._userId) {
+					console.error(`[abracadabra-mcp] Dropping DM: agent _userId=${this._userId} not in channel parts=[${parts[1]}, ${parts[2]}] — channel='${channel}'. The dashboard's awareness likely points at a stale Claude identity.`);
+					return;
+				}
+			}
+			const mode = this.triggerMode;
+			const content = typeof data.content === "string" ? data.content : "";
+			let dispatchContent = content;
+			if (isGroup) {
+				if (mode === "task") return;
+				if (mode === "mention" || mode === "mention+task") {
+					const aliases = this.mentionAliases;
+					if (!containsMention(content, aliases)) {
+						console.error(`[abracadabra-mcp] skipped message on ${channel} — no @mention for ${aliases.join("|")}`);
+						return;
+					}
+					dispatchContent = stripMention(content, aliases) || content;
+				}
 			}
 			if (channel) {
 				const rootProvider = this._activeConnection?.provider;
@@ -20324,14 +20400,13 @@ var AbracadabraMCPServer = class {
 					timestamp: Math.floor(Date.now() / 1e3)
 				}));
 				this._lastChatChannel = channel;
-				this.sendTypingIndicator(channel);
-				this._startTypingInterval(channel);
 			}
+			this._beginTurn();
 			this.setAutoStatus("thinking");
 			await this._serverRef.notification({
 				method: "notifications/claude/channel",
 				params: {
-					content: data.content ?? "",
+					content: dispatchContent,
 					instructions: `You MUST use send_chat_message with channel="${channel ?? ""}" for ALL responses — both progress updates and final answers. The user CANNOT see plain text output; they only see messages sent via send_chat_message. When doing multi-step work, send brief status updates via send_chat_message (e.g. "Looking into that..." or "Found it, writing up results...") so the user knows you're working. Never output plain text as a substitute for send_chat_message.`,
 					meta: {
 						source: "abracadabra",
@@ -20362,13 +20437,35 @@ var AbracadabraMCPServer = class {
 		if (docId !== void 0) provider.awareness.setLocalStateField("docId", docId);
 		const context = status ? statusContext !== void 0 ? statusContext : this._lastChatChannel : null;
 		provider.awareness.setLocalStateField("statusContext", context ?? null);
-		if (!status) this._stopTypingInterval();
+		if (!status) {
+			this._stopTypingInterval();
+			provider.awareness.setLocalStateField("activeToolCall", null);
+			provider.awareness.setLocalStateField("turnId", null);
+			this._toolHistory = [];
+			provider.awareness.setLocalStateField("toolHistory", []);
+		}
 		if (status) this._statusClearTimer = setTimeout(() => {
 			provider.awareness.setLocalStateField("status", null);
 			provider.awareness.setLocalStateField("activeToolCall", null);
 			provider.awareness.setLocalStateField("statusContext", null);
+			provider.awareness.setLocalStateField("turnId", null);
+			this._toolHistory = [];
+			provider.awareness.setLocalStateField("toolHistory", []);
 			this._stopTypingInterval();
-		}, 3e4);
+		}, 1e4);
+	}
+	/**
+	* Start a new agent turn. Mints a fresh UUID and writes it to awareness so
+	* the dashboard can gate the incantation on "there is an active turn",
+	* decoupled from the (racier) status field. Called from chat arrival and
+	* ai:task dispatch right before `setAutoStatus('thinking')`.
+	*/
+	_beginTurn() {
+		const provider = this._activeConnection?.provider;
+		if (!provider) return;
+		this._toolHistory = [];
+		provider.awareness.setLocalStateField("toolHistory", []);
+		provider.awareness.setLocalStateField("turnId", crypto.randomUUID());
 	}
 	/** Re-send typing indicator every 2s so dashboard keeps showing it (expires at 3s). */
 	_startTypingInterval(channel) {
@@ -20386,10 +20483,28 @@ var AbracadabraMCPServer = class {
 	}
 	/**
 	* Broadcast which tool the agent is currently executing.
-	* Dashboard renders this as a ChatTool indicator.
+	*
+	* Renders as a ChatTool pill on the dashboard. On non-null calls, the tool
+	* is also appended to `toolHistory` (capped at TOOL_HISTORY_MAX) and written
+	* to awareness so the dashboard's inline trace can show the turn's recent
+	* activity. Tools do NOT clear (`setActiveToolCall(null)`) on completion —
+	* the pill stays until the next tool replaces it or `setAutoStatus(null)`
+	* flushes the turn. This keeps pills visible long enough to see.
 	*/
 	setActiveToolCall(toolCall) {
-		this._activeConnection?.provider?.awareness.setLocalStateField("activeToolCall", toolCall);
+		const provider = this._activeConnection?.provider;
+		if (!provider) return;
+		provider.awareness.setLocalStateField("activeToolCall", toolCall);
+		if (toolCall) {
+			this._toolHistory.push({
+				tool: toolCall.name,
+				target: toolCall.target,
+				ts: Date.now(),
+				channel: this._lastChatChannel
+			});
+			if (this._toolHistory.length > AbracadabraMCPServer.TOOL_HISTORY_MAX) this._toolHistory.splice(0, this._toolHistory.length - AbracadabraMCPServer.TOOL_HISTORY_MAX);
+			provider.awareness.setLocalStateField("toolHistory", [...this._toolHistory]);
+		}
 	}
 	/**
 	* Send a typing indicator to a chat channel.
@@ -20420,8 +20535,11 @@ var AbracadabraMCPServer = class {
 			conn.provider.awareness.setLocalStateField("status", null);
 			conn.provider.awareness.setLocalStateField("activeToolCall", null);
 			conn.provider.awareness.setLocalStateField("statusContext", null);
+			conn.provider.awareness.setLocalStateField("turnId", null);
+			conn.provider.awareness.setLocalStateField("toolHistory", []);
 			conn.provider.destroy();
 		}
+		this._toolHistory = [];
 		this._spaceConnections.clear();
 		this._activeConnection = null;
 		console.error("[abracadabra-mcp] Shutdown complete");
@@ -21237,16 +21355,12 @@ function registerTreeTools(mcp, server) {
 		server.setAutoStatus("reading");
 		server.setActiveToolCall({ name: "list_documents" });
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const targetId = normalizeRootId(parentId, server);
 		const children = childrenOf$1(readEntries$1(treeMap), targetId);
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: JSON.stringify(children, null, 2)
@@ -21259,17 +21373,13 @@ function registerTreeTools(mcp, server) {
 		server.setAutoStatus("reading");
 		server.setActiveToolCall({ name: "get_document_tree" });
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const targetId = normalizeRootId(rootId, server);
 		const maxDepth = depth ?? 3;
 		const tree = buildTree$1(readEntries$1(treeMap), targetId, maxDepth);
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: JSON.stringify(tree, null, 2)
@@ -21285,13 +21395,10 @@ function registerTreeTools(mcp, server) {
 			target: query
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const entries = readEntries$1(treeMap);
 		const lowerQuery = query.toLowerCase();
 		const normalizedRoot = normalizeRootId(rootId, server);
@@ -21316,7 +21423,6 @@ function registerTreeTools(mcp, server) {
 				path
 			};
 		});
-		server.setActiveToolCall(null);
 		if (results.length === 0) return { content: [{
 			type: "text",
 			text: `No documents found matching "${query}". Try get_document_tree to see the full hierarchy.`
@@ -21330,7 +21436,7 @@ function registerTreeTools(mcp, server) {
 		parentId: zod.z.string().optional().describe("Parent document ID. Omit for top-level pages. Use a document ID for nested/child pages."),
 		label: zod.z.string().describe("Display name / title for the document."),
 		type: zod.z.string().optional().describe("Page type — sets how this document renders. Core types (always available): \"doc\" (rich text), \"kanban\" (columns → cards), \"table\" (columns → rows, positional), \"calendar\" (events with datetimeStart/End), \"timeline\" (epics → tasks with dateStart/End + taskProgress), \"checklist\" (tasks with checked/priority, unlimited nesting), \"outline\" (nested items, unlimited depth), \"gallery\" (visual grid with covers/ratings), \"map\" (markers/lines with geoLat/geoLng), \"graph\" (force-directed knowledge graph), \"dashboard\" (positioned widgets with deskX/deskY/deskMode), \"slides\" (slides → sub-slides with transitions), \"chart\" (bar/stacked bar/line/donut/treemap from data points or aggregation), \"sheets\" (spreadsheet with formulas and formatting), \"overview\" (space home — activity and stats), \"call\" (video call room, no children). Plugin types (require plugin enabled on the server): \"spatial\" (3D scene with spShape/spX/spY/spZ + universal color, plugin: spatial), \"media\" (audio/video player with playlists, plugin: media), \"coder\" (collaborative multi-file coding env with fileType/entry, plugin: coder). Alias: \"desktop\" → \"dashboard\". Omit to inherit parent view. Only set on the parent page, NEVER on child items."),
-		meta: zod.z.record(zod.z.unknown()).optional().describe("Initial metadata (PageMeta fields: color as hex string, icon as Lucide kebab-case name like \"star\"/\"code-2\"/\"users\" — never emoji, dateStart, dateEnd, priority 0-4, tags array, etc). Omit icon entirely to use page type default.")
+		meta: zod.z.record(zod.z.string(), zod.z.unknown()).optional().describe("Initial metadata (PageMeta fields: color as hex string, icon as Lucide kebab-case name like \"star\"/\"code-2\"/\"users\" — never emoji, dateStart, dateEnd, priority 0-4, tags array, etc). Omit icon entirely to use page type default.")
 	}, async ({ parentId, label, type, meta }) => {
 		server.setAutoStatus("creating");
 		server.setActiveToolCall({
@@ -21339,13 +21445,10 @@ function registerTreeTools(mcp, server) {
 		});
 		const treeMap = server.getTreeMap();
 		const rootDoc = server.rootDocument;
-		if (!treeMap || !rootDoc) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap || !rootDoc) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const id = crypto.randomUUID();
 		const normalizedParent = normalizeRootId(parentId, server);
 		const now = Date.now();
@@ -21361,7 +21464,6 @@ function registerTreeTools(mcp, server) {
 			});
 		});
 		server.setFocusedDoc(id);
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: JSON.stringify({
@@ -21382,28 +21484,21 @@ function registerTreeTools(mcp, server) {
 			target: id
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const raw = treeMap.get(id);
-		if (!raw) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: `Document ${id} not found`
-			}] };
-		}
+		if (!raw) return { content: [{
+			type: "text",
+			text: `Document ${id} not found`
+		}] };
 		const entry = toPlain(raw);
 		treeMap.set(id, {
 			...entry,
 			label,
 			updatedAt: Date.now()
 		});
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: `Renamed to "${label}"`
@@ -21420,21 +21515,15 @@ function registerTreeTools(mcp, server) {
 			target: id
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const raw = treeMap.get(id);
-		if (!raw) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: `Document ${id} not found`
-			}] };
-		}
+		if (!raw) return { content: [{
+			type: "text",
+			text: `Document ${id} not found`
+		}] };
 		const entry = toPlain(raw);
 		treeMap.set(id, {
 			...entry,
@@ -21442,7 +21531,6 @@ function registerTreeTools(mcp, server) {
 			order: order ?? Date.now(),
 			updatedAt: Date.now()
 		});
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: `Moved ${id} to parent ${newParentId}`
@@ -21457,13 +21545,10 @@ function registerTreeTools(mcp, server) {
 		const treeMap = server.getTreeMap();
 		const trashMap = server.getTrashMap();
 		const rootDoc = server.rootDocument;
-		if (!treeMap || !trashMap || !rootDoc) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap || !trashMap || !rootDoc) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const toDelete = [id, ...descendantsOf(readEntries$1(treeMap), id).map((e) => e.id)];
 		const now = Date.now();
 		rootDoc.transact(() => {
@@ -21482,7 +21567,6 @@ function registerTreeTools(mcp, server) {
 				treeMap.delete(nid);
 			}
 		});
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: `Deleted ${toDelete.length} document(s)`
@@ -21498,28 +21582,21 @@ function registerTreeTools(mcp, server) {
 			target: id
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const raw = treeMap.get(id);
-		if (!raw) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: `Document ${id} not found`
-			}] };
-		}
+		if (!raw) return { content: [{
+			type: "text",
+			text: `Document ${id} not found`
+		}] };
 		const entry = toPlain(raw);
 		treeMap.set(id, {
 			...entry,
 			type,
 			updatedAt: Date.now()
 		});
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: `Changed type to "${type}"`
@@ -22775,7 +22852,6 @@ function registerContentTools(mcp, server) {
 				});
 				children.sort((a, b) => (treeMap.get(a.id)?.order ?? 0) - (treeMap.get(b.id)?.order ?? 0));
 			}
-			server.setActiveToolCall(null);
 			const result = {
 				label,
 				type,
@@ -22788,7 +22864,6 @@ function registerContentTools(mcp, server) {
 				text: JSON.stringify(result, null, 2)
 			}] };
 		} catch (error) {
-			server.setActiveToolCall(null);
 			return {
 				content: [{
 					type: "text",
@@ -22838,13 +22913,11 @@ function registerContentTools(mcp, server) {
 			populateYDocFromMarkdown(fragment, body || markdown, title || "Untitled");
 			server.setFocusedDoc(docId);
 			server.setDocCursor(docId, fragment.length);
-			server.setActiveToolCall(null);
 			return { content: [{
 				type: "text",
 				text: `Document ${docId} updated (${writeMode} mode)`
 			}] };
 		} catch (error) {
-			server.setActiveToolCall(null);
 			return {
 				content: [{
 					type: "text",
@@ -22866,22 +22939,15 @@ function registerMetaTools(mcp, server) {
 			target: docId
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const entry = treeMap.get(docId);
-		if (!entry) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: `Document ${docId} not found`
-			}] };
-		}
-		server.setActiveToolCall(null);
+		if (!entry) return { content: [{
+			type: "text",
+			text: `Document ${docId} not found`
+		}] };
 		return { content: [{
 			type: "text",
 			text: JSON.stringify({
@@ -22894,7 +22960,7 @@ function registerMetaTools(mcp, server) {
 	});
 	mcp.tool("update_metadata", "Update metadata fields on a document. Merges the provided fields into existing metadata.", {
 		docId: zod.z.string().describe("Document ID."),
-		meta: zod.z.record(zod.z.unknown()).describe("Metadata fields to update (merged with existing). Universal keys: color (hex), icon (Lucide kebab-case — NEVER emoji), dateStart/dateEnd, datetimeStart/datetimeEnd, allDay, timeStart/timeEnd, tags (string[]), checked (bool), priority (0=none,1=low,2=med,3=high,4=urgent), status, rating (0-5), url, email, phone, number, unit, subtitle, note, taskProgress (0-100), members ({id,label}[]), coverUploadId, coverDocId, dateTaken. Geo/Map (children): geoType (\"marker\"|\"line\"|\"measure\"), geoLat, geoLng, geoDescription. Spatial 3D (children, plugin: spatial): spShape (\"box\"|\"sphere\"|\"cylinder\"|\"cone\"|\"plane\"|\"torus\"|\"glb\"), spX/spY/spZ, spRX/spRY/spRZ (deg), spSX/spSY/spSZ (scale), spOpacity (0-100), spModelUploadId, spModelDocId — spatial uses the universal `color` key, NOT spColor. Dashboard (children): deskX, deskY, deskZ, deskMode (\"icon\"|\"widget-sm\"|\"widget-lg\"). Mindmap-layout (children): mmX, mmY. Graph-layout (children): graphX, graphY, graphPinned. Slides (children): slidesTransition (\"none\"|\"fade\"|\"slide\"). Coder (children, plugin: coder): fileType (\"vue\"|\"ts\"|\"js\"|\"css\"|\"json\"|\"folder\"), entry (bool). Cell formatting (sheets cells): bold, italic, textColor, bgColor, align (\"left\"|\"center\"|\"right\"), formula. Renderer config (on the PAGE doc itself, not children): kanbanColumnWidth (\"narrow\"|\"default\"|\"wide\"), galleryColumns (1-6), galleryAspect (\"square\"|\"4:3\"|\"3:2\"|\"16:9\"|\"free\"), galleryCardStyle (\"default\"|\"compact\"|\"detailed\"), galleryShowLabels, gallerySortBy (\"manual\"|\"date\"|\"name\"|\"rating\"), calendarView (\"month\"|\"week\"|\"day\"), calendarWeekStart (\"sun\"|\"mon\"), calendarShowWeekNumbers, tableMode (\"hierarchy\"|\"flat\"), tableSortKey, tableSortDir (\"asc\"|\"desc\"), timelineZoom (\"week\"|\"month\"|\"quarter\"), timelinePixelsPerDay, timelineCenterDate (ISO date), checklistFilter (\"all\"|\"active\"|\"completed\"), checklistSort (\"manual\"|\"priority\"|\"due\"), mapShowLabels, graphSpacing (\"compact\"|\"default\"|\"spacious\"), graphShowLabels, graphEdgeThickness (\"thin\"|\"normal\"|\"thick\"), showRefEdges, mmSpacing, spatialGridVisible, slidesTheme (\"dark\"|\"light\"), chartType (\"bar\"|\"stacked bar\"|\"line\"|\"donut\"|\"treemap\"), chartMetric (\"value\"|\"type\"|\"tag\"|\"status\"|\"priority\"|\"activity\"|\"completion\"), chartColorScheme (\"default\"|\"warm\"|\"cool\"|\"mono\"), chartLimit (3-30), chartShowLegend, chartShowValues, sheetsDefaultColWidth (40-500), sheetsDefaultRowHeight (20-100), sheetsShowGridlines, sheetsFreezeRows, sheetsFreezeCols, mediaRepeat (\"off\"|\"all\"|\"one\"), mediaShuffle. Set a key to null to clear it.")
+		meta: zod.z.record(zod.z.string(), zod.z.unknown()).describe("Metadata fields to update (merged with existing). Universal keys: color (hex), icon (Lucide kebab-case — NEVER emoji), dateStart/dateEnd, datetimeStart/datetimeEnd, allDay, timeStart/timeEnd, tags (string[]), checked (bool), priority (0=none,1=low,2=med,3=high,4=urgent), status, rating (0-5), url, email, phone, number, unit, subtitle, note, taskProgress (0-100), members ({id,label}[]), coverUploadId, coverDocId, dateTaken. Geo/Map (children): geoType (\"marker\"|\"line\"|\"measure\"), geoLat, geoLng, geoDescription. Spatial 3D (children, plugin: spatial): spShape (\"box\"|\"sphere\"|\"cylinder\"|\"cone\"|\"plane\"|\"torus\"|\"glb\"), spX/spY/spZ, spRX/spRY/spRZ (deg), spSX/spSY/spSZ (scale), spOpacity (0-100), spModelUploadId, spModelDocId — spatial uses the universal `color` key, NOT spColor. Dashboard (children): deskX, deskY, deskZ, deskMode (\"icon\"|\"widget-sm\"|\"widget-lg\"). Mindmap-layout (children): mmX, mmY. Graph-layout (children): graphX, graphY, graphPinned. Slides (children): slidesTransition (\"none\"|\"fade\"|\"slide\"). Coder (children, plugin: coder): fileType (\"vue\"|\"ts\"|\"js\"|\"css\"|\"json\"|\"folder\"), entry (bool). Cell formatting (sheets cells): bold, italic, textColor, bgColor, align (\"left\"|\"center\"|\"right\"), formula. Renderer config (on the PAGE doc itself, not children): kanbanColumnWidth (\"narrow\"|\"default\"|\"wide\"), galleryColumns (1-6), galleryAspect (\"square\"|\"4:3\"|\"3:2\"|\"16:9\"|\"free\"), galleryCardStyle (\"default\"|\"compact\"|\"detailed\"), galleryShowLabels, gallerySortBy (\"manual\"|\"date\"|\"name\"|\"rating\"), calendarView (\"month\"|\"week\"|\"day\"), calendarWeekStart (\"sun\"|\"mon\"), calendarShowWeekNumbers, tableMode (\"hierarchy\"|\"flat\"), tableSortKey, tableSortDir (\"asc\"|\"desc\"), timelineZoom (\"week\"|\"month\"|\"quarter\"), timelinePixelsPerDay, timelineCenterDate (ISO date), checklistFilter (\"all\"|\"active\"|\"completed\"), checklistSort (\"manual\"|\"priority\"|\"due\"), mapShowLabels, graphSpacing (\"compact\"|\"default\"|\"spacious\"), graphShowLabels, graphEdgeThickness (\"thin\"|\"normal\"|\"thick\"), showRefEdges, mmSpacing, spatialGridVisible, slidesTheme (\"dark\"|\"light\"), chartType (\"bar\"|\"stacked bar\"|\"line\"|\"donut\"|\"treemap\"), chartMetric (\"value\"|\"type\"|\"tag\"|\"status\"|\"priority\"|\"activity\"|\"completion\"), chartColorScheme (\"default\"|\"warm\"|\"cool\"|\"mono\"), chartLimit (3-30), chartShowLegend, chartShowValues, sheetsDefaultColWidth (40-500), sheetsDefaultRowHeight (20-100), sheetsShowGridlines, sheetsFreezeRows, sheetsFreezeCols, mediaRepeat (\"off\"|\"all\"|\"one\"), mediaShuffle. Set a key to null to clear it.")
 	}, async ({ docId, meta }) => {
 		server.setAutoStatus("writing", docId);
 		server.setActiveToolCall({
@@ -22902,21 +22968,15 @@ function registerMetaTools(mcp, server) {
 			target: docId
 		});
 		const treeMap = server.getTreeMap();
-		if (!treeMap) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: "Not connected"
-			}] };
-		}
+		if (!treeMap) return { content: [{
+			type: "text",
+			text: "Not connected"
+		}] };
 		const entry = treeMap.get(docId);
-		if (!entry) {
-			server.setActiveToolCall(null);
-			return { content: [{
-				type: "text",
-				text: `Document ${docId} not found`
-			}] };
-		}
+		if (!entry) return { content: [{
+			type: "text",
+			text: `Document ${docId} not found`
+		}] };
 		treeMap.set(docId, {
 			...entry,
 			meta: {
@@ -22925,7 +22985,6 @@ function registerMetaTools(mcp, server) {
 			},
 			updatedAt: Date.now()
 		});
-		server.setActiveToolCall(null);
 		return { content: [{
 			type: "text",
 			text: `Metadata updated for ${docId}`
@@ -22940,6 +22999,11 @@ function registerMetaTools(mcp, server) {
 */
 function registerFileTools(mcp, server) {
 	mcp.tool("list_uploads", "List file attachments for a document.", { docId: zod.z.string().describe("Document ID.") }, async ({ docId }) => {
+		server.setAutoStatus("reading", docId);
+		server.setActiveToolCall({
+			name: "list_uploads",
+			target: docId
+		});
 		try {
 			const uploads = await server.client.listUploads(docId);
 			return { content: [{
@@ -22961,6 +23025,11 @@ function registerFileTools(mcp, server) {
 		filePath: zod.z.string().describe("Absolute path to the local file to upload."),
 		filename: zod.z.string().optional().describe("Override filename (defaults to basename of filePath).")
 	}, async ({ docId, filePath, filename }) => {
+		server.setAutoStatus("uploading", docId);
+		server.setActiveToolCall({
+			name: "upload_file",
+			target: node_path.basename(filePath)
+		});
 		try {
 			const resolvedPath = node_path.resolve(filePath);
 			const data = node_fs.readFileSync(resolvedPath);
@@ -22986,6 +23055,11 @@ function registerFileTools(mcp, server) {
 		uploadId: zod.z.string().describe("Upload ID to download."),
 		saveTo: zod.z.string().describe("Absolute local file path to save the download.")
 	}, async ({ docId, uploadId, saveTo }) => {
+		server.setAutoStatus("reading", docId);
+		server.setActiveToolCall({
+			name: "download_file",
+			target: node_path.basename(saveTo)
+		});
 		try {
 			const blob = await server.client.getUpload(docId, uploadId);
 			const buffer = Buffer.from(await blob.arrayBuffer());
@@ -23009,6 +23083,11 @@ function registerFileTools(mcp, server) {
 		docId: zod.z.string().describe("Document ID."),
 		uploadId: zod.z.string().describe("Upload ID to delete.")
 	}, async ({ docId, uploadId }) => {
+		server.setAutoStatus("writing", docId);
+		server.setActiveToolCall({
+			name: "delete_file",
+			target: uploadId
+		});
 		try {
 			await server.client.deleteUpload(docId, uploadId);
 			return { content: [{
@@ -23050,6 +23129,10 @@ function registerAwarenessTools(mcp, server) {
 		docId: zod.z.string().describe("Document ID to set awareness on."),
 		fields: zod.z.record(zod.z.string(), zod.z.unknown()).describe("Key-value pairs to set on the child document's awareness state. Use namespaced keys like \"kanban:hovering\", \"table:editing\", \"slides:viewing\", \"outline:editing\", \"calendar:focused\", \"gallery:focused\", \"timeline:focused\", \"graph:focused\", \"map:focused\", \"doc:scroll\". Set a key to null to clear it.")
 	}, async ({ docId, fields }) => {
+		server.setActiveToolCall({
+			name: "set_doc_awareness",
+			target: docId
+		});
 		try {
 			const provider = await server.getChildProvider(docId);
 			for (const [key, value] of Object.entries(fields)) provider.awareness.setLocalStateField(key, value ?? null);
@@ -23068,6 +23151,7 @@ function registerAwarenessTools(mcp, server) {
 		}
 	});
 	mcp.tool("poll_inbox", "Check the \"AI Inbox\" document for pending instructions from humans. Returns the inbox content and any pending task sub-documents. Create the inbox as a doc called \"AI Inbox\" under the hub doc if it does not exist yet. Note: channel-based watching via watch_chat is preferred for real-time use.", {}, async () => {
+		server.setActiveToolCall({ name: "poll_inbox" });
 		try {
 			const treeMap = server.getTreeMap();
 			const rootDocId = server.rootDocId;
@@ -23114,6 +23198,10 @@ function registerAwarenessTools(mcp, server) {
 		}
 	});
 	mcp.tool("list_connected_users", "List all connected users and their awareness state. Shows who is online and what they are doing.", { docId: zod.z.string().optional().describe("If provided, list users connected to this specific document. Otherwise lists users from root awareness.") }, async ({ docId }) => {
+		server.setActiveToolCall({
+			name: "list_connected_users",
+			target: docId
+		});
 		try {
 			let awareness;
 			if (docId) awareness = (await server.getChildProvider(docId)).awareness;
@@ -23158,16 +23246,13 @@ function registerChannelTools(mcp, server) {
 			});
 			const treeMap = server.getTreeMap();
 			const rootDoc = server.rootDocument;
-			if (!treeMap || !rootDoc) {
-				server.setActiveToolCall(null);
-				return {
-					content: [{
-						type: "text",
-						text: "Not connected"
-					}],
-					isError: true
-				};
-			}
+			if (!treeMap || !rootDoc) return {
+				content: [{
+					type: "text",
+					text: "Not connected"
+				}],
+				isError: true
+			};
 			const label = `AI Reply — ${(/* @__PURE__ */ new Date()).toISOString().replace("T", " ").slice(0, 19)}: ${text.slice(0, 40).replace(/\n/g, " ")}`;
 			const replyId = crypto.randomUUID();
 			const now = Date.now();
@@ -23183,7 +23268,6 @@ function registerChannelTools(mcp, server) {
 			});
 			populateYDocFromMarkdown((await server.getChildProvider(replyId)).document, text);
 			if (task_id) server.clearAiTask(task_id);
-			server.setActiveToolCall(null);
 			return { content: [{
 				type: "text",
 				text: JSON.stringify({
@@ -23192,7 +23276,6 @@ function registerChannelTools(mcp, server) {
 				})
 			}] };
 		} catch (error) {
-			server.setActiveToolCall(null);
 			return {
 				content: [{
 					type: "text",
@@ -23215,14 +23298,15 @@ function registerChannelTools(mcp, server) {
 				}],
 				isError: true
 			};
+			const normalized = text.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\r/g, "\n");
+			server.setAutoStatus(null);
+			server.sendTypingIndicator(channel);
 			rootProvider.sendStateless(JSON.stringify({
 				type: "chat:send",
 				channel,
-				content: text,
+				content: normalized,
 				sender_name: server.agentName
 			}));
-			server.setAutoStatus(null);
-			server.setActiveToolCall(null);
 			return { content: [{
 				type: "text",
 				text: `Sent to ${channel}`
@@ -23377,16 +23461,13 @@ function registerSvgTools(mcp, server) {
 				target: docId
 			});
 			const cleanSvg = sanitizeSvg(svg);
-			if (!cleanSvg) {
-				server.setActiveToolCall(null);
-				return {
-					content: [{
-						type: "text",
-						text: "Error: SVG markup was empty or entirely stripped by sanitizer."
-					}],
-					isError: true
-				};
-			}
+			if (!cleanSvg) return {
+				content: [{
+					type: "text",
+					text: "Error: SVG markup was empty or entirely stripped by sanitizer."
+				}],
+				isError: true
+			};
 			const doc = (await server.getChildProvider(docId)).document;
 			const fragment = doc.getXmlFragment("default");
 			doc.transact(() => {
@@ -23397,13 +23478,11 @@ function registerSvgTools(mcp, server) {
 				fragment.insert(insertPos, [el]);
 			});
 			server.setFocusedDoc(docId);
-			server.setActiveToolCall(null);
 			return { content: [{
 				type: "text",
 				text: `SVG inserted into document ${docId}${title ? ` ("${title}")` : ""}`
 			}] };
 		} catch (error) {
-			server.setActiveToolCall(null);
 			return {
 				content: [{
 					type: "text",
@@ -24207,6 +24286,9 @@ var HookBridge = class {
 	}
 	routeEvent(payload) {
 		switch (payload.hook_event_name) {
+			case "UserPromptSubmit":
+				this.onUserPromptSubmit();
+				break;
 			case "PreToolUse":
 				this.onPreToolUse(payload);
 				break;
@@ -24217,13 +24299,18 @@ var HookBridge = class {
 				this.onSubagentStart(payload);
 				break;
 			case "SubagentStop":
-				this.onSubagentStop(payload);
+				this.onSubagentStop();
 				break;
 			case "Stop":
 				this.onStop();
 				break;
 		}
 	}
+	/** New user turn — reset any lingering status/tool state from the previous turn. */
+	onUserPromptSubmit() {
+		this.server.setAutoStatus(null);
+		this.server.setActiveToolCall(null);
+	}
 	onPreToolUse(payload) {
 		const toolName = payload.tool_name ?? "";
 		if (toolName.startsWith("mcp__abracadabra__")) return;
@@ -24235,7 +24322,6 @@ var HookBridge = class {
 	}
 	onPostToolUse(payload) {
 		if ((payload.tool_name ?? "").startsWith("mcp__abracadabra__")) return;
-		this.server.setAutoStatus("thinking");
 	}
 	onSubagentStart(payload) {
 		const agentType = payload.agent_type ?? "agent";
@@ -24245,9 +24331,7 @@ var HookBridge = class {
 		});
 		this.server.setAutoStatus("thinking");
 	}
-	onSubagentStop(_payload) {
-		this.server.setAutoStatus("thinking");
-	}
+	onSubagentStop() {}
 	onStop() {
 		this.server.setAutoStatus(null);
 		this.server.setActiveToolCall(null);
@@ -24260,11 +24344,19 @@ var HookBridge = class {
 * Abracadabra MCP Server — entry point.
 *
 * Environment variables:
-*   ABRA_URL         (required) — Server URL (e.g. http://localhost:1234)
+*   ABRA_URL                    (required) — Server URL (e.g. http://localhost:1234)
 *   ABRA_AGENT_NAME             — Display name (default: "AI Assistant")
 *   ABRA_AGENT_COLOR            — HSL color for presence (default: "hsl(270, 80%, 60%)")
 *   ABRA_INVITE_CODE            — Invite code for first-run registration (grants role)
 *   ABRA_KEY_FILE               — Path to Ed25519 key file (default: ~/.abracadabra/agent.key)
+*   ABRA_AGENT_TRIGGER_MODE     — When to respond in group chats:
+*                                   all          → every message (legacy)
+*                                   mention      → only when @<alias> is used
+*                                   task         → only ai:task awareness events
+*                                   mention+task → mention OR ai:task (default)
+*                                 DMs always trigger regardless of mode.
+*   ABRA_AGENT_MENTION_ALIASES  — Comma-separated aliases for @mentions
+*                                 (default: [ABRA_AGENT_NAME])
 */
 async function main() {
 	const url = process.env.ABRA_URL;
@@ -24272,13 +24364,27 @@ async function main() {
 		console.error("Missing required environment variable: ABRA_URL");
 		process.exit(1);
 	}
+	const rawMode = (process.env.ABRA_AGENT_TRIGGER_MODE ?? "mention+task").trim().toLowerCase();
+	const validModes = [
+		"all",
+		"mention",
+		"task",
+		"mention+task"
+	];
+	const triggerMode = validModes.includes(rawMode) ? rawMode : "mention+task";
+	if (rawMode && !validModes.includes(rawMode)) console.error(`[abracadabra-mcp] Invalid ABRA_AGENT_TRIGGER_MODE="${rawMode}", falling back to "mention+task"`);
+	const aliasEnv = process.env.ABRA_AGENT_MENTION_ALIASES;
+	const mentionAliases = aliasEnv ? aliasEnv.split(",").map((a) => a.trim()).filter((a) => a.length > 0) : void 0;
 	const server = new AbracadabraMCPServer({
 		url,
 		agentName: process.env.ABRA_AGENT_NAME,
 		agentColor: process.env.ABRA_AGENT_COLOR,
 		inviteCode: process.env.ABRA_INVITE_CODE,
-		keyFile: process.env.ABRA_KEY_FILE
+		keyFile: process.env.ABRA_KEY_FILE,
+		triggerMode,
+		mentionAliases
 	});
+	console.error(`[abracadabra-mcp] Trigger mode: ${triggerMode}; aliases: ${server.mentionAliases.join(", ")}`);
 	const mcp = new McpServer({
 		name: "abracadabra",
 		version: "1.0.0"