oc-tweaks 0.5.2 → 0.6.0

package/README.md

@@ -89,6 +89,11 @@ Customize the appearance of the WPF notification window.
 | `shadow` | `true` | Enable or disable the drop shadow effect. |
 | `idleColor` | `"#4ADE80"` | Accent color for idle (success) notifications. |
 | `errorColor` | `"#EF4444"` | Accent color for error notifications. |
+| `fadeOut` | `true` | Animate opacity from `initialOpacity` to `finalOpacity` over `duration`. |
+| `initialOpacity` | `0.85` | Window opacity at start (0–1). |
+| `finalOpacity` | `0.05` | Window opacity at end before auto-close (0–1). |
+| `clickThrough` | `true` | Mouse clicks pass through the window (WS_EX_TRANSPARENT). Hover over the ✕ zone to dismiss. |
+| `hoverDismissMs` | `400` | Milliseconds the cursor must dwell on the ✕ zone to dismiss the notification. |
 
 #### `notify.toolCall` (Windows WPF)
 
@@ -305,6 +310,11 @@ bunx oc-tweaks init
 | `shadow` | `true` | 启用或禁用下拉阴影效果。 |
 | `idleColor` | `"#4ADE80"` | 空闲 (成功) 通知的强调色。 |
 | `errorColor` | `"#EF4444"` | 错误通知的强调色。 |
+| `fadeOut` | `true` | 在 `duration` 时间内从 `initialOpacity` 渐隐到 `finalOpacity`。 |
+| `initialOpacity` | `0.85` | 窗口初始不透明度 (0–1)。 |
+| `finalOpacity` | `0.05` | 自动关闭前的最终不透明度 (0–1)。 |
+| `clickThrough` | `true` | 鼠标点击穿透窗口 (WS_EX_TRANSPARENT)。将鼠标悬停在 ✕ 区域即可关闭。 |
+| `hoverDismissMs` | `400` | 光标在 ✕ 区域停留多少毫秒后关闭通知。 |
 
 #### `notify.toolCall` (Windows WPF)
 

package/dist/index.js

@@ -662,6 +662,11 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
   const shadow = style?.shadow !== false;
   const idleColor = style?.idleColor ?? "#4ADE80";
   const errorColor = style?.errorColor ?? "#EF4444";
+  const fadeOut = style?.fadeOut !== false;
+  const initialOpacity = style?.initialOpacity ?? 0.85;
+  const finalOpacity = style?.finalOpacity ?? 0.05;
+  const clickThrough = style?.clickThrough !== false;
+  const hoverDismissMs = style?.hoverDismissMs ?? 400;
   const contentMaxWidth = Math.max(160, width - 120);
   const accentColor = renderOptions?.accentColor ?? (tag === "Error" ? errorColor : idleColor);
   const icon = renderOptions?.icon ?? (tag === "Error" ? "❌" : "✅");
@@ -677,8 +682,19 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
   const messageLimit = typeof renderOptions?.maxMessageLength === "number" && renderOptions.maxMessageLength > 0 ? renderOptions.maxMessageLength : 400;
   const normalizedMessage = renderOptions?.preserveMessageFormatting ? message : cleanMarkdown(message);
   const textB64 = escapeForPowerShell(truncateText(normalizedMessage, messageLimit));
