message ops

Author: Shaw

cloud/packages/tests/unit/eliza-agent-provision-route.test.ts

@@ -148,6 +148,7 @@ function installMocks(state: MockState): void {
         }
         return state.enqueueResult;
       },
+      triggerImmediate: async () => undefined,
     },
   }));
 

packages/core/src/services/message.ts

@@ -1113,11 +1113,79 @@ function createV5MessageContextObject(args: {
 	});
 }
 
-function renderV5MessageHandlerPrompt(context: ContextObject): string {
-	return v5MessageHandlerTemplate.replace(
-		"{{contextObject}}",
-		JSON.stringify(context, null, 2),
-	);
+/**
+ * Format the role-filtered context catalog as a compact bullet list for the
+ * Stage 1 prompt. Each line is `- <id>: <description>` (or just `- <id>` when
+ * no description is available). Order is preserved from the registry, which
+ * keeps the rendered prefix byte-stable across iterations.
+ */
+export function formatAvailableContextsForPrompt(
+	contexts: readonly ContextDefinition[],
+): string {
+	if (contexts.length === 0) {
+		return "(no contexts registered)";
+	}
+	return contexts
+		.map((definition) => {
+			const description = definition.description?.trim();
+			return description
+				? `- ${definition.id}: ${description}`
+				: `- ${definition.id}`;
+		})
+		.join("\n");
+}
+
+function renderV5MessageHandlerPrompt(
+	context: ContextObject,
+	availableContexts: readonly ContextDefinition[] = [],
+): string {
+	return v5MessageHandlerTemplate
+		.replace("{{contextObject}}", JSON.stringify(context, null, 2))
+		.replace(
+			"{{availableContexts}}",
+			formatAvailableContextsForPrompt(availableContexts),
+		);
+}
+
+/**
+ * Resolve the calling sender's role for context-catalog filtering.
+ *
+ * This is best-effort: when there is no world context (DM-only sessions,
+ * benchmarks, tests), `checkSenderRole` returns null and we fall through to a
+ * conservative default. Owner-only messages always pass the agent's own
+ * messages without a world lookup.
+ */
+async function resolveStage1SenderRole(
+	runtime: IAgentRuntime,
+	message: Memory,
+): Promise<RoleGateRole> {
+	if (typeof message.entityId === "string" && message.entityId === runtime.agentId) {
+		return "OWNER";
+	}
+	try {
+		const result = await checkSenderRole(runtime, message);
+		if (result?.role) {
+			return result.role as RoleGateRole;
+		}
+	} catch (error) {
+		runtime.logger.debug(
+			{ src: "service:message", error },
+			"Stage 1 sender role lookup failed; defaulting to USER",
+		);
+	}
+	// No world metadata — fall back to USER. This matches the lenient default
+	// in plugin-role-gating so local-only usage isn't blocked.
+	return "USER";
+}
+
+function listAvailableContextsForRole(
+	registry: ContextRegistry | undefined,
+	role: RoleGateRole,
+): ContextDefinition[] {
+	if (!registry) {
+		return [];
+	}
+	return registry.listAvailable(role);
 }
 
 interface ExecuteV5PlannedToolCallParams {
@@ -1240,10 +1308,15 @@ export async function runV5MessageRuntimeStage1(args: {
 	responseId: UUID;
 }): Promise<V5MessageRuntimeStage1Result> {
 	const context = createV5MessageContextObject(args);
+	const senderRole = await resolveStage1SenderRole(args.runtime, args.message);
+	const availableContexts = listAvailableContextsForRole(
+		args.runtime.contexts,
+		senderRole,
+	);
 	const rawMessageHandler = (await args.runtime.useModel(
 		ModelType.RESPONSE_HANDLER,
 		{
-			prompt: renderV5MessageHandlerPrompt(context),
+			prompt: renderV5MessageHandlerPrompt(context, availableContexts),
 			responseFormat: { type: "json_object" },
 			responseSchema: v5MessageHandlerSchema,
 		},

plugins/plugin-bluebubbles/src/actions/messageOp.ts

@@ -9,16 +9,12 @@ import type {
 	ActionExample,
 	ActionResult,
 	HandlerCallback,
+	HandlerOptions,
 	IAgentRuntime,
 	Memory,
 	State,
 } from "@elizaos/core";
-import {
-	composePromptFromState,
-	logger,
-	ModelType,
-	parseToonKeyValue,
-} from "@elizaos/core";
+import { composePromptFromState, logger, ModelType } from "@elizaos/core";
 import { BLUEBUBBLES_SERVICE_NAME } from "../constants.js";
 import type { BlueBubblesService } from "../service.js";
 
@@ -45,12 +41,8 @@ Operations:
 - send: send an iMessage reply. Provide \`text\` with the reply.
 - react: add or remove a reaction. Provide \`emoji\`, \`messageId\` ("last" for the most recent message), and \`remove\` (true to remove).
 
-Respond with TOON only:
-op: send
-text:
-emoji:
-messageId: last
-remove: false
+Respond with JSON only. Return exactly one JSON object with this shape:
+{"op":"send","text":"","emoji":null,"messageId":"last","remove":false}
 `;
 
 const sendMessageTemplate = `# Task: Generate a response to send via iMessage (BlueBubbles)
@@ -89,11 +81,38 @@ const examples: ActionExample[][] = [
 	],
 ];
 
-function parseInfo(raw: string): MessageOpInfo | null {
-	const parsed = parseToonKeyValue<Record<string, unknown>>(raw);
-	if (!parsed) {
+function parseJsonObject(value: unknown): Record<string, unknown> | null {
+	if (value && typeof value === "object" && !Array.isArray(value)) {
+		return value as Record<string, unknown>;
+	}
+	if (typeof value !== "string") {
+		return null;
+	}
+	try {
+		const parsed = JSON.parse(value.trim()) as unknown;
+		return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+			? (parsed as Record<string, unknown>)
+			: null;
+	} catch {
 		return null;
 	}
+}
+
+function readParams(
+	options?: HandlerOptions | Record<string, unknown> | unknown,
+): Record<string, unknown> {
+	const direct =
+		options && typeof options === "object"
+			? (options as Record<string, unknown>)
+			: {};
+	const parameters =
+		direct.parameters && typeof direct.parameters === "object"
+			? (direct.parameters as Record<string, unknown>)
+			: {};
+	return { ...direct, ...parameters };
+}
+
+function normalizeInfo(parsed: Record<string, unknown>): MessageOpInfo | null {
 	const opRaw =
 		typeof parsed.op === "string" ? parsed.op.toLowerCase().trim() : "";
 	if (!VALID_OPS.has(opRaw as MessageOp)) {
@@ -119,6 +138,11 @@ function parseInfo(raw: string): MessageOpInfo | null {
 	};
 }
 
+function parseInfo(raw: unknown): MessageOpInfo | null {
+	const parsed = parseJsonObject(raw);
+	return parsed ? normalizeInfo(parsed) : null;
+}
+
 async function handleSend(
 	runtime: IAgentRuntime,
 	service: BlueBubblesService,
@@ -272,7 +296,7 @@ export const bluebubblesMessageOp: Action = {
 		runtime: IAgentRuntime,
 		message: Memory,
 		state: State | undefined,
-		_options: Record<string, unknown> | undefined,
+		_options: HandlerOptions | Record<string, unknown> | undefined,
 		callback?: HandlerCallback,
 	): Promise<ActionResult> => {
 		const service = runtime.getService<BlueBubblesService>(
@@ -315,12 +339,13 @@ export const bluebubblesMessageOp: Action = {
 			template: messageOpTemplate,
 		});
 
-		let info: MessageOpInfo | null = null;
+		let info: MessageOpInfo | null = normalizeInfo(readParams(_options));
 		for (let attempt = 0; attempt < 3; attempt++) {
+			if (info) {
+				break;
+			}
 			const response = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
-			info = parseInfo(
-				typeof response === "string" ? response : String(response),
-			);
+			info = parseInfo(response);
 			if (info) {
 				break;
 			}

plugins/plugin-discord/actions/mediaOp.ts

@@ -12,13 +12,13 @@ import {
 	type Memory,
 	MemoryType,
 	ModelType,
-	parseToonKeyValue,
 	type Service,
 	ServiceType,
 	type State,
 } from "@elizaos/core";
 import { mediaUrlTemplate } from "../generated/prompts/typescript/prompts.js";
 import { requireActionSpec } from "../generated/specs/spec-helpers";
+import { getActionParameters, parseJsonObjectFromText } from "../utils";
 
 type DiscordMediaOp = "download" | "transcribe";
 
@@ -33,8 +33,8 @@ Allowed values for "op":
 - download: download a media attachment or URL from Discord
 - transcribe: transcribe an audio or video attachment from Discord
 
-Respond with TOON only:
-op: <one of: download|transcribe>`;
+Respond with JSON only, no markdown:
+{"op":"download"}`;
 
 const TRANSCRIBE_REQUEST_PATTERN =
 	/\b(?:transcribe|transcript|audio|video|media|youtube|meeting|recording|podcast|call|conference|interview|speech|lecture|presentation|voice|song)\b/i;
@@ -201,9 +201,10 @@ function quickResolveOp(
 	options: HandlerOptions | undefined,
 	message: Memory,
 ): DiscordMediaOp | null {
+	const parameters = getActionParameters(options);
 	const optsOp =
-		typeof (options as Record<string, unknown> | undefined)?.op === "string"
-			? ((options as Record<string, unknown>).op as string).toLowerCase()
+		typeof parameters.op === "string"
+			? parameters.op.toLowerCase()
 			: undefined;
 	if (optsOp && (VALID_OPS as readonly string[]).includes(optsOp)) {
 		return optsOp as DiscordMediaOp;
@@ -227,7 +228,7 @@ async function modelResolveOp(
 	const prompt = composePromptFromState({ state, template: opRouterTemplate });
 	for (let i = 0; i < 3; i++) {
 		const response = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
-		const parsed = parseToonKeyValue<Record<string, unknown>>(response);
+		const parsed = parseJsonObjectFromText(response);
 		const op =
 			typeof parsed?.op === "string" ? parsed.op.toLowerCase() : undefined;
 		if (op && (VALID_OPS as readonly string[]).includes(op)) {
@@ -241,6 +242,7 @@ async function handleDownload(
 	runtime: IAgentRuntime,
 	message: Memory,
 	state: State,
+	options: HandlerOptions | undefined,
 	callback: HandlerCallback | undefined,
 ): Promise<ActionResult | undefined> {
 	const videoService = runtime.getService<VideoServiceInterface>(
@@ -257,11 +259,14 @@ async function handleDownload(
 		return { success: false, error: "Video service not available" };
 	}
 
+	const parameters = getActionParameters(options);
+	let mediaUrl =
+		typeof parameters.mediaUrl === "string" ? parameters.mediaUrl : null;
 	const prompt = composePromptFromState({ state, template: mediaUrlTemplate });
-	let mediaUrl: string | null = null;
 	for (let i = 0; i < 5; i++) {
+		if (mediaUrl) break;
 		const response = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
-		const parsed = parseToonKeyValue<Record<string, unknown>>(response);
+		const parsed = parseJsonObjectFromText(response);
 		if (parsed?.mediaUrl) {
 			mediaUrl = String(parsed.mediaUrl);
 			break;
@@ -446,7 +451,7 @@ export const mediaOp: Action = {
 			case "download": {
 				const downloadState =
 					currentState ?? (await runtime.composeState(message));
-				return handleDownload(runtime, message, downloadState, callback);
+				return handleDownload(runtime, message, downloadState, options, callback);
 			}
 			case "transcribe":
 				return handleTranscribe(runtime, message, callback);