@hybridlabor-api/aos 4.2.0 → 4.4.0

package/mcps/RhinoMCP/tests/Integration.Tests/ListSlotsShapeTests.cs

@@ -1,55 +0,0 @@
-using System.Text.Json;
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Pins down the JSON shape list_slots returns post-spawn / post-close. The
-// existing ListSlotsTests fixture only asserts the empty case; this one
-// asserts the populated case and the close-removes path.
-[TestFixture]
-public sealed class ListSlotsShapeTests : RouterFixture
-{
-    [Test]
-    public async Task list_slots_after_spawn_contains_expected_fields()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        string slotId = spawn.Payload!.Value.GetProperty("slotId").GetString()!;
-        int port = spawn.Payload.Value.GetProperty("port").GetInt32();
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(1));
-
-        JsonElement slot = list.Payload!.Value[0];
-        Assert.That(slot.GetProperty("slotId").GetString(), Is.EqualTo(slotId));
-        Assert.That(slot.GetProperty("port").GetInt32(), Is.EqualTo(port));
-        Assert.That(slot.GetProperty("version").GetString(), Is.EqualTo("8"));
-        Assert.That(slot.GetProperty("adopted").GetBoolean(), Is.False);
-        Assert.That(slot.GetProperty("pid").GetInt32(), Is.GreaterThan(0));
-        Assert.That(slot.GetProperty("endpoint").GetString(), Is.EqualTo($"http://localhost:{port}"));
-    }
-
-    [Test]
-    public async Task list_slots_after_close_does_not_include_closed_slot()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        string slotId = spawn.Payload!.Value.GetProperty("slotId").GetString()!;
-
-        ReturnResult close = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotId)));
-        Assert.That(close.Payload?.GetProperty("closed").GetBoolean(), Is.True);
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-
-    [Test]
-    public async Task close_slot_twice_returns_slot_not_found_on_second_call()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        string slotId = spawn.Payload!.Value.GetProperty("slotId").GetString()!;
-
-        _ = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotId)));
-
-        ReturnResult secondClose = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotId)));
-        Assert.That(secondClose.Error?.Code, Is.EqualTo("slot_not_found"));
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/ListSlotsTests.cs

