@hybridlabor-api/aos 4.3.0 → 4.4.0

package/mcps/RhinoMCP/tests/Router.Tests/RhinoLocatorTests.cs

@@ -1,38 +0,0 @@
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-[TestFixture]
-public class RhinoLocatorTests
-{
-    // Regression for the conflated token-to-install mapping: the tokens the
-    // locator advertises must be exactly the ones the header documents ("8",
-    // "9", "WIP") and nothing else. Previously ListInstalledVersions probed
-    // undocumented "10"/"11"/"12" that no branch could ever resolve. Compared
-    // as a set so the assertion pins the token membership, not Dictionary
-    // insertion-order preservation (not a documented CLR guarantee).
-    [Test]
-    public void Advertises_exactly_the_documented_version_tokens()
-    {
-        Assert.That(RhinoLocator.KnownVersionTokens, Is.EquivalentTo(new[] { "8", "9", "WIP" }));
-    }
-
-    [Test]
-    public void Versions_with_plugin_are_a_subset_of_installed_versions()
-    {
-        Assert.That(RhinoLocator.ListVersionsWithPlugin(),
-            Is.SubsetOf(RhinoLocator.ListInstalledVersions()));
-    }
-
-    // "9" and "WIP" are deliberate aliases for the current WIP install; the
-    // documented "8" token is distinct. This pins the aliasing so a future
-    // edit can't silently make "9" mean a non-WIP install on one platform only.
-    [Test]
-    public void Treats_nine_and_WIP_as_the_same_install_token_distinct_from_eight()
-    {
-        Assert.That(RhinoLocator.KnownVersionTokens, Does.Contain("9"));
-        Assert.That(RhinoLocator.KnownVersionTokens, Does.Contain("WIP"));
-        Assert.That(RhinoLocator.KnownVersionTokens, Does.Contain("8"));
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/RhinoManagerResolutionTests.cs

@@ -1,151 +0,0 @@
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-// Exercises GetOrCreateDefaultAsync, the slot-less resolution ladder
-// (sticky → already-open → own-spawn → cold start). Every reuse branch returns
-// before SpawnAsync, so no real Rhino is launched. The one spawn path we hit is
-// driven with an uninstalled version so RhinoLocator fails fast (no process).
-//
-// Isolation: a per-test RHINO_MCP_HOME makes ScanAnnouncements read an empty
-// listeners dir, and the SlotStore uses a temp db under it. [SetUp]/[TearDown]
-// run around each test, so each gets a clean home + store.
-[TestFixture]
-public sealed class RhinoManagerResolutionTests
-{
-    private string _homeDir = null!;
-    private string? _previousHome;
-    private SlotStore _store = null!;
-    private RhinoManager _manager = null!;
-    private readonly int _routerPid = Environment.ProcessId;
-    private int _nextPort = 11000;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _homeDir = Path.Combine(Path.GetTempPath(), "rhmcp-test-" + Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(_homeDir);
-        _previousHome = Environment.GetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar);
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, _homeDir);
-
-        // SlotStore + RhinoManager read their on-disk paths from RHINO_MCP_HOME
-        // (set above), and RhinoLocator is a static resolver, so neither is injected.
-        _store = new SlotStore(NullLogger<SlotStore>.Instance);
-        RhinoControlClient control = new(new StubHttpClientFactory(), NullLogger<RhinoControlClient>.Instance);
-        _manager = new RhinoManager(
-            RouterConfig.FromArgs([]), control, _store, NullLogger<RhinoManager>.Instance);
-    }
-
-    [Test]
-    public async Task Sticky_slot_wins_over_a_newer_open_rhino()
-    {
-        string own = SeedOwnReady("8");
-        SeedAdopted("9"); // opened later, sticky should still win
-        _manager.SetActiveSlot(own);
-
-        (ChildRhino child, bool spawned) = await _manager.GetOrCreateDefaultAsync();
-
-        Assert.That(child.SlotId, Is.EqualTo(own));
-        Assert.That(spawned, Is.False);
-    }
-
-    [Test]
-    public async Task Uses_the_open_user_rhino_when_nothing_is_active()
-    {
-        string adopted = SeedAdopted("9");
-
-        (ChildRhino child, bool spawned) = await _manager.GetOrCreateDefaultAsync();
-
-        Assert.That(child.SlotId, Is.EqualTo(adopted));
-        Assert.That(child.Adopted, Is.True);
-        Assert.That(spawned, Is.False);
-    }
-
-    [Test]
-    public async Task Prefers_the_oldest_open_rhino()
-    {
-        string first = SeedAdopted("8");
-        SeedAdopted("9");
-
-        (ChildRhino child, bool _) = await _manager.GetOrCreateDefaultAsync();
-
-        Assert.That(child.SlotId, Is.EqualTo(first));
-    }
-
-    [Test]
-    public async Task Falls_back_to_this_sessions_own_spawn_when_nothing_is_open()
-    {
-        string own = SeedOwnReady("8");
-
-        (ChildRhino child, bool spawned) = await _manager.GetOrCreateDefaultAsync();
-
-        Assert.That(child.SlotId, Is.EqualTo(own));
-        Assert.That(spawned, Is.False);
-    }
-
-    [Test]
-    public async Task Stale_active_pointer_self_heals()
-    {
-        _manager.SetActiveSlot("ghost"); // points at a slot that doesn't exist
-        string adopted = SeedAdopted("9");
-
-        (ChildRhino child, bool _) = await _manager.GetOrCreateDefaultAsync();
-
-        Assert.That(child.SlotId, Is.EqualTo(adopted));
-    }
-
-    [Test]
-    public async Task Gh2_reuses_an_open_wip_announced_as_9()
-    {
-        string adopted = SeedAdopted("9"); // user-opened WIP announces its major
-
-        (ChildRhino child, bool spawned) = await _manager.GetOrCreateDefaultAsync(requiredVersion: "WIP");
-
-        Assert.That(child.SlotId, Is.EqualTo(adopted));
-        Assert.That(spawned, Is.False);
-    }
-
-    [Test]
-    public void Pinned_call_does_not_reuse_an_incompatible_open_rhino()
-    {
-        // An open Rhino 8 must not satisfy a call that needs another version, so
-        // the router falls through to spawn. An uninstalled version makes the
-        // spawn fail fast (locator), proving the 8 was not handed back.
-        SeedAdopted("8");
-
-        Assert.ThrowsAsync<FileNotFoundException>(
-            (Func<Task>)(() => _manager.GetOrCreateDefaultAsync(requiredVersion: "nope-not-installed")));
-    }
-
-    private string SeedAdopted(string version)
-    {
-        int port = _nextPort++;
-        string? id = _store.AdoptIfNew(version, port, pid: _routerPid, routerPid: _routerPid);
-        Assert.That(id, Is.Not.Null);
-        return id!;
-    }
-
-    private string SeedOwnReady(string version)
-    {
-        (_, string id) = _store.ReserveNewNamed(version, _routerPid);
-        _store.MarkReady(id, port: _nextPort++, pid: _routerPid);
-        return id;
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        _store.Dispose();
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, _previousHome);
-        try { Directory.Delete(_homeDir, recursive: true); } catch { /* best effort */ }
-    }
-
-    private sealed class StubHttpClientFactory : IHttpClientFactory
-    {
-        // Never invoked on the reuse paths under test; the spawn path fails at the
-        // locator before any HTTP. Present only to satisfy the ctor.
-        public HttpClient CreateClient(string name) => new();
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/Router.Tests.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>RhMcp.Router.Tests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="NUnit" Version="4.6.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.4.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <!-- Drives RouterToolGenerator directly in CodegenTests. The codegen project
-         marks its Roslyn package PrivateAssets=all, so reference it here too. -->
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../rhino/router/Router.csproj" />
-    <!-- ReferenceOutputAssembly=true (not as an Analyzer) so tests can instantiate
-         the generator type and run it through a CSharpGeneratorDriver. -->
-    <ProjectReference Include="../../rhino/router/codegen/Router.Codegen.csproj" />
-  </ItemGroup>
-
-</Project>

package/mcps/RhinoMCP/tests/Router.Tests/RouterConfigTests.cs

@@ -1,92 +0,0 @@
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-[TestFixture]
-public class RouterConfigTests
-{
-    [Test]
-    public void Defaults_to_rhino_8_when_no_args()
-    {
-        var config = RouterConfig.FromArgs([]);
-        Assert.That(config.DefaultVersion, Is.EqualTo("8"));
-    }
-
-    [TestCase("WIP")]
-    [TestCase("9")]
-    [TestCase("8")]
-    public void Parses_default_version_long_form(string version)
-    {
-        var config = RouterConfig.FromArgs(["--default-version", version]);
-        Assert.That(config.DefaultVersion, Is.EqualTo(version));
-    }
-
-    [Test]
-    public void Parses_default_version_short_form()
-    {
-        var config = RouterConfig.FromArgs(["-v", "WIP"]);
-        Assert.That(config.DefaultVersion, Is.EqualTo("WIP"));
-    }
-
-    [Test]
-    public void Ignores_unknown_flags()
-    {
-        var config = RouterConfig.FromArgs(["--garbage", "value", "--default-version", "WIP"]);
-        Assert.That(config.DefaultVersion, Is.EqualTo("WIP"));
-    }
-
-    [Test]
-    public void Ignores_trailing_unmatched_flag()
-    {
-        // --default-version without a value should fall back to default.
-        var config = RouterConfig.FromArgs(["--default-version"]);
-        Assert.That(config.DefaultVersion, Is.EqualTo("8"));
-    }
-
-    [Test]
-    public void Default_version_arg_wins_over_env()
-    {
-        string? prev = Environment.GetEnvironmentVariable(RouterConfig.DefaultVersionEnvVar);
-        try
-        {
-            Environment.SetEnvironmentVariable(RouterConfig.DefaultVersionEnvVar, "9");
-            Assert.That(RouterConfig.FromArgs([]).DefaultVersion, Is.EqualTo("9"));
-            Assert.That(RouterConfig.FromArgs(["-v", "WIP"]).DefaultVersion, Is.EqualTo("WIP"));
-        }
-        finally
-        {
-            Environment.SetEnvironmentVariable(RouterConfig.DefaultVersionEnvVar, prev);
-        }
-    }
-
-    [Test]
-    public void No_rhino_exe_override_by_default()
-    {
-        var config = RouterConfig.FromArgs([]);
-        Assert.That(config.RhinoExeOverrides, Is.Null);
-    }
-
-    [Test]
-    public void Parses_rhino_exe_override()
-    {
-        var config = RouterConfig.FromArgs(["--rhino-exe", "9=/path/to/Rhinoceros.app"]);
-        Assert.That(config.RhinoExeOverrides, Is.Not.Null);
-        Assert.That(config.RhinoExeOverrides!["9"], Is.EqualTo("/path/to/Rhinoceros.app"));
-    }
-
-    [Test]
-    public void Rhino_exe_override_splits_on_first_equals()
-    {
-        // A path containing '=' must survive intact.
-        var config = RouterConfig.FromArgs(["--rhino-exe", "9=/path/with=equals/Rhino.exe"]);
-        Assert.That(config.RhinoExeOverrides!["9"], Is.EqualTo("/path/with=equals/Rhino.exe"));
-    }
-
-    [Test]
-    public void Ignores_rhino_exe_override_without_version()
-    {
-        var config = RouterConfig.FromArgs(["--rhino-exe", "/no/version/prefix"]);
-        Assert.That(config.RhinoExeOverrides, Is.Null);
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/SlotStoreLaunchingAbsenceTests.cs

@@ -1,70 +0,0 @@
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-// Regression for the sentinel finding: a launching placeholder INSERT omits port/pid, and
-// ReadRow used to map the DBNull columns to 0, conflating "not yet assigned" with a real 0
-// and materialising a lying "http://localhost:0" endpoint. Port/Pid are now int?, so a
-// launching row carries genuine absence and Endpoint refuses to address an unbound slot.
-[TestFixture]
-public sealed class SlotStoreLaunchingAbsenceTests
-{
-    private string HomeOverride { get; set; } = "";
-    private string? PreviousHome { get; set; }
-
-    [SetUp]
-    public void SetUp()
-    {
-        PreviousHome = Environment.GetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar);
-        HomeOverride = Path.Combine(Path.GetTempPath(), "rhmcp-slotstore-launch-test-" + Guid.NewGuid().ToString("N"));
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, HomeOverride);
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, PreviousHome);
-        try { Directory.Delete(HomeOverride, recursive: true); }
-        catch { /* best effort temp cleanup */ }
-    }
-
-    private SlotStore NewStore() => new(NullLogger<SlotStore>.Instance);
-
-    [Test]
-    public void Launching_row_has_no_port_or_pid()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-
-        ChildRhino? row = store.Get("alpha");
-        Assert.That(row, Is.Not.Null);
-        Assert.That(row!.Port, Is.Null);
-        Assert.That(row.Pid, Is.Null);
-        Assert.That(row.Status, Is.EqualTo(SlotStatus.Launching));
-    }
-
-    [Test]
-    public void Launching_row_endpoint_is_not_addressable()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-
-        ChildRhino row = store.Get("alpha")!;
-        Assert.Throws<InvalidOperationException>((Action)(() => { _ = row.Endpoint; }));
-    }
-
-    [Test]
-    public void Ready_row_carries_port_pid_and_addressable_endpoint()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-        store.MarkReady("alpha", port: 10500, pid: 4321);
-
-        ChildRhino row = store.Get("alpha")!;
-        Assert.That(row.Port, Is.EqualTo(10500));
-        Assert.That(row.Pid, Is.EqualTo(4321));
-        Assert.That(row.Endpoint, Is.EqualTo("http://localhost:10500"));
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/SlotStorePortReservationTests.cs

