@mohak34/opencode-notifier 0.1.36 → 0.1.37-beta.0

package/README.md

@@ -320,15 +320,16 @@ To disable this and always get notified:
 | macOS | AppleScript (`System Events`) | None | Untested |
 | Linux X11 | `xdotool` | `xdotool` installed | Untested |
 | Linux Wayland (Hyprland) | `hyprctl activewindow` | None | Tested |
+| Linux Wayland (Niri) | `niri msg --json focused-window` | None | Tested |
 | Linux Wayland (Sway) | `swaymsg -t get_tree` | None | Untested |
 | Linux Wayland (KDE) | `kdotool` | `kdotool` installed | Untested |
 | Linux Wayland (GNOME) | Not supported | - | Falls back to always notifying |
-| Linux Wayland (Niri, river, dwl, Cosmic, etc.) | Not supported | - | Falls back to always notifying |
+| Linux Wayland (river, dwl, Cosmic, etc.) | Not supported | - | Falls back to always notifying |
 | Windows | `GetForegroundWindow()` via PowerShell | None | Untested |
 
 **Unsupported compositors**: Wayland has no standard protocol for querying the focused window. Each compositor has its own IPC, and GNOME intentionally doesn't expose focus information. Unsupported compositors fall back to always notifying.
 
-**tmux/screen**: When running inside tmux, the tmux server daemonizes and detaches from the terminal's process tree. The plugin handles this by querying the tmux client PID and walking from there. GNU Screen has the same issue but is not currently handled (falls back to always notifying).
+**tmux/screen**: When running inside tmux, focus detection uses tmux pane state (`session_attached`, `window_active`, `pane_active`) via `tmux display-message`. This keeps suppression accurate when switching panes/windows/sessions. GNU Screen is not currently handled (falls back to always notifying).
 
 **Fail-open design**: If detection fails for any reason (missing tools, unknown compositor, permissions), it falls back to always notifying. It never silently eats your notifications.
 

package/dist/index.js

