opencode-discord-bot 0.0.9 → 0.0.10

package/package.json

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

package/src/Orchestrator/ContextAssembly.test.ts

@@ -31,7 +31,7 @@ describe("context assembly", () => {
       })
     )
 
-    expect(rendered).toContain("[Nick 1 | <@u-1> | 2026-06-05 14:03 UTC | messageId=1]")
+    expect(rendered).toContain("[Nick 1 | 2026-06-05 14:03 UTC | messageId=1]")
     expect(rendered).toContain("Can you refactor this?")
     expect(rendered).toContain("(discord target: guildId=g1 channelId=c1)")
     expect(rendered).toContain("(attachments: screenshot.png [image/png; 12 bytes; https://cdn/a1])")
@@ -51,13 +51,17 @@ describe("context assembly", () => {
 
     expect(prompt.messages.map((item) => item.id)).toEqual(["1", "2", "3"])
     expect(prompt.text.match(/latest <@999>/g)).toHaveLength(1)
+    expect(prompt.text).toContain("(participants)\nNick 1 - <@u-1>\nNick 2 - <@u-2>\nNick 3 - <@u-3>")
+    expect(prompt.text.match(/<@u-3>/g)).toHaveLength(1)
     expect(prompt.text).toContain("Plain assistant text is streamed to Discord automatically")
     expect(prompt.text).toContain("do not use bridge tools to send messages")
     expect(prompt.text).toContain("<@id> pings that user in Discord")
+    expect(prompt.text).toContain("use the participants list to map server nicknames/display names")
+    expect(prompt.text).toContain("When a display name is shared")
     expect(prompt.text).toContain("combine the discord default scope or message target override with the header messageId")
     expect(prompt.text).toContain("Do not emit @everyone, @here, or role pings")
     expect(prompt.text).toContain("(discord default scope: guildId=g1 channelId=c1)")
-    expect(prompt.text).toContain("[Nick 3 | <@u-3> | 2026-06-05 14:03 UTC | messageId=3]")
+    expect(prompt.text).toContain("[Nick 3 | 2026-06-05 14:03 UTC | messageId=3]")
     expect(prompt.text).not.toContain("(discord target: guildId=g1 channelId=c1 messageId=3)")
   })
 
@@ -73,11 +77,32 @@ describe("context assembly", () => {
     })
 
     expect(prompt.text).toContain("(discord default scope: guildId=g1 channelId=c1)")
-    expect(prompt.text).toContain("[Nick 1 | <@u-1> | 2026-06-05 14:03 UTC | messageId=1]")
+    expect(prompt.text).toContain("[Nick 1 | 2026-06-05 14:03 UTC | messageId=1]")
     expect(prompt.text).toContain("(discord target: guildId=g1 channelId=c2 threadId=t2)")
     expect(prompt.text).not.toContain("(discord target: guildId=g1 channelId=c1)")
   })
 
