@openclaw/signal 2026.11.3 → 2026.11.5-beta.2

package/dist/.setup/{channel-CM-rLLPN.mjs → channel-ByJj8fSh.mjs}

@@ -1,14 +1,13 @@
-import { a as migrateLegacySignalTransportConfig, i as clearLegacySignalTransportFieldsForAccount, n as normalizeCompatibilityConfig, r as repairSignalAccountKeys } from "./doctor-contract-api-BIdVW0PF.mjs";
-import { a as normalizeSignalTransportUrl, i as normalizeSignalTransportHost, o as resolveSignalAccountEntry, s as resolveSignalAccountKey, t as assertSignalSocketTransport } from "./transport-url-CAC0JcuI.mjs";
-import { a as isSignalManagedNativeConnectionUrlForBind, c as resolveLocalSignalTransportPort, i as assignSignalManagedNativePort, o as isValidSignalManagedNativePort, r as allocateSignalManagedNativePort, s as reserveSignalTransportPorts } from "./transport-policy-B6C_LogW.mjs";
-import { a as resolveSignalAccountConfig, i as resolveSignalAccount, n as listSignalAccountIds, o as resolveSignalReplyToMode, r as resolveDefaultSignalAccountId, s as resolveSignalTransport, t as listEnabledSignalAccounts } from "./accounts-B0Pba1-q.mjs";
-import { n as normalizeSignalMessagingTarget, r as normalizeSignalReactionRecipient, t as looksLikeSignalTargetId } from "./normalize-D7kSomXt.mjs";
-import { a as resolveSignalTarget, n as signalApprovalAuth, r as listSignalAliasDirectoryEntries, t as getSignalApprovalApprovers } from "./approval-auth-DhUKkSkA.mjs";
-import { c as resolveSignalSender, l as looksLikeUuid, o as resolveSignalPeerId, s as resolveSignalRecipient } from "./identity-B3JyPqGO.mjs";
-import { n as sendReactionSignal, t as removeReactionSignal } from "./reaction-runtime-api-mdO4k0yv.mjs";
+import { a as migrateLegacySignalTransportConfig, i as clearLegacySignalTransportFieldsForAccount, n as normalizeCompatibilityConfig, r as repairSignalAccountKeys } from "./doctor-contract-api-CcLwIhsD.mjs";
+import { c as resolveSignalAccountEntry, l as resolveSignalAccountKey, o as normalizeSignalTransportHost, r as assertSignalSocketTransport, s as normalizeSignalTransportUrl } from "./legacy-transport-D_cZC3bS.mjs";
+import { a as isSignalManagedNativeConnectionUrlForBind, c as resolveLocalSignalTransportPort, i as assignSignalManagedNativePort, o as isValidSignalManagedNativePort, r as allocateSignalManagedNativePort, s as reserveSignalTransportPorts } from "./transport-policy-zIR3lRUj.mjs";
+import { a as resolveSignalAccountConfig, i as resolveSignalAccount, n as listSignalAccountIds, o as resolveSignalReplyToMode, r as resolveDefaultSignalAccountId, s as resolveSignalTransport, t as listEnabledSignalAccounts } from "./accounts-enJKL3ci.mjs";
+import { c as resolveSignalSender, d as normalizeSignalMessagingTarget, f as normalizeSignalReactionRecipient, l as looksLikeUuid, o as resolveSignalPeerId, s as resolveSignalRecipient, u as looksLikeSignalTargetId } from "./identity-vKtR3DrM.mjs";
+import { a as resolveSignalTarget, n as signalApprovalAuth, r as listSignalAliasDirectoryEntries, t as getSignalApprovalApprovers } from "./approval-auth-B_5Ytx8K.mjs";
+import { c as containerRpcRequest, i as streamSignalEvents$1, l as streamContainerEvents, n as signalCheck$1, r as signalRpcRequest$1, s as containerCheck } from "./client-CesmEjRc.mjs";
 import { t as getOptionalSignalRuntime } from "./runtime-8sxUF217.mjs";
-import { t as detectSignalTransport } from "./transport-detection-CmlgOybe.mjs";
-import { t as SignalChannelConfigSchema } from "./config-schema-DvxZ18SD.mjs";
+import { t as detectSignalTransport } from "./transport-detection-DvR6X_UQ.mjs";
+import { t as SignalChannelConfigSchema } from "./config-schema-BCmW0BLB.mjs";
 import { describeAccountSnapshot, resolveChannelMediaMaxBytes } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { buildDmGroupAccountAllowlistAdapter } from "openclaw/plugin-sdk/allowlist-config-edit";
@@ -19,12 +18,11 @@ import { attachChannelToResult } from "openclaw/plugin-sdk/channel-send-result";
 import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
