Mirror connection status dot onto lobster tray and desktop icons

src/OpenClaw.Tray.WinUI/App.xaml.cs

@@ -760,7 +760,10 @@ private void InitializeTrayIcon()
         // Pre-create tray menu window at startup to avoid creation crashes later
         InitializeTrayMenuWindow();
 
-        var iconPath = IconHelper.GetStatusIconPath(ConnectionStatus.Disconnected);
+        // Start with the status-badged lobster (neutral/gray dot) so the tray icon
+        // mirrors the companion-app status from first paint, even before the first
+        // connection-state update arrives.
+        var iconPath = StatusBadgeIconFactory.GetBadgedIconPath(ConnectionStatusAccent.Neutral);
         _trayIcon = new TrayIcon(1, iconPath, BuildTrayTooltip());
         _trayIconCoordinator = new TrayIconCoordinator(
             _trayIcon,

src/OpenClaw.Tray.WinUI/Helpers/StatusBadgeIconFactory.cs

@@ -0,0 +1,249 @@
+using OpenClawTray.Services;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.Versioning;
+
+namespace OpenClawTray.Helpers;
+
+/// <summary>
+/// Builds application icons that surface the connection status on the lobster
+/// mascot as a small badge in the bottom-right corner. To avoid a distracting
+/// always-on indicator, only attention states are badged:
+/// <list type="bullet">
+///   <item>disconnected / neutral → a grey dot,</item>
+///   <item>error → a red dot with a white "-" (minus) glyph.</item>
+/// </list>
+/// Healthy states (connected, connecting) render the plain lobster with no badge.
+/// Composed icons are cached per <see cref="ConnectionStatusAccent"/> and written
+/// to a temp folder as multi-resolution .ico files so both the tray icon
+/// (<see cref="WinUIEx.TrayIcon.SetIcon(string)"/>) and the desktop/taskbar window
+/// icon (<c>Window.SetIcon(string)</c>) can consume them.
+/// </summary>
+[SupportedOSPlatform("windows")]
+internal static class StatusBadgeIconFactory
+{
+    private static readonly string AssetsPath = Path.Combine(AppContext.BaseDirectory, "Assets");
+    private static readonly string OutputDir = Path.Combine(Path.GetTempPath(), "OpenClawTray", "StatusIcons");
+    private static readonly object Gate = new();
+    private static readonly ConcurrentDictionary<ConnectionStatusAccent, string> Cache = new();
+
+    // Cover the sizes the shell requests for the tray (16-32 by DPI) and the
+    // taskbar/window (up to 256), so LoadImage always finds a crisp match.
+    private static readonly int[] Sizes = { 16, 20, 24, 32, 40, 48, 64, 128, 256 };
+
+    /// <summary>
+    /// Returns a filesystem path to a lobster icon badged with the status dot for
+    /// <paramref name="accent"/>. Falls back to the plain app icon on failure.
+    /// </summary>
+    public static string GetBadgedIconPath(ConnectionStatusAccent accent)
+    {
+        if (Cache.TryGetValue(accent, out var cached) && File.Exists(cached))
+            return cached;
+
+        lock (Gate)
+        {
+            if (Cache.TryGetValue(accent, out cached) && File.Exists(cached))
+                return cached;
+
+            var (path, isFallback) = Build(accent);
+
+            // Only cache successfully composed icons. Caching the fallback would
+            // permanently pin the un-badged icon after a transient GDI+ failure.
+            if (!isFallback)
+                Cache[accent] = path;
+
+            return path;
+        }
+    }
+
+    /// <summary>Maps a status accent to its dot colour (mirrors the companion-app dot).</summary>
+    public static Color DotColor(ConnectionStatusAccent accent) => accent switch
+    {
+        ConnectionStatusAccent.Success => Color.FromArgb(76, 175, 80),   // Green  – connected
+        ConnectionStatusAccent.Caution => Color.FromArgb(255, 193, 7),   // Amber  – connecting / attention
+        ConnectionStatusAccent.Critical => Color.FromArgb(244, 67, 54),  // Red    – error
+        _ => Color.FromArgb(158, 158, 158),                              // Gray   – disconnected / neutral
+    };
+
+    /// <summary>
+    /// Whether <paramref name="accent"/> gets a status badge. Only attention states
+    /// are badged so the icon is quiet when everything is healthy: disconnected
+    /// (neutral) and error (critical). Connected/connecting render the plain lobster.
+    /// </summary>
+    public static bool ShouldBadge(ConnectionStatusAccent accent) =>
+        accent is ConnectionStatusAccent.Neutral or ConnectionStatusAccent.Critical;
+
+    /// <summary>Whether the badge carries the "-" (minus) glyph. Only the error state does.</summary>
+    public static bool HasDash(ConnectionStatusAccent accent) =>
+        accent is ConnectionStatusAccent.Critical;
+
+    private static (string Path, bool IsFallback) Build(ConnectionStatusAccent accent)
+    {
+        var fallback = Path.Combine(AssetsPath, "openclaw.ico");
+        try
+        {
+            Directory.CreateDirectory(OutputDir);
+            var outputPath = Path.Combine(OutputDir, $"openclaw-{accent}".ToLowerInvariant() + ".ico");
+
+            // Only attention states (neutral/critical) get a dot; healthy states
+            // render the plain lobster (null dot colour).
+            Color? dotColor = ShouldBadge(accent) ? DotColor(accent) : null;
+
+            using var baseImage = LoadBaseImage();
+            File.WriteAllBytes(outputPath, CreateIcoBytes(baseImage, dotColor, HasDash(accent), Sizes));
+            return (outputPath, false);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to build status-badged icon for {accent}: {ex.Message}");
+            return (fallback, true);
+        }
+    }
+
+    /// <summary>
+    /// Composes the (optionally badged) lobster at every requested size and packs
+    /// the frames into a single multi-resolution .ico byte array. A null
+    /// <paramref name="dotColor"/> renders the plain lobster. Exposed for testing.
+    /// </summary>
+    internal static byte[] CreateIcoBytes(Bitmap baseImage, Color? dotColor, bool withDash, IReadOnlyList<int> sizes)
+    {
+        var frames = new List<byte[]>(sizes.Count);
+        foreach (var size in sizes)
+        {
+            using var composed = Compose(baseImage, size, dotColor, withDash);
+            using var ms = new MemoryStream();
+            composed.Save(ms, ImageFormat.Png);
+            frames.Add(ms.ToArray());
+        }
+
+        return BuildIco(frames, sizes);
+    }
+
+    /// <summary>The icon sizes baked into every composed .ico container.</summary>
+    internal static IReadOnlyList<int> IconSizes => Sizes;
+
+    private static Bitmap LoadBaseImage()
+    {
+        // Prefer the high-resolution unplated mascot PNG (transparent background)
+        // for crisp scaling; fall back to the multi-size app .ico.
+        var png = Path.Combine(AssetsPath, "Square44x44Logo.targetsize-256_altform-unplated.png");
+        if (File.Exists(png))
+            return new Bitmap(png);
+
+        var ico = Path.Combine(AssetsPath, "openclaw.ico");
+        using var icon = new Icon(ico, 256, 256);
+        return icon.ToBitmap();
+    }
+
+    /// <summary>
+    /// The dot diameter as a fraction of the icon size. Tiny tray icons need a
+    /// proportionally larger dot to stay legible at 16-32px, while large taskbar
+    /// / alt-tab icons look cleaner with a subtler corner dot. Interpolates
+    /// between the two extremes. Exposed for testing.
+    /// </summary>
+    internal static double DotFraction(int size)
+    {
+        const double maxFraction = 0.44; // <= 32px  (tray legibility)
+        const double minFraction = 0.26; // >= 256px (subtle corner dot)
+        const int minSize = 32;
+        const int maxSize = 256;
+
+        if (size <= minSize)
+            return maxFraction;
+        if (size >= maxSize)
+            return minFraction;
+
+        var t = (double)(size - minSize) / (maxSize - minSize);
+        return maxFraction + (t * (minFraction - maxFraction));
+    }
+
+    internal static Bitmap Compose(Bitmap baseImage, int size, Color? dotColor, bool withDash = false)
+    {
+        var bmp = new Bitmap(size, size, PixelFormat.Format32bppArgb);
+        bmp.SetResolution(96, 96);
+
+        using var g = Graphics.FromImage(bmp);
+        g.SmoothingMode = SmoothingMode.AntiAlias;
+        g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+        g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+        g.CompositingQuality = CompositingQuality.HighQuality;
+        g.Clear(Color.Transparent);
+
+        g.DrawImage(baseImage, new Rectangle(0, 0, size, size));
+
+        // No badge for healthy states: render the plain lobster.
+        if (dotColor is not Color color)
+            return bmp;
+
+        // Dot geometry: bottom-right corner with a white ring for contrast against
+        // both the red mascot and arbitrary taskbar backgrounds. The dot scales by
+        // size so it is legible on tiny tray icons yet subtle on large icons; the
+        // ring is tied to the dot so it shrinks proportionally too.
+        float dot = size * (float)DotFraction(size);
+        float ring = Math.Max(1f, dot * 0.14f);
+        float pad = size * 0.02f;
+        float outer = dot + (ring * 2f);
+        float outerX = size - outer - pad;
+        float outerY = size - outer - pad;
+
+        using (var ringBrush = new SolidBrush(Color.White))
+            g.FillEllipse(ringBrush, outerX, outerY, outer, outer);
+
+        using (var dotBrush = new SolidBrush(color))
+            g.FillEllipse(dotBrush, outerX + ring, outerY + ring, dot, dot);
+
+        // Error badge carries a white "-" (minus) glyph centred on the dot.
+        if (withDash)
+        {
+            float cx = outerX + ring + (dot / 2f);
+            float cy = outerY + ring + (dot / 2f);
+            float dashW = dot * 0.52f;
+            float dashH = Math.Max(2f, dot * 0.18f);
+            using var dashBrush = new SolidBrush(Color.White);
+            g.FillRectangle(dashBrush, cx - (dashW / 2f), cy - (dashH / 2f), dashW, dashH);
+        }
+
+        return bmp;
+    }
+
+    /// <summary>
+    /// Packs PNG frames into a Vista-style .ico container (PNG-compressed entries,
+    /// supported by LoadImage on Windows 10+).
+    /// </summary>
+    private static byte[] BuildIco(IReadOnlyList<byte[]> pngFrames, IReadOnlyList<int> sizes)
+    {
+        using var ms = new MemoryStream();
+        using var writer = new BinaryWriter(ms);
+
+        var count = (ushort)pngFrames.Count;
+        writer.Write((ushort)0); // idReserved
+        writer.Write((ushort)1); // idType = icon
+        writer.Write(count);     // idCount
+
+        var offset = 6 + (16 * count);
+        for (var i = 0; i < pngFrames.Count; i++)
+        {
+            var dim = (byte)(sizes[i] >= 256 ? 0 : sizes[i]); // 0 encodes 256
+            writer.Write(dim);              // bWidth
+            writer.Write(dim);              // bHeight
+            writer.Write((byte)0);          // bColorCount
+            writer.Write((byte)0);          // bReserved
+            writer.Write((ushort)1);        // wPlanes
+            writer.Write((ushort)32);       // wBitCount
+            writer.Write((uint)pngFrames[i].Length); // dwBytesInRes
+            writer.Write((uint)offset);     // dwImageOffset
+            offset += pngFrames[i].Length;
+        }
+
+        foreach (var frame in pngFrames)
+            writer.Write(frame);
+
+        writer.Flush();
+        return ms.ToArray();
+    }
+}

src/OpenClaw.Tray.WinUI/Services/ConnectionStatusPresenter.cs

@@ -64,6 +64,26 @@ public static bool IsOperatorChannelLive(GatewayConnectionSnapshot snapshot) =>
         },
     };
 
