1 files changed, 61 insertions, 17 deletions
diff --git a/packages/meshbay-hub/tests/test_desktop_shell.py b/packages/meshbay-hub/tests/test_desktop_shell.py
index 45e3ed4..c9d8683 100644
--- a/packages/meshbay-hub/tests/test_desktop_shell.py
+++ b/packages/meshbay-hub/tests/test_desktop_shell.py
@@ -380,19 +380,18 @@ def test_package_json_does_not_define_a_second_linux_package():
 
 # ── System tray is cross-platform ────────────────────────────────────────────
 
-def test_tray_capability_and_ipc_handler_agree_on_which_platforms():
+def test_tray_capability_and_main_process_agree_on_which_platforms():
     """
-    The tray (GNOME, then Windows) has exactly two platform gates: the
-    `tray` capability preload.js exposes, which is all app.js's nav button
-    is keyed on, and the `window:minimize-to-tray` IPC handler in main.js
-    that actually creates it. Both must name the same platform set, or one
-    of two broken states results: a button that renders but does nothing
-    (handler stricter than the capability), or a hidden window with no way
-    back (capability stricter than the handler, on a desktop with no tray
-    to have hidden it into). Everything else the tray uses (`ensureTray`,
-    `tray.on('click')`, the poll-refresh, `nodeService.status/stop/restart`)
-    is unconditional Electron/abstraction code with no platform check of its
-    own -- these two lines are the whole gate.
+    The tray (GNOME, then Windows) has exactly two platform gates: the `tray`
+    capability preload.js exposes, which is all app.js's nav button is keyed
+    on, and main.js's `trayOS()`, which every path that creates or uses the
+    indicator goes through. Both must name the same platform set, or one of
+    two broken states results: a button that renders but does nothing (main
+    stricter than the capability), or a hidden window with no way back
+    (capability stricter than main, on a desktop with no tray to have hidden
+    it into). Everything else the tray uses (`ensureTray`, `tray.on('click')`,
+    the poll-refresh, `nodeService.status/stop/restart`) is unconditional
+    Electron/abstraction code with no platform check of its own.
     """
     preload = _preload()
     cap_line = next(
@@ -400,11 +399,56 @@ def test_tray_capability_and_ipc_handler_agree_on_which_platforms():
          and "process.platform" in line), None)
     assert cap_line, "no platform-gated `tray:` capability found in preload.js"
 
-    lines = _main().splitlines()
-    handler_start = next(
-        i for i, line in enumerate(lines) if "'window:minimize-to-tray'" in line)
-    handler_block = "\n".join(lines[handler_start:handler_start + 5])
+    main = _main()
+    gate = next(
+        (line for line in main.splitlines()
+         if line.startswith("const trayOS =") and "process.platform" in line), None)
+    assert gate, "no `trayOS` platform gate found in main.js"
 
     for plat in ("'linux'", "'win32'"):
         assert plat in cap_line, f"tray capability must name {plat}"
-        assert plat in handler_block, f"minimize-to-tray handler must name {plat}"
+        assert plat in gate, f"trayOS must name {plat}"
+
+
+def test_every_tray_path_goes_through_the_one_gate():
+    """
+    There is one platform test, not a copy per call site. A second inline
+    `process.platform === ...` beside a tray call is how the two drift, which
+    is the whole failure the test above exists to catch — it can only compare
+    what it can find.
+
+    Both entry points are named explicitly: the launch-time creation (the
+    indicator is there before anyone minimises, which is most of what a tray
+    is for) and the minimise handler.
+    """
+    lines = _main().splitlines()
+
+    # Both entry points still exist, so a rename cannot make this vacuous.
+    for marker in ("ensureTray()", "'window:minimize-to-tray'", "'tray:labels'"):
+        assert any(marker in line for line in lines), f"{marker} not found in main.js"
+
+    inline = [line for line in lines
+              if "process.platform" in line and "tray" in line.lower()
+              and not line.startswith("const trayOS =")]
+    assert not inline, (
+        "a tray path is testing process.platform itself instead of calling "
+        f"trayOS(): {inline}")
+
+
+def test_the_tray_is_created_at_launch():
+    """
+    Not on the first minimise. An indicator that only appears once you have
+    already hidden the window cannot be used to find the application.
+
+    `ensureTray` must be called after `registerBridge`, because buildTrayMenu
+    reads the `nodeService` registerBridge assigns: the other order puts the
+    Start/Stop entry on the menu one five-second poll late.
+    """
+    main = _main()
+    ready = main.index("app.whenReady()")
+    bridge = main.index("registerBridge();", ready)
+    launch = main.index("ensureTray()", ready)
+    window = main.index("createWindow();", ready)
+
+    assert bridge < launch, "ensureTray must come after registerBridge"
+    assert launch < window, "the tray is created as part of startup"