1 files changed, 30 insertions, 33 deletions
diff --git a/packages/meshbay-node/tests/test_platform.py b/packages/meshbay-node/tests/test_platform.py
index 5c80c5b..bebe8d9 100644
--- a/packages/meshbay-node/tests/test_platform.py
+++ b/packages/meshbay-node/tests/test_platform.py
@@ -427,39 +427,8 @@ def test_source_checkout_has_no_packaged_default(monkeypatch, tmp_path):
     assert plat.packaged_default_env() is None
 
 
-def test_install_node_env_copies_once(monkeypatch, tmp_path):
-    src = tmp_path / "default.env"
-    src.write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJfirst\n")
-    monkeypatch.setattr(plat, "packaged_default_env", lambda: src)
-    cfg = tmp_path / "config"
-    cfg.mkdir()
-
-    written = plat.install_node_env(cfg)
-    assert written == cfg / "node.env"
-    assert "eyJfirst" in written.read_text()
-
-
-def test_install_node_env_never_overwrites_operator_values(monkeypatch, tmp_path):
-    """An existing node.env holds the operator's own token; clobbering it would
-    silently downgrade a configured node to the shared default."""
-    src = tmp_path / "default.env"
-    src.write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJpackaged\n")
-    monkeypatch.setattr(plat, "packaged_default_env", lambda: src)
-    cfg = tmp_path / "config"
-    cfg.mkdir()
-    (cfg / "node.env").write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJoperator\n")
-
-    assert plat.install_node_env(cfg) is None
-    assert "eyJoperator" in (cfg / "node.env").read_text()
-
-
-def test_install_node_env_is_a_noop_without_a_package(monkeypatch, tmp_path):
-    monkeypatch.setattr(plat, "packaged_default_env", lambda: None)
-    assert plat.install_node_env(tmp_path) is None
-    assert not (tmp_path / "node.env").exists()
-
-
 def test_load_node_env_sets_names(monkeypatch, tmp_path):
+    monkeypatch.setattr(plat, "packaged_default_env", lambda: None)
     (tmp_path / "node.env").write_text(
         "# a comment\n"
         "\n"
@@ -482,5 +451,33 @@ def test_load_node_env_does_not_override_the_environment(monkeypatch, tmp_path):
     assert os.environ["MESHBAY_TMDB_DEFAULT_TOKEN"] == "eyJfromenv"
 
 
-def test_load_node_env_tolerates_a_missing_file(tmp_path):
+def test_load_node_env_tolerates_a_missing_file(monkeypatch, tmp_path):
+    monkeypatch.setattr(plat, "packaged_default_env", lambda: None)
     assert plat.load_node_env(tmp_path) == 0
+
+
+def test_load_node_env_reads_the_packaged_default_without_a_node_env(monkeypatch, tmp_path):
+    """A node onboarded by the desktop client has no node.env: nothing ran
+    `init` to copy one. The packaged token must reach it anyway."""
+    src = tmp_path / "default.env"
+    src.write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJpackaged\n")
+    monkeypatch.setattr(plat, "packaged_default_env", lambda: src)
+    monkeypatch.delenv("MESHBAY_TMDB_DEFAULT_TOKEN", raising=False)
+    cfg = tmp_path / "config"
+    cfg.mkdir()
+
+    assert plat.load_node_env(cfg) == 1
+    assert os.environ["MESHBAY_TMDB_DEFAULT_TOKEN"] == "eyJpackaged"
+
+
+def test_load_node_env_prefers_the_operator_node_env(monkeypatch, tmp_path):
+    src = tmp_path / "default.env"
+    src.write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJpackaged\n")
+    monkeypatch.setattr(plat, "packaged_default_env", lambda: src)
+    monkeypatch.delenv("MESHBAY_TMDB_DEFAULT_TOKEN", raising=False)
+    cfg = tmp_path / "config"
+    cfg.mkdir()
+    (cfg / "node.env").write_text("MESHBAY_TMDB_DEFAULT_TOKEN=eyJoperator\n")
+
+    plat.load_node_env(cfg)
+    assert os.environ["MESHBAY_TMDB_DEFAULT_TOKEN"] == "eyJoperator"