@brantrusnak/openclaw-omadeus 1.0.4 → 1.0.6

package/dist/src/api/message.api.js

@@ -16,7 +16,7 @@ async function sendRoomMessage(opts, params) {
 			method: "SEND",
 			body: JSON.stringify({
 				body: params.body,
-				temporaryId: generateTemporaryId(),
+				temporaryId: params.temporaryId ?? generateTemporaryId(),
 				links: "[]"
 			})
 		});
@@ -38,6 +38,17 @@ async function sendRoomMessage(opts, params) {
 		};
 	}
 }
+async function seeMessage(opts, params) {
+	const res = await jaguarFetch(opts, `/messages/${params.messageId}`, {
+		method: "SEE",
+		body: "{}"
+	});
+	if (!res.ok) {
+		const text = await res.text().catch(() => "");
+		throw new Error(`Omadeus see message failed (${res.status}): ${text.slice(0, 200)}`);
+	}
+	return await res.json();
+}
 async function editMessage(opts, params) {
 	const res = await jaguarFetch(opts, `/messages/${params.messageId}`, {
 		method: "EDIT",
@@ -73,4 +84,4 @@ async function addMessageReaction(opts, params) {
 	return readJsonOrEmpty(res);
 }
 //#endregion
-export { addMessageReaction, deleteMessage, editMessage, sendRoomMessage };
+export { addMessageReaction, deleteMessage, editMessage, seeMessage, sendRoomMessage };

package/dist/src/channel.js

@@ -1,5 +1,6 @@
 import { DEFAULT_ACCOUNT_ID, missingTargetError } from "../runtime-api.js";
 import { ALLOWED_OMADEUS_REACTION_EMOJI_LIST, isAllowedOmadeusReactionEmoji } from "./allowed-reaction-emojis.js";
+import { generateTemporaryId } from "./utils/http.util.js";
 import { createNugget, resolveTaskRoomIdByNumber } from "./api/nugget.api.js";
 import { addMessageReaction, deleteMessage, editMessage } from "./api/message.api.js";
 import { getOmadeusChannelConfig, listOmadeusAccountIds, resolveDefaultOmadeusAccountId, resolveOmadeusAccount } from "./config.js";
@@ -8,6 +9,7 @@ import { parseTaskChannelTargetIntent } from "./nugget-lookup.js";
 import { sendOmadeusMessage } from "./outbound.js";
 import { getOmadeusRuntime } from "./runtime.js";
 import { createOmadeusMessageHandler } from "./message-handler.js";
+import { SentMessageTracker } from "./sent-message-tracker.js";
 import { omadeusSetupAdapter } from "./setup-core.js";
 import { omadeusSetupWizard } from "./onboarding.js";
 import "./setup-surface.js";
@@ -23,14 +25,16 @@ const CHANNEL_ID = "omadeus";
 const gatewayState = {
 	tokenManager: null,
 	dolphin: null,
-	jaguar: null
+	jaguar: null,
+	sentTracker: null
 };
 const isUnconfigured = (account) => account.credentialSource === "none";
 let lastPersistedToken = null;
-async function persistSessionToken(token) {
+async function persistSessionToken(token, environment) {
 	if (lastPersistedToken === token) return;
 	const runtime = getOmadeusRuntime();
-	if ((getOmadeusChannelConfig(runtime.config.current()) ?? {}).sessionToken === token) {
+	const section = getOmadeusChannelConfig(runtime.config.current()) ?? {};
+	if (section.sessionToken === token && section.sessionTokenEnvironment === environment) {
 		lastPersistedToken = token;
 		return;
 	}
@@ -41,7 +45,8 @@ async function persistSessionToken(token) {
 				...draft.channels ?? {},
 				omadeus: {
 					...getOmadeusChannelConfig(draft) ?? {},
-					sessionToken: token
+					sessionToken: token,
+					sessionTokenEnvironment: environment
 				}
 			};
 		}
@@ -82,12 +87,12 @@ const omadeusConfigAdapter = createTopLevelChannelConfigAdapter({
 	defaultAccountId: resolveDefaultOmadeusAccountId,
 	deleteMode: "clear-fields",
 	clearBaseFields: [
-		"casUrl",
-		"maestroUrl",
+		"environment",
 		"email",
 		"password",
 		"organizationId",
 		"sessionToken",
+		"sessionTokenEnvironment",
 		"inbound"
 	],
 	resolveAllowFrom: () => [],
@@ -249,10 +254,17 @@ const omadeusPlugin = {
 				if (messageId == null) return actionError("Omadeus edit requires `messageId` (Jaguar message id) or current inbound MessageSid.", "Missing messageId for edit.");
 				if (!body) return actionError("Omadeus edit requires new text in `message`, `text`, or `content`.", "Missing body for edit.");
 				try {
-					await editMessage(apiOpts(), {
-						messageId,
+					const temporaryId = generateTemporaryId();
+					gatewayState.sentTracker?.trackOutbound({
+						temporaryId,
 						body
 					});
+					const edited = await editMessage(apiOpts(), {
+						messageId,
+						body,
+						temporaryId
+					});
+					if (typeof edited?.id === "number") gatewayState.sentTracker?.trackId(edited.id);
 				} catch (err) {
 					return actionError(err instanceof Error ? err.message : String(err));
 				}
@@ -374,7 +386,8 @@ const omadeusPlugin = {
 						maestroUrl: resolveOmadeusAccount({ cfg }).maestroUrl,
 						tokenManager: gatewayState.tokenManager
 					},
-					jaguarSocket: gatewayState.jaguar
+					jaguarSocket: gatewayState.jaguar,
+					sentTracker: gatewayState.sentTracker ?? void 0
 				}, {
 					to,
 					text
@@ -473,7 +486,7 @@ const omadeusPlugin = {
 			initialToken: account.sessionToken,
 			onRefresh: (token) => {
 				log.info("[omadeus] token refreshed");
-				persistSessionToken(token).catch((err) => log.warn(`[omadeus] failed to persist session token: ${String(err)}`));
+				persistSessionToken(token, account.environment).catch((err) => log.warn(`[omadeus] failed to persist session token: ${String(err)}`));
 			},
 			onError: (err) => {
 				log.error(`[omadeus] token refresh failed: ${err.message}`);
@@ -498,12 +511,15 @@ const omadeusPlugin = {
 		tokenManager.startAutoRefresh();
 		gatewayState.tokenManager = tokenManager;
 		const selfReferenceId = tokenManager.getPayload().referenceId;
+		const sentTracker = new SentMessageTracker();
+		gatewayState.sentTracker = sentTracker;
 		const outboundDeps = {
 			apiOpts: {
 				maestroUrl: account.maestroUrl,
 				tokenManager
 			},
-			jaguarSocket: null
+			jaguarSocket: null,
+			sentTracker
 		};
 		const handleMessage = createOmadeusMessageHandler({
 			cfg,
@@ -519,6 +535,16 @@ const omadeusPlugin = {
 			onMessage: (msg) => {
 				const label = msg.subscribableKind === "direct" ? `DM from ${msg.senderReferenceId}` : `${msg.subscribableKind}/${msg.roomName ?? msg.roomId} from ${msg.senderReferenceId}`;
 				log.info(`[jaguar] ${label}: ${msg.body.slice(0, 80)}`);
+				if (sentTracker.isEcho({
+					id: msg.id,
+					temporaryId: msg.temporaryId,
+					body: msg.body,
+					roomId: msg.roomId,
+					fromSelf: msg.senderReferenceId === selfReferenceId
+				})) {
+					log.debug?.(`[jaguar] suppressed self-echo id=${msg.id}`);
+					return;
+				}
 				const inbound = parseJaguarMessage(msg, { selfReferenceId }, log);
 				if (inbound) {
 					log.info(`[jaguar] inbound: ${inbound.subscribableKind} room=${inbound.roomId} from=${inbound.from} mention=${inbound.isMention}`);
@@ -605,6 +631,7 @@ const omadeusPlugin = {
 			gatewayState.tokenManager = null;
 			gatewayState.jaguar = null;
 			gatewayState.dolphin = null;
+			gatewayState.sentTracker = null;
 			lastPersistedToken = null;
 			ctx.setStatus({
 				accountId: account.accountId,

package/dist/src/config.js

@@ -1,5 +1,5 @@
 import { DEFAULT_ACCOUNT_ID } from "../runtime-api.js";
-import "./defaults.js";
+import { getOmadeusEnvironmentUrls, resolveOmadeusEnvironment } from "./defaults.js";
 //#region src/config.ts
 function getOmadeusChannelConfig(cfg) {
 	return cfg.channels?.["omadeus"];
@@ -14,11 +14,15 @@ function resolveDefaultOmadeusAccountId(_cfg) {
 function resolveOmadeusAccount(params) {
 	const { cfg } = params;
 	const section = getOmadeusChannelConfig(cfg) ?? {};
+	const environment = resolveOmadeusEnvironment(section.environment);
+	const { casUrl, maestroUrl } = getOmadeusEnvironmentUrls(environment);
 	const envCredentials = resolveOmadeusEnvCredentials();
 	const email = section.email?.trim() || envCredentials?.email || "";
 	const password = section.password?.trim() || envCredentials?.password || "";
 	const orgId = section.organizationId ?? envCredentials?.organizationId;
-	const sessionToken = section.sessionToken?.trim() ?? "";
+	const rawSessionToken = section.sessionToken?.trim() ?? "";
+	const sessionTokenEnvironment = resolveOmadeusEnvironment(section.sessionTokenEnvironment);
+	const sessionToken = Boolean(rawSessionToken) && sessionTokenEnvironment === environment ? rawSessionToken : "";
 	const hasCredentials = Boolean(email && password && orgId);
 	const hasSessionToken = Boolean(sessionToken);
 	const credentialSource = Boolean(section.email?.trim() && section.password?.trim() && section.organizationId) ? "config" : hasCredentials ? "env" : hasSessionToken ? "session" : "none";
@@ -27,8 +31,9 @@ function resolveOmadeusAccount(params) {
 		name: "Omadeus",
 		enabled: section.enabled !== false,
 		config: section,
-		casUrl: section.casUrl?.trim() || "https://dev1-cas.rouztech.com",
-		maestroUrl: section.maestroUrl?.trim() || "https://dev3-maestro.rouztech.com",
+		environment,
+		casUrl,
+		maestroUrl,
 		email,
 		password,
 		organizationId: orgId ?? 0,

package/dist/src/defaults.js

@@ -1,5 +1,31 @@
-//#region src/defaults.ts
-const OMADEUS_CAS_URL = "https://dev1-cas.rouztech.com";
-const OMADEUS_MAESTRO_URL = "https://dev3-maestro.rouztech.com";
+const OMADEUS_ENVIRONMENTS = {
+	production: {
+		label: "Production",
+		casUrl: "https://xas.xeba.tech",
+		maestroUrl: "https://maestro.xeba.tech"
+	},
+	staging: {
+		label: "Staging",
+		casUrl: "https://staging-xas.xeba.tech",
+		maestroUrl: "https://staging.xeba.tech"
+	},
+	dev: {
+		label: "Dev",
+		casUrl: "https://dev1-cas.rouztech.com",
+		maestroUrl: "https://dev1-maestro.rouztech.com"
+	}
+};
+const OMADEUS_ENVIRONMENT_SET = new Set(Object.keys(OMADEUS_ENVIRONMENTS));
+function resolveOmadeusEnvironment(value) {
+	if (typeof value === "string" && OMADEUS_ENVIRONMENT_SET.has(value)) return value;
+	return "dev";
+}
+function getOmadeusEnvironmentUrls(env) {
+	const config = OMADEUS_ENVIRONMENTS[env];
+	return {
+		casUrl: config.casUrl,
+		maestroUrl: config.maestroUrl
+	};
+}
 //#endregion
-export { OMADEUS_CAS_URL, OMADEUS_MAESTRO_URL };
+export { OMADEUS_ENVIRONMENTS, getOmadeusEnvironmentUrls, resolveOmadeusEnvironment };

package/dist/src/inbound-policy.js

@@ -42,7 +42,8 @@ function surfaceForKind(kind) {
 	if (kind === "channel") return "channel";
 	return "entity";
 }
-function senderAllowed(allowed, fromReferenceId) {
+function senderAllowed(allowed, fromReferenceId, selfReferenceId) {
+	if (fromReferenceId === selfReferenceId) return true;
 	if (!allowed || allowed.length === 0) return true;
 	return allowed.includes(fromReferenceId);
 }
@@ -85,18 +86,14 @@ function mentionRequired(params) {
 }
 /**
 * Evaluate whether a normalized Jaguar inbound should be dispatched to OpenClaw.
-* Callers must drop self-authored messages separately if they prefer logging there.
+*
+* The logged-in user (`selfReferenceId`) is always treated as an allowed sender
+* so they can message their own OpenClaw even if the stored allowlist predates
+* them. Self-authored *echoes* (the reply loop) are filtered earlier, at socket
+* ingestion, by the {@link SentMessageTracker} — not here.
 */
 function evaluateOmadeusInboundPolicy(params) {
 	const { inbound, omadeusCfg, selfReferenceId } = params;
-	if (inbound.fromReferenceId === selfReferenceId) return {
-		allow: false,
-		reason: "self_message",
-		details: {
-			fromReferenceId: inbound.fromReferenceId,
-			selfReferenceId
-		}
-	};
 	const policy = mergePolicy(omadeusCfg);
 	const surface = surfaceForKind(inbound.subscribableKind);
 	if (surface === "direct") {
@@ -105,7 +102,7 @@ function evaluateOmadeusInboundPolicy(params) {
 			reason: "direct_disabled",
 			details: { surface }
 		};
-		if (!senderAllowed(policy.direct.allowedSenderReferenceIds, inbound.fromReferenceId)) return {
+		if (!senderAllowed(policy.direct.allowedSenderReferenceIds, inbound.fromReferenceId, selfReferenceId)) return {
 			allow: false,
 			reason: "direct_sender_not_allowed",
 			details: { fromReferenceId: inbound.fromReferenceId }
@@ -128,7 +125,7 @@ function evaluateOmadeusInboundPolicy(params) {
 			reason: "channels_disabled",
 			details: { surface }
 		};
-		if (!senderAllowed(policy.channels.allowedSenderReferenceIds, inbound.fromReferenceId)) return {
+		if (!senderAllowed(policy.channels.allowedSenderReferenceIds, inbound.fromReferenceId, selfReferenceId)) return {
 			allow: false,
 			reason: "channel_sender_not_allowed",
 			details: { fromReferenceId: inbound.fromReferenceId }
@@ -139,7 +136,7 @@ function evaluateOmadeusInboundPolicy(params) {
 			allowedRoomIds: policy.channels.allowedRoomIds,
 			allowedChannelViewIds: policy.channels.allowedChannelViewIds
 		});
-		const senderInList = !policy.channels.allowedSenderReferenceIds || policy.channels.allowedSenderReferenceIds.length === 0 || policy.channels.allowedSenderReferenceIds.includes(inbound.fromReferenceId);
+		const senderInList = inbound.fromReferenceId === selfReferenceId || !policy.channels.allowedSenderReferenceIds || policy.channels.allowedSenderReferenceIds.length === 0 || policy.channels.allowedSenderReferenceIds.includes(inbound.fromReferenceId);
 		const inAllowlist = rv.geoInAllowlist && senderInList;
 		const channelMention = policy.channels.requireMention ?? DEFAULT_INBOUND_POLICY.channels.requireMention;
 		if (mentionRequired({
@@ -170,7 +167,7 @@ function evaluateOmadeusInboundPolicy(params) {
 			allowedKinds: policy.entities.allowedKinds
 		}
 	};
-	if (!senderAllowed(policy.entities.allowedSenderReferenceIds, inbound.fromReferenceId)) return {
+	if (!senderAllowed(policy.entities.allowedSenderReferenceIds, inbound.fromReferenceId, selfReferenceId)) return {
 		allow: false,
 		reason: "entity_sender_not_allowed",
 		details: { fromReferenceId: inbound.fromReferenceId }

package/dist/src/message-handler.js

@@ -1,5 +1,6 @@
 import { logInboundDrop, resolveControlCommandGate } from "../runtime-api.js";
 import { createNugget, findNuggetByTaskChannelRoom, resolveTaskChannelRoomId, searchNuggetByNumber } from "./api/nugget.api.js";
+import { seeMessage } from "./api/message.api.js";
 import { getOmadeusChannelConfig } from "./config.js";
 import { appendNuggetContextForTaskOrNuggetRoom, appendNuggetLookupContextForAgent, parseChannelTaskCreateIntent, parseNuggetLookupIntent, parseRecurringScheduleIntent } from "./nugget-lookup.js";
 import { getOmadeusRuntime } from "./runtime.js";
@@ -36,7 +37,17 @@ function createOmadeusMessageHandler(deps) {
 		cfg,
 		channel: "omadeus"
 	});
-	const handleMessageNow = async (inbound) => {
+	/** Mark inbound messages as seen in Omadeus (fire-and-forget). */
+	const markMessagesSeen = (messageIds) => {
+		for (const messageId of messageIds) {
+			if (!Number.isFinite(messageId)) continue;
+			log.info(`omadeus: marking message ${messageId} seen`);
+			seeMessage(outboundDeps.apiOpts, { messageId }).then(() => log.debug?.(`omadeus: marked message ${messageId} seen`)).catch((err) => {
+				log.warn(`omadeus: failed to mark message ${messageId} seen: ${err instanceof Error ? err.message : String(err)}`);
+			});
+		}
+	};
+	const handleMessageNow = async (inbound, ackMessageIds = [inbound.messageId]) => {
 		const isDirectMessage = inbound.subscribableKind === "direct";
 		const senderId = String(inbound.fromReferenceId);
 		const senderName = inbound.from;
@@ -77,6 +88,7 @@ function createOmadeusMessageHandler(deps) {
 			});
 			return;
 		}
+		if (inbound.fromReferenceId !== selfReferenceId) markMessagesSeen(ackMessageIds);
 		let bodyForAgent = rawBody;
 		const createIntent = parseChannelTaskCreateIntent(rawBody);
 		if (createIntent) try {
@@ -248,7 +260,7 @@ function createOmadeusMessageHandler(deps) {
 				...last,
 				content: combinedContent,
 				isMention: entries.some((e) => e.isMention)
-			});
+			}, entries.map((e) => e.messageId));
 		},
 		onError: (err) => {
 			runtime.error?.(`omadeus debounce flush failed: ${String(err)}`);

package/dist/src/onboarding.js

@@ -1,4 +1,4 @@
-import { OMADEUS_CAS_URL, OMADEUS_MAESTRO_URL } from "./defaults.js";
+import { OMADEUS_ENVIRONMENTS, getOmadeusEnvironmentUrls, resolveOmadeusEnvironment } from "./defaults.js";
 import { getOmadeusChannelConfig, resolveOmadeusAccount } from "./config.js";
 import { listOrganizationMembers, listOrganizations } from "./api/auth.api.js";
 import { formatMemberLabel } from "./member-resolve.js";
@@ -19,17 +19,26 @@ function formatAuthError(err) {
 	} else if (typeof cause === "string" && cause.trim()) parts.push(cause);
 	return parts.join(" — ");
 }
-async function noteOmadeusAuthHelp(prompter) {
+async function noteOmadeusAuthHelp(prompter, environment) {
+	const envLabel = OMADEUS_ENVIRONMENTS[environment].label;
 	await prompter.note([
-		"Omadeus authenticates via CAS + Maestro (email + password + organization).",
-		"You need:",
-		"  - Email + password",
-		"  - Organization ID (we can look it up for you)",
-		`CAS URL: ${OMADEUS_CAS_URL}`,
-		`Maestro URL: ${OMADEUS_MAESTRO_URL}`,
-		"Env vars supported: OMADEUS_EMAIL, OMADEUS_PASSWORD, OMADEUS_ORGANIZATION_ID."
+		`Connect OpenClaw to Omadeus (${envLabel}).`,
+		"",
+		"We'll ask for your email and password, then show the organizations on your account so you can pick one."
 	].join("\n"), "Omadeus setup");
 }
+async function promptEnvironment(prompter, existing) {
+	const initial = existing ?? "dev";
+	return resolveOmadeusEnvironment(await prompter.select({
+		message: "Select Omadeus environment",
+		options: Object.keys(OMADEUS_ENVIRONMENTS).map((env) => ({
+			value: env,
+			label: OMADEUS_ENVIRONMENTS[env].label,
+			hint: getOmadeusEnvironmentUrls(env).maestroUrl
+		})),
+		initialValue: initial
+	}));
+}
 async function promptOrganizationId(params) {
 	const { prompter, maestroUrl, email, existing } = params;
 	try {
@@ -143,28 +152,43 @@ async function promptCredentials(prompter, existing) {
 		})).trim()
 	};
 }
-async function promptSenderAllowlist(params) {
-	const { prompter, message, members, existingReferenceIds } = params;
-	if (members.length === 0) throw new Error("No organization members found.");
-	if (await prompter.select({
-		message,
-		options: [{
-			value: "all",
-			label: "All users",
-			hint: "No sender allowlist"
-		}, {
-			value: "specific",
-			label: "Specific users",
-			hint: "Select one or more users"
-		}],
-		initialValue: existingReferenceIds && existingReferenceIds.length > 0 ? "specific" : "all"
-	}) === "all") return;
-	return readReferenceIds(await promptMultiSelect({
-		prompter,
-		message: `${message} (specific users)`,
-		options: memberOptions(members),
-		initialValues: existingReferenceIds?.map(String)
-	}));
+/**
+* Prompt for the set of users allowed to message this OpenClaw instance.
+*
+* This single allowlist governs direct messages, channels, and entity rooms.
+* There is no "all users" option: only whitelisted members may message
+* OpenClaw. The logged-in user is always added
+* to the allowlist (and is excluded from the selectable list by the caller) so
+* they can interact with their own OpenClaw. Self-authored echoes (the reply
+* loop) are filtered earlier, at socket ingestion, by the SentMessageTracker —
+* not by the inbound policy — so allowing yourself here cannot cause a loop.
+*/
+async function promptMessagingAllowlist(params) {
+	const { prompter, members, selfReferenceId, existingReferenceIds } = params;
+	let selected = [];
+	if (members.length === 0) await prompter.note("No other organization members found. Only you will be able to message OpenClaw.", "Omadeus messaging allowlist");
+	else {
+		const memberReferenceIds = new Set(members.map((member) => member.referenceId));
+		const initialValues = (existingReferenceIds ?? []).filter((id) => id !== selfReferenceId && memberReferenceIds.has(id)).map(String);
+		selected = readReferenceIds(await promptMultiSelect({
+			prompter,
+			message: "Which users do you want to be able to message this OpenClaw instance? (You are always allowed.)",
+			options: memberOptions(members),
+			initialValues
+		}));
+	}
+	return Array.from(new Set([selfReferenceId, ...selected]));
+}
+/**
+* Ask whether an @mention is required to trigger OpenClaw in a given surface
+* (channels or entity rooms). DMs never use this — you can't @mention in a DM.
+*/
+async function promptRequireMention(params) {
+	if (params.existing === "outsideAllowlist") return "outsideAllowlist";
+	return await params.prompter.confirm({
+		message: `Require an @mention to trigger OpenClaw in ${params.surfaceLabel}?`,
+		initialValue: params.existing ? params.existing !== "never" : true
+	}) ? "always" : "never";
 }
 async function promptEntityKindSelection(params) {
 	const selected = await promptMultiSelect({
@@ -208,11 +232,11 @@ const omadeusSetupWizard = {
 		const account = resolveOmadeusAccount({ cfg });
 		const section = getOmadeusChannelConfig(cfg) ?? {};
 		let next = cfg;
-		if (account.credentialSource === "none") await noteOmadeusAuthHelp(prompter);
+		const environment = await promptEnvironment(prompter, section.environment ? resolveOmadeusEnvironment(section.environment) : void 0);
+		const { casUrl, maestroUrl } = getOmadeusEnvironmentUrls(environment);
+		if (account.credentialSource === "none") await noteOmadeusAuthHelp(prompter, environment);
 		const envEmail = process.env.OMADEUS_EMAIL?.trim();
 		const envPassword = process.env.OMADEUS_PASSWORD?.trim();
-		const casUrl = OMADEUS_CAS_URL;
-		const maestroUrl = OMADEUS_MAESTRO_URL;
 		let { email, password } = await promptCredentials(prompter, {
 			email: section.email ?? envEmail,
 			password: section.password ?? envPassword
@@ -260,11 +284,15 @@ const omadeusSetupWizard = {
 			excludeReferenceIds: [selfReferenceId]
 		});
 		const existingInbound = section.inbound;
-		const directSenderIds = await promptSenderAllowlist({
+		const allowedUserReferenceIds = await promptMessagingAllowlist({
 			prompter,
-			message: "Which users can DM OpenClaw directly?",
 			members,
-			existingReferenceIds: existingInbound?.direct?.allowedSenderReferenceIds
+			selfReferenceId,
+			existingReferenceIds: Array.from(new Set([
+				...existingInbound?.direct?.allowedSenderReferenceIds ?? [],
+				...existingInbound?.channels?.allowedSenderReferenceIds ?? [],
+				...existingInbound?.entities?.allowedSenderReferenceIds ?? []
+			]))
 		});
 		const selectedChannels = await promptChannelSelection({
 			prompter,
@@ -273,33 +301,34 @@ const omadeusSetupWizard = {
 			memberReferenceId: selfReferenceId,
 			existingChannelViewIds: existingInbound?.channels?.allowedChannelViewIds
 		});
-		const channelSenderIds = selectedChannels.length > 0 ? await promptSenderAllowlist({
+		const channelSenderIds = selectedChannels.length > 0 ? allowedUserReferenceIds : void 0;
+		const channelRequireMention = selectedChannels.length > 0 ? await promptRequireMention({
 			prompter,
-			message: "Which users can trigger OpenClaw from allowed channels?",
-			members,
-			existingReferenceIds: existingInbound?.channels?.allowedSenderReferenceIds
-		}) : void 0;
+			surfaceLabel: "allowed channels",
+			existing: existingInbound?.channels?.requireMention
+		}) : "never";
 		const entityKinds = await promptEntityKindSelection({
 			prompter,
 			existingKinds: existingInbound?.entities?.allowedKinds
 		});
-		const entitySenderIds = entityKinds.length > 0 ? await promptSenderAllowlist({
+		const entitySenderIds = entityKinds.length > 0 ? allowedUserReferenceIds : void 0;
+		const entityRequireMention = entityKinds.length > 0 ? await promptRequireMention({
 			prompter,
-			message: "Which users can trigger OpenClaw from entity rooms?",
-			members,
-			existingReferenceIds: existingInbound?.entities?.allowedSenderReferenceIds
-		}) : void 0;
+			surfaceLabel: "entity rooms",
+			existing: existingInbound?.entities?.requireMention
+		}) : "never";
 		const channelRoomIds = selectedChannels.flatMap((selectedChannel) => [selectedChannel.publicRoomId, selectedChannel.privateRoomId]).filter((id) => typeof id === "number");
 		const channelViewIds = selectedChannels.map((selectedChannel) => selectedChannel.id);
 		const channelTitles = selectedChannels.map((selectedChannel) => selectedChannel.title || `Channel ${selectedChannel.id}`).join(", ");
 		const senderSummary = (ids) => ids && ids.length > 0 ? ids.join(", ") : "all users";
-		const entityKindSummary = entityKinds.length > 0 ? entityKinds.join(", ") : "none (entity rooms disabled)";
-		const channelSummary = selectedChannels.length > 0 ? `- Channels "${channelTitles}": rooms ${channelRoomIds.join(", ") || "(no room ids)"} from ${senderSummary(channelSenderIds)}; @mention not required in those rooms.` : "- Channels: disabled (none selected).";
+		const mentionSummary = (require) => require === "never" ? "no @mention required" : require === "outsideAllowlist" ? "@mention required outside the allowlist" : "@mention required";
+		const channelSummary = selectedChannels.length > 0 ? `- Channels "${channelTitles}": rooms ${channelRoomIds.join(", ") || "(no room ids)"} from ${senderSummary(channelSenderIds)}; ${mentionSummary(channelRequireMention)}.` : "- Channels: disabled (none selected).";
+		const entitySummary = entityKinds.length > 0 ? `- Entity rooms (${entityKinds.join(", ")}): ${senderSummary(entitySenderIds)}; ${mentionSummary(entityRequireMention)}.` : "- Entity rooms: disabled (no room types selected).";
 		await prompter.note([
 			`Inbound policy (Jaguar chat):`,
-			`- Direct messages: enabled for ${senderSummary(directSenderIds)} (no @mention required).`,
+			`- Direct messages: enabled for ${senderSummary(allowedUserReferenceIds)}.`,
 			channelSummary,
-			`- Entity rooms (${entityKindSummary}): ${senderSummary(entitySenderIds)}; @mention required.`
+			entitySummary
 		].join("\n"), "Omadeus inbound policy");
 		next = {
 			...next,
@@ -307,17 +336,17 @@ const omadeusSetupWizard = {
 				...next.channels,
 				omadeus: {
 					enabled: true,
-					casUrl,
-					maestroUrl,
+					environment,
 					email,
 					password,
 					organizationId,
 					sessionToken,
+					sessionTokenEnvironment: environment,
 					inbound: {
 						version: 1,
 						direct: {
 							enabled: true,
-							...directSenderIds ? { allowedSenderReferenceIds: directSenderIds } : {},
+							allowedSenderReferenceIds: allowedUserReferenceIds,
 							requireMention: "never"
 						},
 						channels: {
@@ -325,13 +354,13 @@ const omadeusSetupWizard = {
 							allowedRoomIds: channelRoomIds,
 							allowedChannelViewIds: channelViewIds,
 							...channelSenderIds ? { allowedSenderReferenceIds: channelSenderIds } : {},
-							requireMention: "outsideAllowlist"
+							requireMention: channelRequireMention
 						},
 						entities: {
 							enabled: entityKinds.length > 0,
 							allowedKinds: entityKinds,
 							...entitySenderIds ? { allowedSenderReferenceIds: entitySenderIds } : {},
-							requireMention: "always"
+							requireMention: entityRequireMention
 						}
 					}
 				}

package/dist/src/outbound.js

@@ -1,12 +1,21 @@
+import { generateTemporaryId } from "./utils/http.util.js";
 import { sendRoomMessage } from "./api/message.api.js";
 //#region src/outbound.ts
 async function sendOmadeusMessage(deps, params) {
 	const { to, text } = params;
+	const temporaryId = generateTemporaryId();
+	deps.sentTracker?.trackOutbound({
+		temporaryId,
+		body: text,
+		roomId: to
+	});
 	const result = await sendRoomMessage(deps.apiOpts, {
 		roomId: to,
-		body: text
+		body: text,
+		temporaryId
 	});
 	if (!result.ok) throw new Error(`Omadeus send failed: ${result.error}`);
+	if (typeof result.message?.id === "number") deps.sentTracker?.trackId(result.message.id);
 	return {
 		channel: "omadeus",
 		messageId: String(result.message?.id ?? ""),