opencode-discord 1.8.2 → 1.8.3

package/index.ts

@@ -6,13 +6,15 @@ const RECONNECT_DELAY = 5_000
 const MAX_RECONNECT_ATTEMPTS = 5
 
 type Activity = "idle" | "thinking" | "editing" | "running" | "reading" | "approving" | "commanding"
-type LogLevel = "debug" | "info" | "error" | "warn"
 
 function basename(filePath?: string): string | undefined {
   if (!filePath) return undefined
   const normalized = filePath.replace(/\\/g, "/")
-  const name = normalized.split("/").pop()
-  return name || undefined
+  return normalized.split("/").pop() || undefined
+}
+
+function props(event: { properties?: Record<string, unknown> }) {
+  return (event.properties ?? {}) as Record<string, any>
 }
 
 export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
@@ -26,26 +28,37 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
   let sessionCount = 0
   let filesChanged = 0
   let lastCommand: string | undefined
+  let modelName: string | undefined
+  let sessionTokens = { input: 0, output: 0 }
   let reconnectAttempts = 0
   let reconnectTimer: ReturnType<typeof setTimeout> | undefined
   let pendingPresence = false
+  let presenceDirty = false
   let destroyed = false
 
-  function log(level: LogLevel, message: string, extra?: Record<string, unknown>) {
-    sdk.app.log({
-      body: {
-        service: "discord-status",
-        level,
-        message,
-        extra,
-      },
-    }).catch(() => {})
+  function log(level: string, message: string, extra?: Record<string, unknown>) {
+    sdk.app.log({ body: { service: "discord-status", level, message, extra } }).catch(() => {})
   }
 
-  log("info", "Plugin initializing", { clientId: CLIENT_ID, project: currentProject })
+  function formatTokens(n: number): string {
+    if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`
+    if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`
+    return String(n)
+  }
+
+  function resetSession() {
+    lastEditedFile = undefined
+    lastCommand = undefined
+    filesChanged = 0
+    sessionTokens = { input: 0, output: 0 }
+  }
 
   function updatePresence() {
-    if (!connected || pendingPresence) return
+    if (!connected) return
+    if (pendingPresence) {
+      presenceDirty = true
+      return
+    }
     pendingPresence = true
 
     let details: string
@@ -82,9 +95,12 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
           details = "Session active"
       }
 
-      state = filesChanged > 0
-        ? `${currentProject} · ${filesChanged} file${filesChanged !== 1 ? "s" : ""} changed`
-        : currentProject
+      const stateParts = [currentProject]
+      if (filesChanged > 0) stateParts.push(`${filesChanged} file${filesChanged !== 1 ? "s" : ""} changed`)
+      const totalTokens = sessionTokens.input + sessionTokens.output
+      if (totalTokens > 0) stateParts.push(`${formatTokens(totalTokens)} tokens`)
+      state = stateParts.join(" · ")
+
       smallImageKey = activity === "thinking" ? "thinking" : activity === "approving" ? "idle" : "active"
       smallImageText = activity === "thinking" ? "Generating" : activity === "approving" ? "Needs approval" : "Active"
     }
@@ -94,13 +110,21 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
       state,
       startTimestamp,
       largeImageKey: "opencode",
-      largeImageText: `OpenCode · ${sessionCount} session${sessionCount !== 1 ? "s" : ""}`,
+      largeImageText: modelName
+        ? `OpenCode · ${modelName}`
+        : `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 })
+      .finally(() => {
+        pendingPresence = false
+        if (presenceDirty) {
+          presenceDirty = false
+          updatePresence()
+        }
+      })
   }
 
   function scheduleReconnect() {
@@ -145,8 +169,8 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
     rpc.destroy().catch(() => {})
   })
 
+  log("info", "Logging in to Discord RPC...", { clientId: CLIENT_ID, project: currentProject })
   try {
-    log("info", "Logging in to Discord RPC...")
     await rpc.login()
     reconnectAttempts = 0
     log("info", "Discord RPC login successful")
@@ -163,9 +187,7 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
           sessionActive = true
           sessionCount += 1
           startTimestamp = new Date()
-          lastEditedFile = undefined
-          lastCommand = undefined
-          filesChanged = 0
+          resetSession()
           activity = "thinking"
           break
         case "session.updated":
@@ -173,7 +195,7 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
           if (activity === "idle") activity = "thinking"
           break
         case "session.status": {
-          const status = (event as { properties?: { status?: string } }).properties?.status
+          const status = props(event).status
           if (status === "busy" || status === "retry") {
             sessionActive = true
             activity = "thinking"
@@ -191,29 +213,28 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
           break
         case "session.deleted":
           sessionActive = false
-          lastEditedFile = undefined
-          lastCommand = undefined
-          filesChanged = 0
+          resetSession()
           activity = "idle"
-          if (connected) {
-            rpc.user?.clearActivity().catch(() => {})
-          }
+          if (connected) rpc.user?.clearActivity().catch(() => {})
           return
         case "session.compacted":
           activity = "thinking"
           break
-        case "file.edited": {
+        case "file.edited":
           activity = "editing"
-          const editedFile = (event as { properties?: { file?: string } }).properties?.file
-          lastEditedFile = basename(editedFile) ?? lastEditedFile
+          lastEditedFile = basename(props(event).file) ?? lastEditedFile
           break
-        }
         case "session.diff": {
-          const diffs = (event as { properties?: { diff?: unknown[] } }).properties?.diff
-          if (diffs) filesChanged = diffs.length
+          const diffs = props(event).diff
+          if (Array.isArray(diffs)) filesChanged = diffs.length
           break
         }
         case "message.part.updated": {
+          const part = props(event).part
+          if (part?.type === "step-finish" && part.tokens) {
+            sessionTokens.input += part.tokens.input ?? 0
+            sessionTokens.output += part.tokens.output ?? 0
+          }
           if (sessionActive && activity !== "editing" && activity !== "running") {
             activity = "thinking"
           }
@@ -231,17 +252,20 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
         case "permission.replied":
           activity = sessionActive ? "thinking" : "idle"
           break
-        case "command.executed": {
-          const cmdName = (event as { properties?: { name?: string } }).properties?.name
-          lastCommand = cmdName
+        case "command.executed":
+          lastCommand = props(event).name
           activity = "commanding"
           break
-        }
       }
 
       updatePresence()
     },
 
+    "chat.params": async (input) => {
+      const name = input.model?.name ?? input.model?.id
+      if (name) modelName = name
+    },
+
     "tool.execute.before": async (input, output) => {
       const args = output.args as { filePath?: string } | undefined
 
@@ -259,15 +283,11 @@ export const DiscordStatus: Plugin = async ({ client: sdk, directory }) => {
     },
 
     "tool.execute.after": async (input) => {
-      if (input.tool === "edit" || input.tool === "write") {
-        activity = "editing"
-        const filePath = input.args?.filePath as string | undefined
-        lastEditedFile = basename(filePath) ?? lastEditedFile
-      } else if (input.tool === "bash") {
+      if (input.tool === "bash") {
         activity = sessionActive ? "thinking" : "idle"
       }
 
       updatePresence()
     },
   }
-}
+}

package/package.json

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