@@ -1,19 +0,0 @@
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// list_slots is the router's window into its own slot registry. With an
-// isolated state dir and no user-started Rhino announcement to adopt, the
-// router should report an empty list. Tests in this fixture do NOT spawn a
-// Rhino — slot-population behaviour lives in SpawnSlotTests,
-// GrasshopperStartTests, MultiRouterTests.
-[TestFixture]
-internal sealed class ListSlotsTests : SharedRouterFixture
-{
-    [Test]
-    public async Task list_slots_is_empty_for_freshly_spawned_router()
-    {
-        ReturnResult result = await _router.CallToolAsync("list_slots");
-        Assert.That(result.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/MacSharedProcessTests.cs

@@ -1,87 +0,0 @@
-using System.Text.Json;
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Pins down the Mac-specific shared-process contract:
-//   On macOS, Rhino is single-instance per bundle id, so multiple slots for the
-//   same version share one OS process and each get a private listener port.
-//   The first slot launches Rhino.app; subsequent slots ask the existing
-//   listener to spawn another doc + port via _router_spawn_listener.
-//
-// [Platform(MacOSX)] keeps the case from running on Windows where the contract
-// is the opposite.
-[TestFixture]
-[Platform("MacOSX")]
-public sealed class MacSharedProcessTests : RouterFixture
-{
-    [Test]
-    public async Task two_slots_same_version_share_pid_and_use_distinct_ports()
-    {
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(2));
-
-        List<JsonElement> slots = list.Payload!.Value.EnumerateArray().ToList();
-        HashSet<int> pids = slots.Select(s => s.GetProperty("pid").GetInt32()).ToHashSet();
-        HashSet<int> ports = slots.Select(s => s.GetProperty("port").GetInt32()).ToHashSet();
-
-        Assert.That(pids, Has.Count.EqualTo(1), "Mac slots for the same version must share one Rhino process.");
-        Assert.That(ports, Has.Count.EqualTo(2), "Each Mac sibling slot must have its own listener port.");
-    }
-
-    [Test]
-    public async Task closing_first_of_two_mac_siblings_keeps_rhino_alive()
-    {
-        ReturnResult spawnA = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        ReturnResult spawnB = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        string slotA = spawnA.Payload!.Value.GetProperty("slotId").GetString()!;
-        string slotB = spawnB.Payload!.Value.GetProperty("slotId").GetString()!;
-        int sharedPid = spawnA.Payload.Value.GetProperty("pid").GetInt32();
-
-        ReturnResult close = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotA)));
-        Assert.That(close.Payload?.GetProperty("closed").GetBoolean(), Is.True);
-
-        // Slot B must still be in the registry and its pid (which was shared
-        // with A) must still be alive — the listener for A was closed via the
-        // control channel, but the Rhino process keeps running for B.
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(1));
-
-        JsonElement remaining = list.Payload!.Value[0];
-        Assert.That(remaining.GetProperty("slotId").GetString(), Is.EqualTo(slotB));
-        Assert.That(remaining.GetProperty("pid").GetInt32(), Is.EqualTo(sharedPid));
-        Assert.That(IsProcessAlive(sharedPid), Is.True, "Shared Rhino process must outlive close_slot on a sibling.");
-    }
-
-    [Test]
-    public async Task closing_last_mac_sibling_terminates_rhino()
-    {
-        ReturnResult spawnA = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        ReturnResult spawnB = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        string slotA = spawnA.Payload!.Value.GetProperty("slotId").GetString()!;
-        string slotB = spawnB.Payload!.Value.GetProperty("slotId").GetString()!;
-        int sharedPid = spawnA.Payload.Value.GetProperty("pid").GetInt32();
-
-        _ = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotA)));
-        _ = await _router.CallToolAsync("close_slot", Args.Of(("slot", slotB)));
-
-        Assert.That(IsProcessAlive(sharedPid), Is.False, "Closing the last sibling must terminate the shared Rhino.");
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-
-    private static bool IsProcessAlive(int pid)
-    {
-        try
-        {
-            using System.Diagnostics.Process p = System.Diagnostics.Process.GetProcessById(pid);
-            return !p.HasExited;
-        }
-        catch (ArgumentException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/MultiRouterTests.cs

@@ -1,74 +0,0 @@
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Exercises the "many tools / many routers share the same slot" behaviour:
-// repeated tool calls (from one router, or from several isolated routers)
-// should not leave duplicate slot entries behind.
-// Fresh router per test (RouterFixture, not SharedRouterFixture): the
-// parameterized "share a single slot" cases assert list_slots count == 1, which
-// is order-dependent if a sibling test (e.g. spawn_slot_across_two_versions)
-// leaks its slots into a router shared across the whole fixture.
-[TestFixture]
-public sealed class MultiRouterTests : RouterFixture
-{
-    private RhinoMcpRouter? _router2;
-    private RhinoMcpRouter? _router3;
-
-    // The base fixture disposes _router per test; here we also need to clean up
-    // the extra routers spawned by the cross-router test cases.
-    [TearDown]
-    public async Task DisposeExtraRouters()
-    {
-        foreach (RhinoMcpRouter? router in new[] { _router2, _router3 })
-        {
-            if (router is null) continue;
-            try { await router.DisposeAsync(); } catch { /* best effort */ }
-        }
-        _router2 = null;
-        _router3 = null;
-    }
-
-    [TestCase("8")]
-    [TestCase("WIP")]
-    public async Task repeated_tool_calls_from_one_router_share_a_single_slot(string version)
-    {
-        _ = await _router.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-        _ = await _router.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-        _ = await _router.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-
-        ReturnResult result = await _router.CallToolAsync("list_slots");
-        Assert.That(result.Payload?.GetArrayLength(), Is.EqualTo(1));
-    }
-
-    // TODO : Each isolated router currently shares an adopted slot via the
-    // announcement directory. Decide whether that's the intended contract;
-    // if every router should get its own ID, this test will need to change.
-    [TestCase("8", Ignore = "2nd call locks up?")]
-    [TestCase("WIP", Ignore = "2nd call locks up?")]
-    public async Task tool_calls_across_isolated_routers_share_a_single_slot(string version)
-    {
-        _router2 = await RhinoMcpRouter.LaunchIsolatedAsync();
-        _router3 = await RhinoMcpRouter.LaunchIsolatedAsync();
-
-        _ = await _router.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-        // TODO : 2nd call locks up — investigate before re-enabling.
-        _ = await _router2.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-        _ = await _router3.CallToolTextAsync("list_objects", Args.Of(("version", version)));
-
-        ReturnResult result = await _router.CallToolAsync("list_slots");
-        Assert.That(result.Payload?.GetArrayLength(), Is.EqualTo(1));
-    }
-
-    // Spawning two slots for two different versions should produce two entries
-    // in list_slots — the version is part of the slot identity, not collapsed.
-    [Test]
-    public async Task spawn_slot_across_two_versions_produces_two_slots()
-    {
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "WIP")));
-
-        ReturnResult result = await _router.CallToolAsync("list_slots");
-        Assert.That(result.Payload?.GetArrayLength(), Is.EqualTo(2));
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/PluginToolTests.cs

@@ -1,115 +0,0 @@
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Tests that need a live Rhino with the rh-mcp plugin loaded. The fixture
-// spawns Rhino via the router's spawn_slot, so Rhino must be installed and
-// licensed, and the freshly-built plugin must be loadable.
-[TestFixture]
-internal sealed class PluginToolTests : SharedRouterFixture
-{
-    private string _slot = null!;
-
-    // Base sets up the router; we then spawn a single slot shared across every
-    // plugin-side test in the fixture.
-    [OneTimeSetUp]
-    public async Task SpawnSharedSlot()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot");
-        if (spawn.Error is not null)
-        {
-            Assert.Inconclusive(
-                $"spawn_slot failed; cannot run plugin-side tests. Error: {spawn.Error.Code}: {spawn.Error.Message}");
-        }
-        _slot = spawn.Payload!.Value.GetProperty("slotId").GetString()!;
-    }
-
-    // Runs before the base disposes the router.
-    [OneTimeTearDown]
-    public async Task CloseSharedSlot()
-    {
-        if (_slot is not null)
-        {
-            try
-            {
-                await _router.CallToolTextAsync("close_slot", Args.Of(("slot", _slot)));
-            }
-            catch { /* best effort */ }
-        }
-    }
-
-    // Regression: a previous version of the filter stripped leading '_' / '-'
-    // via TrimStart, which for the literal filter "_" produced an empty needle
-    // and returned every registered command. The fix falls back to the
-    // original filter when trimming empties it. Rhino command names never
-    // contain '_', so a filter of "_" must return zero commands.
-    [Test]
-    public async Task get_commands_with_underscore_filter_does_not_return_every_command()
-    {
-        ReturnResult result = await _router.CallToolAsync(
-            "get_commands",
-            Args.Of(("slot", (object?)_slot), ("filter", "_")));
-
-        string? text = result.Payload?.GetString();
-        Assert.That(text, Does.Contain("No commands found"),
-            $"Expected no matches for filter '_'; got:\n{text}");
-    }
-
-    // Sanity check that the trim-when-meaningful path still works. "_Box"
-    // should be normalised to "Box" and find at least the Box command.
-    [Test]
-    public async Task get_commands_strips_leading_underscore_in_user_filter()
-    {
-        ReturnResult result = await _router.CallToolAsync(
-            "get_commands",
-            Args.Of(("slot", (object?)_slot), ("filter", "_Box")));
-
-        string? text = result.Payload?.GetString();
-        Assert.That(text, Does.Contain("Box"));
-        Assert.That(text, Does.Not.StartWith("No commands found"));
-    }
-
-    // Regression: when a caller supplies a non-existent layer as the only
-    // filter, the layer-index filter never gets set on ObjectEnumeratorSettings,
-    // and the enumerator yields every object in the document. The fix
-    // short-circuits the enumeration when the layer didn't resolve.
-    [Test]
-    public async Task set_selection_with_unresolved_layer_only_selects_nothing()
-    {
-        // Create a few objects so a select-all bug would be visible.
-        await _router.CallToolTextAsync("run_python", Args.Of(
-            ("slot", (object?)_slot),
-            ("script", """
-                from Rhino.Geometry import Point3d, Line
-                doc = __rhino_doc__
-                for i in range(3):
-                    doc.Objects.AddLine(Line(Point3d(i, 0, 0), Point3d(i, 1, 0)))
-                """)));
-
-        ReturnResult result = await _router.CallToolAsync("set_selection", Args.Of(
-            ("slot", (object?)_slot),
-            ("layer", "this-layer-does-not-exist")));
-
-        string? text = result.Payload?.GetString();
-        Assert.That(text, Does.Contain("Selected 0 object(s)"));
-        Assert.That(text, Does.Contain("Layer not found"));
-    }
-
-    // Regression: the script tools previously joined captured lines with "\n",
-    // which produced doubled newlines because Rhino's CapturedCommandWindowStrings
-    // already terminates each entry with '\n'. The fix concatenates without
-    // injecting a separator. This test asserts the output between two prints
-    // is a single newline rather than the legacy "\n\n".
-    [Test]
-    public async Task run_python_does_not_double_newlines_between_print_lines()
-    {
-        ReturnResult result = await _router.CallToolAsync("run_python", Args.Of(
-            ("slot", (object?)_slot),
-            ("script", "print(\"first\")\nprint(\"second\")")));
-
-        string? stdout = result.Payload?.GetProperty("stdout").GetString();
-        Assert.That(stdout, Does.Contain("first"));
-        Assert.That(stdout, Does.Contain("second"));
-        Assert.That(stdout, Does.Not.Contain("first\n\nsecond"));
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/README.md

@@ -1,35 +0,0 @@
-# Integration.Tests
-
-End-to-end tests that drive a real Claude session against the rhino MCP router.
-
-## Pre-requisites
-
-- Login to Claude Code locally: `claude /login`
-- Build the router binary: `dotnet build rhino/plugin/RhMcp.csproj -c Release -p:RhinoTarget=R9`
-
-## Running
-
-Agent-driven tests are marked `[Explicit]` and `[Category("AgentDriven")]` so they
-do not run by default — they cost real subscription quota and are non-deterministic.
-
-Opt in with:
-
-```sh
-dotnet test tests/Integration.Tests --filter "Category=AgentDriven"
-```
-
-Direct MCP tests (no LLM in the loop) run normally:
-
-```sh
-dotnet test tests/Integration.Tests
-```
-
-## How it works
-
-The harness under `Harness/` spawns the local `claude` CLI in headless mode
-(`-p --output-format stream-json`), hands it an inline MCP config that points
-at a freshly-built router binary in an isolated TMPDIR, and parses the
-stream-json output into a trajectory of tool calls + results.
-
-See [Harness/ClaudeAgent.cs](Harness/ClaudeAgent.cs) and
-[CloseSlotAgentTests.cs](CloseSlotAgentTests.cs) for the canonical pattern.

package/mcps/RhinoMCP/tests/Integration.Tests/RhinoCrashHandlingTests.cs

@@ -1,107 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Verifies the end-to-end crash path: when a Rhino slot dies mid-call, the
-// dispatcher must catch the dropped HTTP connection (ProxyDispatcher.WrapCrash)
-// and surface an ErrorInfo with code "rhino_crashed" on the in-flight call,
-// not let the exception escape or return a successful payload. The dead slot
-// must also be reaped from the registry. Runs on both macOS and Windows — the
-// handler and RhinoCrashReportFinder are platform-agnostic; only the way we
-// forcibly crash the child Rhino differs (SIGSEGV vs. forced terminate), see
-// CrashRhino.
-[TestFixture]
-public sealed class RhinoCrashHandlingTests : RouterFixture
-{
-    [Test]
-    public async Task in_flight_call_when_rhino_crashes_returns_rhino_crashed_envelope()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        Assert.That(spawn.Error, Is.Null,
-            $"Precondition: spawn must succeed. {spawn.Error?.Code}: {spawn.Error?.Message}");
-        string slotId = spawn.Payload!.Value.GetProperty("slotId").GetString()!;
-        int pid = spawn.Payload.Value.GetProperty("pid").GetInt32();
-
-        // Long-running script keeps the HTTP call in-flight on the router side
-        // until the crash lands. 15s is comfortably longer than the kill delay
-        // but short enough that a failed-to-crash run fails the test promptly.
-        Task<ReturnResult> callTask = _router.CallToolAsync(
-            "run_python",
-            Args.Of(("slot", (object?)slotId), ("script", "import time\ntime.sleep(15)\n")));
-
-        // Give the plugin a moment to receive the call and enter the sleep —
-        // killing before the HTTP request has been forwarded would short-circuit
-        // through a different (slot_not_found / probe-during-list) code path.
-        await Task.Delay(2000);
-        CrashRhino(pid);
-
-        ReturnResult result = await callTask;
-        Assert.That(result.Error, Is.Not.Null,
-            "A crash in the target Rhino must surface as an ErrorInfo on the in-flight call, not a successful payload.");
-        Assert.That(result.Error!.Code, Is.EqualTo("rhino_crashed"));
-        Assert.That(result.Error.Message, Does.Contain(slotId),
-            "rhino_crashed message must name the dead slot so the agent can correlate.");
-        Assert.That(result.Error.Message, Does.Contain(pid.ToString()),
-            "rhino_crashed message must include the dead pid for log correlation.");
-
-        // CrashReportPath is best-effort: macOS may not have flushed the .ips
-        // by the time WrapCrash runs, and a Windows forced terminate writes no
-        // artifact at all (no minidump / RhinoDotNetCrash.txt), so it stays null
-        // there. But when the dispatcher does attach one, it must point at a real
-        // file — otherwise we're handing the agent a dead pointer.
-        if (result.Error.CrashReportPath is not null)
-        {
-            Assert.That(File.Exists(result.Error.CrashReportPath), Is.True,
-                $"crashReportPath '{result.Error.CrashReportPath}' was attached but the file is missing.");
-        }
-
-        // WrapCrash prunes the slot before returning, so a follow-up list_slots
-        // must show it gone — otherwise the router is leaking dead entries.
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-
-    // Forcibly crash the target Rhino so its HTTP listener drops mid-call. The
-    // dispatcher path under test is identical on both OSes — only the kill
-    // mechanism differs.
-    private static void CrashRhino(int pid)
-    {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            KillWindows(pid);
-        else
-            KillWithSegv(pid);
-    }
-
-    // A forced terminate drops the socket, which is all the dispatcher needs to
-    // see (connection reset → reap → rhino_crashed). It produces no crash
-    // artifact, so crashReportPath stays null — handled best-effort above.
-    private static void KillWindows(int pid)
-    {
-        using Process target = Process.GetProcessById(pid);
-        target.Kill(entireProcessTree: true);
-        target.WaitForExit();
-    }
-
-    // SIGSEGV (vs. SIGKILL) is what makes macOS write a Rhinoceros-*.ips into
-    // ~/Library/Logs/DiagnosticReports — SIGKILL produces no crash report.
-    // Using /bin/kill keeps us out of P/Invoke territory.
-    private static void KillWithSegv(int pid)
-    {
-        using Process kill = Process.Start(new ProcessStartInfo
-        {
-            FileName = "/bin/kill",
-            Arguments = $"-SEGV {pid}",
-            UseShellExecute = false,
-            RedirectStandardError = true,
-            RedirectStandardOutput = true,
-        }) ?? throw new InvalidOperationException("Failed to spawn /bin/kill");
-        kill.WaitForExit();
-        if (kill.ExitCode != 0)
-        {
-            string err = kill.StandardError.ReadToEnd();
-            throw new InvalidOperationException($"kill -SEGV {pid} exited {kill.ExitCode}: {err}");
-        }
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/SlotReapingTests.cs

@@ -1,84 +0,0 @@
-using System.Diagnostics;
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Slot rows in the SQLite registry are intent, not liveness — RhinoManager
-// probes pid + port on every list_slots call and prunes dead rows. These tests
-// pin down the reaping behaviour by killing the Rhino out from under the router
-// and asserting that list_slots no longer reports the slot.
-[TestFixture]
-public sealed class SlotReapingTests : RouterFixture
-{
-    [Test]
-    public async Task externally_killed_rhino_is_pruned_from_list_slots()
-    {
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        int pid = spawn.Payload!.Value.GetProperty("pid").GetInt32();
-
-        KillExternally(pid);
-
-        // Give the OS a moment to actually tear the process down before we
-        // probe pid+port from inside the router.
-        for (int i = 0; i < 50 && IsProcessAlive(pid); i++)
-        {
-            await Task.Delay(100);
-        }
-        Assert.That(IsProcessAlive(pid), Is.False, "Test could not kill the spawned Rhino; reaping cannot be verified.");
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-
-    [Test]
-    public async Task animal_name_freed_by_reap_is_reusable_on_next_spawn()
-    {
-        // Two consecutive spawns: kill the first, spawn again, and verify the
-        // second spawn either reuses the freed name or progresses without
-        // waiting for the stale row. We don't pin the exact name (the pool's
-        // ordering is implementation detail) — only that we can re-spawn and
-        // list_slots returns one healthy row.
-        ReturnResult spawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        int pid = spawn.Payload!.Value.GetProperty("pid").GetInt32();
-        string firstSlotId = spawn.Payload.Value.GetProperty("slotId").GetString()!;
-
-        KillExternally(pid);
-        for (int i = 0; i < 50 && IsProcessAlive(pid); i++)
-        {
-            await Task.Delay(100);
-        }
-        Assert.That(IsProcessAlive(pid), Is.False, "Test could not kill the first Rhino; reap-then-respawn cannot be verified.");
-
-        ReturnResult respawn = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "8")));
-        Assert.That(respawn.Error, Is.Null,
-            $"Respawn after reap should succeed. Error: {respawn.Error?.Code}: {respawn.Error?.Message}");
-
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(1));
-        // Pool ordering is implementation detail — reusing the freed name or
-        // picking the next one in the pool are both acceptable. We deliberately
-        // don't pin `firstSlotId` here; the count assertion above is the contract.
-        _ = firstSlotId;
-    }
-
-    private static void KillExternally(int pid)
-    {
-        try
-        {
-            using Process p = Process.GetProcessById(pid);
-            p.Kill(entireProcessTree: true);
-        }
-        catch (ArgumentException) { /* already gone */ }
-    }
-
-    private static bool IsProcessAlive(int pid)
-    {
-        try
-        {
-            using Process p = Process.GetProcessById(pid);
-            return !p.HasExited;
-        }
-        catch (ArgumentException) { return false; }
-        catch (InvalidOperationException) { return false; }
-    }
-}

package/mcps/RhinoMCP/tests/Integration.Tests/SpawnErrorTests.cs

@@ -1,52 +0,0 @@
-using RhMcp.Integration.Tests.Harness;
-
-namespace RhMcp.Integration.Tests;
-
-// Exercises the error branches of spawn_slot. These don't need a real Rhino —
-// the version-resolution step in RhinoLocator throws FileNotFoundException for
-// any string the locator doesn't recognise, which the tool maps to a structured
-// `rhino_not_installed` payload before any process is launched.
-[TestFixture]
-internal sealed class SpawnErrorTests : SharedRouterFixture
-{
-
-    [Test]
-    public async Task spawn_with_unknown_version_returns_rhino_not_installed()
-    {
-        ReturnResult result = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "garbage")));
-
-        Assert.That(result.Error?.Code, Is.EqualTo("rhino_not_installed"));
-        Assert.That(result.Error?.Message, Does.Contain("garbage"));
-
-        // The launching placeholder must be cleaned up so the slot id is free
-        // again — otherwise the next spawn waits 90s for the stale row.
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-
-    // Regression: a version sent as a JSON number must coerce to string and reach
-    // the locator, not fail string binding with a bare invocation error.
-    [Test]
-    public async Task spawn_with_unknown_numeric_version_returns_rhino_not_installed()
-    {
-        // 42 is passed as a JSON number, not the string "42".
-        ReturnResult result = await _router.CallToolAsync("spawn_slot", Args.Of(("version", 42)));
-
-        Assert.That(result.Error?.Code, Is.EqualTo("rhino_not_installed"));
-        Assert.That(result.Error?.Message, Does.Contain("42"));
-    }
-
-    [Test]
-    public async Task failed_spawn_does_not_leave_launching_row_behind()
-    {
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "garbage")));
-        _ = await _router.CallToolAsync("spawn_slot", Args.Of(("version", "garbage")));
-
-        // Two failed spawns in a row must still not produce ready slots and
-        // must not pile up placeholders. list_slots filters to Ready rows, so
-        // a non-empty result here would mean adoption-as-ready (wrong) or
-        // duplicate launching rows leaked through (also wrong).
-        ReturnResult list = await _router.CallToolAsync("list_slots");
-        Assert.That(list.Payload?.GetArrayLength(), Is.EqualTo(0));
-    }
-}