-  const shadowXaml = shadow ? '<Border.Effect><DropShadowEffect BlurRadius="20" ShadowDepth="2" Opacity="0.7" Color="Black"/></Border.Effect>' : "";
-  const dismissHintXaml = showDismissHint ? `                    <TextBlock Text="Click to dismiss" Foreground="#555555" FontSize="9" Margin="0,4,0,0"/>` : "";
+  const shadowXaml = shadow ? '<Border.Effect><DropShadowEffect BlurRadius="16" ShadowDepth="0" Opacity="0.4" Color="Black"/></Border.Effect>' : "";
+  const closeBtnXaml = clickThrough ? [
+    `            <Border Name="CloseBg" CornerRadius="4" Width="22" Height="22"`,
+    `                    HorizontalAlignment="Right" VerticalAlignment="Top"`,
+    `                    Margin="0,6,6,0" Background="Transparent">`,
+    `                <TextBlock Name="CloseBtn" Text="&#x2715;" FontSize="13"`,
+    `                           Foreground="#2A2A3A"`,
+    `                           HorizontalAlignment="Center" VerticalAlignment="Center"`,
+    `                           Margin="0,-1,0,0"/>`,
+    `            </Border>`
+  ].join(`
+`) : "";
+  const dismissHintXaml = showDismissHint && !clickThrough ? `                    <TextBlock Text="Click to dismiss" Foreground="#555555" FontSize="9" Margin="0,4,0,0"/>` : "";
   const xaml = [
     `<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`,
     `        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`,
@@ -693,7 +709,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     `        ${shadowXaml}`,
     `        <Grid>`,
     `            <Border CornerRadius="${borderRadius},0,0,${borderRadius}" Width="${colorBarWidth}" HorizontalAlignment="Left" Name="ColorBar"/>`,
-    `            <StackPanel Orientation="Horizontal" Margin="22,12,16,12" VerticalAlignment="Center">`,
+    `            <StackPanel Orientation="Horizontal" Margin="22,12,${clickThrough ? 50 : 16},12" VerticalAlignment="Center">`,
     `                <TextBlock Name="IconText" FontSize="${iconFontSize}" VerticalAlignment="Center" Margin="0,0,15,0" Foreground="White"/>`,
     `                <StackPanel VerticalAlignment="Center" MaxWidth="${contentMaxWidth}">`,
     `                    <TextBlock Name="TitleText" FontSize="${titleFontSize}" FontWeight="SemiBold" TextWrapping="Wrap"/>`,
@@ -701,6 +717,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     dismissHintXaml,
     `                </StackPanel>`,
     `            </StackPanel>`,
+    closeBtnXaml,
     `        </Grid>`,
     `    </Border>`,
     `</Window>`
@@ -711,13 +728,55 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     `$window.Left = ${resolvedPosition.leftExpr}`,
     `$window.Top = ${resolvedPosition.topExpr}`
   ] : [];
