## Summary - **Restructure `src/server/` into subdirectories** (`service/`, `compiler/`, `worker/`, `workspace/`, `protocol/`) to separate concerns: transport/session management, compilation, worker orchestration, and persistent workspace state. - **Decouple MasterServer from transport**: MasterServer no longer holds a `JsonPeer&` reference or registers handlers itself. New `LSPClient` and `AgentClient` classes own their peer references and register protocol handlers, accessing MasterServer internals via `friend class`. - **Add agentic protocol**: A TCP-based side channel (`agentic/compileCommand`) that lets external tools (AI agents, build systems) query compile commands from a running clice server. Includes a CLI client mode (`--mode agentic --port N --path FILE`), server-side listener when `--port` is specified in pipe mode, and integration tests for happy path, fallback, concurrency, and connection-refused. - **Replace fire-and-forget `loop.schedule()` with `kota::task_group`**: Compiler compile tasks, Indexer background indexing + resource monitor, WorkerPool worker monitors, and socket accept loops now use structured concurrency. This eliminates manual `alive_count_`/generation counters and ensures all spawned tasks are joined on shutdown. - **Fix flaky integration test**: `CliceClient.initialize()` now always sets `cache_dir` to a workspace-local `.clice/` directory, preventing stale PCH artifacts from the global `~/.cache/clice/` from polluting test runs. ## Details **Compiler peer lifetime**: `Compiler` and `Indexer` previously took `JsonPeer&` in their constructors, coupling them to a single connection. They now store a `JsonPeer*` set via `set_peer()`, with null checks before sending diagnostics/progress. This supports the multi-connection model where agentic clients don't need diagnostics. **Socket mode single-LSP enforcement**: `accept_connections()` takes a `register_lsp` flag; when true, only the first connection gets an `LSPClient`. All connections get an `AgentClient`. This prevents multiple LSP sessions from racing on shared server state. **Structured shutdown**: `Compiler::stop()` cancels in-flight compile tasks and joins them. `WorkerPool::stop()` signals workers and joins the monitor task group. `Indexer` uses a `cancellation_source` to stop its resource monitor when a background indexing run completes. **Pin kotatsu**: Changed from `GIT_TAG main` + `GIT_SHALLOW TRUE` to an exact commit hash for reproducible builds. --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
286 lines
8.1 KiB
C++
286 lines
8.1 KiB
C++
#include <string>
|
|
#include <vector>
|
|
|
|
#include "test/test.h"
|
|
#include "server/protocol/worker.h"
|
|
#include "server/worker_test_helpers.h"
|
|
|
|
#include "kota/codec/bincode/bincode.h"
|
|
|
|
namespace clice::testing {
|
|
|
|
namespace {
|
|
|
|
// ============================================================================
|
|
// Bincode Serialization Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(BincodeRoundTrip) {
|
|
|
|
TEST_CASE(CompileParamsRoundTrip) {
|
|
namespace bincode = kota::codec::bincode;
|
|
|
|
worker::CompileParams params;
|
|
params.path = "/tmp/test.cpp";
|
|
params.version = 1;
|
|
params.text = "int main() { return 0; }";
|
|
params.directory = "/tmp";
|
|
params.arguments = {"clang++", "-c", "test.cpp"};
|
|
params.pch = {"", 0};
|
|
params.pcms = {};
|
|
|
|
auto bytes = bincode::to_bytes(params);
|
|
ASSERT_TRUE(bytes.has_value());
|
|
|
|
worker::CompileParams result;
|
|
auto status =
|
|
bincode::from_bytes(std::span<const std::byte>(bytes->data(), bytes->size()), result);
|
|
ASSERT_TRUE(status.has_value());
|
|
|
|
EXPECT_EQ(result.path, params.path);
|
|
EXPECT_EQ(result.version, params.version);
|
|
EXPECT_EQ(result.text, params.text);
|
|
EXPECT_EQ(result.directory, params.directory);
|
|
EXPECT_EQ(result.arguments.size(), params.arguments.size());
|
|
}
|
|
|
|
TEST_CASE(CompileResultRoundTrip) {
|
|
namespace bincode = kota::codec::bincode;
|
|
|
|
worker::CompileResult result;
|
|
result.version = 1;
|
|
result.diagnostics = {}; // empty
|
|
result.memory_usage = 0;
|
|
|
|
auto bytes = bincode::to_bytes(result);
|
|
ASSERT_TRUE(bytes.has_value());
|
|
|
|
worker::CompileResult decoded;
|
|
auto status =
|
|
bincode::from_bytes(std::span<const std::byte>(bytes->data(), bytes->size()), decoded);
|
|
ASSERT_TRUE(status.has_value());
|
|
EXPECT_EQ(decoded.version, result.version);
|
|
}
|
|
|
|
}; // TEST_SUITE(BincodeRoundTrip)
|
|
|
|
// ============================================================================
|
|
// StatelessWorker Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(StatelessWorker) {
|
|
|
|
TEST_CASE(SpawnAndExit) {
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
// Close stdin pipe to signal worker to exit.
|
|
w.peer->close_output();
|
|
w.loop.schedule(w.peer->run());
|
|
w.loop.run();
|
|
}
|
|
|
|
TEST_CASE(BuildPCHRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_pch.h", "#pragma once\nint pch_global = 42;\n");
|
|
auto hdr = tmp.path("test_pch.h");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::BuildPCH;
|
|
params.file = hdr;
|
|
params.directory = "/tmp";
|
|
params.arguments =
|
|
{"clang++", "-resource-dir", std::string(resource_dir()), "-x", "c++-header", hdr};
|
|
params.text = "#pragma once\nint pch_global = 42;\n";
|
|
params.output_path = tmp.path("test_pch.pch");
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
if(!result.has_value()) {
|
|
w.peer->close_output();
|
|
co_return;
|
|
}
|
|
EXPECT_TRUE(result.value().success);
|
|
EXPECT_FALSE(result.value().output_path.empty());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(IndexRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_index.cpp", "int indexed_var = 1;\n");
|
|
auto src = tmp.path("test_index.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Index;
|
|
params.file = src;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
}; // TEST_SUITE(StatelessWorker)
|
|
|
|
// ============================================================================
|
|
// StatelessWorker Extended Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(StatelessWorkerExtended) {
|
|
|
|
TEST_CASE(BuildPCMRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_module.cppm",
|
|
"export module test_module;\nexport int module_func() { return 1; }\n");
|
|
auto src = tmp.path("test_module.cppm");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::BuildPCM;
|
|
params.file = src;
|
|
params.directory = "/tmp";
|
|
params.arguments = {"clang++",
|
|
"-resource-dir",
|
|
std::string(resource_dir()),
|
|
"-std=c++20",
|
|
"--precompile",
|
|
src};
|
|
params.module_name = "test_module";
|
|
params.output_path = tmp.path("test_module.pcm");
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(CompletionRequest) {
|
|
std::string text = "int foo = 1;\nint bar = fo";
|
|
TempDir tmp;
|
|
tmp.touch("completion_test.cpp", text);
|
|
auto src = tmp.path("completion_test.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Completion;
|
|
params.file = src;
|
|
params.version = 1;
|
|
params.text = text;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
params.offset = 25; // after "fo" in "int bar = fo" (13 + 12)
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(SignatureHelpRequest) {
|
|
std::string text = "void foo(int a, int b) {}\nint main() { foo(";
|
|
TempDir tmp;
|
|
tmp.touch("sighelp_test.cpp", text);
|
|
auto src = tmp.path("sighelp_test.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::SignatureHelp;
|
|
params.file = src;
|
|
params.version = 1;
|
|
params.text = text;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
params.offset = 45; // after "foo(" (26 + 19)
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
// Should return signature help for foo(int a, int b).
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(MultipleStatelessRequests) {
|
|
TempDir tmp;
|
|
std::vector<std::string> paths;
|
|
for(int i = 0; i < 3; i++) {
|
|
auto name = "multi_index_" + std::to_string(i) + ".cpp";
|
|
auto text = "int idx_var_" + std::to_string(i) + " = " + std::to_string(i) + ";\n";
|
|
tmp.touch(name, text);
|
|
paths.push_back(tmp.path(name));
|
|
}
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> kota::task<> {
|
|
// Send multiple index requests to test stateless worker handles them sequentially.
|
|
for(int i = 0; i < 3; i++) {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Index;
|
|
params.file = paths[i];
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(paths[i]);
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
}
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
}; // TEST_SUITE(StatelessWorkerExtended)
|
|
|
|
} // namespace
|
|
|
|
} // namespace clice::testing
|