+    /// <summary>
+    /// Resolves the status accent (Success/Caution/Critical/Neutral) used for the
+    /// companion-app status dot, so the tray and desktop icons can mirror it.
+    /// Prefers the richer <see cref="OverallConnectionState"/> when available and
+    /// falls back to the legacy <see cref="ConnectionStatus"/>.
+    /// </summary>
+    public static ConnectionStatusAccent Accent(OverallConnectionState? overall, ConnectionStatus fallback)
+    {
+        if (overall is OverallConnectionState state)
+            return Pill(state).Accent;
+
+        return fallback switch
+        {
+            ConnectionStatus.Connected => ConnectionStatusAccent.Success,
+            ConnectionStatus.Connecting => ConnectionStatusAccent.Caution,
+            ConnectionStatus.Error => ConnectionStatusAccent.Critical,
+            _ => ConnectionStatusAccent.Neutral,
+        };
+    }
+
     public static (string LabelKey, ConnectionStatusAccent Accent) Pill(OverallConnectionState overall) => overall switch
     {
         OverallConnectionState.Connected or OverallConnectionState.Ready =>

src/OpenClaw.Tray.WinUI/Services/TrayIconCoordinator.cs

@@ -1,4 +1,5 @@
 using Microsoft.UI.Dispatching;
+using OpenClawTray.Helpers;
 using System;
 using WinUIEx;
 
@@ -39,8 +40,10 @@ internal void UpdateTrayIcon()
         if (!_isAlive())
             return;
 
-        var iconPath = System.IO.Path.Combine(AppContext.BaseDirectory, "Assets", "openclaw.ico");
-        var tooltip = BuildTrayTooltip();
+        var snapshot = _captureSnapshot();
+        var accent = ConnectionStatusPresenter.Accent(snapshot.OverallState, snapshot.Status);
+        var iconPath = StatusBadgeIconFactory.GetBadgedIconPath(accent);
+        var tooltip = new TrayTooltipBuilder(snapshot).Build();
 
         try
         {
@@ -60,7 +63,4 @@ internal void ApplyTrayTooltip(string tooltip)
 
         _trayIcon.Tooltip = tooltip;
     }
-
-    private string BuildTrayTooltip() =>
-        new TrayTooltipBuilder(_captureSnapshot()).Build();
 }

