opencode-discord 1.8.0 → 1.8.2

package/index.ts

@@ -2,8 +2,10 @@ import type { Plugin } from "@opencode-ai/plugin"
 import { Client } from "@xhayper/discord-rpc"
 
 const CLIENT_ID = process.env.DISCORD_CLIENT_ID ?? "1486144419940929676"
+const RECONNECT_DELAY = 5_000
+const MAX_RECONNECT_ATTEMPTS = 5
 
-type Activity = "idle" | "thinking" | "editing" | "running" | "reading"
+type Activity = "idle" | "thinking" | "editing" | "running" | "reading" | "approving" | "commanding"
 type LogLevel = "debug" | "info" | "error" | "warn"
 
 function basename(filePath?: string): string | undefined {
@@ -18,28 +20,33 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
   let connected = false
   let sessionActive = false
   const currentProject = basename(directory) ?? "Unknown Project"
-  let startTimestamp = Date.now()
+  let startTimestamp = new Date()
   let lastEditedFile: string | undefined
   let activity: Activity = "idle"
   let sessionCount = 0
+  let filesChanged = 0
+  let lastCommand: string | undefined
+  let reconnectAttempts = 0
+  let reconnectTimer: ReturnType<typeof setTimeout> | undefined
+  let pendingPresence = false
+  let destroyed = false
 
-  async function log(level: LogLevel, message: string, extra?: Record<string, unknown>) {
-    try {
-      await sdk.app.log({
-        body: {
-          service: "discord-status",
-          level,
-          message,
-          extra,
-        },
-      })
-    } catch { }
+  function log(level: LogLevel, message: string, extra?: Record<string, unknown>) {
+    sdk.app.log({
+      body: {
+        service: "discord-status",
+        level,
+        message,
+        extra,
+      },
+    }).catch(() => {})
   }
 
-  await log("info", "Plugin initializing", { clientId: CLIENT_ID, project: currentProject })
+  log("info", "Plugin initializing", { clientId: CLIENT_ID, project: currentProject })
 
-  async function updatePresence() {
-    if (!connected) return
+  function updatePresence() {
+    if (!connected || pendingPresence) return
+    pendingPresence = true
 
     let details: string
     let state: string
@@ -65,70 +72,117 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
         case "reading":
           details = lastEditedFile ? `Reading ${lastEditedFile}` : "Reading files"
           break
+        case "approving":
+          details = "Waiting for approval..."
+          break
+        case "commanding":
+          details = lastCommand ? `Running /${lastCommand}` : "Running command"
+          break
         default:
           details = "Session active"
       }
 
-      state = currentProject
-      smallImageKey = activity === "thinking" ? "thinking" : "active"
-      smallImageText = activity === "thinking" ? "Generating" : "Active"
+      state = filesChanged > 0
+        ? `${currentProject} · ${filesChanged} file${filesChanged !== 1 ? "s" : ""} changed`
+        : currentProject
+      smallImageKey = activity === "thinking" ? "thinking" : activity === "approving" ? "idle" : "active"
+      smallImageText = activity === "thinking" ? "Generating" : activity === "approving" ? "Needs approval" : "Active"
     }
 
-    try {
-      await rpc.user?.setActivity({
-        details,
-        state,
-        startTimestamp,
-        largeImageKey: "opencode",
-        largeImageText: `OpenCode · ${sessionCount} session${sessionCount !== 1 ? "s" : ""}`,
-        smallImageKey,
-        smallImageText,
-      })
-      await log("debug", "Presence updated", { details, state })
-    } catch (e) {
-      await log("error", "Failed to set presence", { error: String(e) })
+    rpc.user?.setActivity({
+      details,
+      state,
+      startTimestamp,
+      largeImageKey: "opencode",
+      largeImageText: `OpenCode · ${sessionCount} session${sessionCount !== 1 ? "s" : ""}`,
+      smallImageKey,
+      smallImageText,
+    })
+      .then(() => log("debug", "Presence updated", { details, state }))
+      .catch((e) => log("error", "Failed to set presence", { error: String(e) }))
+      .finally(() => { pendingPresence = false })
+  }
+
+  function scheduleReconnect() {
+    if (destroyed || reconnectTimer) return
+    if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+      log("error", "Max reconnect attempts reached, giving up")
+      return
     }
+    reconnectAttempts++
+    log("info", "Scheduling reconnect", { attempt: reconnectAttempts })
+    reconnectTimer = setTimeout(() => {
+      reconnectTimer = undefined
+      rpc.login()
+        .then(() => {
+          log("info", "Reconnected to Discord RPC")
+          reconnectAttempts = 0
+        })
+        .catch((e) => {
+          log("error", "Reconnect failed", { error: String(e) })
+          scheduleReconnect()
+        })
+    }, RECONNECT_DELAY)
   }
 
-  rpc.on("ready", async () => {
+  rpc.on("ready", () => {
     connected = true
-    startTimestamp = Date.now()
-    await log("info", "Discord RPC connected")
-    await updatePresence()
+    startTimestamp = new Date()
+    log("info", "Discord RPC connected")
+    updatePresence()
   })
 
-  rpc.on("error", async (err: any) => {
-    await log("error", "Discord RPC error", { error: String(err) })
+  rpc.on("disconnected", () => {
+    connected = false
+    log("warn", "Discord RPC disconnected")
+    scheduleReconnect()
   })
 
-  rpc.on("disconnected", async () => {
-    connected = false
-    await log("warn", "Discord RPC disconnected")
+  process.on("exit", () => {
+    destroyed = true
+    if (reconnectTimer) clearTimeout(reconnectTimer)
+    if (connected) rpc.user?.clearActivity().catch(() => {})
+    rpc.destroy().catch(() => {})
   })
 
   try {
-    await log("info", "Logging in to Discord RPC...")
+    log("info", "Logging in to Discord RPC...")
     await rpc.login()
-    await log("info", "Discord RPC login successful")
+    reconnectAttempts = 0
+    log("info", "Discord RPC login successful")
   } catch (e) {
     connected = false
-    await log("error", "Discord RPC login failed", { error: String(e) })
+    log("error", "Discord RPC login failed", { error: String(e) })
+    scheduleReconnect()
   }
 
   return {
     event: async ({ event }) => {
-      const eventType = event.type as string
-
-      switch (eventType) {
+      switch (event.type) {
         case "session.created":
           sessionActive = true
           sessionCount += 1
-          startTimestamp = Date.now()
+          startTimestamp = new Date()
           lastEditedFile = undefined
+          lastCommand = undefined
+          filesChanged = 0
           activity = "thinking"
           break
-        case "session.idle":
+        case "session.updated":
           sessionActive = true
+          if (activity === "idle") activity = "thinking"
+          break
+        case "session.status": {
+          const status = (event as { properties?: { status?: string } }).properties?.status
+          if (status === "busy" || status === "retry") {
+            sessionActive = true
+            activity = "thinking"
+          } else if (status === "idle") {
+            activity = "idle"
+          }
+          break
+        }
+        case "session.idle":
           activity = "idle"
           break
         case "session.error":
@@ -138,8 +192,13 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
         case "session.deleted":
           sessionActive = false
           lastEditedFile = undefined
+          lastCommand = undefined
+          filesChanged = 0
           activity = "idle"
-          break
+          if (connected) {
+            rpc.user?.clearActivity().catch(() => {})
+          }
+          return
         case "session.compacted":
           activity = "thinking"
           break
@@ -149,6 +208,35 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
           lastEditedFile = basename(editedFile) ?? lastEditedFile
           break
         }
+        case "session.diff": {
+          const diffs = (event as { properties?: { diff?: unknown[] } }).properties?.diff
+          if (diffs) filesChanged = diffs.length
+          break
+        }
+        case "message.part.updated": {
+          if (sessionActive && activity !== "editing" && activity !== "running") {
+            activity = "thinking"
+          }
+          break
+        }
+        case "pty.created":
+          activity = "running"
+          break
+        case "pty.exited":
+          activity = sessionActive ? "thinking" : "idle"
+          break
+        case "permission.updated":
+          activity = "approving"
+          break
+        case "permission.replied":
+          activity = sessionActive ? "thinking" : "idle"
+          break
+        case "command.executed": {
+          const cmdName = (event as { properties?: { name?: string } }).properties?.name
+          lastCommand = cmdName
+          activity = "commanding"
+          break
+        }
       }
 
       updatePresence()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discord",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Discord Rich Presence plugin for OpenCode — shows your AI coding activity in Discord",
   "type": "module",
   "main": "index.ts",