@@ -1,92 +0,0 @@
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-// Regression for the concurrency finding: ReservePort used to hold _connLock AND an open
-// BEGIN IMMEDIATE write transaction across the whole synchronous isPortListening probe loop,
-// pinning the cross-process SQLite write lock across slow per-port network I/O and serialising
-// every other router's write path behind it. The fix snapshots taken ports in a short read,
-// drops the lock to probe, then takes a fresh transaction only for the final claim. These tests
-// pin both that behaviour (a concurrent write proceeds while a probe is parked) and that the
-// chosen port still respects DB-taken ports and the probe result.
-[TestFixture]
-public sealed class SlotStorePortReservationTests
-{
-    private string HomeOverride { get; set; } = "";
-    private string? PreviousHome { get; set; }
-
-    [SetUp]
-    public void SetUp()
-    {
-        PreviousHome = Environment.GetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar);
-        HomeOverride = Path.Combine(Path.GetTempPath(), "rhmcp-slotstore-test-" + Guid.NewGuid().ToString("N"));
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, HomeOverride);
-    }
-
-    [TearDown]
-    public void TearDown()
-    {
-        Environment.SetEnvironmentVariable(RouterPaths.HomeOverrideEnvVar, PreviousHome);
-        try { Directory.Delete(HomeOverride, recursive: true); }
-        catch { /* best effort temp cleanup */ }
-    }
-
-    private SlotStore NewStore() => new(NullLogger<SlotStore>.Instance);
-
-    [Test]
-    public async Task ReservePort_does_not_hold_the_write_lock_across_the_probe()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-        store.Reserve("beta", "8", routerPid: 1);
-
-        using ManualResetEventSlim probeEntered = new();
-        using ManualResetEventSlim releaseProbe = new();
-
-        Task<int> reserve = Task.Run(() => store.ReservePort("alpha", basePort: 5000, isPortListening: _ =>
-        {
-            probeEntered.Set();
-            releaseProbe.Wait(TimeSpan.FromSeconds(5));
-            return false;
-        }));
-
-        Assert.That(probeEntered.Wait(TimeSpan.FromSeconds(5)), Is.True, "probe was never entered");
-
-        // With the lock held across the probe (the bug), this concurrent write path would block
-        // until the probe returned. With the fix it completes promptly while the probe is parked.
-        Task write = Task.Run(() => store.Delete("beta"));
-        Task completed = await Task.WhenAny(write, Task.Delay(TimeSpan.FromSeconds(2)));
-        Assert.That(ReferenceEquals(completed, write), Is.True,
-            "a concurrent write path was blocked while ReservePort sat in its probe");
-        await write;
-
-        releaseProbe.Set();
-        Assert.That(await reserve, Is.EqualTo(5000));
-    }
-
-    [Test]
-    public void ReservePort_skips_ports_already_taken_in_the_db()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-        store.Reserve("beta", "8", routerPid: 1);
-
-        int first = store.ReservePort("alpha", basePort: 6000, isPortListening: _ => false);
-        Assert.That(first, Is.EqualTo(6000));
-
-        int second = store.ReservePort("beta", basePort: 6000, isPortListening: _ => false);
-        Assert.That(second, Is.EqualTo(6001));
-    }
-
-    [Test]
-    public void ReservePort_skips_ports_the_os_is_listening_on()
-    {
-        using SlotStore store = NewStore();
-        store.Reserve("alpha", "8", routerPid: 1);
-
-        int port = store.ReservePort("alpha", basePort: 7000, isPortListening: p => p == 7000);
-        Assert.That(port, Is.EqualTo(7001));
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/SpawnDiagnosticsTests.cs

@@ -1,100 +0,0 @@
-using System.Net;
-using System.Net.Sockets;
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
-using RhMcp.Router;
-
-namespace RhMcp.Router.Tests;
-
-// Locks in the single-source-of-truth seam both spawn callers (SpawnSlotTool and
-// ProxyDispatcher) now share. If the spawn-pipeline exception->code map drifts,
-// these break, they previously couldn't, because each caller had its own copy.
-[TestFixture]
-public class SpawnDiagnosticsTests
-{
-    private static RhinoCrashReportFinder Finder => new(NullLogger<RhinoCrashReportFinder>.Instance);
-
-    [Test]
-    public void FileNotFound_classifies_as_rhino_not_installed()
-    {
-        bool ok = SpawnDiagnostics.TryClassify(
-            new FileNotFoundException("Rhino 9 is not installed."), Finder, out SpawnDiagnostics.SpawnDiagnosis d);
-
-        Assert.That(ok, Is.True);
-        Assert.That(d.Code, Is.EqualTo("rhino_not_installed"));
-        // Base message carries the diagnosis; the next-action suffix is the caller's.
-        Assert.That(d.BaseMessage, Is.EqualTo("Rhino 9 is not installed."));
-    }
-
-    [Test]
-    public void PluginNotInstalled_classifies_with_versions_and_setup_link()
-    {
-        bool ok = SpawnDiagnostics.TryClassify(
-            new PluginNotInstalledException("8", ["9"]), Finder, out SpawnDiagnostics.SpawnDiagnosis d);
-
-        Assert.That(ok, Is.True);
-        Assert.That(d.Code, Is.EqualTo("plugin_not_installed"));
-        Assert.That(d.BaseMessage, Does.Contain("Rhino 8"));
-        Assert.That(d.BaseMessage, Does.Contain("installed for: 9"));
-        Assert.That(d.BaseMessage, Does.Contain("getting-started"));
-    }
-
-    [Test]
-    public void Timeout_classifies_as_startup_timeout_with_shared_advice()
-    {
-        bool ok = SpawnDiagnostics.TryClassify(
-            new TimeoutException("Rhino didn't start in time."), Finder, out SpawnDiagnostics.SpawnDiagnosis d);
-
-        Assert.That(ok, Is.True);
-        Assert.That(d.Code, Is.EqualTo("startup_timeout"));
-        Assert.That(d.BaseMessage, Does.Contain("license, EULA, or update dialog"));
-    }
-
-    [Test]
-    public void PlatformNotSupported_classifies_as_unsupported_platform()
-    {
-        bool ok = SpawnDiagnostics.TryClassify(
-            new PlatformNotSupportedException("WIP not on this OS."), Finder, out SpawnDiagnostics.SpawnDiagnosis d);
-
-        Assert.That(ok, Is.True);
-        Assert.That(d.Code, Is.EqualTo("unsupported_platform"));
-        Assert.That(d.BaseMessage, Is.EqualTo("WIP not on this OS."));
-    }
-
-    [Test]
-    public void Connection_level_http_failure_classifies_as_existing_rhino_unreachable()
-    {
-        HttpRequestException hre = new(
-            HttpRequestError.ConnectionError, "connection refused", inner: new SocketException());
-
-        bool ok = SpawnDiagnostics.TryClassify(hre, Finder, out SpawnDiagnostics.SpawnDiagnosis d);
-
-        Assert.That(ok, Is.True);
-        Assert.That(d.Code, Is.EqualTo("existing_rhino_unreachable"));
-        Assert.That(d.BaseMessage, Does.Contain("stale slot has been pruned"));
-    }
-
-    [Test]
-    public void Non_connection_http_failure_is_not_a_shared_shape()
-    {
-        // HTTP 5xx from the plugin: Rhino is alive, the request failed. Each caller
-        // handles this itself, so the shared classifier must decline it.
-        HttpRequestException hre = new("Child Rhino returned HTTP 500");
-
-        bool ok = SpawnDiagnostics.TryClassify(hre, Finder, out _);
-
-        Assert.That(ok, Is.False);
-    }
-
-    [TestCase(typeof(InvalidOperationException))]
-    [TestCase(typeof(OperationCanceledException))]
-    [TestCase(typeof(Exception))]
-    public void Caller_specific_shapes_are_declined(Type exceptionType)
-    {
-        Exception ex = (Exception)Activator.CreateInstance(exceptionType)!;
-
-        bool ok = SpawnDiagnostics.TryClassify(ex, Finder, out _);
-
-        Assert.That(ok, Is.False);
-    }
-}

package/mcps/RhinoMCP/tests/Router.Tests/SpawnSlotToolDiagnoseTests.cs

@@ -1,66 +0,0 @@
-using System.Net;
-using System.Net.Sockets;
-using Microsoft.Extensions.Logging.Abstractions;
-using NUnit.Framework;
-using RhMcp.Router;
-using RhMcp.Router.Tools;
-
-namespace RhMcp.Router.Tests;
-
-// Guards the spawn_slot-specific exception arms that SpawnDiagnostics deliberately
-// declines. The status-code HttpRequestException case is a regression guard: the Mac
-// listener fan-out (RhinoControlClient.SpawnListenerAsync) can throw a non-2xx
-// HttpRequestException that IsConnectionFailure rejects, so SpawnDiagnostics returns
-// false and this local arm must still classify it as existing_rhino_unreachable rather
-// than dropping it into the generic `unexpected` bucket.
-[TestFixture]
-public sealed class SpawnSlotToolDiagnoseTests
-{
-    private static RhinoCrashReportFinder Finder => new(NullLogger<RhinoCrashReportFinder>.Instance);
-
-    [Test]
-    public void Status_code_http_failure_classifies_as_existing_rhino_unreachable()
-    {
-        // Non-connection HTTP failure: a 5xx from the control endpoint during the
-        // Mac fan-out. IsConnectionFailure is false, so SpawnDiagnostics declines it.
-        HttpRequestException hre = new("Control call _router_spawn_listener returned HTTP 500: boom");
-        Assert.That(SpawnDiagnostics.TryClassify(hre, Finder, out _), Is.False);
-
-        ErrorInfo error = SpawnSlotTool.Diagnose(hre, Finder);
-
-        Assert.That(error.Code, Is.EqualTo("existing_rhino_unreachable"));
-        Assert.That(error.Message, Does.Contain("Call spawn_slot again"));
-        Assert.That(error.Message, Does.Contain("HTTP 500"));
-    }
-
-    [Test]
-    public void Connection_level_http_failure_keeps_the_shared_classification()
-    {
-        // The connection-level shape is owned by SpawnDiagnostics; the local arm must
-        // not shadow it. Same code, but the shared base message (not the status-code one).
-        HttpRequestException hre = new(
-            HttpRequestError.ConnectionError, "connection refused", inner: new SocketException());
-
-        ErrorInfo error = SpawnSlotTool.Diagnose(hre, Finder);
-
-        Assert.That(error.Code, Is.EqualTo("existing_rhino_unreachable"));
-        Assert.That(error.Message, Does.Contain("stale slot has been pruned"));
-        Assert.That(error.Message, Does.Contain("Call spawn_slot again"));
-    }
-
-    [Test]
-    public void Cancellation_classifies_as_cancelled()
-    {
-        ErrorInfo error = SpawnSlotTool.Diagnose(new OperationCanceledException(), Finder);
-
-        Assert.That(error.Code, Is.EqualTo("cancelled"));
-    }
-
-    [Test]
-    public void Unknown_exception_falls_through_to_unexpected()
-    {
-        ErrorInfo error = SpawnSlotTool.Diagnose(new ArgumentNullException("arg"), Finder);
-
-        Assert.That(error.Code, Is.EqualTo("unexpected"));
-    }
-}