src/OpenClaw.Tray.WinUI/Windows/HubWindow.xaml.cs

@@ -114,7 +114,7 @@ public HubWindow()
 
         this.SetWindowSize(1000, 650);
         this.CenterOnScreen();
-        this.SetIcon(IconHelper.GetStatusIconPath(ConnectionStatus.Connected));
+        ApplyWindowStatusIcon(ConnectionStatusAccent.Neutral);
 
         RootGrid.SizeChanged += OnRootGridSizeChanged;
 
@@ -771,13 +771,29 @@ private void UpdateTitleBarStatus(ConnectionStatus status)
         var (text, accent) = ComputePillState(status, snapshot);
         StatusPillText.Text = text;
         StatusPillDot.Fill = AccentBrush(accent);
+        ApplyWindowStatusIcon(accent);
     }
 
     internal void UpdateTitleBarStatus(GatewayConnectionSnapshot snapshot, ConnectionStatus status)
     {
         var (text, accent) = ComputePillState(status, snapshot);
         StatusPillText.Text = text;
         StatusPillDot.Fill = AccentBrush(accent);
+        ApplyWindowStatusIcon(accent);
+    }
+
+    // Mirrors the companion-app status dot onto the desktop/taskbar window icon:
+    // the lobster with a coloured dot in the bottom-right corner.
+    private void ApplyWindowStatusIcon(ConnectionStatusAccent accent)
+    {
+        try
+        {
+            this.SetIcon(StatusBadgeIconFactory.GetBadgedIconPath(accent));
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to update window status icon: {ex.Message}");
+        }
     }
 
     private static (string Text, ConnectionStatusAccent Accent) ComputePillState(

tests/OpenClaw.Tray.Tests/AppRefactorContractTests.cs

@@ -795,6 +795,34 @@ public void TrayCoordinator_UpdateGuardsLivenessBeforeTouchingIcon()
         Assert.True(guardIndex < setIconIndex, "Liveness guard must run before SetIcon");
     }
 