-  const psScript = [
-    "Add-Type -AssemblyName PresentationFramework",
-    "Add-Type -AssemblyName PresentationCore",
-    "Add-Type -AssemblyName WindowsBase",
-    "Add-Type -AssemblyName System.Windows.Forms",
-    "$targetScreen = [System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea",
+  const win32TypeDef = clickThrough ? [
+    "Add-Type -TypeDefinition @'",
+    "using System;",
+    "using System.Runtime.InteropServices;",
+    "",
+    "[StructLayout(LayoutKind.Sequential)]",
+    "public struct RECT { public int Left, Top, Right, Bottom; }",
+    "",
+    "[StructLayout(LayoutKind.Sequential)]",
+    "public struct POINT { public int X, Y; }",
+    "",
+    "public static class VDesktop {",
+    '    [DllImport("user32.dll", SetLastError = true)]',
+    "    public static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);",
+    "",
+    '    [DllImport("user32.dll", SetLastError = true)]',
+    "    public static extern int GetWindowLong(IntPtr hWnd, int nIndex);",
     "",
+    '    [DllImport("user32.dll")]',
+    "    public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);",
+    "",
+    '    [DllImport("user32.dll")]',
+    "    public static extern bool GetCursorPos(out POINT lpPoint);",
+    "",
+    "    public const int GWL_EXSTYLE = -20;",
+    "    public const int WS_EX_TOOLWINDOW = 0x00000080;",
+    "    public const int WS_EX_NOACTIVATE = 0x08000000;",
+    "    public const int WS_EX_APPWINDOW = 0x00040000;",
+    "    public const int WS_EX_TRANSPARENT = 0x00000020;",
+    "",
+    "    public static void MakeGlobalWindow(IntPtr hwnd, bool transparent) {",
+    "        int style = GetWindowLong(hwnd, GWL_EXSTYLE);",
+    "        style = style | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE;",
+    "        style = style & ~WS_EX_APPWINDOW;",
+    "        if (transparent) { style = style | WS_EX_TRANSPARENT; }",
+    "        else { style = style & ~WS_EX_TRANSPARENT; }",
+    "        SetWindowLong(hwnd, GWL_EXSTYLE, style);",
+    "    }",
+    "",
+    "    public static bool IsCursorInTopRight(IntPtr hwnd, int zoneW, int zoneH) {",
+    "        RECT r; POINT p;",
+    "        if (!GetWindowRect(hwnd, out r)) return false;",
+    "        if (!GetCursorPos(out p)) return false;",
+    "        return (p.X >= r.Right - zoneW && p.X <= r.Right &&",
+    "                p.Y >= r.Top && p.Y <= r.Top + zoneH);",
+    "    }",
+    "}",
+    "'@ -ErrorAction SilentlyContinue"
+  ] : [
     "Add-Type -TypeDefinition @'",
     "using System;",
     "using System.Runtime.InteropServices;",
@@ -734,14 +793,95 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     "    public const int WS_EX_NOACTIVATE = 0x08000000;",
     "    public const int WS_EX_APPWINDOW = 0x00040000;",
     "",
-    "    public static void MakeGlobalWindow(IntPtr hwnd) {",
+    "    public static void MakeGlobalWindow(IntPtr hwnd, bool transparent) {",
     "        int style = GetWindowLong(hwnd, GWL_EXSTYLE);",
     "        style = style | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE;",
     "        style = style & ~WS_EX_APPWINDOW;",
     "        SetWindowLong(hwnd, GWL_EXSTYLE, style);",
     "    }",
     "}",
-    "'@ -ErrorAction SilentlyContinue",
+    "'@ -ErrorAction SilentlyContinue"
+  ];
+  const hoverThreshold = Math.max(1, Math.round(hoverDismissMs / 100));
+  const hoverDismissLines = clickThrough ? [
+    "",
+    "$script:hoverTicks = 0",
+    `$hoverThreshold = ${hoverThreshold}`,
+    "$brushConv = [System.Windows.Media.BrushConverter]::new()",
+    "$closeBtnEl = $window.FindName('CloseBtn')",
+    "$closeBgEl = $window.FindName('CloseBg')",
+    "",
+    "$hitTimer = New-Object System.Windows.Threading.DispatcherTimer",
+    "$hitTimer.Interval = [TimeSpan]::FromMilliseconds(100)",
+    "$hitTimer.Add_Tick({",
+    "    if ($script:hwnd -eq [IntPtr]::Zero) { return }",
+    "    $inZone = [VDesktop]::IsCursorInTopRight($script:hwnd, 80, 50)",
+    "    if ($inZone) {",
+    "        $script:hoverTicks++",
+    "        $closeBtnEl.Foreground = $brushConv.ConvertFromString('#FFFFFF')",
+    "        $closeBgEl.Background = $brushConv.ConvertFromString('#CC3344')",
+    "        if ($script:hoverTicks -ge $hoverThreshold) {",
+    "            $hitTimer.Stop()",
+    "            $window.Close()",
+    "        }",
+    "    } else {",
+    "        $script:hoverTicks = 0",
+    "        $closeBtnEl.Foreground = $brushConv.ConvertFromString('#2A2A3A')",
+    "        $closeBgEl.Background = $brushConv.ConvertFromString('Transparent')",
+    "    }",
+    "})"
+  ] : [];
+  const loadedLines = clickThrough ? [
+    "$window.Add_Loaded({",
+    "    $script:hwnd = (New-Object System.Windows.Interop.WindowInteropHelper($window)).Handle",
+    "    [VDesktop]::MakeGlobalWindow($script:hwnd, $true)",
+    ...fadeOut ? [
+      `    $fadeAnim = New-Object System.Windows.Media.Animation.DoubleAnimation`,
+      `    $fadeAnim.From = ${initialOpacity}`,
+      `    $fadeAnim.To = ${finalOpacity}`,
+      `    $fadeAnim.Duration = [System.Windows.Duration]::new([TimeSpan]::FromMilliseconds($duration))`,
+      `    $fadeAnim.Add_Completed({ $window.Close() })`,
+      `    $window.BeginAnimation([System.Windows.UIElement]::OpacityProperty, $fadeAnim)`
+    ] : [],
+    "    $hitTimer.Start()",
+    "})",
+    "",
+    "$window.Add_Closed({ $hitTimer.Stop() })"
+  ] : [
+    "$window.Add_Loaded({",
+    "    $script:hwnd = (New-Object System.Windows.Interop.WindowInteropHelper($window)).Handle",
+    "    [VDesktop]::MakeGlobalWindow($script:hwnd, $false)",
+    ...fadeOut ? [
+      `    $fadeAnim = New-Object System.Windows.Media.Animation.DoubleAnimation`,
+      `    $fadeAnim.From = ${initialOpacity}`,
+      `    $fadeAnim.To = ${finalOpacity}`,
+      `    $fadeAnim.Duration = [System.Windows.Duration]::new([TimeSpan]::FromMilliseconds($duration))`,
+      `    $fadeAnim.Add_Completed({ $window.Close() })`,
+      `    $window.BeginAnimation([System.Windows.UIElement]::OpacityProperty, $fadeAnim)`
+    ] : [],
+    "})"
+  ];
+  const timerLines = !fadeOut ? [
+    "",
+    "if ($duration -gt 0) {",
+    "    $timer = New-Object System.Windows.Threading.DispatcherTimer",
+    "    $timer.Interval = [TimeSpan]::FromMilliseconds($duration)",
+    "    $timer.Add_Tick({",
+    "        $window.Close()",
+    "        $timer.Stop()",
+    "    })",
+    "    $timer.Start()",
+    "}"
+  ] : [];
+  const clickDismissLine = !clickThrough ? "$window.Add_MouseLeftButtonDown({ $window.Close() })" : "";
+  const psScript = [
+    "Add-Type -AssemblyName PresentationFramework",
+    "Add-Type -AssemblyName PresentationCore",
+    "Add-Type -AssemblyName WindowsBase",
+    "Add-Type -AssemblyName System.Windows.Forms",
+    "$targetScreen = [System.Windows.Forms.Screen]::FromPoint([System.Windows.Forms.Cursor]::Position).WorkingArea",
+    "",
+    ...win32TypeDef,
     "",
     `$title = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${titleB64}'))`,
     `$text = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('${textB64}'))`,
@@ -756,6 +896,7 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     "$reader = New-Object System.Xml.XmlNodeReader $xaml",
     "$window = [Windows.Markup.XamlReader]::Load($reader)",
     ...manualPositionLines,
+    ...fadeOut ? [`$window.Opacity = ${initialOpacity}`] : [],
     "",
     "$colorBar = $window.FindName('ColorBar')",
     "$iconText = $window.FindName('IconText')",
@@ -768,22 +909,11 @@ async function runWpfNotification($, shellCommand, title, message, tag, style, p
     "$titleText.Foreground = [System.Windows.Media.BrushConverter]::new().ConvertFromString($accentColor)",
     "$contentText.Text = $text",
     "",
-    "$window.Add_MouseLeftButtonDown({ $window.Close() })",
-    "",
-    "$window.Add_Loaded({",
-    "    $hwnd = (New-Object System.Windows.Interop.WindowInteropHelper($window)).Handle",
-    "    [VDesktop]::MakeGlobalWindow($hwnd)",
-    "})",
+    clickDismissLine,
+    ...hoverDismissLines,
     "",
-    "if ($duration -gt 0) {",
-    "    $timer = New-Object System.Windows.Threading.DispatcherTimer",
-    "    $timer.Interval = [TimeSpan]::FromMilliseconds($duration)",
-    "    $timer.Add_Tick({",
-    "        $window.Close()",
-    "        $timer.Stop()",
-    "    })",
-    "    $timer.Start()",
-    "}",
+    ...loadedLines,
+    ...timerLines,
     "",
     "$window.ShowActivated = $false",
     "$window.Show()",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-tweaks",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "type": "module",
   "exports": {
     ".": "./dist/index.js"