opencode-discord-bot 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discord-bot",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Discord bot bridge for a self-hosted opencode instance",
   "type": "module",
   "main": "src/Main.ts",

package/src/Discord/ChatSdkDiscord.test.ts

@@ -142,6 +142,27 @@ describe("makeChatSdkDiscord", () => {
     ])
   })
 
+  test("normalizes Discord user mention wrappers before chat-sdk output conversion", async () => {
+    const adapter = new FakeDiscordAdapter()
+    const discord = makeChatSdkDiscord(adapter)
+
+    const posted = await Effect.runPromise(discord.postMessage(scope, "hello <@999> and <@!888>"))
+    await Effect.runPromise(discord.editMessage(scope, posted.id, "edited <@777>"))
+    await Effect.runPromise(discord.postChannelMessage("g1", "c2", "channel <@666>"))
+
+    expect(adapter.calls).toEqual([
+      ["encodeThreadId", { guildId: "g1", channelId: "c1", threadId: "t1" }],
+      ["postMessage", { threadId: "discord:g1:c1:t1", message: "hello @999 and @888" }],
+      ["encodeThreadId", { guildId: "g1", channelId: "c1", threadId: "t1" }],
+      ["editMessage", { threadId: "discord:g1:c1:t1", messageId: "posted-1", message: "edited @777" }],
+      ["encodeThreadId", { guildId: "g1", channelId: "c2" }],
+      ["fetchChannelInfo", { channelId: "discord:g1:c2" }],
+      ["postChannelMessage", { channelId: "discord:g1:c2", message: "channel @666" }]
+    ])
+  })
+})
+
+describe("makeChatSdkDiscord REST operations", () => {
   test("routes channel posts, deletes, and raw REST adapter gaps", async () => {
     const adapter = new FakeDiscordAdapter()
     const requests: Array<readonly [string, RequestInit]> = []

package/src/Discord/ChatSdkDiscord.ts

@@ -142,6 +142,8 @@ const rawDiscord = (options: RawDiscordOptions | undefined, path: string, init:
     return await response.json()
   })
 
+const normalizeMentionsForChatAdapter = (content: string): string => content.replace(/<@!?(\w+)>/g, "@$1")
+
 export const makeChatSdkDiscord = (adapter: ChatDiscordAdapter, raw: RawDiscordOptions | undefined = undefined): DiscordService => ({
   fetchContext: (scope, limit) =>
     tryAdapter(async () => {
@@ -158,11 +160,13 @@ export const makeChatSdkDiscord = (adapter: ChatDiscordAdapter, raw: RawDiscordO
   sendTyping: (scope) => tryAdapter(() => adapter.startTyping(threadIdFromScope(adapter, scope))).pipe(Effect.asVoid),
   postMessage: (scope, content) =>
     tryAdapter(async () => {
-      const result = await adapter.postMessage(threadIdFromScope(adapter, scope), content)
+      const result = await adapter.postMessage(threadIdFromScope(adapter, scope), normalizeMentionsForChatAdapter(content))
       return { id: result.id }
     }),
   editMessage: (scope, messageId, content) =>
-    tryAdapter(() => adapter.editMessage(threadIdFromScope(adapter, scope), messageId, content)).pipe(Effect.asVoid),
+    tryAdapter(() => adapter.editMessage(threadIdFromScope(adapter, scope), messageId, normalizeMentionsForChatAdapter(content))).pipe(
+      Effect.asVoid
+    ),
   deleteMessage: (scope, messageId) =>
     tryAdapter(() => adapter.deleteMessage(threadIdFromScope(adapter, scope), messageId)).pipe(Effect.asVoid),
   addReaction: (scope, messageId, emoji) =>
@@ -184,7 +188,10 @@ export const makeChatSdkDiscord = (adapter: ChatDiscordAdapter, raw: RawDiscordO
     tryAdapter(async () => {
       const encodedChannelId = adapter.encodeThreadId({ guildId, channelId })
       await validateGuildChannel(adapter, guildId, encodedChannelId)
-      const result = await adapter.postChannelMessage(encodedChannelId, sanitizeGuildContent(guildId, content))
+      const result = await adapter.postChannelMessage(
+        encodedChannelId,
+        normalizeMentionsForChatAdapter(sanitizeGuildContent(guildId, content))
+      )
       return { id: result.id }
     }),
   pinMessage: (scope, messageId) =>

package/src/Discord/ChatSdkGatewayIntake.test.ts

@@ -42,6 +42,7 @@ test("maps Discord messages through the chat-sdk adapter facade", async () => {
   const parsed = adapter.parseMessage(withAttachment)
 
   expect(adapter.encodeThreadId({ guildId: "g1", channelId: "c1", threadId: "t1" })).toBe("discord:g1:c1:t1")
+  expect(adapter.userName).toBe("self")
   expect(adapter.decodeThreadId("discord:g1:c1:t1")).toEqual({ guildId: "g1", channelId: "c1", threadId: "t1" })
   expect(adapter.channelIdFromThreadId("discord:g1:c1:t1")).toBe("c1")
   expect(parsed.threadId).toBe("discord:g1:c1")

package/src/Discord/ChatSdkGatewayIntake.ts

@@ -175,7 +175,7 @@ const unsupported = (operation: string): Promise<never> => Promise.reject(new Er
 
 export const makeGatewayAdapter = (bot: BotIdentity): Adapter<DiscordScope, DiscordMessage> => ({
   name: "discord",
-  userName: `<@${bot.userId}>`,
+  userName: bot.userId,
   botUserId: bot.userId,
   lockScope: "thread",
   initialize: () => Promise.resolve(),
@@ -208,7 +208,7 @@ export const makeChatGatewayIntake = (options: ChatGatewayIntakeOptions): ChatGa
   const chat = new Chat({
     adapters: { discord: adapter },
     state: makeTransientChatState(),
-    userName: `<@${options.bot.userId}>`,
+    userName: options.bot.userId,
     concurrency: "concurrent",
     dedupeTtlMs: 5 * 60 * 1000
   })