@mohak34/opencode-notifier 0.1.30-beta.0 → 0.1.30-beta.2

package/README.md

@@ -176,11 +176,15 @@ Messages support placeholder tokens that get replaced with actual values:
 
 - `{sessionTitle}` - The title/summary of the current session (e.g. "Fix login bug")
 - `{projectName}` - The project folder name
+- `{timestamp}` - Current time in `HH:MM:SS` format (e.g. "14:30:05")
+- `{turn}` - Notification counter for the session, increments with each notification (e.g. 1, 2, 3)
 
 When `showSessionTitle` is `false`, `{sessionTitle}` is replaced with an empty string. Any trailing separators (`: `, ` - `, ` | `) are automatically cleaned up when a placeholder resolves to empty.
 
 To disable session titles in messages without changing `showSessionTitle`, just remove the `{sessionTitle}` placeholder from your custom messages.
 
+The `{timestamp}` and `{turn}` placeholders also work in custom command args.
+
 ### Sounds
 
 Use your own sound files:
@@ -293,17 +297,24 @@ To disable this and always get notified:
 
 ### Platform support
 
-| Platform | Method | Requirements |
-|----------|--------|--------------|
-| macOS | AppleScript (`System Events`) | None |
-| Linux X11 | `xdotool` | `xdotool` installed |
-| Linux Wayland (Hyprland) | `hyprctl activewindow` | None |
-| Linux Wayland (Sway) | `swaymsg -t get_tree` | None |
-| Linux Wayland (KDE) | `kdotool` | `kdotool` installed |
-| Linux Wayland (GNOME) | Not supported | Falls back to always notifying |
-| Windows | `GetForegroundWindow()` via PowerShell | None |
-
-If detection fails for any reason (missing tools, unknown compositor, permissions), it falls back to always notifying. It never silently eats your notifications.
+| Platform | Method | Requirements | Status |
+|----------|--------|--------------|--------|
+| macOS | AppleScript (`System Events`) | None | Untested |
+| Linux X11 | `xdotool` | `xdotool` installed | Untested |
+| Linux Wayland (Hyprland) | `hyprctl activewindow` | 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 |
+| 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).
+
+**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.
+
+If you test on a platform marked "Untested" and it works (or doesn't), please open an issue and let us know.
 
 ## Linux: Notification Grouping
 

package/dist/index.js

@@ -3850,7 +3850,7 @@ function loadConfig() {
       showSessionTitle: userConfig.showSessionTitle ?? DEFAULT_CONFIG.showSessionTitle,
       showIcon: userConfig.showIcon ?? DEFAULT_CONFIG.showIcon,
       suppressWhenFocused: userConfig.suppressWhenFocused ?? DEFAULT_CONFIG.suppressWhenFocused,
-      notificationSystem: userConfig.notificationSystem === "node-notifier" ? "node-notifier" : "osascript",
+      notificationSystem: userConfig.notificationSystem === "node-notifier" ? "node-notifier" : userConfig.notificationSystem === "ghostty" ? "ghostty" : "osascript",
       linux: {
         grouping: typeof userConfig.linux?.grouping === "boolean" ? userConfig.linux.grouping : DEFAULT_CONFIG.linux.grouping
       },
@@ -3936,6 +3936,10 @@ function interpolateMessage(message, context) {
   result = result.replaceAll("{sessionTitle}", sessionTitle);
   const projectName = context.projectName || "";
   result = result.replaceAll("{projectName}", projectName);
+  const timestamp = context.timestamp || "";
+  result = result.replaceAll("{timestamp}", timestamp);
+  const turn = context.turn != null ? String(context.turn) : "";
+  result = result.replaceAll("{turn}", turn);
   result = result.replace(/\s*[:\-|]\s*$/, "").trim();
   result = result.replace(/\s{2,}/g, " ");
   return result;
@@ -4009,6 +4013,15 @@ async function sendNotification(title, message, timeout, iconPath, notificationS
     return;
   }
   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]777;notify;${escapedTitle};${escapedMessage}\x07`, () => {
+        resolve();
+      });
+    });
+  }
   if (platform === "Darwin") {
     if (notificationSystem === "node-notifier") {
       return new Promise((resolve) => {
@@ -4180,18 +4193,20 @@ async function playSound(event, customPath, volume) {
 
 // src/command.ts
 import { spawn as spawn2 } from "child_process";
-function substituteTokens(value, event, message, sessionTitle, projectName) {
+function substituteTokens(value, event, message, sessionTitle, projectName, timestamp, turn) {
   let result = value.replaceAll("{event}", event).replaceAll("{message}", message);
   result = result.replaceAll("{sessionTitle}", sessionTitle || "");
   result = result.replaceAll("{projectName}", projectName || "");
+  result = result.replaceAll("{timestamp}", timestamp || "");
+  result = result.replaceAll("{turn}", turn != null ? String(turn) : "");
   return result;
 }
-function runCommand2(config, event, message, sessionTitle, projectName) {
+function runCommand2(config, event, message, sessionTitle, projectName, timestamp, turn) {
   if (!config.command.enabled || !config.command.path) {
     return;
   }
-  const args = (config.command.args ?? []).map((arg) => substituteTokens(arg, event, message, sessionTitle, projectName));
-  const command = substituteTokens(config.command.path, event, message, sessionTitle, projectName);
+  const args = (config.command.args ?? []).map((arg) => substituteTokens(arg, event, message, sessionTitle, projectName, timestamp, turn));
+  const command = substituteTokens(config.command.path, event, message, sessionTitle, projectName, timestamp, turn);
   const proc = spawn2(command, args, {
     stdio: "ignore",
     detached: true
@@ -4258,25 +4273,47 @@ function isMacOSFocused(terminal) {
     return false;
   return terminal.macProcessNames.some((name) => name.toLowerCase() === frontApp.toLowerCase());
 }
-function isPidAncestorOfCurrentProcess(pid) {
-  let currentPid = process.pid;
+function getParentPid(pid) {
+  try {
+    const stat = readFileSync2(`/proc/${pid}/stat`, "utf-8");
+    const closingParen = stat.lastIndexOf(")");
+    if (closingParen === -1)
+      return null;
+    const fields = stat.slice(closingParen + 2).split(" ");
+    const ppid = parseInt(fields[1], 10);
+    return Number.isFinite(ppid) ? ppid : null;
+  } catch {
+    return null;
+  }
+}
+function getProcessTreeRoot() {
+  if (process.env.TMUX) {
+    const clientPidStr = execWithTimeout("tmux display-message -p '#{client_pid}'");
+    if (clientPidStr) {
+      const clientPid = parseInt(clientPidStr, 10);
+      if (Number.isFinite(clientPid) && clientPid > 0)
+        return clientPid;
+    }
+  }
+  return process.pid;
+}
+function isPidAncestorOfProcess(targetPid, startPid) {
+  let currentPid = startPid;
   for (let depth = 0;depth < 20; depth++) {
-    if (currentPid === pid)
+    if (currentPid === targetPid)
       return true;
     if (currentPid <= 1)
       return false;
-    try {
-      const stat = readFileSync2(`/proc/${currentPid}/stat`, "utf-8");
-      const match = stat.match(/^\d+\s+\(.*?\)\s+\S+\s+(\d+)/);
-      if (!match)
-        return false;
-      currentPid = parseInt(match[1], 10);
-    } catch {
+    const ppid = getParentPid(currentPid);
+    if (ppid === null)
       return false;
-    }
+    currentPid = ppid;
   }
   return false;
 }
+function isFocusedWindowOurs(windowPid) {
+  return isPidAncestorOfProcess(windowPid, getProcessTreeRoot());
+}
 function isLinuxX11Focused() {
   const pidStr = execWithTimeout("xdotool getactivewindow getwindowpid");
   if (!pidStr)
@@ -4284,7 +4321,7 @@ function isLinuxX11Focused() {
   const pid = parseInt(pidStr, 10);
   if (!Number.isFinite(pid) || pid <= 0)
     return false;
-  return isPidAncestorOfCurrentProcess(pid);
+  return isFocusedWindowOurs(pid);
 }
 function isHyprlandFocused() {
   const output = execWithTimeout("hyprctl activewindow -j");
@@ -4295,7 +4332,7 @@ function isHyprlandFocused() {
     const pid = data?.pid;
     if (typeof pid !== "number" || pid <= 0)
       return false;
-    return isPidAncestorOfCurrentProcess(pid);
+    return isFocusedWindowOurs(pid);
   } catch {
     return false;
   }
@@ -4309,7 +4346,7 @@ function isSwayFocused() {
     const pid = findFocusedPid(tree);
     if (pid === null)
       return false;
-    return isPidAncestorOfCurrentProcess(pid);
+    return isFocusedWindowOurs(pid);
   } catch {
     return false;
   }
@@ -4344,7 +4381,7 @@ function isKDEWaylandFocused() {
   const pid = parseInt(pidStr, 10);
   if (!Number.isFinite(pid) || pid <= 0)
     return false;
-  return isPidAncestorOfCurrentProcess(pid);
+  return isFocusedWindowOurs(pid);
 }
 function isLinuxWaylandFocused() {
   const env = process.env;
@@ -4380,7 +4417,8 @@ Write-Output $pid
   const pid = parseInt(pidStr, 10);
   if (!Number.isFinite(pid) || pid <= 0)
     return false;
-  let currentPid = process.pid;
+  const startPid = getProcessTreeRoot();
+  let currentPid = startPid;
   for (let depth = 0;depth < 20; depth++) {
     if (currentPid === pid)
       return true;
@@ -4428,6 +4466,7 @@ var pendingIdleTimers = new Map;
 var sessionIdleSequence = new Map;
 var sessionErrorSuppressionAt = new Map;
 var sessionLastBusyAt = new Map;
+var sessionTurnCount = new Map;
 setInterval(() => {
   const cutoff = Date.now() - 5 * 60 * 1000;
   for (const [sessionID] of sessionIdleSequence) {
@@ -4445,6 +4484,11 @@ setInterval(() => {
       sessionLastBusyAt.delete(sessionID);
     }
   }
+  for (const [sessionID] of sessionTurnCount) {
+    if (!pendingIdleTimers.has(sessionID) && !sessionLastBusyAt.has(sessionID)) {
+      sessionTurnCount.delete(sessionID);
+    }
+  }
 }, 5 * 60 * 1000);
 function getNotificationTitle(config, projectName) {
   if (config.showProjectName && projectName) {
@@ -4452,15 +4496,33 @@ function getNotificationTitle(config, projectName) {
   }
   return "OpenCode";
 }
-async function handleEvent(config, eventType, projectName, elapsedSeconds, sessionTitle) {
+function formatTimestamp() {
+  const now = new Date;
+  const h = String(now.getHours()).padStart(2, "0");
+  const m = String(now.getMinutes()).padStart(2, "0");
+  const s = String(now.getSeconds()).padStart(2, "0");
+  return `${h}:${m}:${s}`;
+}
+function incrementSessionTurn(sessionID) {
+  if (!sessionID)
+    return 1;
+  const next = (sessionTurnCount.get(sessionID) ?? 0) + 1;
+  sessionTurnCount.set(sessionID, next);
+  return next;
+}
+async function handleEvent(config, eventType, projectName, elapsedSeconds, sessionTitle, sessionID) {
   if (config.suppressWhenFocused && isTerminalFocused()) {
     return;
   }
   const promises = [];
+  const timestamp = formatTimestamp();
+  const turn = incrementSessionTurn(sessionID ?? null);
   const rawMessage = getMessage(config, eventType);
   const message = interpolateMessage(rawMessage, {
     sessionTitle: config.showSessionTitle ? sessionTitle : null,
-    projectName
+    projectName,
+    timestamp,
+    turn
   });
   if (isEventNotificationEnabled(config, eventType)) {
     const title = getNotificationTitle(config, projectName);
@@ -4475,7 +4537,7 @@ async function handleEvent(config, eventType, projectName, elapsedSeconds, sessi
   const minDuration = config.command?.minDuration;
   const shouldSkipCommand = typeof minDuration === "number" && Number.isFinite(minDuration) && minDuration > 0 && typeof elapsedSeconds === "number" && Number.isFinite(elapsedSeconds) && elapsedSeconds < minDuration;
   if (!shouldSkipCommand) {
-    runCommand2(config, eventType, message, sessionTitle, projectName);
+    runCommand2(config, eventType, message, sessionTitle, projectName, timestamp, turn);
   }
   await Promise.allSettled(promises);
 }
@@ -4609,7 +4671,7 @@ async function handleEventWithElapsedTime(client, config, eventType, projectName
     const info = await getSessionInfo(client, sessionID);
     sessionTitle = info.title;
   }
-  await handleEvent(config, eventType, projectName, elapsedSeconds, sessionTitle);
+  await handleEvent(config, eventType, projectName, elapsedSeconds, sessionTitle, sessionID);
 }
 var NotifierPlugin = async ({ client, directory }) => {
   const getConfig = () => loadConfig();

package/package.json

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