connect DEV to live MCP configuration and verify tool conformance

This commit is contained in:
2026-09-29 10:36:50 +01:00
parent 20bbbd26bd
commit 9592c9b274
16 changed files with 417 additions and 18 deletions
@@ -0,0 +1,52 @@
package p.studio.app.mcp;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.core.project.ProjectAccessRegistry;
import p.studio.core.session.DefaultAutomationSession;
import p.studio.app.operation.ExecutorOperationExecutor;
import p.studio.api.automation.*;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.jupiter.api.Assertions.*;
class McpConnectionGuideTest {
@TempDir Path root;
@Test void exportsLiveProjectDescriptorWithoutGrantAndTracksRestartWithoutRetainingSecrets() throws Exception {
var mapper = new ObjectMapper(); var projects = new ProjectAccessRegistry();
try (var workers = Executors.newSingleThreadExecutor();
var server = new LocalMcpServer(mapper, new McpToolRegistry(new McpToolCatalog(mapper), mapper, Map.of()))) {
var authority = new DefaultAutomationSession(root, new ExecutorOperationExecutor(workers));
var registration = projects.register(root, authority::enterManual, () -> !authority.snapshot().closed(), authority);
var guide = new McpConnectionGuide(server, projects, mapper);
assertTrue(guide.endpoint().isEmpty());
assertThrows(IllegalStateException.class, () -> guide.configuration(root));
var notifications = new AtomicInteger();
var subscription = guide.subscribe(notifications::incrementAndGet);
server.start(); assertEquals(2, notifications.get());
var descriptor = mapper.readTree(guide.configuration(root));
assertEquals(server.connection().endpoint().toString(), descriptor.path("url").asText());
assertEquals(root.toRealPath().toString(), descriptor.path("projectRoot").asText());
// Do not put bearer credentials into assertion diagnostics.
assertTrue(server.connection().authorizationHeader().equals(descriptor.path("headers").path("Authorization").asText()));
assertFalse(guide.toString().contains(descriptor.path("headers").path("Authorization").asText()));
assertEquals(ControlState.MANUAL, authority.snapshot().state());
assertNull(authority.snapshot().task());
for (var instruction : List.of("studio_project_context", "studio_reference_read", "studio_control_acquire", "studio_control_release",
"studio_language_query", "studio_build_start", "clientRequestId", "read-only", "restart", "native file writes"))
assertTrue(descriptor.path("instructions").asText().contains(instruction));
var old = server.connection(); server.close(); assertEquals(3, notifications.get()); assertTrue(guide.endpoint().isEmpty());
server.start(); assertEquals(4, notifications.get());
var fresh = mapper.readTree(guide.configuration(root));
assertTrue(fresh.path("headers").path("Authorization").asText().equals(server.connection().authorizationHeader()));
assertFalse(fresh.path("headers").path("Authorization").asText().equals(old.authorizationHeader()));
assertThrows(AutomationException.class, () -> guide.configuration(root.resolve("unopened")));
authority.closeAsync().toCompletableFuture().join();
assertThrows(AutomationException.class, () -> guide.configuration(root));
registration.close(); subscription.close(); server.close(); assertEquals(4, notifications.get());
}
}
}
@@ -238,6 +238,97 @@ class McpTaskToolsTest {
}
}
}
@Test void allToolGroupsConformOverHttpWithRealLspAndTestOnlyRuntime() throws Exception {
Path source = Files.createDirectories(root.resolve("src")).resolve("main.pbs");
Files.writeString(source, "fn main() -> int { return 1; }\n");
var lifecycle = new p.studio.lsp.services.LspServerLifecycleImpl();
var lsp = new p.studio.app.lsp.LspLifecycleAdapter(lifecycle);
var project = catalog.openProject(root); lsp.boot(project);
var knowledge = new p.studio.app.compiler.CompilerProjectKnowledge(access, catalog, mapper);
var language = new p.studio.core.language.TaskLanguageQueries(access,
new p.studio.app.lsp.AutomationLspQueries(lifecycle, catalog, knowledge, mapper));
var handlers = new LinkedHashMap<>(McpTaskTools.handlers(service, mapper, true));
handlers.putAll(McpProjectKnowledgeTools.handlers(knowledge, mapper));
handlers.putAll(McpLanguageTools.handlers(language, mapper));
try (var server = new LocalMcpServer(mapper, new McpToolRegistry(new McpToolCatalog(mapper), mapper, handlers));
var client = java.net.http.HttpClient.newHttpClient()) {
server.start();
var unauthorized = java.net.http.HttpRequest.newBuilder(server.connection().endpoint()).POST(java.net.http.HttpRequest.BodyPublishers.ofString("{}"))
.timeout(java.time.Duration.ofSeconds(5)).build();
assertEquals(401, client.send(unauthorized, java.net.http.HttpResponse.BodyHandlers.discarding()).statusCode());
String first = connect(client, server), second = connect(client, server);
var list = mapper.createObjectNode().put("jsonrpc", "2.0").put("id", 1).put("method", "tools/list");
assertEquals(17, mapper.readTree(post(client, server, first, list).body()).path("result").path("tools").size());
var context = value(httpCall(client, server, first, "studio_project_context", rootOnly()));
assertTrue(context.path("languages").toString().contains("pbs"));
value(httpCall(client, server, first, "studio_reference_read", rootOnly().put("referenceId", "pbs:quickstart").put("limit", 100)));
error("NOT_GRANTED", httpCall(client, server, first, "studio_control_acquire", rootOnly()));
error("INVALID_TASK", httpCall(client, server, first, "studio_build_start", args().put("taskId", "missing").put("clientRequestId", "denied")));
session.grant(false).toCompletableFuture().join();
var a = workers.submit(() -> httpCall(client, server, first, "studio_control_acquire", rootOnly()));
var b = workers.submit(() -> httpCall(client, server, second, "studio_control_acquire", rootOnly()));
var results = List.of(a.get(5, TimeUnit.SECONDS), b.get(5, TimeUnit.SECONDS));
assertEquals(1, results.stream().filter(r -> !r.path("isError").asBoolean()).count());
task = value(results.stream().filter(r -> !r.path("isError").asBoolean()).findFirst().orElseThrow()).path("taskId").asText();
var query = args().put("operation", "diagnostics"); query.putObject("parameters").put("uri", source.toUri().toString());
value(httpCall(client, server, first, "studio_language_query", query));
Files.writeString(source, "fn main( {");
assertFalse(value(httpCall(client, server, first, "studio_language_query", query)).path("result").isEmpty());
Files.writeString(source, "fn main() -> int { return 2; }\n");
value(httpCall(client, server, first, "studio_language_query", query));
httpCall(client, server, first, "studio_build_start", args().put("clientRequestId", "conformance-build"));
var build = httpCompleted(client, server, first, "conformance-build");
value(httpCall(client, server, first, "studio_headless_boot", args().put("buildId", build.path("result").path("buildId").asText())));
for (var op : List.of("reset", "clear_input", "state", "fault")) value(httpCall(client, server, first, "studio_headless_" + op, args()));
value(httpCall(client, server, first, "studio_headless_set_input", args().set("input", mapper.createObjectNode().put("a", true))));
value(httpCall(client, server, first, "studio_headless_advance", args().put("clientRequestId", "conformance-advance").put("frames", 5)));
var advanced = httpCompleted(client, server, first, "conformance-advance");
assertEquals("SUCCEEDED", advanced.path("result").path("status").asText());
var captured = httpCall(client, server, first, "studio_headless_capture", args()); value(captured);
assertArrayEquals(session.snapshot().capture().png(), Base64.getDecoder().decode(captured.path("content").get(1).path("data").asText()));
var deleted = java.net.http.HttpRequest.newBuilder(server.connection().endpoint()).DELETE()
.header("Authorization", server.connection().authorizationHeader()).header("Mcp-Session-Id", first).build();
assertEquals(200, client.send(deleted, java.net.http.HttpResponse.BodyHandlers.discarding()).statusCode());
assertEquals(ControlState.AGENT_WORKING, session.snapshot().state());
String reconnected = connect(client, server);
assertEquals(advanced.path("operationId"), value(httpCall(client, server, reconnected, "studio_operation_get", args().put("clientRequestId", "conformance-advance"))).path("operationId"));
runtime.kind = AutomationOutcome.Kind.GUEST_FAULT;
value(httpCall(client, server, reconnected, "studio_headless_advance", args().put("clientRequestId", "guest").put("frames", 2)));
assertEquals("GUEST_FAULT", httpCompleted(client, server, reconnected, "guest").path("result").path("status").asText());
value(httpCall(client, server, reconnected, "studio_operation_cancel", args().put("operationId", advanced.path("operationId").asText())));
runtime.hold = true;
String pending = value(httpCall(client, server, reconnected, "studio_headless_advance",
args().put("clientRequestId", "cancel-over-http").put("frames", 50))).path("operationId").asText();
assertTrue(value(httpCall(client, server, reconnected, "studio_operation_cancel", args().put("operationId", pending)))
.path("cancellationRequested").asBoolean());
runtime.gate.countDown();
assertEquals("CANCELLED", httpCompleted(client, server, reconnected, "cancel-over-http").path("state").asText());
value(httpCall(client, server, reconnected, "studio_headless_shutdown", args()));
value(httpCall(client, server, reconnected, "studio_control_release", args()));
error("INVALID_TASK", httpCall(client, server, reconnected, "studio_operation_get", args().put("clientRequestId", "conformance-advance")));
session.grant(false).toCompletableFuture().join();
task = value(httpCall(client, server, reconnected, "studio_control_acquire", rootOnly())).path("taskId").asText();
session.reclaim().toCompletableFuture().join();
error("INVALID_TASK", httpCall(client, server, reconnected, "studio_build_start", args().put("clientRequestId", "late")));
} finally { lsp.shutdown(project); }
}
String connect(java.net.http.HttpClient client, LocalMcpServer server) throws Exception {
var initialize = mapper.createObjectNode().put("jsonrpc", "2.0").put("id", 1).put("method", "initialize");
var params = initialize.putObject("params").put("protocolVersion", "2025-06-18");
params.putObject("capabilities"); params.putObject("clientInfo").put("name", "conformance-test").put("version", "1");
String connection = post(client, server, null, initialize).headers().firstValue("Mcp-Session-Id").orElseThrow();
assertEquals(202, post(client, server, connection, mapper.createObjectNode().put("jsonrpc", "2.0").put("method", "notifications/initialized")).statusCode());
return connection;
}
JsonNode httpCompleted(java.net.http.HttpClient client, LocalMcpServer server, String connection, String request) throws Exception {
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
do {
var result = value(httpCall(client, server, connection, "studio_operation_get", args().put("clientRequestId", request)));
if (result.path("workerTerminated").asBoolean()) return result;
Thread.sleep(5);
} while (System.nanoTime() < deadline);
throw new AssertionError("Operation did not terminate");
}
JsonNode httpCall(java.net.http.HttpClient client, LocalMcpServer server, String connection, String name, ObjectNode arguments) throws Exception {
var request = mapper.createObjectNode().put("jsonrpc", "2.0").put("id", UUID.randomUUID().toString()).put("method", "tools/call");
request.putObject("params").put("name", name).set("arguments", arguments);