+    [Fact]
+    public void TrayCoordinator_UsesStatusBadgedLobsterIcon()
+    {
+        var method = ExtractMethod(ReadCoordinatorSource(), "UpdateTrayIcon");
+
+        // The tray lobster mirrors the companion-app status dot instead of the
+        // static openclaw.ico, so it must resolve the accent and the badged icon.
+        Assert.Contains("ConnectionStatusPresenter.Accent(", method);
+        Assert.Contains("StatusBadgeIconFactory.GetBadgedIconPath(", method);
+        Assert.DoesNotContain("\"openclaw.ico\"", method);
+    }
+
+    [Fact]
+    public void HubWindow_DesktopIconMirrorsStatusAccent()
+    {
+        var root = TestRepositoryPaths.GetRepositoryRoot();
+        var source = File.ReadAllText(Path.Combine(
+            root, "src", "OpenClaw.Tray.WinUI", "Windows", "HubWindow.xaml.cs"));
+
+        // The desktop/taskbar icon is refreshed from the same accent as the pill.
+        var apply = ExtractMethod(source, "ApplyWindowStatusIcon");
+        Assert.Contains("StatusBadgeIconFactory.GetBadgedIconPath(accent)", apply);
+
+        // Both status-update paths must repaint the window icon.
+        var update = ExtractMethod(source, "UpdateTitleBarStatus");
+        Assert.Contains("ApplyWindowStatusIcon(accent)", update);
+    }
+
     [Fact]
     public void AppNotifications_ConnectionIssueUsesStableDedupeKey()
     {