+  test("keeps author ids in headers when participant labels collide", () => {
+    const first = makeMessage("1", "from first Sam", {
+      author: { id: "sam-1", displayName: "Sam", nickname: "Sam", isBot: false }
+    })
+    const second = makeMessage("2", "from second Sam", {
+      author: { id: "sam-2", displayName: "Sam", nickname: "Sam", isBot: false }
+    })
+    const prompt = assembleContextPrompt({
+      botUserId: "999",
+      contextMessages: [first],
+      triggerMessage: second,
+      maxMessages: 30,
+      maxChars: 10_000,
+      maxAttachmentBytes: 10_000
+    })
+
+    expect(prompt.text).toContain("(participants)\nSam - <@sam-1>\nSam - <@sam-2>")
+    expect(prompt.text).toContain("[Sam | <@sam-1> | 2026-06-05 14:03 UTC | messageId=1]")
+    expect(prompt.text).toContain("[Sam | <@sam-2> | 2026-06-05 14:03 UTC | messageId=2]")
+  })
+
   test("applies top-N and character budgets without dropping the trigger", () => {
     const trigger = makeMessage("5", "trigger")
     const prompt = assembleContextPrompt({

package/src/Orchestrator/ContextAssembly.ts

@@ -18,7 +18,7 @@ type ContextInput = {
 }
 
 const preamble = (botUserId: string) =>
-  `Discord bridge context for <@${botUserId}>. Plain assistant text is streamed to Discord automatically; do not use bridge tools to send messages. <@id> pings that user in Discord. For non-message bridge tools, combine the discord default scope or message target override with the header messageId. Do not emit @everyone, @here, or role pings unless explicitly allowed.`
+  `Discord bridge context for <@${botUserId}>. Plain assistant text is streamed to Discord automatically; do not use bridge tools to send messages. <@id> pings that user in Discord; use the participants list to map server nicknames/display names to their <@id> values. When a display name is shared, the message header also includes that author's <@id>. For non-message bridge tools, combine the discord default scope or message target override with the header messageId. Do not emit @everyone, @here, or role pings unless explicitly allowed.`
 
 const timestamp = (value: string): string => {
   const date = new Date(value)
@@ -72,10 +72,53 @@ const attachmentParts = (messages: ReadonlyArray<DiscordMessage>, maxBytes: numb
     })
   )
 
-export const formatDiscordMessage = (message: DiscordMessage, defaultScope?: DiscordScope): string => {
-  const label = message.author.nickname ?? message.author.displayName
+const authorLabel = (message: DiscordMessage): string => message.author.nickname ?? message.author.displayName
+
+type ParticipantsSummary = {
+  readonly text: string | undefined
+  readonly ambiguousAuthorIds: ReadonlySet<string>
+}
+
+const participantsSummary = (messages: ReadonlyArray<DiscordMessage>): ParticipantsSummary => {
+  const participants: Array<{ readonly id: string; readonly label: string }> = []
+  const seenAuthorIds = new Set<string>()
+  const authorIdsByLabel = new Map<string, Set<string>>()
+
+  for (const message of messages) {
+    const id = message.author.id
+    if (seenAuthorIds.has(id)) continue
+    seenAuthorIds.add(id)
+
+    const label = authorLabel(message)
+    participants.push({ id, label })
+
+    const authorIds = authorIdsByLabel.get(label)
+    if (authorIds === undefined) authorIdsByLabel.set(label, new Set([id]))
+    else authorIds.add(id)
+  }
+
+  const ambiguousAuthorIds = new Set<string>()
+  for (const authorIds of authorIdsByLabel.values()) {
+    if (authorIds.size <= 1) continue
+    for (const id of authorIds) ambiguousAuthorIds.add(id)
+  }
+
+  return {
+    ambiguousAuthorIds,
+    text:
+      participants.length === 0 ? undefined : `(participants)\n${participants.map((item) => `${item.label} - <@${item.id}>`).join("\n")}`
+  }
+}
+
+export const formatDiscordMessage = (
+  message: DiscordMessage,
+  defaultScope?: DiscordScope,
+  ambiguousAuthorIds?: ReadonlySet<string>
+): string => {
+  const label = authorLabel(message)
+  const author = ambiguousAuthorIds?.has(message.author.id) === true ? `${label} | <@${message.author.id}>` : label
   const scope = scopeOf(message)
-  const lines = [`[${label} | <@${message.author.id}> | ${timestamp(message.timestamp)} | messageId=${message.id}]`, message.content]
+  const lines = [`[${author} | ${timestamp(message.timestamp)} | messageId=${message.id}]`, message.content]
   if (defaultScope === undefined || !sameScope(scope, defaultScope)) lines.push(targetSummary(scope))
   const attachments = attachmentSummary(message)
   const reactions = reactionSummary(message)
@@ -115,11 +158,14 @@ const renderPrompt = (
   const skippedIds = new Set(skippedMessages.map((message) => message.id))
   const latestMessage = messages.at(-1)
   const defaultScope = latestMessage === undefined ? undefined : scopeOf(latestMessage)
+  const participants = participantsSummary(messages)
   return [
     preamble(botUserId),
+    ...(participants.text === undefined ? [] : [participants.text]),
     ...(defaultScope === undefined ? [] : [defaultScopeSummary(defaultScope)]),
     ...messages.map(
-      (message) => `${skippedIds.has(message.id) ? "(queued intermediate message)\n" : ""}${formatDiscordMessage(message, defaultScope)}`
+      (message) =>
+        `${skippedIds.has(message.id) ? "(queued intermediate message)\n" : ""}${formatDiscordMessage(message, defaultScope, participants.ambiguousAuthorIds)}`
     )
   ].join("\n\n")
 }