@friendlyrobot/discord-pi-agent 0.21.0 → 0.21.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import type { DiscordGateway, DiscordGatewayConfig } from "./types";
-export { buildDiscordMessageContextPrompt, formatDiscordPromptTime, type DiscordMessageContextPromptOptions, type DiscordPromptScope, type DiscordPromptTimeFormatOptions, } from "./prompt-context";
+export { formatDiscordPromptTime } from "./prompt-context";
 export { loadDiscordGatewayConfigFromEnv, resolveConfig } from "./config";
 export type { AgentStatus, DiscordGateway, DiscordGatewayConfig, PromptTransform, PromptTransformContext, ResolvedDiscordGatewayConfig, GatewayAccessConfig, } from "./types";
 /**

package/dist/index.js

@@ -508,8 +508,9 @@ class AgentService {
     const session = this.requireSession();
     const transformedPrompt = await this.config.promptTransform({
       rawContent: text,
-      now: () => new Date().toISOString(),
-      wrapWithDiscordContext: () => text
+      discordMetadata: "",
+      now: () => "",
+      userMessage: () => text
     });
     return runAgentTurn(session, transformedPrompt);
   }
@@ -674,7 +675,8 @@ function parseThinkingLevel(value) {
   return;
 }
 function defaultPromptTransform(ctx) {
-  return ctx.wrapWithDiscordContext();
+  return [ctx.now(), ctx.discordMetadata, "", ctx.userMessage()].filter(Boolean).join(`
+`);
 }
 function parseStringArrayFromEnv(key) {
   const value = process.env[key];
@@ -1611,28 +1613,6 @@ function stopTypingForChannel(channelKey) {
 }
 
 // src/prompt-context.ts
-function buildDiscordMessageContextPrompt(userMessage, options) {
-  const contextEntries = [
-    ["scope", options.scope],
-    ["sent_at", options.sentAt],
-    ["sent_at_local", options.sentAtLocal],
-    ["message_id", options.messageId],
-    ["author_name", normalizeContextValue(options.authorName)],
-    ["author_id", options.authorId],
-    ["thread_title", normalizeContextValue(options.threadTitle)],
-    ["thread_id", options.threadId],
-    ["forum_channel_id", options.forumChannelId ?? undefined]
-  ].filter((entry) => {
-    return typeof entry[1] === "string" && entry[1].trim().length > 0;
-  });
-  const contextJson = JSON.stringify(Object.fromEntries(contextEntries), null, 2);
-  return [
-    wrapXmlTag("discord_message_context", contextJson),
-    "",
-    wrapXmlTag("user_message", userMessage.trim())
-  ].join(`
-`);
-}
 function formatDiscordPromptTime(date, options = {}) {
   const timeZone = options.timeZone || "UTC";
   const locale = options.locale || "en-AU";
@@ -1651,41 +1631,35 @@ function formatDiscordPromptTime(date, options = {}) {
 function wrapXmlTag(tag, content) {
   return `<${tag}>${content}</${tag}>`;
 }
-function normalizeContextValue(value) {
-  if (value === undefined) {
-    return;
-  }
-  return value.replace(/\s+/g, " ").trim();
-}
 
 // src/discord-message-handler.ts
 var logger12 = createModuleLogger("discord-message-handler");
-function buildPromptTransformContext(message, scope, content, config) {
+function formatDiscordMessageMetadata(message, scope) {
   const isThread = scope.startsWith("thread:") && message.channel.isThread();
-  const sentAtLocal = formatDiscordPromptTime(message.createdAt, {
-    timeZone: config.promptTimeZone,
-    locale: config.promptLocale
+  const contextEntries = [
+    ["scope", scope === "dm" ? "dm" : "thread"],
+    ["sent_at", message.createdAt.toISOString()],
+    ["sent_at_local", formatDiscordPromptTime(message.createdAt)],
+    ["message_id", message.id],
+    [
+      "author_name",
+      getAuthorDisplayName(message).replace(/\s+/g, " ").trim() || undefined
+    ],
+    ["author_id", message.author.id],
+    [
+      "thread_title",
+      isThread ? (message.channel.name ?? "").replace(/\s+/g, " ").trim() : undefined
+    ],
+    ["thread_id", isThread ? message.channel.id : undefined],
+    [
+      "forum_channel_id",
+      isThread ? message.channel.parentId ?? undefined : undefined
+    ]
+  ].filter((entry) => {
+    return typeof entry[1] === "string" && entry[1].length > 0;
   });
-  return {
-    rawContent: content,
-    now: () => `<datetime>${sentAtLocal}</datetime>`,
-    wrapWithDiscordContext: () => {
-      return buildDiscordMessageContextPrompt(content, {
-        scope: scope === "dm" ? "dm" : "thread",
-        sentAt: message.createdAt.toISOString(),
-        sentAtLocal: formatDiscordPromptTime(message.createdAt, {
-          timeZone: config.promptTimeZone,
-          locale: config.promptLocale
-        }),
-        messageId: message.id,
-        authorId: message.author.id,
-        authorName: getAuthorDisplayName(message),
-        threadId: isThread ? message.channel.id : undefined,
-        threadTitle: isThread ? message.channel.name : undefined,
-        forumChannelId: isThread ? message.channel.parentId : undefined
-      });
-    }
-  };
+  const contextJson = JSON.stringify(Object.fromEntries(contextEntries), null, 2);
+  return `<discord_message_context>${contextJson}</discord_message_context>`;
 }
 async function handleDiscordMessage(message, config, agentService, sessionRegistry, accessConfig) {
   if (message.author.bot) {
@@ -1809,8 +1783,16 @@ ${commandResult.response ?? "Archiving..."}
           promptImages = resolvedPromptMedia.images;
         }
       }
-      const transformCtx = buildPromptTransformContext(message, scope, promptContent, config);
-      const transformedPrompt = await config.promptTransform(transformCtx);
+      const discordMetadata = formatDiscordMessageMetadata(message, scope);
+      const transformedPrompt = await config.promptTransform({
+        rawContent: promptContent,
+        discordMetadata,
+        now: () => wrapXmlTag("datetime", formatDiscordPromptTime(new Date, {
+          timeZone: config.promptTimeZone,
+          locale: config.promptLocale
+        })),
+        userMessage: () => wrapXmlTag("user_message", promptContent)
+      });
       return runAgentTurn(session, transformedPrompt, {
         images: promptImages
       });
@@ -1930,6 +1912,5 @@ export {
   startDiscordGateway,
   resolveConfig,
   loadDiscordGatewayConfigFromEnv,
-  formatDiscordPromptTime,
-  buildDiscordMessageContextPrompt
+  formatDiscordPromptTime
 };

package/dist/prompt-context.d.ts

@@ -2,17 +2,6 @@ export type DiscordPromptTimeFormatOptions = {
     timeZone?: string;
     locale?: string;
 };
-export type DiscordPromptScope = "dm" | "thread";
-export type DiscordMessageContextPromptOptions = {
-    scope: DiscordPromptScope;
-    messageId: string;
-    authorId: string;
-    sentAt?: string;
-    sentAtLocal?: string;
-    authorName?: string;
-    threadId?: string;
-    threadTitle?: string;
-    forumChannelId?: string | null;
-};
-export declare function buildDiscordMessageContextPrompt(userMessage: string, options: DiscordMessageContextPromptOptions): string;
 export declare function formatDiscordPromptTime(date: Date, options?: DiscordPromptTimeFormatOptions): string;
+/** Wrap content in an XML-style tag: `<tag>content</tag>`. */
+export declare function wrapXmlTag(tag: string, content: string): string;

package/dist/types.d.ts

@@ -2,14 +2,15 @@ import type { Client } from "discord.js";
 /** Context object passed to promptTransform so consumers can optionally
  * wrap the raw content with Discord metadata. */
 export type PromptTransformContext = {
-    /** The raw user content without any Discord context wrapping. */
+    /** The raw user content without any XML wrapping. */
     rawContent: string;
-    /** Returns the message timestamp formatted using the gateway config's
-     * promptTimeZone and promptLocale. */
+    /** XML string with Discord message metadata (context JSON block). */
+    discordMetadata: string;
+    /** Returns current datetime formatted using the gateway config's
+     * promptTimeZone and promptLocale, wrapped in a <datetime> tag. */
     now: () => string;
-    /** Wraps the raw content with Discord message metadata (scope, author,
-     * timestamps, thread info). Returns the traditional wrapped prompt. */
-    wrapWithDiscordContext: () => string;
+    /** Returns rawContent wrapped in a <user_message> tag. */
+    userMessage: () => string;
 };
 export type PromptTransform = (ctx: PromptTransformContext) => string | Promise<string>;
 export type ThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@friendlyrobot/discord-pi-agent",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Reusable Discord gateway for persistent pi agent sessions",
   "license": "MIT",
   "type": "module",