@jack-yang/opencode-bark-notify 1.0.2 → 1.1.0

package/README.md

@@ -1,12 +1,11 @@
 # opencode-bark-notify
 
-Focus-aware [Bark](https://github.com/Finb/Bark) push notifications for [OpenCode](https://opencode.ai).
+[Bark](https://github.com/Finb/Bark) push notifications for [OpenCode](https://opencode.ai).
 
-Get **detailed agent messages** on your iPhone when you step away from your computer. When you're at the terminal, notifications are suppressed — no spam.
+Get **detailed agent messages** on your iPhone: task finished, permission needed, or a question waiting for you.
 
 ## Features
 
-- **Focus-aware** — Suppresses notifications when your terminal is the frontmost app
 - **Detailed content** — Sends the agent's actual last message, not just "task completed"
 - **Category badges** — iOS subtitle shows what happened: ✅ Responded / 🔐 Wait for Permission / ❓ Input Needed
 - **Session-aware** — Includes the session title in every notification
@@ -59,7 +58,6 @@ Restart OpenCode.
 | `barkUrl` | string | `https://api.day.app` | Bark server URL (for self-hosted) |
 | `level` | string | `timeSensitive` | iOS notification level |
 | `group` | string | `opencode` | iOS notification group |
-| `terminals` | string[] | `["Ghostty", "Terminal", "iTerm2", ...]` | Terminal app names for focus detection |
 
 ### Example with all options
 
@@ -70,24 +68,17 @@ Restart OpenCode.
       "barkKey": "YOUR_KEY",
       "barkUrl": "https://your-bark-server.com",
       "level": "active",
-      "group": "my-agent",
-      "terminals": ["Ghostty", "WezTerm"]
+      "group": "my-agent"
     }]
   ]
 }
 ```
 
-## How focus detection works
-
-On macOS, the plugin uses `osascript` to check if a terminal app is the frontmost application. If it is, notifications are suppressed — you're already looking at the terminal. If you've switched to another app or stepped away, notifications fire.
-
-On non-macOS, focus detection is disabled (notifications always fire).
-
 ## Notification types
 
 | Event | Badge | Body |
 |-------|-------|------|
-| Session complete | **✅ Responded** | Agent's last message (up to 500 chars) |
+| Session complete | **✅ Responded** | The agent's last reply (up to 500 chars) |
 | Permission request | **🔐 Wait for Permission** | Permission type + patterns |
 | Question | **❓ Input Needed** | The question text |
 
@@ -95,10 +86,10 @@ On non-macOS, focus detection is disabled (notifications always fire).
 
 This plugin complements [@mohak34/opencode-notifier](https://github.com/mohak34/opencode-notifier) (desktop notifications). Use both together:
 
-- **Desktop** (osascript/sound/bell) → when at computer but in another app
-- **Bark** (iPhone push) → when away from computer entirely
+- **Desktop** (osascript/sound/bell) → on the computer
+- **Bark** (iPhone push) → on your phone
 
-Both independently check focus, so there's no conflict.
+This plugin always sends; if you want desktop notifications only when the terminal is in the background, set `suppressWhenFocused` in opencode-notifier.
 
 ## License
 

package/README.zh-CN.md

@@ -1,12 +1,11 @@
 # opencode-bark-notify
 
-为 [OpenCode](https://opencode.ai) 提供基于 [Bark](https://github.com/Finb/Bark) 的手机推送通知，**智能感知终端焦点**。
+为 [OpenCode](https://opencode.ai) 提供基于 [Bark](https://github.com/Finb/Bark) 的手机推送通知。
 
-离开电脑时收到 **agent 的实际消息内容**，在终端前时自动静默——不打扰。
+任务完成、需要授权、等你回答时，iPhone 上收到 **agent 的实际消息内容**。
 
 ## 功能
 
-- **焦点感知** — 终端在前台时不发通知，切走或离开时才推
 - **详细内容** — 推送 agent 的最后一条消息，不只是"任务完成"
 - **分类标识** — iOS 副标题显示事件类型：✅ Responded / 🔐 Wait for Permission / ❓ Input Needed
 - **Session 感知** — 每条通知包含 session 标题
@@ -59,13 +58,12 @@ export BARK_KEY="你的BARK设备KEY"
 | `barkUrl` | string | `https://api.day.app` | Bark 服务器地址（自建服务器用） |
 | `level` | string | `timeSensitive` | iOS 通知级别 |
 | `group` | string | `opencode` | iOS 通知分组 |
