opencode-discord-bot 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discord-bot",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Discord bot bridge for a self-hosted opencode instance",
   "type": "module",
   "main": "src/Main.ts",
@@ -68,6 +68,7 @@
     "@commitlint/cli": "^21.0.2",
     "@commitlint/config-conventional": "^21.0.2",
     "@effect/vitest": "4.0.0-beta.74",
+    "@opencode-ai/plugin": "1.16.2",
     "@types/bun": "1.3.13",
     "@typescript/native-preview": "^7.0.0-dev.20260606.1",
     "@vitest/coverage-v8": "^4.1.8",

package/src/Main.test.ts

@@ -41,6 +41,12 @@ const mentionMessage = {
   channelType: "guild"
 } satisfies DiscordMessage
 
+const makeTestEnv = (projectDir: string, bridgePort: number) => ({
+  DISCORD_TOKEN: "token",
+  OPENCODE_PROJECT_DIR: projectDir,
+  DISCORD_BRIDGE_PORT: bridgePort.toString()
+})
+
 describe("makeProgram", () => {
   test("runs Bun preflight, loads config, and scaffolds generated Discord tools", async () => {
     const projectDir = await mkdtemp(join(tmpdir(), "ocdb-program-"))
@@ -54,11 +60,11 @@ describe("makeProgram", () => {
     }
 
     try {
-      await Effect.runPromise(makeProgram(projectDir, { DISCORD_TOKEN: "token", OPENCODE_PROJECT_DIR: projectDir }, factories))
+      await Effect.runPromise(makeProgram(projectDir, makeTestEnv(projectDir, 18_787), factories))
       const tool = await readFile(join(projectDir, ".opencode", "tools", "discord-bridge.ts"), "utf8")
 
       expect(tool).toContain("Generated by opencode-discord-bot")
-      expect(tool).toContain("http://127.0.0.1:8787/tool")
+      expect(tool).toContain("http://127.0.0.1:18787/tool")
     } finally {
       await rm(projectDir, { recursive: true, force: true })
     }
@@ -152,7 +158,7 @@ describe("makeProgram callbacks", () => {
     }
 
     try {
-      await Effect.runPromise(makeProgram(projectDir, { DISCORD_TOKEN: "token", OPENCODE_PROJECT_DIR: projectDir }, factories))
+      await Effect.runPromise(makeProgram(projectDir, makeTestEnv(projectDir, 18_788), factories))
       if (gatewayOptions === undefined) throw new Error("gateway options were not captured")
 
       await Effect.runPromise(gatewayOptions.onMessage(mentionMessage, { userId: "self" }))

package/src/Tools/DiscordBridgeTool.ts

@@ -0,0 +1,44 @@
+import { tool } from "@opencode-ai/plugin"
+
+const loopbackToolUrl = "__OPENCODE_DISCORD_BOT_LOOPBACK_URL__/tool"
+
+export default tool({
+  description: "Perform safe Discord bridge actions through the local opencode-discord-bot process.",
+  args: {
+    action: tool.schema
+      .enum([
+        "followUpMessage",
+        "addReaction",
+        "removeReaction",
+        "fetchHistory",
+        "attachFile",
+        "createThread",
+        "editOwnMessage",
+        "deleteOwnMessage",
+        "postOtherChannel",
+        "pin",
+        "unpin"
+      ])
+      .describe("Discord bridge action to perform."),
+    target: tool.schema
+      .object({
+        guildId: tool.schema.string().optional(),
+        channelId: tool.schema.string().optional(),
+        threadId: tool.schema.string().optional(),
+        messageId: tool.schema.string().optional()
+      })
+      .describe("Discord target for the action."),
+    args: tool.schema
+      .record(tool.schema.string(), tool.schema.unknown())
+      .describe("Action-specific arguments, such as content, emoji, limit, path, or name.")
+  },
+  async execute(request) {
+    const response = await fetch(loopbackToolUrl, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(request)
+    })
+    const payload: unknown = await response.json()
+    return JSON.stringify(payload, null, 2) ?? String(payload)
+  }
+})

package/src/Tools/Scaffolding.test.ts

@@ -5,15 +5,24 @@ import { join } from "node:path"
 import { ensureDiscordTools, renderDiscordToolFile } from "./Scaffolding.ts"
 
 describe("Discord tool scaffolding", () => {
-  test("renders a generated tool file with the injected loopback URL", () => {
-    const source = renderDiscordToolFile("http://127.0.0.1:8787")
+  test("renders a generated opencode tool file with the injected loopback URL", async () => {
+    const source = await renderDiscordToolFile("http://127.0.0.1:8787")
 
     expect(source).toContain("Generated by opencode-discord-bot")
     expect(source).toContain("http://127.0.0.1:8787/tool")
+    expect(source).toContain('import { tool } from "@opencode-ai/plugin"')
+    expect(source).toContain("export default tool({")
+    expect(source).toContain("args: {")
+    expect(source).toContain(".enum([")
+    expect(source).toContain('"fetchHistory"')
+    expect(source).toContain('"addReaction"')
+    expect(source).toContain(".record(tool.schema.string(), tool.schema.unknown())")
     expect(source).toContain("fetch")
+    expect(source).not.toContain("export const parameters")
+    expect(source).not.toContain("__OPENCODE_DISCORD_BOT_LOOPBACK_URL__")
   })
 
-  test("creates and refreshes only generated files", async () => {
+  test("creates and regenerates the tool file on every run", async () => {
     const projectDir = await mkdtemp(join(tmpdir(), "ocdb-tools-"))
 
     try {
@@ -28,16 +37,18 @@ describe("Discord tool scaffolding", () => {
       expect(await readFile(toolPath, "utf8")).toContain("http://127.0.0.1:9999/tool")
 
       await writeFile(toolPath, "// operator file\n")
-      const skipped = await ensureDiscordTools({ projectDir, bridgePort: 7777, enabled: true, autoInstall: true })
+      const regenerated = await ensureDiscordTools({ projectDir, bridgePort: 7777, enabled: true, autoInstall: true })
 
-      expect(skipped).toEqual([])
-      expect(await readFile(toolPath, "utf8")).toBe("// operator file\n")
+      expect(regenerated).toEqual([toolPath])
+      expect(await readFile(toolPath, "utf8")).toContain("http://127.0.0.1:7777/tool")
+      expect(await readFile(toolPath, "utf8")).not.toContain("// operator file")
 
-      await writeFile(toolPath, `${renderDiscordToolFile("http://127.0.0.1:9999")}\n// operator edit\n`)
-      const edited = await ensureDiscordTools({ projectDir, bridgePort: 6666, enabled: true, autoInstall: true })
+      await writeFile(toolPath, "// Generated by opencode-discord-bot. DO NOT EDIT.\nexport const parameters = {}\n")
+      const migrated = await ensureDiscordTools({ projectDir, bridgePort: 6666, enabled: true, autoInstall: true })
 
-      expect(edited).toEqual([])
-      expect(await readFile(toolPath, "utf8")).toContain("// operator edit")
+      expect(migrated).toEqual([toolPath])
+      expect(await readFile(toolPath, "utf8")).toContain("http://127.0.0.1:6666/tool")
+      expect(await readFile(toolPath, "utf8")).not.toContain("export const parameters")
     } finally {
       await rm(projectDir, { recursive: true, force: true })
     }

package/src/Tools/Scaffolding.ts

@@ -2,7 +2,8 @@ import { mkdir, readFile, writeFile } from "node:fs/promises"
 import { join } from "node:path"
 
 const header = "// Generated by opencode-discord-bot. DO NOT EDIT."
-const loopbackUrlPattern = /const loopbackToolUrl = "(http:\/\/127\.0\.0\.1:\d+)\/tool"/
+const loopbackUrlPlaceholder = "__OPENCODE_DISCORD_BOT_LOOPBACK_URL__"
+const discordToolSourceUrl = new URL("./DiscordBridgeTool.ts", import.meta.url)
 
 export type ToolScaffoldOptions = {
   readonly projectDir: string
@@ -11,50 +12,18 @@ export type ToolScaffoldOptions = {
   readonly autoInstall: boolean
 }
 
-export const renderDiscordToolFile = (loopbackUrl: string): string => `${header}
-const loopbackToolUrl = "${loopbackUrl}/tool"
-
-export const description = "Perform safe Discord bridge actions through the local opencode-discord-bot process."
-
-export const parameters = {
-  type: "object",
-  properties: {
-    action: { type: "string" },
-    target: { type: "object" },
-    args: { type: "object" }
-  },
-  required: ["action", "target", "args"]
-}
-
-export async function execute(input: { action: string; target: object; args: object }) {
-  const response = await fetch(loopbackToolUrl, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify(input)
-  })
-  return await response.json()
+export const renderDiscordToolFile = async (loopbackUrl: string): Promise<string> => {
+  const source = await readFile(discordToolSourceUrl, "utf8")
+  return `${header}\n${source.replaceAll(loopbackUrlPlaceholder, loopbackUrl)}`
 }
-`
-
-const generatedLoopbackUrl = (source: string): string | undefined => loopbackUrlPattern.exec(source)?.[1]
 
 export const ensureDiscordTools = async (options: ToolScaffoldOptions): Promise<ReadonlyArray<string>> => {
   if (!options.enabled || !options.autoInstall) return []
   const toolsDir = join(options.projectDir, ".opencode", "tools")
   const toolPath = join(toolsDir, "discord-bridge.ts")
-  const next = renderDiscordToolFile(`http://127.0.0.1:${options.bridgePort}`)
+  const next = await renderDiscordToolFile(`http://127.0.0.1:${options.bridgePort}`)
 
   await mkdir(toolsDir, { recursive: true })
-  try {
-    const current = await readFile(toolPath, "utf8")
-    if (!current.startsWith(header)) return []
-    if (current === next) return [toolPath]
-    const currentLoopbackUrl = generatedLoopbackUrl(current)
-    if (currentLoopbackUrl === undefined || current !== renderDiscordToolFile(currentLoopbackUrl)) return []
-  } catch (error) {
-    if (!(error instanceof Error) || !Reflect.has(error, "code")) throw error
-  }
-
   await writeFile(toolPath, next)
   return [toolPath]
 }