@@ -250,6 +250,18 @@ if (platform === "Linux" || platform.match(/BSD$/)) {
 var lastNotificationTime = {};
 var lastLinuxNotificationId = null;
 var linuxNotifySendSupportsReplace = null;
+function sanitizeGhosttyField(value) {
+  return value.replace(/[;\x07\x1b\n\r]/g, "");
+}
+function formatGhosttyNotificationSequence(title, message, env = process.env) {
+  const escapedTitle = sanitizeGhosttyField(title);
+  const escapedMessage = sanitizeGhosttyField(message);
+  const payload = `\x1B]9;${escapedTitle}: ${escapedMessage}\x07`;
+  if (env.TMUX) {
+    return `\x1BPtmux;\x1B${payload}\x1B\\`;
+  }
+  return payload;
+}
 function detectNotifySendCapabilities() {
   return new Promise((resolve) => {
     execFile("notify-send", ["--version"], (error, stdout) => {
@@ -302,9 +314,8 @@ async function sendNotification(title, message, timeout, iconPath, notificationS
   lastNotificationTime[message] = now;
   if (notificationSystem === "ghostty") {
     return new Promise((resolve) => {
-      const escapedTitle = title.replace(/[;\x07\x1b\n\r]/g, "");
-      const escapedMessage = message.replace(/[;\x07\x1b\n\r]/g, "");
-      process.stdout.write(`\x1B]9;${escapedTitle}: ${escapedMessage}\x07`, () => {
+      const sequence = formatGhosttyNotificationSequence(title, message);
+      process.stdout.write(sequence, () => {
         resolve();
       });
     });
@@ -578,10 +589,23 @@ function getSwayActiveWindowId() {
     return null;
   }
 }
+function getNiriActiveWindowId() {
+  const output = execWithTimeout("niri msg --json focused-window", 1000);
+  if (!output)
+    return null;
+  try {
+    const data = JSON.parse(output);
+    return typeof data?.id === "number" ? String(data.id) : null;
+  } catch {
+    return null;
+  }
+}
 function getLinuxWaylandActiveWindowId() {
   const env = process.env;
   if (env.HYPRLAND_INSTANCE_SIGNATURE)
     return getHyprlandActiveWindowId();
+  if (env.NIRI_SOCKET)
+    return getNiriActiveWindowId();
   if (env.SWAYSOCK)
     return getSwayActiveWindowId();
   if (env.KDE_SESSION_VERSION)
@@ -652,16 +676,19 @@ function getActiveWindowId() {
   return null;
 }
 var cachedWindowId = getActiveWindowId();
-var tmuxPane = process.env.TMUX_PANE ?? null;
-function isTmuxPaneActive() {
+function isTmuxPaneFocused(tmuxPane, probeResult) {
   if (!tmuxPane)
-    return true;
-  const result = execWithTimeout(`tmux display-message -t ${tmuxPane} -p '#{session_attached} #{window_active} #{pane_active}'`);
-  if (!result)
     return false;
-  const [sessionAttached, windowActive, paneActive] = result.split(" ");
+  if (!probeResult)
+    return false;
+  const [sessionAttached, windowActive, paneActive] = probeResult.split(" ");
   return sessionAttached === "1" && windowActive === "1" && paneActive === "1";
 }
+function isTmuxPaneActive() {
+  const tmuxPane = process.env.TMUX_PANE ?? null;
+  const result = execFileWithTimeout("tmux", ["display-message", "-t", tmuxPane ?? "", "-p", "#{session_attached} #{window_active} #{pane_active}"]);
+  return isTmuxPaneFocused(tmuxPane, result);
+}
 function isTerminalFocused() {
   try {
     if (process.platform === "darwin") {
@@ -687,6 +714,34 @@ function isTerminalFocused() {
   }
 }
 
+// src/permission-dedupe.ts
+var PERMISSION_DEDUPE_WINDOW_MS = 1000;
+var sessionLastPermissionAt = new Map;
+var globalLastPermissionAt = 0;
+function shouldSuppressPermissionAlert(sessionID, now = Date.now()) {
+  const sessionLastAt = sessionID ? sessionLastPermissionAt.get(sessionID) : undefined;
+  const latestSeen = Math.max(globalLastPermissionAt, sessionLastAt ?? 0);
+  const isDuplicate = latestSeen > 0 && now - latestSeen < PERMISSION_DEDUPE_WINDOW_MS;
+  if (isDuplicate) {
+    return true;
+  }
+  globalLastPermissionAt = now;
+  if (sessionID) {
+    sessionLastPermissionAt.set(sessionID, now);
+  }
+  return false;
+}
+function prunePermissionAlertState(cutoffMs) {
+  for (const [sessionID, timestamp] of sessionLastPermissionAt) {
+    if (timestamp < cutoffMs) {
+      sessionLastPermissionAt.delete(sessionID);
+    }
+  }
+  if (globalLastPermissionAt < cutoffMs) {
+    globalLastPermissionAt = 0;
+  }
+}
+
 // src/index.ts
 var IDLE_COMPLETE_DELAY_MS = 350;
 var pendingIdleTimers = new Map;
@@ -734,6 +789,7 @@ setInterval(() => {
       sessionLastBusyAt.delete(sessionID);
     }
   }
+  prunePermissionAlertState(cutoff);
 }, 5 * 60 * 1000);
 function getNotificationTitle(config, projectName) {
   if (config.showProjectName && projectName) {
@@ -924,7 +980,10 @@ var NotifierPlugin = async ({ client, directory }) => {
     event: async ({ event }) => {
       const config = getConfig();
       if (event.type === "permission.asked") {
-        await handleEventWithElapsedTime(client, config, "permission", projectName, event);
+        const sessionID = getSessionIDFromEvent(event);
+        if (!shouldSuppressPermissionAlert(sessionID)) {
+          await handleEventWithElapsedTime(client, config, "permission", projectName, event);
+        }
       }
       if (event.type === "session.idle") {
         const sessionID = getSessionIDFromEvent(event);
@@ -951,7 +1010,9 @@ var NotifierPlugin = async ({ client, directory }) => {
     },
     "permission.ask": async () => {
       const config = getConfig();
-      await handleEvent(config, "permission", projectName, null);
+      if (!shouldSuppressPermissionAlert(null)) {
+        await handleEvent(config, "permission", projectName, null);
+      }
     },
     "tool.execute.before": async (input) => {
       const config = getConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohak34/opencode-notifier",
-  "version": "0.1.36",
+  "version": "0.1.37-beta.0",
   "description": "OpenCode plugin that sends system notifications and plays sounds when permission is needed, generation completes, or errors occur",
   "author": "mohak34",
   "license": "MIT",