@mohak34/opencode-notifier 0.1.30-beta.4 → 0.1.30-beta.6

package/dist/index.js

@@ -3728,7 +3728,7 @@ var require_node_notifier = __commonJS((exports, module) => {
 
 // src/index.ts
 import { basename } from "path";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 
 // src/config.ts
 import { readFileSync, existsSync } from "fs";
@@ -4222,49 +4222,6 @@ function runCommand2(config, event, message, sessionTitle, projectName, timestam
 
 // src/focus.ts
 import { execSync } from "child_process";
-import { readFileSync as readFileSync2 } from "fs";
-var TERMINAL_MAP = {
-  ghostty: { name: "Ghostty", macProcessNames: ["Ghostty", "ghostty"] },
-  kitty: { name: "kitty", macProcessNames: ["kitty"] },
-  alacritty: { name: "Alacritty", macProcessNames: ["Alacritty", "alacritty"] },
-  wezterm: { name: "WezTerm", macProcessNames: ["WezTerm", "wezterm-gui"] },
-  apple_terminal: { name: "Terminal", macProcessNames: ["Terminal"] },
-  iterm: { name: "iTerm2", macProcessNames: ["iTerm2", "iTerm"] },
-  warp: { name: "Warp", macProcessNames: ["Warp"] },
-  vscode: { name: "VS Code", macProcessNames: ["Code", "Code - Insiders", "Cursor", "cursor"] },
-  windows_terminal: { name: "Windows Terminal", macProcessNames: [] },
-  tmux: { name: "tmux", macProcessNames: [] }
-};
-var cachedTerminal = undefined;
-function detectTerminal() {
-  if (cachedTerminal !== undefined)
-    return cachedTerminal;
-  const env = process.env;
-  let result = null;
-  if (env.GHOSTTY_RESOURCES_DIR) {
-    result = TERMINAL_MAP.ghostty;
-  } else if (env.KITTY_PID) {
-    result = TERMINAL_MAP.kitty;
-  } else if (env.ALACRITTY_SOCKET || env.ALACRITTY_LOG) {
-    result = TERMINAL_MAP.alacritty;
-  } else if (env.WEZTERM_EXECUTABLE) {
-    result = TERMINAL_MAP.wezterm;
-  } else if (env.WT_SESSION) {
-    result = TERMINAL_MAP.windows_terminal;
-  } else if (env.VSCODE_PID || env.TERM_PROGRAM === "vscode") {
-    result = TERMINAL_MAP.vscode;
-  } else if (env.TERM_PROGRAM === "Apple_Terminal") {
-    result = TERMINAL_MAP.apple_terminal;
-  } else if (env.TERM_PROGRAM === "iTerm.app") {
-    result = TERMINAL_MAP.iterm;
-  } else if (env.TERM_PROGRAM === "WarpTerminal") {
-    result = TERMINAL_MAP.warp;
-  } else if (env.TMUX || env.TERM_PROGRAM === "tmux") {
-    result = TERMINAL_MAP.tmux;
-  }
-  cachedTerminal = result;
-  return result;
-}
 function execWithTimeout(command, timeoutMs = 500) {
   try {
     return execSync(command, { timeout: timeoutMs, encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
@@ -4272,205 +4229,107 @@ function execWithTimeout(command, timeoutMs = 500) {
     return null;
   }
 }
-function isMacOSFocused(terminal) {
-  const frontApp = execWithTimeout(`osascript -e 'tell application "System Events" to get name of first application process whose frontmost is true'`);
-  if (!frontApp)
-    return false;
-  return terminal.macProcessNames.some((name) => name.toLowerCase() === frontApp.toLowerCase());
-}
-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 === targetPid)
-      return true;
-    if (currentPid <= 1)
-      return false;
-    const ppid = getParentPid(currentPid);
-    if (ppid === null)
-      return false;
-    currentPid = ppid;
-  }
-  return false;
-}
-function isFocusedWindowOurs(windowPid) {
-  return isPidAncestorOfProcess(windowPid, getProcessTreeRoot());
-}
-var tmuxPane = process.env.TMUX_PANE ?? null;
-function isTmuxPaneActive() {
-  if (!tmuxPane)
-    return true;
-  const result = execWithTimeout(`tmux display-message -t ${tmuxPane} -p '#{window_active} #{pane_active}'`);
-  if (!result)
-    return false;
-  const [windowActive, paneActive] = result.split(" ");
-  return windowActive === "1" && paneActive === "1";
-}
-function isLinuxX11Focused() {
-  const pidStr = execWithTimeout("xdotool getactivewindow getwindowpid");
-  if (!pidStr)
-    return false;
-  const pid = parseInt(pidStr, 10);
-  if (!Number.isFinite(pid) || pid <= 0)
-    return false;
-  return isFocusedWindowOurs(pid);
-}
-function isHyprlandFocused() {
+function getHyprlandActiveWindowId() {
   const output = execWithTimeout("hyprctl activewindow -j");
   if (!output)
-    return false;
+    return null;
   try {
     const data = JSON.parse(output);
-    const pid = data?.pid;
-    if (typeof pid !== "number" || pid <= 0)
-      return false;
-    return isFocusedWindowOurs(pid);
+    return typeof data?.address === "string" ? data.address : null;
   } catch {
-    return false;
-  }
-}
-function isSwayFocused() {
-  const output = execWithTimeout("swaymsg -t get_tree", 1000);
-  if (!output)
-    return false;
-  try {
-    const tree = JSON.parse(output);
-    const pid = findFocusedPid(tree);
-    if (pid === null)
-      return false;
-    return isFocusedWindowOurs(pid);
-  } catch {
-    return false;
+    return null;
   }
 }
-function findFocusedPid(node) {
-  if (node.focused === true && typeof node.pid === "number") {
-    return node.pid;
+function findFocusedWindowId(node) {
+  if (node.focused === true && typeof node.id === "number") {
+    return String(node.id);
   }
   if (Array.isArray(node.nodes)) {
     for (const child of node.nodes) {
-      const pid = findFocusedPid(child);
-      if (pid !== null)
-        return pid;
+      const id = findFocusedWindowId(child);
+      if (id !== null)
+        return id;
     }
   }
   if (Array.isArray(node.floating_nodes)) {
     for (const child of node.floating_nodes) {
-      const pid = findFocusedPid(child);
-      if (pid !== null)
-        return pid;
+      const id = findFocusedWindowId(child);
+      if (id !== null)
+        return id;
     }
   }
   return null;
 }
-function isKDEWaylandFocused() {
-  const windowId = execWithTimeout("kdotool getactivewindow");
-  if (!windowId)
-    return false;
-  const pidStr = execWithTimeout(`kdotool getwindowpid ${windowId}`);
-  if (!pidStr)
-    return false;
-  const pid = parseInt(pidStr, 10);
-  if (!Number.isFinite(pid) || pid <= 0)
-    return false;
-  return isFocusedWindowOurs(pid);
+function getSwayActiveWindowId() {
+  const output = execWithTimeout("swaymsg -t get_tree", 1000);
+  if (!output)
+    return null;
+  try {
+    const tree = JSON.parse(output);
+    return findFocusedWindowId(tree);
+  } catch {
+    return null;
+  }
 }
-function isLinuxWaylandFocused() {
+function getLinuxWaylandActiveWindowId() {
   const env = process.env;
-  if (env.HYPRLAND_INSTANCE_SIGNATURE) {
-    return isHyprlandFocused();
-  }
-  if (env.SWAYSOCK) {
-    return isSwayFocused();
-  }
-  if (env.KDE_SESSION_VERSION) {
-    return isKDEWaylandFocused();
-  }
-  return false;
+  if (env.HYPRLAND_INSTANCE_SIGNATURE)
+    return getHyprlandActiveWindowId();
+  if (env.SWAYSOCK)
+    return getSwayActiveWindowId();
+  if (env.KDE_SESSION_VERSION)
+    return execWithTimeout("kdotool getactivewindow");
+  return null;
 }
-function isWindowsFocused() {
+function getWindowsActiveWindowId() {
   const script = `
 Add-Type @"
 using System;
 using System.Runtime.InteropServices;
 public class FocusHelper {
   [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
-  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint pid);
 }
 "@
 $hwnd = [FocusHelper]::GetForegroundWindow()
-$pid = 0
-[void][FocusHelper]::GetWindowThreadProcessId($hwnd, [ref]$pid)
-Write-Output $pid
+Write-Output $hwnd
 `.trim().replace(/\n/g, "; ");
-  const pidStr = execWithTimeout(`powershell -NoProfile -Command "${script}"`, 1000);
-  if (!pidStr)
-    return false;
-  const pid = parseInt(pidStr, 10);
-  if (!Number.isFinite(pid) || pid <= 0)
-    return false;
-  const startPid = getProcessTreeRoot();
-  let currentPid = startPid;
-  for (let depth = 0;depth < 20; depth++) {
-    if (currentPid === pid)
-      return true;
-    if (currentPid <= 1)
-      return false;
-    const parentPidStr = execWithTimeout(`powershell -NoProfile -Command "(Get-Process -Id ${currentPid}).Parent.Id"`, 500);
-    if (!parentPidStr)
-      return false;
-    currentPid = parseInt(parentPidStr, 10);
-    if (!Number.isFinite(currentPid))
-      return false;
+  return execWithTimeout(`powershell -NoProfile -Command "${script}"`, 1000);
+}
+function getMacOSActiveWindowId() {
+  return execWithTimeout(`osascript -e 'tell application "System Events" to return id of window 1 of (first application process whose frontmost is true)'`);
+}
+function getActiveWindowId() {
+  const platform3 = process.platform;
+  if (platform3 === "darwin")
+    return getMacOSActiveWindowId();
+  if (platform3 === "linux") {
+    if (process.env.WAYLAND_DISPLAY)
+      return getLinuxWaylandActiveWindowId();
+    if (process.env.DISPLAY)
+      return execWithTimeout("xdotool getactivewindow");
+    return null;
   }
-  return false;
+  if (platform3 === "win32")
+    return getWindowsActiveWindowId();
+  return null;
+}
+var cachedWindowId = getActiveWindowId();
+var tmuxPane = process.env.TMUX_PANE ?? null;
+function isTmuxPaneActive() {
+  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(" ");
+  return sessionAttached === "1" && windowActive === "1" && paneActive === "1";
 }
 function isTerminalFocused() {
   try {
-    const platform3 = process.platform;
-    let windowFocused = false;
-    if (platform3 === "darwin") {
-      const terminal = detectTerminal();
-      if (!terminal || terminal.macProcessNames.length === 0)
-        return false;
-      windowFocused = isMacOSFocused(terminal);
-    } else if (platform3 === "linux") {
-      if (process.env.WAYLAND_DISPLAY) {
-        windowFocused = isLinuxWaylandFocused();
-      } else if (process.env.DISPLAY) {
-        windowFocused = isLinuxX11Focused();
-      } else {
-        return false;
-      }
-    } else if (platform3 === "win32") {
-      windowFocused = isWindowsFocused();
-    } else {
+    if (!cachedWindowId)
       return false;
-    }
-    if (!windowFocused)
+    const currentId = getActiveWindowId();
+    if (currentId !== cachedWindowId)
       return false;
     if (process.env.TMUX)
       return isTmuxPaneActive();
@@ -4489,7 +4348,7 @@ var sessionLastBusyAt = new Map;
 var globalTurnCount = null;
 function loadTurnCount() {
   try {
-    const content = readFileSync3(getStatePath(), "utf-8");
+    const content = readFileSync2(getStatePath(), "utf-8");
     const state = JSON.parse(content);
     if (typeof state.turn === "number" && Number.isFinite(state.turn) && state.turn >= 0) {
       return state.turn;

package/package.json

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