hovclaw 0.1.4 → 0.1.5

package/dist/gateway/ui/index.html

@@ -36,7 +36,7 @@
             <input
               id="gateway-url"
               type="text"
-              placeholder="ws://127.0.0.1:18789"
+              placeholder="ws://127.0.0.1:18889"
               spellcheck="false"
             />
           </label>

package/dist/hovclaw.js

@@ -181,7 +181,7 @@ const DEFAULT_FILE_CONFIG = {
 	gateway: {
 		enabled: true,
 		host: "127.0.0.1",
-		port: 18789,
+		port: 18889,
 		mode: "local",
 		tickIntervalMs: 3e4,
 		webUi: {
@@ -1696,8 +1696,13 @@ async function writeFileIfMissing(filePath, content) {
 		throw error;
 	}
 }
+function isMeaningfulWorkspaceEntry(entry) {
+	if (IGNORED_WORKSPACE_ENTRIES.has(entry)) return false;
+	if (entry.startsWith(".")) return false;
+	return true;
+}
 async function listMeaningfulWorkspaceEntries(workspaceDir) {
-	return (await fs$1.readdir(workspaceDir)).filter((entry) => !IGNORED_WORKSPACE_ENTRIES.has(entry));
+	return (await fs$1.readdir(workspaceDir)).filter((entry) => isMeaningfulWorkspaceEntry(entry));
 }
 function resolveAgentWorkspaceDir(config, agentId) {
 	return (config.agents.list.find((entry) => entry.id === agentId)?.workspace)?.trim() || config.agents.defaults.workspace;
@@ -1769,6 +1774,7 @@ function buildDefaultSystemPrompt(workspaceDir) {
 		"",
 		"## Messaging",
 		"Respond with clear, direct language tailored to the user's request.",
+		"Default to plain text and avoid markdown formatting unless the user asks for markdown or structured output.",
 		"If you cannot complete a request, explain the blocker and the minimum next step."
 	].join("\n");
 }
@@ -2257,7 +2263,8 @@ var PiAgentManager = class {
 					model: model.resolvedRef,
 					modelResolutionReason: selectedModel.reason,
 					source: input.meta.source,
-					channel: input.meta.channel
+					channel: input.meta.channel,
+					...input.meta.sender ? { sender: input.meta.sender } : {}
 				}
 			});
 			const exec = async () => {
@@ -2499,6 +2506,57 @@ function isTelegramParseModeError(error) {
 	const message = error.message.toLowerCase();
 	return message.includes("can't parse entities") || message.includes("parse entities") || message.includes("parse mode");
 }
+function escapeTelegramHtml(text) {
+	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function escapeTelegramHtmlAttr(text) {
+	return escapeTelegramHtml(text).replace(/"/g, "&quot;");
+}
+function stripMarkdownToPlainText(input) {
+	let value = input.replace(/\r\n/g, "\n");
+	value = value.replace(/^#{1,6}\s+/gm, "");
+	value = value.replace(/^>\s?/gm, "");
+	value = value.replace(/```(?:[a-zA-Z0-9_-]+)?\n?([\s\S]*?)```/g, (_match, code) => code.replace(/\n$/, ""));
+	value = value.replace(/`([^`\n]+)`/g, "$1");
+	value = value.replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, "$1");
+	value = value.replace(/\*\*([^*]+)\*\*/g, "$1");
+	value = value.replace(/~~([^~]+)~~/g, "$1");
+	value = value.replace(/\|\|([^|]+)\|\|/g, "$1");
+	value = value.replace(/\*([^*\n]+)\*/g, "$1");
+	value = value.replace(/_([^_\n]+)_/g, "$1");
+	return value;
+}
+function renderMarkdownToTelegramHtml(input) {
+	const placeholders = [];
+	const toPlaceholder = (html) => {
+		return `\u0000TG_PLACEHOLDER_${placeholders.push(html) - 1}\u0000`;
+	};
+	let value = input.replace(/\r\n/g, "\n");
+	value = value.replace(/```(?:[a-zA-Z0-9_-]+)?\n?([\s\S]*?)```/g, (_match, code) => toPlaceholder(`<pre><code>${escapeTelegramHtml(code.replace(/\n$/, ""))}</code></pre>`));
+	value = value.replace(/`([^`\n]+)`/g, (_match, code) => toPlaceholder(`<code>${escapeTelegramHtml(code)}</code>`));
+	value = escapeTelegramHtml(value);
+	value = value.replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, (_match, text, href) => `<a href="${escapeTelegramHtmlAttr(href)}">${text}</a>`);
+	value = value.replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>");
+	value = value.replace(/~~([^~]+)~~/g, "<s>$1</s>");
+	value = value.replace(/\|\|([^|]+)\|\|/g, "<tg-spoiler>$1</tg-spoiler>");
+	value = value.replace(/\*([^*\n]+)\*/g, "<i>$1</i>");
+	value = value.replace(/_([^_\n]+)_/g, "<i>$1</i>");
+	return value.replace(/\u0000TG_PLACEHOLDER_(\d+)\u0000/g, (_match, rawIndex) => {
+		return placeholders[Number.parseInt(rawIndex, 10)] ?? "";
+	});
+}
+function prepareTelegramTextCandidates(text, textMode) {
+	const plain = stripMarkdownToPlainText(text);
+	const fallbackPlain = plain.trim().length > 0 ? plain : text;
+	if (textMode === "plain") return {
+		html: escapeTelegramHtml(fallbackPlain),
+		plain: fallbackPlain
+	};
+	return {
+		html: renderMarkdownToTelegramHtml(text),
+		plain: fallbackPlain
+	};
+}
 function mediaMethod(media) {
 	if (media.kind === "image") return {
 		method: "sendPhoto",
@@ -2928,25 +2986,24 @@ var TelegramChannel = class {
 	async sendRichMessage(target, text, options) {
 		const parsedTarget = parseTargetChatId(target.chatId);
 		for (const chunk of chunkText(text, TELEGRAM_CHUNK_LIMIT)) {
+			const rendered = prepareTelegramTextCandidates(chunk, this.textMode);
 			const payload = {
 				chat_id: parsedTarget.chatId,
-				text: chunk,
+				text: rendered.html,
 				message_thread_id: parsedTarget.messageThreadId,
 				disable_web_page_preview: true,
-				reply_markup: options?.inlineKeyboard ? { inline_keyboard: options.inlineKeyboard } : void 0
+				reply_markup: options?.inlineKeyboard ? { inline_keyboard: options.inlineKeyboard } : void 0,
+				parse_mode: "HTML"
 			};
-			if (this.textMode !== "markdown") {
-				await this.callApi("sendMessage", payload);
-				continue;
-			}
 			try {
+				await this.callApi("sendMessage", payload);
+			} catch (error) {
+				if (!isTelegramParseModeError(error)) throw error;
 				await this.callApi("sendMessage", {
 					...payload,
-					parse_mode: "Markdown"
+					text: rendered.plain,
+					parse_mode: void 0
 				});
-			} catch (error) {
-				if (!isTelegramParseModeError(error)) throw error;
-				await this.callApi("sendMessage", payload);
 			}
 		}
 	}
@@ -2981,18 +3038,24 @@ var TelegramChannel = class {
 			caption: media.caption?.trim() || void 0,
 			message_thread_id: parsedTarget.messageThreadId
 		};
-		if (this.textMode !== "markdown" || !payload.caption) {
+		if (!payload.caption) {
 			await this.callApi(method, payload);
 			return;
 		}
+		const renderedCaption = prepareTelegramTextCandidates(payload.caption, this.textMode);
 		try {
 			await this.callApi(method, {
 				...payload,
-				parse_mode: "Markdown"
+				caption: renderedCaption.html,
+				parse_mode: "HTML"
 			});
 		} catch (error) {
 			if (!isTelegramParseModeError(error)) throw error;
-			await this.callApi(method, payload);
+			await this.callApi(method, {
+				...payload,
+				caption: renderedCaption.plain,
+				parse_mode: void 0
+			});
 		}
 	}
 	async setReaction(target, reaction) {
@@ -6233,7 +6296,7 @@ function registerGatewayCommands(program, deps = defaultGatewayCommandDeps) {
 	gateway.command("run").description("Run HOVClaw daemon with gateway in foreground").action(async () => {
 		if (!config.gateway.enabled) throw new Error("Gateway is disabled in config. Enable gateway.enabled first.");
 		process.stdout.write(`Starting HOVClaw gateway on ${config.gateway.host}:${config.gateway.port}...\n`);
-		await import("./src-GZDRRc5A.js");
+		await import("./src-GoIM4Tv1.js");
 	});
 	gateway.command("open-ui").description("Open the minimal gateway web UI in your default browser").option("--no-open", "Print URL but do not open browser").option("--json", "Print JSON output").action(async (options) => {
 		const url = resolveGatewayWebUiUrl();

package/dist/index.js

@@ -162,7 +162,7 @@ const DEFAULT_FILE_CONFIG = {
 	gateway: {
 		enabled: true,
 		host: "127.0.0.1",
-		port: 18789,
+		port: 18889,
 		mode: "local",
 		tickIntervalMs: 3e4,
 		webUi: {
@@ -1480,8 +1480,13 @@ async function writeFileIfMissing(filePath, content) {
 		throw error;
 	}
 }
+function isMeaningfulWorkspaceEntry(entry) {
+	if (IGNORED_WORKSPACE_ENTRIES.has(entry)) return false;
+	if (entry.startsWith(".")) return false;
+	return true;
+}
 async function listMeaningfulWorkspaceEntries(workspaceDir) {
-	return (await fs$1.readdir(workspaceDir)).filter((entry) => !IGNORED_WORKSPACE_ENTRIES.has(entry));
+	return (await fs$1.readdir(workspaceDir)).filter((entry) => isMeaningfulWorkspaceEntry(entry));
 }
 function resolveAgentWorkspaceDir(config, agentId) {
 	return (config.agents.list.find((entry) => entry.id === agentId)?.workspace)?.trim() || config.agents.defaults.workspace;
@@ -1553,6 +1558,7 @@ function buildDefaultSystemPrompt(workspaceDir) {
 		"",
 		"## Messaging",
 		"Respond with clear, direct language tailored to the user's request.",
+		"Default to plain text and avoid markdown formatting unless the user asks for markdown or structured output.",
 		"If you cannot complete a request, explain the blocker and the minimum next step."
 	].join("\n");
 }
@@ -2041,7 +2047,8 @@ var PiAgentManager = class {
 					model: model.resolvedRef,
 					modelResolutionReason: selectedModel.reason,
 					source: input.meta.source,
-					channel: input.meta.channel
+					channel: input.meta.channel,
+					...input.meta.sender ? { sender: input.meta.sender } : {}
 				}
 			});
 			const exec = async () => {
@@ -2330,6 +2337,57 @@ function isTelegramParseModeError(error) {
 	const message = error.message.toLowerCase();
 	return message.includes("can't parse entities") || message.includes("parse entities") || message.includes("parse mode");
 }
+function escapeTelegramHtml(text) {
+	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function escapeTelegramHtmlAttr(text) {
+	return escapeTelegramHtml(text).replace(/"/g, "&quot;");
+}
+function stripMarkdownToPlainText(input) {
+	let value = input.replace(/\r\n/g, "\n");
+	value = value.replace(/^#{1,6}\s+/gm, "");
+	value = value.replace(/^>\s?/gm, "");
+	value = value.replace(/```(?:[a-zA-Z0-9_-]+)?\n?([\s\S]*?)```/g, (_match, code) => code.replace(/\n$/, ""));
+	value = value.replace(/`([^`\n]+)`/g, "$1");
+	value = value.replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, "$1");
+	value = value.replace(/\*\*([^*]+)\*\*/g, "$1");
+	value = value.replace(/~~([^~]+)~~/g, "$1");
+	value = value.replace(/\|\|([^|]+)\|\|/g, "$1");
+	value = value.replace(/\*([^*\n]+)\*/g, "$1");
+	value = value.replace(/_([^_\n]+)_/g, "$1");
+	return value;
+}
+function renderMarkdownToTelegramHtml(input) {
+	const placeholders = [];
+	const toPlaceholder = (html) => {
+		return `\u0000TG_PLACEHOLDER_${placeholders.push(html) - 1}\u0000`;
+	};
+	let value = input.replace(/\r\n/g, "\n");
+	value = value.replace(/```(?:[a-zA-Z0-9_-]+)?\n?([\s\S]*?)```/g, (_match, code) => toPlaceholder(`<pre><code>${escapeTelegramHtml(code.replace(/\n$/, ""))}</code></pre>`));
+	value = value.replace(/`([^`\n]+)`/g, (_match, code) => toPlaceholder(`<code>${escapeTelegramHtml(code)}</code>`));
+	value = escapeTelegramHtml(value);
+	value = value.replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, (_match, text, href) => `<a href="${escapeTelegramHtmlAttr(href)}">${text}</a>`);
+	value = value.replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>");
+	value = value.replace(/~~([^~]+)~~/g, "<s>$1</s>");
+	value = value.replace(/\|\|([^|]+)\|\|/g, "<tg-spoiler>$1</tg-spoiler>");
+	value = value.replace(/\*([^*\n]+)\*/g, "<i>$1</i>");
+	value = value.replace(/_([^_\n]+)_/g, "<i>$1</i>");
+	return value.replace(/\u0000TG_PLACEHOLDER_(\d+)\u0000/g, (_match, rawIndex) => {
+		return placeholders[Number.parseInt(rawIndex, 10)] ?? "";
+	});
+}
+function prepareTelegramTextCandidates(text, textMode) {
+	const plain = stripMarkdownToPlainText(text);
+	const fallbackPlain = plain.trim().length > 0 ? plain : text;
+	if (textMode === "plain") return {
+		html: escapeTelegramHtml(fallbackPlain),
+		plain: fallbackPlain
+	};
+	return {
+		html: renderMarkdownToTelegramHtml(text),
+		plain: fallbackPlain
+	};
+}
 function mediaMethod(media) {
 	if (media.kind === "image") return {
 		method: "sendPhoto",
@@ -2759,25 +2817,24 @@ var TelegramChannel = class {
 	async sendRichMessage(target, text, options) {
 		const parsedTarget = parseTargetChatId(target.chatId);
 		for (const chunk of chunkText(text, TELEGRAM_CHUNK_LIMIT)) {
+			const rendered = prepareTelegramTextCandidates(chunk, this.textMode);
 			const payload = {
 				chat_id: parsedTarget.chatId,
-				text: chunk,
+				text: rendered.html,
 				message_thread_id: parsedTarget.messageThreadId,
 				disable_web_page_preview: true,
-				reply_markup: options?.inlineKeyboard ? { inline_keyboard: options.inlineKeyboard } : void 0
+				reply_markup: options?.inlineKeyboard ? { inline_keyboard: options.inlineKeyboard } : void 0,
+				parse_mode: "HTML"
 			};
-			if (this.textMode !== "markdown") {
-				await this.callApi("sendMessage", payload);
-				continue;
-			}
 			try {
+				await this.callApi("sendMessage", payload);
+			} catch (error) {
+				if (!isTelegramParseModeError(error)) throw error;
 				await this.callApi("sendMessage", {
 					...payload,
-					parse_mode: "Markdown"
+					text: rendered.plain,
+					parse_mode: void 0
 				});
-			} catch (error) {
-				if (!isTelegramParseModeError(error)) throw error;
-				await this.callApi("sendMessage", payload);
 			}
 		}
 	}
@@ -2812,18 +2869,24 @@ var TelegramChannel = class {
 			caption: media.caption?.trim() || void 0,
 			message_thread_id: parsedTarget.messageThreadId
 		};
-		if (this.textMode !== "markdown" || !payload.caption) {
+		if (!payload.caption) {
 			await this.callApi(method, payload);
 			return;
 		}
+		const renderedCaption = prepareTelegramTextCandidates(payload.caption, this.textMode);
 		try {
 			await this.callApi(method, {
 				...payload,
-				parse_mode: "Markdown"
+				caption: renderedCaption.html,
+				parse_mode: "HTML"
 			});
 		} catch (error) {
 			if (!isTelegramParseModeError(error)) throw error;
-			await this.callApi(method, payload);
+			await this.callApi(method, {
+				...payload,
+				caption: renderedCaption.plain,
+				parse_mode: void 0
+			});
 		}
 	}
 	async setReaction(target, reaction) {
@@ -5578,6 +5641,39 @@ const channelsLogoutMethod = async (params, context) => {
 	return { ok: true };
 };
 
+//#endregion
+//#region src/inbound-context.ts
+const SENDER_DISPLAY_NAME_MAX_CHARS = 80;
+const SENDER_TOKEN_MAX_CHARS = 80;
+const SENDER_CONTEXT_PREFIX = "[Sender Context]";
+function normalizeInlineToken(value, maxChars, fallback) {
+	const resolved = (value ?? "").replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim() || fallback;
+	if (resolved.length <= maxChars) return resolved;
+	return `${resolved.slice(0, maxChars - 3)}...`;
+}
+function sanitizeSenderDisplayName(displayName, fallbackUserId) {
+	return normalizeInlineToken(displayName, SENDER_DISPLAY_NAME_MAX_CHARS, fallbackUserId);
+}
+function buildSenderContextEnvelope(sender) {
+	const userId = normalizeInlineToken(sender.userId, SENDER_TOKEN_MAX_CHARS, "unknown");
+	const displayName = sanitizeSenderDisplayName(sender.displayName, userId);
+	const accountId = sender.accountId ? normalizeInlineToken(sender.accountId, SENDER_TOKEN_MAX_CHARS, "") : "";
+	return [
+		SENDER_CONTEXT_PREFIX,
+		`displayName=${displayName}`,
+		`userId=${userId}`,
+		`channel=${sender.channel}`,
+		...accountId ? [`accountId=${accountId}`] : [],
+		...sender.peerKind ? [`peerKind=${sender.peerKind}`] : [],
+		""
+	].join("\n");
+}
+function prependSenderContext(prompt, sender) {
+	if (!sender) return prompt;
+	if (prompt.startsWith(`${SENDER_CONTEXT_PREFIX}\n`)) return prompt;
+	return `${buildSenderContextEnvelope(sender)}${prompt}`;
+}
+
 //#endregion
 //#region src/gateway/methods/chat.ts
 const chatHistoryParamsSchema = z.object({ sessionKey: z.string().min(1) });
@@ -5596,15 +5692,23 @@ const chatHistoryMethod = async (params, context) => {
 };
 const chatSendMethod = async (params, context, connId) => {
 	const parsed = chatSendParamsSchema.parse(params);
+	const client = context.getConnectionClient?.(connId) ?? null;
+	const sender = client ? {
+		displayName: client.displayName ?? client.id,
+		userId: client.id,
+		channel: "cli"
+	} : void 0;
+	const prompt = prependSenderContext(parsed.prompt, sender);
 	let finalText = null;
 	let finalError = null;
 	for await (const event of context.agentManager.run({
 		sessionKey: parsed.sessionKey,
-		prompt: parsed.prompt,
+		prompt,
 		modelOverride: parsed.model,
 		meta: {
 			source: "interactive",
-			channel: "cli"
+			channel: "cli",
+			...sender ? { sender } : {}
 		}
 	})) {
 		const maybeText = extractAssistantText(event);
@@ -6271,6 +6375,24 @@ var HovClawGatewayServer = class {
 		this.httpServer = createServer((req, res) => {
 			this.handleHttpRequest(req, res);
 		});
+		this.httpServer.on("error", (error) => {
+			logger.error({
+				error,
+				host: this.runtimeConfig.gateway.host,
+				port: this.runtimeConfig.gateway.port
+			}, "Gateway server error; continuing without gateway listener");
+			if (this.tickTimer) {
+				clearInterval(this.tickTimer);
+				this.tickTimer = null;
+			}
+			for (const state of this.connections.values()) state.socket.close(1011, "gateway-error");
+			this.connections.clear();
+			if (this.wss) {
+				this.wss.close();
+				this.wss = null;
+			}
+			this.httpServer = null;
+		});
 		this.httpServer.on("upgrade", (request, socket, head) => {
 			if (!this.wss) {
 				socket.destroy();
@@ -6433,6 +6555,10 @@ var HovClawGatewayServer = class {
 			return;
 		}
 		state.connected = true;
+		state.client = {
+			id: connectParams.client.id,
+			...connectParams.client.displayName ? { displayName: connectParams.client.displayName } : {}
+		};
 		sendResponse(state.socket, request.id, true, {
 			type: "hello-ok",
 			protocol: PROTOCOL_VERSION,
@@ -6512,6 +6638,11 @@ var HovClawGatewayServer = class {
 			readFileConfig: this.readFileConfig,
 			writeFileConfig: this.writeFileConfig,
 			getChannelStatus: this.getChannelStatus,
+			getConnectionClient: (connId) => {
+				const connection = this.connections.get(connId);
+				if (!connection?.client) return null;
+				return connection.client;
+			},
 			emitEvent: (event, payload, connId) => {
 				this.emitEvent(event, payload, connId);
 			}
@@ -8107,16 +8238,25 @@ async function main() {
 			}
 		}
 		normalizedPrompt = applyThinkingLevel(normalizedPrompt, thinkingLevel, thinkingLevelForced);
+		const sender = {
+			displayName: msg.displayName,
+			userId: msg.userId,
+			channel: msg.channel,
+			...msg.accountId ? { accountId: msg.accountId } : {},
+			...msg.peer?.kind ? { peerKind: msg.peer.kind } : {}
+		};
+		const promptWithSender = prependSenderContext(normalizedPrompt, sender);
 		try {
 			await channel.setTyping?.(target, true);
 			let finalText = null;
 			let finalError = null;
 			for await (const event of agentManager.run({
 				sessionKey,
-				prompt: normalizedPrompt,
+				prompt: promptWithSender,
 				meta: {
 					source: "interactive",
-					channel: msg.channel
+					channel: msg.channel,
+					sender
 				}
 			})) {
 				const maybe = extractAssistantText(event);

package/dist/{src-GZDRRc5A.js → src-GoIM4Tv1.js}

@@ -1553,6 +1553,39 @@ const channelsLogoutMethod = async (params, context) => {
 	return { ok: true };
 };
 
+//#endregion
+//#region src/inbound-context.ts
+const SENDER_DISPLAY_NAME_MAX_CHARS = 80;
+const SENDER_TOKEN_MAX_CHARS = 80;
+const SENDER_CONTEXT_PREFIX = "[Sender Context]";
+function normalizeInlineToken(value, maxChars, fallback) {
+	const resolved = (value ?? "").replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim() || fallback;
+	if (resolved.length <= maxChars) return resolved;
+	return `${resolved.slice(0, maxChars - 3)}...`;
+}
+function sanitizeSenderDisplayName(displayName, fallbackUserId) {
+	return normalizeInlineToken(displayName, SENDER_DISPLAY_NAME_MAX_CHARS, fallbackUserId);
+}
+function buildSenderContextEnvelope(sender) {
+	const userId = normalizeInlineToken(sender.userId, SENDER_TOKEN_MAX_CHARS, "unknown");
+	const displayName = sanitizeSenderDisplayName(sender.displayName, userId);
+	const accountId = sender.accountId ? normalizeInlineToken(sender.accountId, SENDER_TOKEN_MAX_CHARS, "") : "";
+	return [
+		SENDER_CONTEXT_PREFIX,
+		`displayName=${displayName}`,
+		`userId=${userId}`,
+		`channel=${sender.channel}`,
+		...accountId ? [`accountId=${accountId}`] : [],
+		...sender.peerKind ? [`peerKind=${sender.peerKind}`] : [],
+		""
+	].join("\n");
+}
+function prependSenderContext(prompt, sender) {
+	if (!sender) return prompt;
+	if (prompt.startsWith(`${SENDER_CONTEXT_PREFIX}\n`)) return prompt;
+	return `${buildSenderContextEnvelope(sender)}${prompt}`;
+}
+
 //#endregion
 //#region src/gateway/methods/chat.ts
 const chatHistoryParamsSchema = z.object({ sessionKey: z.string().min(1) });
@@ -1571,15 +1604,23 @@ const chatHistoryMethod = async (params, context) => {
 };
 const chatSendMethod = async (params, context, connId) => {
 	const parsed = chatSendParamsSchema.parse(params);
+	const client = context.getConnectionClient?.(connId) ?? null;
+	const sender = client ? {
+		displayName: client.displayName ?? client.id,
+		userId: client.id,
+		channel: "cli"
+	} : void 0;
+	const prompt = prependSenderContext(parsed.prompt, sender);
 	let finalText = null;
 	let finalError = null;
 	for await (const event of context.agentManager.run({
 		sessionKey: parsed.sessionKey,
-		prompt: parsed.prompt,
+		prompt,
 		modelOverride: parsed.model,
 		meta: {
 			source: "interactive",
-			channel: "cli"
+			channel: "cli",
+			...sender ? { sender } : {}
 		}
 	})) {
 		const maybeText = extractAssistantText(event);
@@ -2164,6 +2205,24 @@ var HovClawGatewayServer = class {
 		this.httpServer = createServer((req, res) => {
 			this.handleHttpRequest(req, res);
 		});
+		this.httpServer.on("error", (error) => {
+			logger.error({
+				error,
+				host: this.runtimeConfig.gateway.host,
+				port: this.runtimeConfig.gateway.port
+			}, "Gateway server error; continuing without gateway listener");
+			if (this.tickTimer) {
+				clearInterval(this.tickTimer);
+				this.tickTimer = null;
+			}
+			for (const state of this.connections.values()) state.socket.close(1011, "gateway-error");
+			this.connections.clear();
+			if (this.wss) {
+				this.wss.close();
+				this.wss = null;
+			}
+			this.httpServer = null;
+		});
 		this.httpServer.on("upgrade", (request, socket, head) => {
 			if (!this.wss) {
 				socket.destroy();
@@ -2326,6 +2385,10 @@ var HovClawGatewayServer = class {
 			return;
 		}
 		state.connected = true;
+		state.client = {
+			id: connectParams.client.id,
+			...connectParams.client.displayName ? { displayName: connectParams.client.displayName } : {}
+		};
 		sendResponse(state.socket, request.id, true, {
 			type: "hello-ok",
 			protocol: PROTOCOL_VERSION,
@@ -2405,6 +2468,11 @@ var HovClawGatewayServer = class {
 			readFileConfig: this.readFileConfig,
 			writeFileConfig: this.writeFileConfig,
 			getChannelStatus: this.getChannelStatus,
+			getConnectionClient: (connId) => {
+				const connection = this.connections.get(connId);
+				if (!connection?.client) return null;
+				return connection.client;
+			},
 			emitEvent: (event, payload, connId) => {
 				this.emitEvent(event, payload, connId);
 			}
@@ -2968,16 +3036,25 @@ async function main() {
 			}
 		}
 		normalizedPrompt = applyThinkingLevel(normalizedPrompt, thinkingLevel, thinkingLevelForced);
+		const sender = {
+			displayName: msg.displayName,
+			userId: msg.userId,
+			channel: msg.channel,
+			...msg.accountId ? { accountId: msg.accountId } : {},
+			...msg.peer?.kind ? { peerKind: msg.peer.kind } : {}
+		};
+		const promptWithSender = prependSenderContext(normalizedPrompt, sender);
 		try {
 			await channel.setTyping?.(target, true);
 			let finalText = null;
 			let finalError = null;
 			for await (const event of agentManager.run({
 				sessionKey,
-				prompt: normalizedPrompt,
+				prompt: promptWithSender,
 				meta: {
 					source: "interactive",
-					channel: msg.channel
+					channel: msg.channel,
+					sender
 				}
 			})) {
 				const maybe = extractAssistantText(event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hovclaw",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Multi-channel AI agent gateway",
   "license": "MIT",
   "type": "module",