-import { questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
-import { chunkText, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-chunking";
+import { chunkText, resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-chunking";
 import { buildOutboundBaseSessionKey, parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { buildBaseChannelStatusSummary, collectStatusIssuesFromLastError, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState, resolveReactionLevel } from "openclaw/plugin-sdk/status-helpers";
 import { asPositiveSafeInteger, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { FormatCapabilityProfile, markdownToIR, renderMarkdownIRChunksWithinLimit, renderMarkdownWithAttributedRanges, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
+import { FormatCapabilityProfile, markdownToIR, renderMarkdownIRChunksWithinLimit, renderMarkdownWithAttributedRanges, sanitizeAssistantVisibleText, sliceMarkdownIR } from "openclaw/plugin-sdk/text-chunking";
 import { normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/account-resolution";
 import { createApproverRestrictedNativeApprovalCapabilityFromForwardingRoutesAsync } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapterAsync } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
@@ -35,6 +33,8 @@ import { formatMediaPlaceholderText } from "openclaw/plugin-sdk/channel-inbound"
 import { kindFromMime } from "openclaw/plugin-sdk/media-runtime";
 import { createActionGate, jsonResult, readStringParam, resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
+import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { createChannelPluginBase, getChatChannelMeta } from "openclaw/plugin-sdk/core";
 import { parseAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 import { getExecApprovalReplyMetadata } from "openclaw/plugin-sdk/approval-reply-runtime";
@@ -102,7 +102,7 @@ const signalApproval = createApproverRestrictedNativeApprovalCapabilityFromForwa
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-CsEcBZoc.mjs")).signalApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-0RbVmTxx.mjs")).signalApprovalNativeRuntime
 	})
 });
 const signalApprovalRouting = signalApproval.routing;
@@ -162,12 +162,12 @@ const SIGNAL_FORMAT_PROFILE = FormatCapabilityProfile.define({
 		unit: "chars"
 	}
 });
-function stripEquivalentSignalLinks(ir) {
+function renderSignalText(ir) {
 	const normalize = (value, preserveSuffixCase) => {
 		const normalized = value.trim().replace(/^(?:https?:\/\/)?(?:www\.)?/i, "").replace(/\/+$/, "");
 		return preserveSuffixCase ? normalized.replace(/^[^/?#]+/, (host) => host.toLowerCase()) : normalizeLowercaseStringOrEmpty(normalized);
 	};
-	return {
+	const rendered = renderMarkdownWithAttributedRanges({
 		...ir,
 		links: ir.links.filter((link) => {
 			const label = ir.text.slice(link.start, link.end);
@@ -175,10 +175,7 @@ function stripEquivalentSignalLinks(ir) {
 			const preserveSuffixCase = /^https?:\/\//i.test(href);
 			return normalize(label, preserveSuffixCase) !== normalize(href.replace(/^mailto:/, ""), preserveSuffixCase);
 		})
-	};
-}
-function renderSignalText(ir) {
-	const rendered = renderMarkdownWithAttributedRanges(stripEquivalentSignalLinks(ir), {
+	}, {
 		styleMap: SIGNAL_STYLE_MAP,
 		annotationStyleMap: { assistant_transcript_role: "MONOSPACE" },
 		trimEnd: true
@@ -201,16 +198,43 @@ function markdownToSignalIR(markdown, options) {
 function markdownToSignalText(markdown, options = {}) {
 	return renderSignalText(markdownToSignalIR(markdown, options));
 }
+function chunkSignalIRByParagraph(ir, limit) {
+	const codeSpans = ir.styles.filter((span) => span.style === "code" || span.style === "code_block");
+	const paragraphs = [];
+	let start = 0;
+	for (const match of ir.text.matchAll(/\n[\t ]*\n+/g)) {
+		const end = match.index + match[0].length;
+		if (codeSpans.some((span) => span.start <= match.index && end <= span.end)) continue;
+		if (match.index > start) paragraphs.push({
+			start,
+			end: match.index
+		});
+		start = end;
+	}
+	if (start < ir.text.length) paragraphs.push({
+		start,
+		end: ir.text.length
+	});
+	const chunks = [];
+	let pending;
+	for (const paragraph of paragraphs) if (pending && renderSignalText(sliceMarkdownIR(ir, pending.start, paragraph.end)).text.length <= limit) pending.end = paragraph.end;
+	else {
+		if (pending) chunks.push(sliceMarkdownIR(ir, pending.start, pending.end));
+		pending = paragraph;
+	}
+	if (pending) chunks.push(sliceMarkdownIR(ir, pending.start, pending.end));
+	return chunks;
+}
 function markdownToSignalTextChunks(markdown, limit, options = {}) {
 	const ir = markdownToSignalIR(markdown, options);
 	if (ir.listItems && ir.text.length > limit) ir.listItems = ir.listItems.map((item) => ({ ...item }));
-	return renderMarkdownIRChunksWithinLimit({
-		ir,
+	return (options.chunkMode === "newline" ? chunkSignalIRByParagraph(ir, limit) : [ir]).flatMap((chunk) => renderMarkdownIRChunksWithinLimit({
+		ir: chunk,
 		limit,
 		assistantTranscriptRoleMessageBoundaries: true,
 		renderChunk: renderSignalText,
 		measureRendered: (rendered) => rendered.text.length
-	}).map(({ rendered }) => rendered);
+	}).map(({ rendered }) => rendered));
 }
 //#endregion
 //#region extensions/signal/src/media-text.ts
@@ -238,18 +262,93 @@ function resolveSignalReactionLevel(params) {
 	});
 }
 //#endregion
+//#region extensions/signal/src/client-adapter.ts
+const DEFAULT_TIMEOUT_MS = 1e4;
+async function signalRpcRequest(method, params, opts) {
+	return opts.transportKind === "container" ? containerRpcRequest(method, params, opts) : signalRpcRequest$1(method, params, opts);
+}
+async function signalCheck(baseUrl, timeoutMs = DEFAULT_TIMEOUT_MS, options = {}) {
+	try {
+		return options.transportKind === "container" ? await containerCheck(baseUrl, timeoutMs, options.account) : await signalCheck$1(baseUrl, timeoutMs);
+	} catch (error) {
+		return {
+			ok: false,
+			status: null,
+			error: formatErrorMessage(error)
+		};
+	}
+}
+async function streamSignalEvents(params) {
+	if (params.transportKind === "container") return streamContainerEvents({
+		...params,
+		onEvent: (event) => params.onEvent({
+			event: "receive",
+			data: JSON.stringify(event)
+		})
+	});
+	return streamSignalEvents$1(params);
+}
+//#endregion
+//#region extensions/signal/src/rpc-context.ts
+function resolveSignalRpcContext(opts, accountInfo) {
+	const baseUrlOverride = opts.baseUrl?.trim();
+	const accountOverride = opts.account?.trim();
+	const baseUrl = baseUrlOverride || accountInfo.baseUrl;
+	if (!baseUrl) throw new Error("Signal base URL is required");
+	return {
+		baseUrl,
+		account: accountOverride || accountInfo.config.account?.trim() || void 0
+	};
+}
+//#endregion
+//#region extensions/signal/src/send-reactions.ts
+function createSignalReactionSender(remove) {
+	return async (recipient, targetTimestamp, emoji, opts) => {
+		const cfg = requireRuntimeConfig(opts.cfg, "Signal reactions");
+		const accountInfo = resolveSignalAccount({
+			cfg,
+			accountId: opts.accountId
+		});
+		const { baseUrl, account } = resolveSignalRpcContext(opts, accountInfo);
+		const normalizedRecipient = normalizeSignalReactionRecipient(recipient);
+		const groupId = opts.groupId?.trim();
+		const operation = `Signal reaction${remove ? " removal" : ""}`;
+		if (!normalizedRecipient && !groupId) throw new Error(`Recipient or groupId is required for ${operation}`);
+		if (!Number.isFinite(targetTimestamp) || targetTimestamp <= 0) throw new Error(`Valid targetTimestamp is required for ${operation}`);
+		const normalizedEmoji = emoji?.trim();
+		if (!normalizedEmoji) throw new Error(`Emoji is required for ${operation}`);
+		const targetAuthor = [
+			opts.targetAuthor,
+			opts.targetAuthorUuid,
+			normalizedRecipient
+		].map((candidate) => normalizeSignalReactionRecipient(candidate ?? "")).find(Boolean);
+		if (groupId && !targetAuthor) throw new Error(`targetAuthor is required for group reaction${remove ? " removal" : "s"}`);
+		const requestParams = {
+			emoji: normalizedEmoji,
+			targetTimestamp,
+			...remove ? { remove: true } : {},
+			...targetAuthor ? { targetAuthor } : {}
+		};
+		if (normalizedRecipient) requestParams.recipients = [normalizedRecipient];
+		if (groupId) requestParams.groupIds = [groupId];
+		if (account) requestParams.account = account;
+		return {
+			ok: true,
+			timestamp: (await signalRpcRequest("sendReaction", requestParams, {
+				baseUrl,
+				timeoutMs: opts.timeoutMs,
+				transportKind: opts.transportKind ?? accountInfo.transport.kind,
+				assertDirectAdapterHandoff: opts.assertDirectAdapterHandoff
+			}))?.timestamp
+		};
+	};
+}
+const sendReactionSignal = createSignalReactionSender(false);
+const removeReactionSignal = createSignalReactionSender(true);
+//#endregion
 //#region extensions/signal/src/message-actions.ts
 const providerId = "signal";
 const GROUP_PREFIX = "group:";
-function resolveSignalReactionTarget(raw) {
-	const withoutSignal = raw.trim().replace(/^signal:/i, "").trim();
-	if (!withoutSignal) return {};
-	if (normalizeLowercaseStringOrEmpty(withoutSignal).startsWith(GROUP_PREFIX)) {
-		const groupId = withoutSignal.slice(6).trim();
-		return groupId ? { groupId } : {};
-	}
-	return { recipient: normalizeSignalReactionRecipient(withoutSignal) };
-}
 const signalMessageActions = {
 	describeMessageTool: ({ cfg, accountId }) => {
 		const configuredAccounts = accountId ? [resolveSignalAccount({
@@ -284,11 +383,14 @@ const signalMessageActions = {
 			});
 			if (!reactionLevelInfo.agentReactionsEnabled) throw new Error(`Signal agent reactions disabled (reactionLevel="${reactionLevelInfo.level}"). Set channels.signal.reactionLevel to "minimal" or "extensive" to enable.`);
 			if (!createActionGate(account.config.actions)("reactions")) throw new Error("Signal reactions are disabled via actions.reactions.");
-			const target = resolveSignalReactionTarget(readStringParam(params, "to", {
+			const recipientTarget = readStringParam(params, "to", {
 				required: true,
 				label: "recipient (UUID, phone number, or group)"
-			}));
-			if (!target.recipient && !target.groupId) throw new Error("recipient or group required");
+			}).trim().replace(/^signal:/i, "").trim();
+			const isGroup = normalizeLowercaseStringOrEmpty(recipientTarget).startsWith(GROUP_PREFIX);
+			const groupId = isGroup ? recipientTarget.slice(6).trim() : void 0;
+			const recipient = !isGroup && recipientTarget ? normalizeSignalReactionRecipient(recipientTarget) : void 0;
+			if (!recipient && !groupId) throw new Error("recipient or group required");
 			const messageIdRaw = resolveReactionMessageId({
 				args: params,
 				toolContext
@@ -297,16 +399,16 @@ const signalMessageActions = {
 			if (!messageId) throw new Error("messageId (timestamp) required. Provide messageId explicitly or react to the current inbound message.");
 			const targetAuthor = readStringParam(params, "targetAuthor");
 			const targetAuthorUuid = readStringParam(params, "targetAuthorUuid");
-			if (target.groupId && !targetAuthor && !targetAuthorUuid) throw new Error("targetAuthor or targetAuthorUuid required for group reactions.");
+			if (groupId && !targetAuthor && !targetAuthorUuid) throw new Error("targetAuthor or targetAuthorUuid required for group reactions.");
 			const emoji = readStringParam(params, "emoji", { allowEmpty: true });
 			const remove = typeof params.remove === "boolean" ? params.remove : void 0;
 			const timestamp = parseStrictNonNegativeInteger(messageId);
 			if (timestamp === void 0) throw new Error(`Invalid messageId: ${messageId}. Expected numeric timestamp.`);
 			if (!emoji) throw new Error(`Emoji required to ${remove ? "remove" : "add"} reaction.`);
-			await (remove ? removeReactionSignal : sendReactionSignal)(target.recipient ?? "", timestamp, emoji, {
+			await (remove ? removeReactionSignal : sendReactionSignal)(recipient ?? "", timestamp, emoji, {
 				cfg,
 				accountId: account.accountId,
-				groupId: target.groupId,
+				groupId,
 				targetAuthor,
 				targetAuthorUuid,
 				...assertDirectAdapterHandoff ? { assertDirectAdapterHandoff } : {}
@@ -324,8 +426,7 @@ const signalMessageActions = {
 function resolveSignalOutboundTarget(target) {
 	const normalized = normalizeSignalMessagingTarget(target);
 	if (!normalized) return null;
-	const lowered = normalizeLowercaseStringOrEmpty(normalized);
-	if (lowered.startsWith("group:")) {
+	if (normalized.startsWith("group:")) {
 		const groupId = normalized.slice(6);
 		return {
 			peer: {
@@ -337,21 +438,8 @@ function resolveSignalOutboundTarget(target) {
 			to: `group:${groupId}`
 		};
 	}
-	if (lowered.startsWith("username:")) return {
-		peer: {
-			kind: "direct",
-			id: normalized
-		},
-		chatType: "direct",
-		from: `signal:${normalized}`,
-		to: `signal:${normalized}`
-	};
 	const recipient = normalized;
-	const uuidCandidate = normalizeLowercaseStringOrEmpty(recipient).startsWith("uuid:") ? recipient.slice(5) : recipient;
-	const sender = resolveSignalSender({
-		sourceUuid: looksLikeUuid(uuidCandidate) ? uuidCandidate : null,
-		sourceNumber: looksLikeUuid(uuidCandidate) ? null : recipient
-	});
+	const sender = recipient.startsWith("username:") ? null : resolveSignalSender(looksLikeUuid(recipient) ? { sourceUuid: recipient } : { sourceNumber: recipient });
 	const peerId = sender ? resolveSignalPeerId(sender) : recipient;
 	const displayRecipient = sender ? resolveSignalRecipient(sender) : recipient;
 	return {
@@ -368,11 +456,6 @@ function resolveSignalOutboundTarget(target) {
 //#region extensions/signal/src/presentation-fallback.ts
 /** Materialize presentation content once before Signal's text-only delivery funnels. */
 function materializeSignalPresentationFallback(payload, presentationOverride) {
-	const reactionPayload = questionGatewayRuntime.prepareReactionPayloadForDelivery({
-		payload,
-		presentation: presentationOverride ?? payload.presentation
-	});
-	if (reactionPayload) return reactionPayload;
 	const presentation = presentationOverride ?? normalizeMessagePresentation(payload.presentation);
 	if (!presentation) return payload;
 	const currentText = payload.text?.trim() ?? "";
@@ -461,10 +544,13 @@ async function registerSignalReplyContext(params) {
 	const identity = resolveSignalReplyIdentity(params);
 	const author = normalizeOptionalString(params.author);
 	const body = normalizeOptionalString(params.body);
-	const media = params.media?.map((entry) => ({
-		contentType: normalizeOptionalString(entry.contentType),
-		kind: entry.kind ?? void 0
-	}));
+	const media = params.media?.map((entry) => {
+		const contentType = normalizeOptionalString(entry.contentType);
+		return {
+			...contentType ? { contentType } : {},
+			...entry.kind != null ? { kind: entry.kind } : {}
+		};
+	});
 	const sourceTimestamp = asPositiveSafeInteger(params.sourceTimestamp) ?? Date.now();
 	if (!identity || !author) return;
 	const { key, ...replyIdentity } = identity;
@@ -533,54 +619,11 @@ function normalizeTransport(transport) {
 		url: normalizeSignalTransportUrl(transport.url)
 	};
 }
-function assertSignalContainerTransportHasAccount(params) {
-	if (params.transport.kind !== "container" || params.cfg.channels?.signal?.enabled === false) return;
-	const account = resolveSignalAccountConfig(params.cfg, normalizeAccountId$1(params.accountId));
-	if (account.enabled === false || normalizeOptionalString(account.account)) return;
-	throw new Error("Signal container transport requires an account number for an enabled account.");
-}
-function assertSignalLocalEndpointDoesNotConflictWithManagedSibling(params) {
-	if (params.transport.kind === "managed-native") return;
-	const localPort = resolveLocalSignalTransportPort(params.transport.url);
-	if (localPort === void 0) return;
-	const targetAccountId = normalizeAccountId$1(params.accountId);
-	for (const accountId of listSignalAccountIds(params.cfg)) {
-		if (normalizeAccountId$1(accountId) === targetAccountId) continue;
-		if (resolveSignalAccountEntry(params.cfg.channels?.signal?.accounts, accountId)?.enabled === false) continue;
-		const siblingAccount = resolveSignalAccount({
-			cfg: params.cfg,
-			accountId
-		});
-		if (!siblingAccount.configured) continue;
-		const siblingTransport = siblingAccount.transport;
-		if (siblingTransport?.kind !== "managed-native" || siblingTransport.socketPath !== void 0 || siblingTransport.httpPort !== localPort) continue;
-		throw new Error(`Signal ${params.transport.kind} account "${targetAccountId}" uses local port ${localPort}, which conflicts with managed native account "${accountId}". Choose a distinct transport URL.`);
-	}
-}
 function resolveConfiguredSignalTransport(cfg, accountId) {
 	const signal = cfg.channels?.signal;
 	const normalizedAccountId = normalizeAccountId$1(accountId);
 	return normalizedAccountId === DEFAULT_ACCOUNT_ID$2 ? signal?.transport ?? resolveSignalAccountEntry(signal?.accounts, normalizedAccountId)?.transport : resolveSignalAccountEntry(signal?.accounts, normalizedAccountId)?.transport;
 }
-function alignManagedConnectionUrlAfterBindChange(params) {
-	if (params.hasUrlOverride || !params.existing?.url || !isSignalManagedNativeConnectionUrlForBind(params.existing)) return assignSignalManagedNativePort(params.prepared, params.httpPort);
-	const connectionUrl = new URL(params.existing.url);
-	connectionUrl.port = String(params.httpPort);
-	const alignedPortUrl = normalizeSignalTransportUrl(connectionUrl.toString());
-	const next = {
-		...params.prepared,
-		url: alignedPortUrl,
-		httpPort: params.httpPort
-	};
-	if (isSignalManagedNativeConnectionUrlForBind(next)) return next;
-	const bindHost = params.prepared.httpHost ?? "127.0.0.1";
-	const connectionHost = bindHost === "0.0.0.0" ? "127.0.0.1" : bindHost === "::" ? "::1" : bindHost;
-	connectionUrl.hostname = connectionHost.includes(":") ? `[${connectionHost}]` : connectionHost;
-	return {
-		...next,
-		url: normalizeSignalTransportUrl(connectionUrl.toString())
-	};
-}
 function prepareSignalManagedNativeTransport(params) {
 	const existing = resolveConfiguredSignalTransport(params.cfg, params.accountId);
 	const existingManaged = existing?.kind === "managed-native" ? existing : void 0;
@@ -630,15 +673,27 @@ function prepareSignalManagedNativeTransport(params) {
 		if (localConnectionPort !== void 0) reservedPorts.add(localConnectionPort);
 	}
 	if (params.overrides?.httpPort !== void 0 && reservedPorts.has(params.overrides.httpPort)) throw new Error(`Signal managed native port ${params.overrides.httpPort} is already reserved by another account or local transport endpoint.`);
-	return alignManagedConnectionUrlAfterBindChange({
-		existing: existingManaged,
-		prepared,
-		httpPort: allocateSignalManagedNativePort({
-			reservedPorts,
-			preferredPort
-		}),
-		hasUrlOverride: params.overrides?.url !== void 0
+	const httpPort = allocateSignalManagedNativePort({
+		reservedPorts,
+		preferredPort
 	});
+	if (params.overrides?.url !== void 0 || !existingManaged?.url || !isSignalManagedNativeConnectionUrlForBind(existingManaged)) return assignSignalManagedNativePort(prepared, httpPort);
+	const connectionUrl = new URL(existingManaged.url);
+	connectionUrl.port = String(httpPort);
+	const alignedPortUrl = normalizeSignalTransportUrl(connectionUrl.toString());
+	const next = {
+		...prepared,
+		url: alignedPortUrl,
+		httpPort
+	};
+	if (isSignalManagedNativeConnectionUrlForBind(next)) return next;
+	const bindHost = prepared.httpHost ?? "127.0.0.1";
+	const connectionHost = bindHost === "0.0.0.0" ? "127.0.0.1" : bindHost === "::" ? "::1" : bindHost;
+	connectionUrl.hostname = connectionHost.includes(":") ? `[${connectionHost}]` : connectionHost;
+	return {
+		...next,
+		url: normalizeSignalTransportUrl(connectionUrl.toString())
+	};
 }
 async function probeSignalTransport(params) {
 	const timeoutMs = params.timeoutMs ?? 1e4;
@@ -648,21 +703,37 @@ async function probeSignalTransport(params) {
 		overrides: params.transport
 	}) : params.transport;
 	const resolved = resolveSignalTransport(transport);
-	if (resolved.kind === "container") return (params.probeContainer ?? (await import("./transport-probes.runtime-D-xIMRcn.mjs")).containerCheck)(resolved.baseUrl, timeoutMs, params.account);
-	return (params.probeNative ?? (await import("./transport-probes.runtime-D-xIMRcn.mjs")).nativeCheck)(resolved.baseUrl, timeoutMs);
+	if (resolved.kind === "container") return (params.probeContainer ?? (await import("./transport-probes.runtime-CoH6UFtc.mjs")).containerCheck)(resolved.baseUrl, timeoutMs, params.account);
+	return (params.probeNative ?? (await import("./transport-probes.runtime-CoH6UFtc.mjs")).nativeCheck)(resolved.baseUrl, timeoutMs);
 }
 function writeSignalAccountTransport(params) {
 	const transport = normalizeTransport(params.transport);
-	assertSignalContainerTransportHasAccount({
-		cfg: params.cfg,
-		accountId: params.accountId,
-		transport
-	});
-	assertSignalLocalEndpointDoesNotConflictWithManagedSibling({
-		cfg: params.cfg,
-		accountId: params.accountId,
-		transport
-	});
+	function assertSignalContainerTransportHasAccount() {
+		if (transport.kind !== "container" || params.cfg.channels?.signal?.enabled === false) return;
+		const account = resolveSignalAccountConfig(params.cfg, normalizeAccountId$1(params.accountId));
+		if (account.enabled === false || normalizeOptionalString(account.account)) return;
+		throw new Error("Signal container transport requires an account number for an enabled account.");
+	}
+	assertSignalContainerTransportHasAccount();
+	function assertSignalLocalEndpointDoesNotConflictWithManagedSibling() {
+		if (transport.kind === "managed-native") return;
+		const localPort = resolveLocalSignalTransportPort(transport.url);
+		if (localPort === void 0) return;
+		const targetAccountId = normalizeAccountId$1(params.accountId);
+		for (const accountId of listSignalAccountIds(params.cfg)) {
+			if (normalizeAccountId$1(accountId) === targetAccountId) continue;
+			if (resolveSignalAccountEntry(params.cfg.channels?.signal?.accounts, accountId)?.enabled === false) continue;
+			const siblingAccount = resolveSignalAccount({
+				cfg: params.cfg,
+				accountId
+			});
+			if (!siblingAccount.configured) continue;
+			const siblingTransport = siblingAccount.transport;
+			if (siblingTransport?.kind !== "managed-native" || siblingTransport.socketPath !== void 0 || siblingTransport.httpPort !== localPort) continue;
+			throw new Error(`Signal ${transport.kind} account "${targetAccountId}" uses local port ${localPort}, which conflicts with managed native account "${accountId}". Choose a distinct transport URL.`);
+		}
+	}
+	assertSignalLocalEndpointDoesNotConflictWithManagedSibling();
 	const next = patchChannelConfigForAccount({
 		cfg: params.cfg,
 		channel: "signal",
@@ -743,57 +814,6 @@ function normalizeSignalAccountInput(value) {
 	if (digits.length < MIN_E164_DIGITS || digits.length > MAX_E164_DIGITS) return null;
 	return `+${digits}`;
 }
-function isUuidLike(value) {
-	return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
-}
-function parseSignalAllowFromEntries(raw) {
-	return parseAllowFromEntries(raw, (entry) => {
-		if (normalizeLowercaseStringOrEmpty(entry).startsWith("uuid:")) {
-			const id = entry.slice(5).trim();
-			if (!id) return { error: "Invalid uuid entry" };
-			return { value: `uuid:${id}` };
-		}
-		if (isUuidLike(entry)) return { value: `uuid:${entry}` };
-		const normalized = normalizeSignalAccountInput(entry);
-		if (!normalized) return { error: `Invalid entry: ${entry}` };
-		return { value: normalized };
-	});
-}
-function buildSignalSetupPatch(input) {
-	const account = normalizeSignalAccountInput(input.signalNumber);
-	const transport = input.httpUrl ? {
-		kind: input.signalTransport ?? "external-native",
-		url: normalizeSignalTransportUrl(input.httpUrl)
-	} : input.cliPath || input.httpHost || input.httpPort ? {
-		kind: "managed-native",
-		...managedTransportOverridesFromSetupInput(input)
-	} : void 0;
-	return {
-		...account ? { account } : {},
-		...transport ? { transport } : {}
-	};
-}
-async function prepareSignalSetupInput(params) {
-	if (!params.input.httpUrl || params.input.signalTransport) return params.input;
-	const account = normalizeSignalAccountInput(params.input.signalNumber) ?? normalizeSignalAccountInput(resolveSignalSetupAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	})) ?? void 0;
-	try {
-		const detected = await detectSignalTransport({
-			url: params.input.httpUrl,
-			...account ? { account } : {}
-		});
-		return {
-			...params.input,
-			signalTransport: detected.kind === "container" ? "container" : "external-native"
-		};
-	} catch {
-		const existing = resolveConfiguredSignalTransport(params.cfg, params.accountId);
-		if (existing?.kind === "container" || existing?.kind === "external-native") return params.input;
-		throw new Error("Signal could not detect the HTTP transport; start the endpoint or pass --signal-transport external-native|container.");
-	}
-}
 function managedTransportOverridesFromSetupInput(input) {
 	return {
 		...input.cliPath ? { cliPath: input.cliPath } : {},
@@ -830,7 +850,17 @@ const signalDmPolicy = createChannelDmPolicy({
 		],
 		message: t("wizard.signal.allowFromPrompt"),
 		placeholder: "+15555550123, uuid:123e4567-e89b-12d3-a456-426614174000",
-		parseEntries: parseSignalAllowFromEntries,
+		parseEntries: (raw) => parseAllowFromEntries(raw, (entry) => {
+			if (normalizeLowercaseStringOrEmpty(entry).startsWith("uuid:")) {
+				const id = entry.slice(5).trim();
+				if (!id) return { error: "Invalid uuid entry" };
+				return { value: `uuid:${id}` };
+			}
+			if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(entry)) return { value: `uuid:${entry}` };
+			const normalized = normalizeSignalAccountInput(entry);
+			if (!normalized) return { error: `Invalid entry: ${entry}` };
+			return { value: normalized };
+		}),
 		getExistingAllowFrom: ({ cfg, accountId }) => resolveSignalAccount({
 			cfg,
 			accountId
@@ -844,19 +874,18 @@ const signalDmPolicy = createChannelDmPolicy({
 		})
 	})
 });
-function resolveSignalCliPath(params) {
-	const transport = resolveSignalAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	}).transport;
-	if (transport.kind !== "managed-native") return;
-	return typeof params.credentialValues.cliPath === "string" ? params.credentialValues.cliPath : transport.cliPath;
-}
 function createSignalCliPathTextInput(shouldPrompt) {
 	return createCliPathTextInput({
 		inputKey: "cliPath",
 		message: "signal-cli path",
-		resolvePath: resolveSignalCliPath,
+		resolvePath: (params) => {
+			const transport = resolveSignalAccount({
+				cfg: params.cfg,
+				accountId: params.accountId
+			}).transport;
+			if (transport.kind !== "managed-native") return;
+			return typeof params.credentialValues.cliPath === "string" ? params.credentialValues.cliPath : transport.cliPath;
+		},
 		shouldPrompt
 	});
 }
@@ -899,7 +928,20 @@ const signalSetupAdapterBase = createPatchedAccountSetupAdapter({
 		if (!input.signalNumber && !input.httpUrl && !input.httpHost && !input.httpPort && !input.cliPath) return "Signal requires --signal-number or --http-url/--http-host/--http-port/--cli-path.";
 		return null;
 	} }),
-	buildPatch: buildSignalSetupPatch
+	buildPatch: (input) => {
+		const account = normalizeSignalAccountInput(input.signalNumber);
+		const transport = input.httpUrl ? {
+			kind: input.signalTransport ?? "external-native",
+			url: normalizeSignalTransportUrl(input.httpUrl)
+		} : input.cliPath || input.httpHost || input.httpPort ? {
+			kind: "managed-native",
+			...managedTransportOverridesFromSetupInput(input)
+		} : void 0;
+		return {
+			...account ? { account } : {},
+			...transport ? { transport } : {}
+		};
+	}
 });
 function restorePromotedSignalDefaultAccount(cfg) {
 	const signal = cfg.channels?.signal;
@@ -922,7 +964,27 @@ function restorePromotedSignalDefaultAccount(cfg) {
 const signalSetupAdapter = {
 	...signalSetupAdapterBase,
 	namedAccountPromotionKeys: [],
-	prepareAccountConfigInput: prepareSignalSetupInput,
+	prepareAccountConfigInput: async (params) => {
+		if (!params.input.httpUrl || params.input.signalTransport) return params.input;
+		const account = normalizeSignalAccountInput(params.input.signalNumber) ?? normalizeSignalAccountInput(resolveSignalSetupAccount({
+			cfg: params.cfg,
+			accountId: params.accountId
+		})) ?? void 0;
+		try {
+			const detected = await detectSignalTransport({
+				url: params.input.httpUrl,
+				...account ? { account } : {}
+			});
+			return {
+				...params.input,
+				signalTransport: detected.kind === "container" ? "container" : "external-native"
+			};
+		} catch {
+			const existing = resolveConfiguredSignalTransport(params.cfg, params.accountId);
+			if (existing?.kind === "container" || existing?.kind === "external-native") return params.input;
+			throw new Error("Signal could not detect the HTTP transport; start the endpoint or pass --signal-transport external-native|container.");
+		}
+	},
 	singleAccountKeysToMove: [
 		"signalNumber",
 		"account",
@@ -1090,25 +1152,20 @@ function usesManagedSignalDaemon(cfg) {
 		}
 	});
 }
-/** Warn when the managed daemon will not see proxy or trust-store variables set for OpenClaw. */
-function collectSignalDaemonEnvNotes(params) {
-	const result = {
-		changeNotes: [],
-		warningNotes: []
-	};
-	if (!usesManagedSignalDaemon(params.cfg)) return result;
-	const names = listSignalDaemonDroppedEnvHints(params.env ?? process.env);
-	if (names.length > 0) result.warningNotes.push(`- channels.signal: ${formatSignalDaemonDroppedEnvNotice(names)}`);
-	return result;
-}
 const signalDoctor = {
 	normalizeCompatibilityConfig,
-	runConfigSequence: ({ cfg, env }) => collectSignalDaemonEnvNotes({
-		cfg,
-		env
-	}),
+	runConfigSequence: ({ cfg, env }) => {
+		const result = {
+			changeNotes: [],
+			warningNotes: []
+		};
+		if (!usesManagedSignalDaemon(cfg)) return result;
+		const names = listSignalDaemonDroppedEnvHints(env ?? process.env);
+		if (names.length > 0) result.warningNotes.push(`- channels.signal: ${formatSignalDaemonDroppedEnvNotice(names)}`);
+		return result;
+	},
 	cleanStaleConfig: async ({ cfg }) => {
-		const { detectSignalTransport } = await import("./transport-detection-CmlgOybe.mjs").then((n) => n.n);
+		const { detectSignalTransport } = await import("./transport-detection-DvR6X_UQ.mjs").then((n) => n.n);
 		const transport = await migrateLegacySignalTransportConfig({
 			cfg,
 			detect: detectSignalTransport
@@ -1122,7 +1179,7 @@ const signalDoctor = {
 //#endregion
 //#region extensions/signal/src/shared.ts
 const SIGNAL_CHANNEL = "signal";
-const signalSetupWizard = createSignalSetupWizardProxy(async () => (await import("./setup-surface-DvKLwYrl.mjs")).signalSetupWizard);
+const signalSetupWizard = createSignalSetupWizardProxy(async () => (await import("./setup-surface-DQ1yFZmY.mjs")).signalSetupWizard);
 const signalConfigAdapter = {
 	...createScopedChannelConfigAdapter({
 		sectionKey: SIGNAL_CHANNEL,
@@ -1142,16 +1199,16 @@ const signalConfigAdapter = {
 		const raw = resolveSignalAccount({
 			cfg,
 			accountId
-		}).config.defaultTo;
-		if (typeof raw !== "string" || !raw.trim()) return;
+		}).config.defaultTo?.trim();
+		if (!raw) return;
 		try {
 			return resolveSignalTarget({
 				cfg,
 				accountId,
 				input: raw
-			})?.to ?? raw.trim();
+			})?.to ?? raw;
 		} catch {
-			return raw.trim();
+			return raw;
 		}
 	}
 };
@@ -1207,10 +1264,10 @@ function createSignalPluginBase(params) {
 }
 //#endregion
 //#region extensions/signal/src/channel.ts
-const loadSignalMonitorModule = createLazyRuntimeModule(() => import("./monitor-C6u1JV2C.mjs").then((n) => n.n));
-const loadSignalProbeModule = createLazyRuntimeModule(() => import("./probe-D_93QCe0.mjs").then((n) => n.n));
-const loadSignalSendRuntime = createLazyRuntimeModule(() => import("./send-CM7-016e.mjs").then((n) => n.i));
-const loadSignalApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-JsqCEOHK.mjs").then((n) => n.n));
+const loadSignalMonitorModule = createLazyRuntimeModule(() => import("./monitor-Cf5sihwl.mjs").then((n) => n.n));
+const loadSignalProbeModule = createLazyRuntimeModule(() => import("./probe-Caq5Y4kA.mjs").then((n) => n.n));
+const loadSignalSendRuntime = createLazyRuntimeModule(() => import("./send-BJuOWLky.mjs").then((n) => n.i));
+const loadSignalApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-CvqVSSx8.mjs").then((n) => n.n));
 async function createSignalOutboundSender(params) {
 	const send = resolveOutboundSendDep(params.deps, "signal") ?? (await loadSignalSendRuntime()).sendMessageSignal;
 	const maxBytes = resolveChannelMediaMaxBytes({
@@ -1218,11 +1275,26 @@ async function createSignalOutboundSender(params) {
 		resolveChannelLimitMb: () => resolveSignalAccount(params).config.mediaMaxMb
 	});
 	return async (to, text, { replyToId, ...options }) => {
-		const replyOptions = await resolveSignalReplyOptions({
-			...params,
-			to,
-			replyToId
-		});
+		const normalizedReplyToId = normalizeOptionalString(replyToId);
+		let replyOptions = {};
+		if (normalizedReplyToId) {
+			const accountId = resolveSignalAccount({
+				cfg: params.cfg,
+				accountId: params.accountId
+			}).accountId;
+			const persistedContext = await resolveSignalReplyContextWithPersistence({
+				accountId,
+				to,
+				replyToId: normalizedReplyToId
+			});
+			const replyToAuthor = persistedContext?.ambiguous === true ? void 0 : persistedContext?.author;
+			const replyToBody = persistedContext?.ambiguous === true ? "" : [persistedContext?.body, formatSignalMediaText(persistedContext?.media ?? [])].filter(Boolean).join("\n");
+			replyOptions = {
+				replyToId: normalizedReplyToId,
+				...replyToAuthor ? { replyToAuthor } : {},
+				...replyToBody ? { replyToBody } : {}
+			};
+		}
 		return await send(to, text, {
 			cfg: params.cfg,
 			...options,
@@ -1249,26 +1321,6 @@ async function sendSignalOutbound(params) {
 		...params.mediaReadFile ? { mediaReadFile: params.mediaReadFile } : {}
 	});
 }
-async function resolveSignalReplyOptions(params) {
-	const replyToId = normalizeOptionalString(params.replyToId);
-	if (!replyToId) return {};
-	const accountId = resolveSignalAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	}).accountId;
-	const persistedContext = await resolveSignalReplyContextWithPersistence({
-		accountId,
-		to: params.to,
-		replyToId
-	});
-	const replyToAuthor = persistedContext?.ambiguous === true ? void 0 : persistedContext?.author;
-	const replyToBody = persistedContext?.ambiguous === true ? "" : [persistedContext?.body, formatSignalMediaText(persistedContext?.media ?? [])].filter(Boolean).join("\n");
-	return {
-		replyToId,
-		...replyToAuthor ? { replyToAuthor } : {},
-		...replyToBody ? { replyToBody } : {}
-	};
-}
 function inferSignalTargetChatType(rawTo) {
 	const to = rawTo.trim().replace(/^signal:/i, "").trim();
 	if (!to) return;
@@ -1300,133 +1352,6 @@ const signalMessageAdapter = defineChannelMessageAdapter({
 		media: sendSignalOutbound
 	}
 });
-function resolveSignalOutboundSessionRoute(params) {
-	const target = params.resolvedTarget?.to ?? params.target;
-	const resolved = resolveSignalOutboundTarget(target);
-	if (!resolved) return null;
-	const normalizedTarget = target.replace(/^signal:/i, "").trim();
-	const recipientSessionExact = resolved.chatType === "group" || /^\+?\d{3,15}$/.test(normalizedTarget) ? true : "direct-alias";
-	const baseSessionKey = buildOutboundBaseSessionKey({
-		channel: "signal",
-		cfg: params.cfg,
-		agentId: params.agentId,
-		accountId: params.accountId,
-		peer: resolved.peer
-	});
-	return {
-		sessionKey: baseSessionKey,
-		baseSessionKey,
-		recipientSessionExact,
-		...resolved
-	};
-}
-async function sendFormattedSignalText(ctx) {
-	const send = await createSignalOutboundSender(ctx);
-	const limit = resolveTextChunkLimit(ctx.cfg, "signal", ctx.accountId ?? void 0, { fallbackLimit: 4e3 });
-	const to = resolveSignalSendTarget(ctx);
-	const tableMode = resolveMarkdownTableMode({
-		cfg: ctx.cfg,
-		channel: "signal",
-		accountId: ctx.accountId ?? void 0
-	});
-	let chunks = markdownToSignalTextChunks(ctx.text, limit ?? Number.POSITIVE_INFINITY, { tableMode });
-	if (chunks.length === 0 && ctx.text) chunks = [{
-		text: ctx.text,
-		styles: []
-	}];
-	const effectiveReplyToMode = ctx.replyToMode ?? resolveSignalReplyToMode({
-		cfg: ctx.cfg,
-		accountId: ctx.accountId,
-		chatType: inferSignalTargetChatType(to)
-	});
-	const nextReplyToId = createReplyToFanout({
-		replyToId: ctx.replyToId,
-		replyToIdSource: ctx.replyToIdSource,
-		replyToMode: effectiveReplyToMode
-	});
-	const results = [];
-	for (const chunk of chunks) {
-		ctx.abortSignal?.throwIfAborted();
-		const result = await send(to, chunk.text, {
-			replyToId: nextReplyToId(),
-			textMode: "plain",
-			textStyles: chunk.styles
-		});
-		const deliveryResult = attachChannelToResult("signal", attachSignalVisibleText(result, chunk.text));
-		results.push(deliveryResult);
-		await ctx.onDeliveryResult?.(deliveryResult);
-	}
-	return results;
-}
-async function sendFormattedSignalMedia(ctx) {
-	ctx.abortSignal?.throwIfAborted();
-	const send = await createSignalOutboundSender(ctx);
-	const to = resolveSignalSendTarget(ctx);
-	const tableMode = resolveMarkdownTableMode({
-		cfg: ctx.cfg,
-		channel: "signal",
-		accountId: ctx.accountId ?? void 0
-	});
-	const formatted = markdownToSignalTextChunks(ctx.text, Number.POSITIVE_INFINITY, { tableMode })[0] ?? {
-		text: ctx.text,
-		styles: []
-	};
-	const result = await send(to, formatted.text, {
-		replyToId: ctx.replyToId,
-		mediaUrl: ctx.mediaUrl,
-		...ctx.mediaAccess ? { mediaAccess: ctx.mediaAccess } : {},
-		mediaLocalRoots: ctx.mediaLocalRoots,
-		...ctx.mediaReadFile ? { mediaReadFile: ctx.mediaReadFile } : {},
-		textMode: "plain",
-		textStyles: formatted.styles
-	});
-	return attachChannelToResult("signal", attachSignalVisibleText(result, formatted.text));
-}
-async function registerDeliveredSignalApprovalPayloadForReactions(params) {
-	const account = resolveSignalAccount({
-		cfg: params.cfg,
-		accountId: params.target.accountId ?? void 0
-	});
-	const targetAuthor = normalizeOptionalString(account.config.account);
-	const targetAuthorUuid = normalizeOptionalString(account.config.accountUuid);
-	if (!targetAuthor && !targetAuthorUuid) return;
-	const { registerSignalReactionTargetsForDeliveredPayload } = await import("./reaction-targets-BgPLDHBf.mjs").then((n) => n.t);
-	await registerSignalReactionTargetsForDeliveredPayload({
-		cfg: params.cfg,
-		target: {
-			...params.target,
-			accountId: account.accountId
-		},
-		payload: params.payload,
-		results: params.results,
-		targetAuthor,
-		targetAuthorUuid
-	});
-}
-async function renderSignalApprovalPayloadForReactions(params) {
-	const account = resolveSignalAccount({
-		cfg: params.ctx.cfg,
-		accountId: params.ctx.accountId ?? void 0
-	});
-	const targetAuthor = normalizeOptionalString(account.config.account);
-	const targetAuthorUuid = normalizeOptionalString(account.config.accountUuid);
-	if (!targetAuthor && !targetAuthorUuid) return null;
-	const { addSignalApprovalReactionHintToStructuredPayload } = await loadSignalApprovalReactionsModule();
-	const payload = materializeSignalPresentationFallback(params.payload, params.presentation);
-	const questionPayload = questionGatewayRuntime.prepareReactionPayloadForDelivery({
-		payload: params.payload,
-		presentation: params.presentation
-	});
-	if (questionPayload) return questionPayload;
-	return addSignalApprovalReactionHintToStructuredPayload({
-		cfg: params.ctx.cfg,
-		accountId: params.ctx.accountId ?? void 0,
-		to: params.ctx.to,
-		payload,
-		targetAuthor,
-		targetAuthorUuid
-	});
-}
 const signalPlugin = createChatChannelPlugin({
 	base: {
 		...createSignalPluginBase({
@@ -1462,7 +1387,26 @@ const signalPlugin = createChatChannelPlugin({
 			targetPrefixes: ["signal"],
 			normalizeTarget: normalizeSignalMessagingTarget,
 			inferTargetChatType: ({ to }) => inferSignalTargetChatType(to),
-			resolveOutboundSessionRoute: resolveSignalOutboundSessionRoute,
+			resolveOutboundSessionRoute: (params) => {
+				const target = params.resolvedTarget?.to ?? params.target;
+				const resolved = resolveSignalOutboundTarget(target);
+				if (!resolved) return null;
+				const normalizedTarget = target.replace(/^signal:/i, "").trim();
+				const recipientSessionExact = resolved.chatType === "group" || /^\+?\d{3,15}$/.test(normalizedTarget) ? true : "direct-alias";
+				const baseSessionKey = buildOutboundBaseSessionKey({
+					channel: "signal",
+					cfg: params.cfg,
+					agentId: params.agentId,
+					accountId: params.accountId,
+					peer: resolved.peer
+				});
+				return {
+					sessionKey: baseSessionKey,
+					baseSessionKey,
+					recipientSessionExact,
+					...resolved
+				};
+			},
 			targetResolver: {
 				looksLikeId: looksLikeSignalTargetId,
 				hint: "<E.164|uuid:ID|group:ID|signal:group:ID|signal:+E.164>",
@@ -1642,10 +1586,111 @@ const signalPlugin = createChatChannelPlugin({
 				payload,
 				hint
 			}),
-			afterDeliverPayload: registerDeliveredSignalApprovalPayloadForReactions,
-			renderPresentation: renderSignalApprovalPayloadForReactions,
-			sendFormattedText: sendFormattedSignalText,
-			sendFormattedMedia: sendFormattedSignalMedia
+			afterDeliverPayload: async (params) => {
+				const account = resolveSignalAccount({
+					cfg: params.cfg,
+					accountId: params.target.accountId ?? void 0
+				});
+				const targetAuthor = normalizeOptionalString(account.config.account);
+				const targetAuthorUuid = normalizeOptionalString(account.config.accountUuid);
+				if (!targetAuthor && !targetAuthorUuid) return;
+				const { registerSignalApprovalReactionTargetForDeliveredPayload } = await loadSignalApprovalReactionsModule();
+				await registerSignalApprovalReactionTargetForDeliveredPayload({
+					cfg: params.cfg,
+					target: {
+						...params.target,
+						accountId: account.accountId
+					},
+					payload: params.payload,
+					results: params.results,
+					targetAuthor,
+					targetAuthorUuid
+				});
+			},
+			renderPresentation: async (params) => {
+				const account = resolveSignalAccount({
+					cfg: params.ctx.cfg,
+					accountId: params.ctx.accountId ?? void 0
+				});
+				const targetAuthor = normalizeOptionalString(account.config.account);
+				const targetAuthorUuid = normalizeOptionalString(account.config.accountUuid);
+				if (!targetAuthor && !targetAuthorUuid) return null;
+				const { addSignalApprovalReactionHintToStructuredPayload } = await loadSignalApprovalReactionsModule();
+				const payload = materializeSignalPresentationFallback(params.payload, params.presentation);
+				return addSignalApprovalReactionHintToStructuredPayload({
+					cfg: params.ctx.cfg,
+					accountId: params.ctx.accountId ?? void 0,
+					to: params.ctx.to,
+					payload,
+					targetAuthor,
+					targetAuthorUuid
+				});
+			},
+			sendFormattedText: async (ctx) => {
+				const send = await createSignalOutboundSender(ctx);
+				const limit = resolveTextChunkLimit(ctx.cfg, "signal", ctx.accountId ?? void 0, { fallbackLimit: 4e3 });
+				const to = resolveSignalSendTarget(ctx);
+				const tableMode = resolveMarkdownTableMode({
+					cfg: ctx.cfg,
+					channel: "signal",
+					accountId: ctx.accountId ?? void 0
+				});
+				let chunks = markdownToSignalTextChunks(ctx.text, limit ?? Number.POSITIVE_INFINITY, {
+					tableMode,
+					chunkMode: ctx.formatting?.chunkMode ?? resolveChunkMode(ctx.cfg, "signal", ctx.accountId)
+				});
+				if (chunks.length === 0 && ctx.text) chunks = [{
+					text: ctx.text,
+					styles: []
+				}];
+				const effectiveReplyToMode = ctx.replyToMode ?? resolveSignalReplyToMode({
+					cfg: ctx.cfg,
+					accountId: ctx.accountId,
+					chatType: inferSignalTargetChatType(to)
+				});
+				const nextReplyToId = createReplyToFanout({
+					replyToId: ctx.replyToId,
+					replyToIdSource: ctx.replyToIdSource,
+					replyToMode: effectiveReplyToMode
+				});
+				const results = [];
+				for (const chunk of chunks) {
+					ctx.abortSignal?.throwIfAborted();
+					const result = await send(to, chunk.text, {
+						replyToId: nextReplyToId(),
+						textMode: "plain",
+						textStyles: chunk.styles
+					});
+					const deliveryResult = attachChannelToResult("signal", attachSignalVisibleText(result, chunk.text));
+					results.push(deliveryResult);
+					await ctx.onDeliveryResult?.(deliveryResult);
+				}
+				return results;
+			},
+			sendFormattedMedia: async (ctx) => {
+				ctx.abortSignal?.throwIfAborted();
+				const send = await createSignalOutboundSender(ctx);
+				const to = resolveSignalSendTarget(ctx);
+				const tableMode = resolveMarkdownTableMode({
+					cfg: ctx.cfg,
+					channel: "signal",
+					accountId: ctx.accountId ?? void 0
+				});
+				const formatted = markdownToSignalTextChunks(ctx.text, Number.POSITIVE_INFINITY, { tableMode })[0] ?? {
+					text: ctx.text,
+					styles: []
+				};
+				const result = await send(to, formatted.text, {
+					replyToId: ctx.replyToId,
+					mediaUrl: ctx.mediaUrl,
+					...ctx.mediaAccess ? { mediaAccess: ctx.mediaAccess } : {},
+					mediaLocalRoots: ctx.mediaLocalRoots,
+					...ctx.mediaReadFile ? { mediaReadFile: ctx.mediaReadFile } : {},
+					textMode: "plain",
+					textStyles: formatted.styles
+				});
+				return attachChannelToResult("signal", attachSignalVisibleText(result, formatted.text));
+			}
 		},
 		attachedResults: {
 			channel: "signal",
@@ -1655,4 +1700,4 @@ const signalPlugin = createChatChannelPlugin({
 	}
 });
 //#endregion
-export { markdownToSignalTextChunks as C, markdownToSignalText as S, materializeSignalPresentationFallback as _, formatSignalDaemonDroppedEnvNotice as a, resolveSignalReactionLevel as b, normalizeSignalAccountInput as c, signalNumberTextInput as d, signalSetupContract as f, registerSignalReplyContext as g, writeSignalAccountTransport as h, buildSignalDaemonEnv as i, signalCompletionNote as l, probeSignalTransport as m, createSignalPluginBase as n, listSignalDaemonDroppedEnvHints as o, prepareSignalManagedNativeTransport as p, signalSetupWizard as r, createSignalCliPathTextInput as s, signalPlugin as t, signalDmPolicy as u, resolveSignalOutboundTarget as v, isSignalNativeApprovalHandlerConfigured as w, formatSignalMediaText as x, signalMessageActions as y };
+export { isSignalNativeApprovalHandlerConfigured as A, signalCheck as C, formatSignalMediaText as D, resolveSignalReactionLevel as E, markdownToSignalText as O, resolveSignalRpcContext as S, streamSignalEvents as T, materializeSignalPresentationFallback as _, formatSignalDaemonDroppedEnvNotice as a, removeReactionSignal as b, normalizeSignalAccountInput as c, signalNumberTextInput as d, signalSetupContract as f, registerSignalReplyContext as g, writeSignalAccountTransport as h, buildSignalDaemonEnv as i, markdownToSignalTextChunks as k, signalCompletionNote as l, probeSignalTransport as m, createSignalPluginBase as n, listSignalDaemonDroppedEnvHints as o, prepareSignalManagedNativeTransport as p, signalSetupWizard as r, createSignalCliPathTextInput as s, signalPlugin as t, signalDmPolicy as u, resolveSignalOutboundTarget as v, signalRpcRequest as w, sendReactionSignal as x, signalMessageActions as y };