diff --git a/src/channels/turn/context.ts b/src/channels/turn/context.ts
index 976a116fb05..1b0324f26e3 100644
--- a/src/channels/turn/context.ts
+++ b/src/channels/turn/context.ts
@@ -34,6 +34,19 @@ export type BuildChannelTurnContextParams = {
   extra?: Record<string, unknown>;
 };
 
+export type BuiltChannelTurnContext = FinalizedMsgContext & {
+  Body: string;
+  BodyForAgent: string;
+  BodyForCommands: string;
+  ChatType: ConversationFacts["kind"];
+  CommandAuthorized: boolean;
+  CommandBody: string;
+  From: string;
+  RawBody: string;
+  SessionKey: string;
+  To: string;
+};
+
 function compactStrings(values: Array<string | undefined>): string[] | undefined {
   const compacted = values.filter((value): value is string => Boolean(value));
   return compacted.length > 0 ? compacted : undefined;
@@ -111,7 +124,7 @@ function resolveAccessFactsCommandAuthorized(access: AccessFacts | undefined): b
 
 export function buildChannelTurnContext(
   params: BuildChannelTurnContextParams,
-): FinalizedMsgContext {
+): BuiltChannelTurnContext {
   const media = params.media ?? [];
   const supplemental = filterChannelTurnSupplementalContext({
     supplemental: params.supplemental,
@@ -158,12 +171,7 @@ export function buildChannelTurnContext(
     GroupSubject: params.conversation.kind !== "direct" ? params.conversation.label : undefined,
     GroupSpace: params.conversation.spaceId,
     GroupSystemPrompt: supplemental?.groupSystemPrompt,
-    UntrustedStructuredContext: Array.isArray(supplemental?.untrustedContext)
-      ? supplemental.untrustedContext.map((payload, index) => ({
-          label: `context ${index + 1}`,
-          payload,
-        }))
-      : undefined,
+    UntrustedStructuredContext: supplemental?.untrustedContext,
     SenderName: params.sender.name ?? params.sender.displayLabel,
     SenderId: params.sender.id,
     SenderUsername: params.sender.username,
@@ -173,7 +181,7 @@ export function buildChannelTurnContext(
     Provider: params.provider ?? params.channel,
     Surface: params.surface ?? params.provider ?? params.channel,
     WasMentioned: params.access?.mentions?.wasMentioned,
-    CommandAuthorized: resolveAccessFactsCommandAuthorized(params.access),
+    CommandAuthorized: resolveAccessFactsCommandAuthorized(params.access) === true,
     MessageThreadId: params.reply.messageThreadId ?? params.conversation.threadId,
     NativeChannelId: params.reply.nativeChannelId ?? params.conversation.nativeChannelId,
     OriginatingChannel: params.channel,
diff --git a/src/channels/turn/types.ts b/src/channels/turn/types.ts
index 17f388de00b..3ffcfab0fad 100644
--- a/src/channels/turn/types.ts
+++ b/src/channels/turn/types.ts
@@ -40,7 +40,7 @@ export type NormalizedTurnInput = {
 };
 
 export type SenderFacts = {
-  id: string;
+  id?: string;
   name?: string;
   username?: string;
   tag?: string;
@@ -84,7 +84,7 @@ export type ReplyPlanFacts = {
   deliveryTarget?: string;
   replyToId?: string;
   replyToIdFull?: string;
-  messageThreadId?: string;
+  messageThreadId?: string | number;
   threadParentId?: string;
   sourceReplyDeliveryMode?: "thread" | "reply" | "channel" | "direct" | "none";
 };
@@ -209,7 +209,7 @@ export type SupplementalContextFacts = {
     modelParentSessionKey?: string;
     senderAllowed?: boolean;
   };
-  untrustedContext?: unknown[];
+  untrustedContext?: Array<{ label: string; source?: string; type?: string; payload: unknown }>;
   groupSystemPrompt?: string;
 };
 
diff --git a/src/plugin-sdk/channel-inbound.ts b/src/plugin-sdk/channel-inbound.ts
index 970f15b4163..6ce550a67a4 100644
--- a/src/plugin-sdk/channel-inbound.ts
+++ b/src/plugin-sdk/channel-inbound.ts
@@ -50,4 +50,12 @@ export type { NormalizedLocation } from "../channels/location.js";
 export { formatLocationText, toLocationContext } from "../channels/location.js";
 export { logInboundDrop } from "../channels/logging.js";
 export { resolveInboundSessionEnvelopeContext } from "../channels/session-envelope.js";
+export {
+  buildChannelTurnContext,
+  filterChannelTurnSupplementalContext,
+} from "../channels/turn/context.js";
+export type {
+  BuildChannelTurnContextParams,
+  BuiltChannelTurnContext,
+} from "../channels/turn/context.js";
 export { mergeInboundPathRoots } from "../media/inbound-path-policy.js";