claude-hook-notify 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-hook-notify",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "🔔 Claude Code 任务完成桌面通知 — 一键安装，跨平台支持",
   "main": "src/index.js",
   "bin": {

package/src/activate.js

@@ -26,6 +26,7 @@ const WIN_TERMINAL_NAMES = new Set([
   "windowsterminal",
   "code",
   "cursor",
+  "claude",
   "cmd",
   "powershell",
   "pwsh",
@@ -115,30 +116,21 @@ function detectMac() {
  * Windows: 优先环境变量，回退单次 PowerShell 批量查询
  */
 function detectWindows() {
-  // 1. 环境变量快速检测
-  if (process.env.WT_SESSION) {
-    // Windows Terminal 设置了 WT_SESSION
-    const info = findProcessByName("WindowsTerminal");
-    if (info) return info;
-  }
+  // 1. 环境变量快速检测（仅保留精确 PID 的路径）
   if (process.env.VSCODE_PID) {
     const pid = parseInt(process.env.VSCODE_PID, 10);
     if (pid > 0) return { name: "Code", pid, processName: "code.exe" };
   }
-  if (process.env.TERM_PROGRAM === "vscode") {
-    const info = findProcessByName("Code");
-    if (info) return info;
-  }
 
-  // 2. 单次 PowerShell 调用批量遍历进程树
+  // 2. WMI 遍历进程树（OS 级 ParentProcessId 始终完整，不受 spawn 方式影响）
   try {
     const script = [
-      "$cpid=" + process.ppid,
-      "for($i=0;$i -lt 20 -and $cpid -gt 0;$i++){",
-      "  $p=Get-Process -Id $cpid -EA SilentlyContinue",
-      "  if(-not $p){break}",
-      "  Write-Output \"$($p.ProcessName)|$($p.Id)|$(if($p.Parent){$p.Parent.Id}else{0})\"",
-      "  $cpid=if($p.Parent){$p.Parent.Id}else{0}",
+      "$cpid=" + process.pid,
+      "for($i=0;$i -lt 30 -and $cpid -gt 0;$i++){",
+      "  $w=Get-CimInstance Win32_Process -Filter \"ProcessId=$cpid\" -EA SilentlyContinue",
+      "  if(-not $w){break}",
+      "  Write-Output \"$($w.Name)|$($w.ProcessId)|$($w.ParentProcessId)\"",
+      "  $cpid=$w.ParentProcessId",
       "}",
     ].join(";");
     const output = execFileSync("powershell", ["-NoProfile", "-Command", script], {
@@ -146,41 +138,26 @@ function detectWindows() {
       timeout: 8000,
     }).trim();
 
+    // 遍历整棵进程树，取最高层级（最靠近根）的终端匹配
+    // 避免误取 powershell/cmd 等 shell 进程 —— 它们在 Windows Terminal 下不拥有窗口
+    let bestMatch = null;
     for (const line of output.split("\n")) {
       const parts = line.trim().split("|");
       if (parts.length < 3) continue;
-      const name = parts[0].toLowerCase();
+      // WMI 返回的 Name 带 .exe 后缀，去掉再匹配
+      const name = parts[0].replace(/\.exe$/i, "").toLowerCase();
       const pid = parseInt(parts[1], 10);
       if (WIN_TERMINAL_NAMES.has(name)) {
-        return { name: parts[0], pid, processName: name + ".exe" };
+        bestMatch = { name: parts[0].replace(/\.exe$/i, ""), pid, processName: parts[0] };
       }
     }
+    return bestMatch;
   } catch {
     // PowerShell 调用失败
   }
   return null;
 }
 
-/**
- * 按名称查找进程（Windows）
- */
-function findProcessByName(name) {
-  try {
-    const script = `$p=Get-Process -Name '${name}' -EA SilentlyContinue | Select-Object -First 1; if($p){Write-Output "$($p.ProcessName)|$($p.Id)"}`;
-    const output = execFileSync("powershell", ["-NoProfile", "-Command", script], {
-      encoding: "utf-8",
-      timeout: 5000,
-    }).trim();
-    if (output) {
-      const parts = output.split("|");
-      return { name: parts[0], pid: parseInt(parts[1], 10), processName: parts[0].toLowerCase() + ".exe" };
-    }
-  } catch {
-    // 查找失败
-  }
-  return null;
-}
-
 function detectLinux() {
   // 1. 环境变量快速检测
   if (process.env.VSCODE_PID) {

package/src/notify.js

@@ -254,8 +254,10 @@ async function sendNotification(options = {}) {
     // Windows: notify-helper.exe 通知 + 点击激活终端（无控制台窗口）
     method = "notify-helper";
     command = path.join(__dirname, "..", "vendor", "notify-helper", "ClaudeCodeNotify.exe");
-    const targetNames = ["WindowsTerminal", "Code", "cursor", "cmd", "pwsh", "powershell", "mintty"];
-    args = [title, message, targetNames.join(",")];
+    // 注意：此列表需与 activate.js 的 WIN_TERMINAL_NAMES 保持同步
+    const targetNames = ["WindowsTerminal", "Code", "cursor", "claude", "cmd", "pwsh", "powershell", "mintty"];
+    const pid = (terminalInfo && terminalInfo.pid) ? String(terminalInfo.pid) : "0";
+    args = [title, message, targetNames.join(","), pid];
   }
 
   const result = { sent: !dryRun, method, command, args, activate: !!activateCmd };

package/vendor/notify-helper/NotifyHelper.cs

@@ -16,6 +16,35 @@ class NotifyHelper
     [DllImport("user32.dll")]
     static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
+    delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+    [DllImport("user32.dll")]
+    static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+    [DllImport("user32.dll")]
+    static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+    [DllImport("user32.dll")]
+    static extern bool IsWindowVisible(IntPtr hWnd);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+    [DllImport("user32.dll")]
+    static extern bool AttachThreadInput(uint idAttach, uint idAttachTo, bool fAttach);
+
+    [DllImport("user32.dll")]
+    static extern IntPtr GetForegroundWindow();
+
+    [DllImport("kernel32.dll")]
+    static extern uint GetCurrentThreadId();
+
+    // 已知 GUI 终端的窗口类名（用于 PID 查找失败时的回退）
+    static string[] KnownWindowClasses = new string[] {
+        "CASCADIA_HOSTING_WINDOW_CLASS",  // Windows Terminal
+        "mintty",                          // Git Bash / mintty
+    };
+
     // Claude sparkle 图标 PNG（内嵌，无需外部文件）
     static string IconBase64 = "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";
 
@@ -27,29 +56,80 @@ class NotifyHelper
         string title = args.Length > 0 ? args[0] : "Claude Code";
         string message = args.Length > 1 ? args[1] : "任务完成";
         string targetName = args.Length > 2 ? args[2] : "";
+        int targetPid = 0;
+        if (args.Length > 3) int.TryParse(args[3], out targetPid);
+
+        // 策略 1：通过 PID 精确定位终端窗口（多实例场景）
+        if (targetPid > 0)
+        {
+            try
+            {
+                using (var proc = Process.GetProcessById(targetPid))
+                {
+                    if (proc.MainWindowHandle != IntPtr.Zero)
+                    {
+                        targetHandle = proc.MainWindowHandle;
+                    }
+                    else
+                    {
+                        // MainWindowHandle 可能为零（如 Windows Terminal），用 EnumWindows 查找
+                        targetHandle = FindWindowByPid(targetPid);
+                    }
+                }
+            }
+            catch { /* 进程可能已退出，回退到名称查找 */ }
+        }
 
-        // 查找目标终端窗口
-        if (!string.IsNullOrEmpty(targetName))
+        // 策略 2：通过进程名查找（回退方案）
+        if (targetHandle == IntPtr.Zero && !string.IsNullOrEmpty(targetName))
         {
             foreach (var name in targetName.Split(','))
             {
                 try
                 {
                     var procs = Process.GetProcessesByName(name.Trim());
-                    foreach (var p in procs)
+                    try
                     {
-                        if (p.MainWindowHandle != IntPtr.Zero)
+                        foreach (var p in procs)
                         {
-                            targetHandle = p.MainWindowHandle;
-                            break;
+                            if (p.MainWindowHandle != IntPtr.Zero)
+                            {
+                                targetHandle = p.MainWindowHandle;
+                                break;
+                            }
+                            // MainWindowHandle 为零时尝试 EnumWindows 查找
+                            IntPtr hwnd = FindWindowByPid(p.Id);
+                            if (hwnd != IntPtr.Zero)
+                            {
+                                targetHandle = hwnd;
+                                break;
+                            }
                         }
                     }
+                    finally
+                    {
+                        foreach (var p in procs) p.Dispose();
+                    }
                     if (targetHandle != IntPtr.Zero) break;
                 }
                 catch { }
             }
         }
 
+        // 策略 3：通过已知窗口类名查找（兜底方案）
+        if (targetHandle == IntPtr.Zero)
+        {
+            foreach (var cls in KnownWindowClasses)
+            {
+                IntPtr hwnd = FindWindow(cls, null);
+                if (hwnd != IntPtr.Zero)
+                {
+                    targetHandle = hwnd;
+                    break;
+                }
+            }
+        }
+
         notify = new NotifyIcon();
         notify.Icon = LoadEmbeddedIcon();
         notify.Visible = true;
@@ -71,6 +151,23 @@ class NotifyHelper
         Application.Run();
     }
 
+    static IntPtr FindWindowByPid(int pid)
+    {
+        IntPtr found = IntPtr.Zero;
+        EnumWindows((hWnd, lParam) =>
+        {
+            uint procId;
+            GetWindowThreadProcessId(hWnd, out procId);
+            if ((int)procId == pid && IsWindowVisible(hWnd))
+            {
+                found = hWnd;
+                return false;
+            }
+            return true;
+        }, IntPtr.Zero);
+        return found;
+    }
+
     static Icon LoadEmbeddedIcon()
     {
         try
@@ -93,8 +190,22 @@ class NotifyHelper
     {
         if (targetHandle != IntPtr.Zero)
         {
-            ShowWindow(targetHandle, 9);
-            SetForegroundWindow(targetHandle);
+            ShowWindow(targetHandle, 9); // SW_RESTORE
+            // 使用 AttachThreadInput 确保 SetForegroundWindow 成功
+            // （Windows 限制后台进程直接抢占前台焦点）
+            uint unusedPid;
+            uint targetThread = GetWindowThreadProcessId(targetHandle, out unusedPid);
+            uint curThread = GetCurrentThreadId();
+            if (curThread != targetThread)
+            {
+                AttachThreadInput(curThread, targetThread, true);
+                SetForegroundWindow(targetHandle);
+                AttachThreadInput(curThread, targetThread, false);
+            }
+            else
+            {
+                SetForegroundWindow(targetHandle);
+            }
         }
         Cleanup();
     }