-| `terminals` | string[] | `["Ghostty", "Terminal", "iTerm2", ...]` | 焦点检测的终端 App 名称 |
 
 ## 通知类型
 
 | 事件 | 标识 | 内容 |
 |------|------|------|
-| Session 完成 | **✅ Responded** | agent 最后一条消息（≤500字） |
+| Session 完成 | **✅ Responded** | agent 最后一条回复（≤500字） |
 | 需要权限 | **🔐 Wait for Permission** | 权限类型 + 匹配模式 |
 | 需要回答 | **❓ Input Needed** | 问题内容 |
 
@@ -73,10 +71,10 @@ export BARK_KEY="你的BARK设备KEY"
 
 本插件与 [@mohak34/opencode-notifier](https://github.com/mohak34/opencode-notifier)（桌面通知）互补：
 
-- **桌面通知**（声音/弹窗）→ 在电脑前但切到了其他窗口
-- **Bark 推送**（手机）→ 完全离开电脑
+- **桌面通知**（声音/弹窗）→ 电脑上
+- **Bark 推送**（手机）→ 手机上
 
-两者各自独立检测焦点，互不冲突。
+本插件总是推送；如果希望桌面通知只在终端不在前台时弹，在 opencode-notifier 里设置 `suppressWhenFocused`。
 
 ## 许可证
 

package/index.ts

@@ -5,27 +5,11 @@ interface BarkConfig {
   barkUrl?: string
   level?: string
   group?: string
-  terminals?: string[]
 }
 
-const DEFAULT_TERMINALS = ["Ghostty", "Terminal", "iTerm2", "Alacritty", "kitty", "WezTerm"]
 const DEFAULT_BARK_URL = "https://api.day.app"
 const MAX_BODY_LENGTH = 500
 
-const isFocused = async (terminals: string[]): Promise<boolean> => {
-  if (process.platform !== "darwin") return false
-  try {
-    const proc = Bun.spawn(
-      ["osascript", "-e", 'tell application "System Events" to name of first application whose frontmost is true'],
-      { stdout: "pipe", stderr: "pipe" },
-    )
-    const output = await new Response(proc.stdout).text()
-    return terminals.includes(output.trim())
-  } catch {
-    return false
-  }
-}
-
 const sendBark = async (
   barkUrl: string,
   barkKey: string,
@@ -49,7 +33,12 @@ const truncate = (text: string, max: number): string => {
   return clean.length > max ? clean.slice(0, max) + "..." : clean
 }
 
-export const BarkNotifyPlugin: Plugin = async ({ project, client }, config: BarkConfig = {}) => {
+// Every notification is sent, whether or not the terminal is in front. Focus detection
+// (osascript) proved fragile across macOS releases and silently dropped notifications.
+//
+// Only the plugin itself may be exported: opencode calls every exported function of a
+// plugin module as a plugin, so an exported helper would be invoked with the plugin context.
+export const BarkNotifyPlugin: Plugin = async ({ project, client, directory }, config: BarkConfig = {}) => {
   const barkKey = config.barkKey || process.env.BARK_KEY
   if (!barkKey) {
     console.warn(
@@ -61,54 +50,61 @@ export const BarkNotifyPlugin: Plugin = async ({ project, client }, config: Bark
   const barkUrl = config.barkUrl || process.env.BARK_URL || DEFAULT_BARK_URL
   const level = config.level || "timeSensitive"
   const group = config.group || "opencode"
-  const terminals = config.terminals || DEFAULT_TERMINALS
 
+  // project.id is "global" outside a git repository; the folder name says more.
+  const folder = String(directory || (project as any)?.worktree || "").split("/").filter(Boolean).pop()
+  let currentTitle = `OpenCode · ${folder || "Session"}`
+
+  // Only assistant text is worth sending; user prompts arrive as text parts too.
+  const assistantMessages = new Set<string>()
   let lastMessage = ""
-  let currentTitle = `OpenCode · ${project?.id || "Session"}`
 
   const send = (subtitle: string, body: string) =>
     sendBark(barkUrl, barkKey, currentTitle, subtitle, body, level, group)
 
   return {
-    event: async ({ event }) => {
+    event: async ({ event }: { event: any }) => {
+      if (event.type === "message.updated") {
+        const info = event.properties?.info
+        if (info?.role === "assistant" && info.id) assistantMessages.add(info.id)
+      }
+
       if (event.type === "message.part.updated") {
         const part = event.properties?.part
-        if (part?.type === "text" && part.text) {
+        if (part?.type === "text" && part.text && !part.synthetic && assistantMessages.has(part.messageID)) {
           lastMessage = part.text
         }
         if (part?.type === "tool" && part.tool === "question" && part.state?.status === "running") {
-          if (await isFocused(terminals)) return
           const questions = part.state?.input?.questions || []
           const q = questions[0]?.question || "Input needed"
           await send("❓ Input Needed", q)
         }
       }
 
-      if (event.type === "session.idle") {
-        if (await isFocused(terminals)) return
+      // Permission requests arrive as an event; the old "permission.ask" hook is gone in opencode 1.19+.
+      if (event.type === "permission.asked") {
+        const p = event.properties || {}
+        const patterns: string[] = p.patterns || []
+        let body = p.permission || "permission"
+        if (patterns.length) body += `: ${patterns.join(", ")}`
+        await send("🔐 Wait for Permission", truncate(body, MAX_BODY_LENGTH))
+      }
 
+      if (event.type === "session.idle") {
         const sid = event.properties?.sessionID
         if (sid) {
           try {
-            const sessions = await client.session.list({ limit: 50 })
-            const s = sessions.data?.find((s: any) => s.id === sid)
+            const sessions = await client.session.list({ limit: 50 } as any)
+            const s = (sessions as any).data?.find((s: any) => s.id === sid)
             if (s?.title) currentTitle = `OpenCode · ${s.title}`
           } catch {}
         }
 
         const body = lastMessage ? truncate(lastMessage, MAX_BODY_LENGTH) : "Task completed"
+        lastMessage = ""
         await send("✅ Responded", body)
       }
     },
-
-    "permission.ask": async (input: any) => {
-      if (await isFocused(terminals)) return
-      const permType = input?.type || "permission"
-      const patterns = input?.patterns || []
-      let body = permType
-      if (patterns.length) body += `: ${patterns.join(", ")}`
-      await send("🔐 Wait for Permission", body)
-    },
   }
 }
 

package/package.json

@@ -1,12 +1,16 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@jack-yang/opencode-bark-notify",
-  "version": "1.0.2",
-  "description": "Focus-aware Bark push notifications for OpenCode — get detailed agent messages on your phone when you step away",
+  "version": "1.1.0",
+  "description": "Bark push notifications for OpenCode — get the agent's actual messages on your iPhone",
   "type": "module",
+  "main": "./index.ts",
   "exports": {
     ".": {
       "import": "./index.ts"
+    },
+    "./server": {
+      "import": "./index.ts"
     }
   },
   "engines": {
@@ -33,8 +37,7 @@
     "bark",
     "notification",
     "push-notification",
-    "ios",
-    "focus-aware"
+    "ios"
   ],
   "license": "MIT",
   "repository": {