mirror of
https://github.com/logos-co/logos-logoscore-cli.git
synced 2026-08-31 04:41:06 +00:00
* refactor!: remove legacy inline (-c) mode; use daemon + client only Inline mode (the flat-flag, single-process path: `logoscore -m <dir> -l <modules> -c "module.method(args)" [--quit-on-finish]`) is legacy and its arg/async handling regressed in the current runtime. Module method calls now go exclusively through a daemon (`logoscore -D`) plus the `call`/`load-module` client subcommands, which keep a persistent event loop and work reliably. Removed: - `-c`/`--call` and `--quit-on-finish` options - `runInlineMode()` in main.cpp and the inline dispatch branch - `src/inline/` (CallExecutor, command_line_parser / parseCallString / CoreArgs) - the inline sources from CMakeLists - the `InlineMode_*` end-to-end tests (daemon/client coverage retained; the DaemonMode relative-path test already covers path resolution) Kept (now daemon-only): `-m`/`--modules-dir`, `-l`/`--load-modules`, `--persistence-path` configure daemon startup with `-D`. Invoking these without `-D` and without a subcommand now prints a clear error pointing at the daemon/client workflow instead of silently running inline. Docs (README, docs/spec.md, docs/project.md) updated to drop inline mode and describe the daemon + client workflow. Verified: `ws test logos-logoscore-cli` passes (builds + unit/cli/integration tests green). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix: reject daemon-only flags (no -D / with a client subcommand) + tests Address review on the inline-mode removal: - Reject -m/-l/--persistence-path when used without -D — both with a client subcommand (previously silently ignored, e.g. `logoscore -m /p status`) and on a bare invocation. Factored into one rejectDaemonOnlyFlags() helper used by both paths; also fixes the mid-sentence line break in the message. - Add CLI tests for the new error path: daemon flags with no -D/no subcommand, and daemon flags alongside a client subcommand both exit 1 with guidance. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor!: daemon starts clean — remove -l/--load-modules autoload The daemon never actually autoloaded -l/--load-modules (only the now-removed inline path did); the flag was parsed and persisted but unused at startup. Make that explicit: the daemon starts clean and modules are loaded via the `load-module` client command. - Remove the `-l/--load-modules` option and its config-merge/reject handling. - Drop the vestigial `loadModules` field from DaemonConfig (and thus state.json's `resolved`), its JSON (de)serialization, and the daemon_state tests that asserted it. - Update README/spec/project docs + the daemon flags table. Verified: `ws test logos-logoscore-cli` passes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
316 lines
14 KiB
C++
316 lines
14 KiB
C++
#include <gtest/gtest.h>
|
|
#include <chrono>
|
|
#include <cstdlib>
|
|
#include <filesystem>
|
|
#include <fstream>
|
|
#include <string>
|
|
#include <sys/wait.h>
|
|
#include <vector>
|
|
|
|
#ifdef __APPLE__
|
|
#include <mach-o/dyld.h>
|
|
#elif defined(__linux__)
|
|
#include <unistd.h>
|
|
#include <climits>
|
|
#endif
|
|
|
|
namespace fs = std::filesystem;
|
|
|
|
// Helper function to get the directory of the current executable
|
|
static fs::path getExecutableDir() {
|
|
#ifdef __APPLE__
|
|
char path[PATH_MAX];
|
|
uint32_t size = sizeof(path);
|
|
if (_NSGetExecutablePath(path, &size) == 0) {
|
|
return fs::path(path).parent_path();
|
|
}
|
|
#elif defined(__linux__)
|
|
char path[PATH_MAX];
|
|
ssize_t len = readlink("/proc/self/exe", path, sizeof(path) - 1);
|
|
if (len != -1) {
|
|
path[len] = '\0';
|
|
return fs::path(path).parent_path();
|
|
}
|
|
#endif
|
|
return fs::path();
|
|
}
|
|
|
|
class CLITest : public ::testing::Test {
|
|
protected:
|
|
fs::path logoscoreBinary;
|
|
|
|
void SetUp() override {
|
|
// Check for LOGOSCORE_BINARY environment variable first
|
|
const char* envBinary = std::getenv("LOGOSCORE_BINARY");
|
|
if (envBinary && fs::exists(envBinary)) {
|
|
logoscoreBinary = envBinary;
|
|
return;
|
|
}
|
|
|
|
// Get the directory where the test executable is located
|
|
fs::path execDir = getExecutableDir();
|
|
|
|
// Find the logoscore binary - try multiple locations
|
|
std::vector<fs::path> searchPaths;
|
|
|
|
// First, check in the same directory as the test executable (Nix builds)
|
|
if (!execDir.empty()) {
|
|
searchPaths.push_back(execDir / "logoscore");
|
|
}
|
|
|
|
// Then try paths relative to current working directory
|
|
searchPaths.push_back(fs::current_path() / ".." / "bin" / "logoscore");
|
|
searchPaths.push_back(fs::current_path() / "bin" / "logoscore");
|
|
searchPaths.push_back(fs::current_path() / ".." / ".." / "bin" / "logoscore");
|
|
searchPaths.push_back(fs::current_path().parent_path() / "logoscore");
|
|
|
|
for (const auto& path : searchPaths) {
|
|
if (fs::exists(path)) {
|
|
logoscoreBinary = fs::canonical(path);
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Binary not found, skip tests
|
|
std::string triedPaths;
|
|
for (size_t i = 0; i < searchPaths.size(); ++i) {
|
|
if (i > 0) triedPaths += ", ";
|
|
triedPaths += "\"" + searchPaths[i].string() + "\"";
|
|
}
|
|
GTEST_SKIP() << "logoscore binary not found. Set LOGOSCORE_BINARY env var or build the binary first. Tried: "
|
|
<< triedPaths;
|
|
}
|
|
|
|
// Helper to run logoscore command
|
|
int runLogoscore(const std::string& args, std::string* output = nullptr) {
|
|
std::string cmd = logoscoreBinary.string() + " " + args;
|
|
if (output) {
|
|
cmd += " 2>&1";
|
|
FILE* pipe = popen(cmd.c_str(), "r");
|
|
if (!pipe) return -1;
|
|
|
|
char buffer[128];
|
|
while (fgets(buffer, sizeof(buffer), pipe)) {
|
|
*output += buffer;
|
|
}
|
|
int status = pclose(pipe);
|
|
return WEXITSTATUS(status);
|
|
} else {
|
|
int status = system(cmd.c_str());
|
|
return WEXITSTATUS(status);
|
|
}
|
|
}
|
|
|
|
// Helper to run logoscore with timeout (for commands that run event loop)
|
|
int runLogoscoreWithTimeout(const std::string& args, std::string* output, int timeoutSecs = 2) {
|
|
std::string cmd = "timeout " + std::to_string(timeoutSecs) + " " + logoscoreBinary.string() + " " + args + " 2>&1";
|
|
FILE* pipe = popen(cmd.c_str(), "r");
|
|
if (!pipe) return -1;
|
|
|
|
char buffer[128];
|
|
while (fgets(buffer, sizeof(buffer), pipe)) {
|
|
*output += buffer;
|
|
}
|
|
int status = pclose(pipe);
|
|
return WEXITSTATUS(status);
|
|
}
|
|
};
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Help and version tests
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, HelpCommand) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("--help", &output);
|
|
|
|
EXPECT_EQ(exitCode, 0);
|
|
// New help text includes subcommands
|
|
EXPECT_NE(output.find("logoscore"), std::string::npos) << "Help should contain app name";
|
|
EXPECT_NE(output.find("status"), std::string::npos) << "Help should list status command";
|
|
EXPECT_NE(output.find("load-module"), std::string::npos) << "Help should list load-module command";
|
|
EXPECT_NE(output.find("call"), std::string::npos) << "Help should list call command";
|
|
EXPECT_NE(output.find("watch"), std::string::npos) << "Help should list watch command";
|
|
EXPECT_NE(output.find("--json"), std::string::npos) << "Help should document --json flag";
|
|
}
|
|
|
|
TEST_F(CLITest, HelpShortFlag) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("-h", &output);
|
|
EXPECT_EQ(exitCode, 0);
|
|
EXPECT_NE(output.find("logoscore"), std::string::npos);
|
|
}
|
|
|
|
TEST_F(CLITest, VersionCommand) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("--version", &output);
|
|
|
|
EXPECT_EQ(exitCode, 0);
|
|
EXPECT_NE(output.find("1.0"), std::string::npos) << "Version output should contain version number";
|
|
}
|
|
|
|
TEST_F(CLITest, NoArgs_ShowsHelp) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("", &output);
|
|
EXPECT_EQ(exitCode, 0);
|
|
EXPECT_NE(output.find("logoscore"), std::string::npos) << "No args should show help";
|
|
}
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Client commands without daemon (should fail gracefully)
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, Status_NoDaemon) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("status --json", &output);
|
|
// Should report not_running (exit 1) or connection error (exit 2)
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, ListModules_NoDaemon) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("list-modules --json", &output);
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, LoadModule_NoDaemon) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("load-module waku --json", &output);
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, ModuleInfo_NoDaemon) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("module-info chat --json", &output);
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, Stats_NoDaemon) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("stats --json", &output);
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Timing tests — client commands must return quickly (catches RPC hangs)
|
|
// If the RPC layer has a misconfigured token key or missing timeout,
|
|
// commands hang for 20+ seconds waiting for capability_module negotiation.
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, Status_NoDaemon_ReturnsFast) {
|
|
auto start = std::chrono::steady_clock::now();
|
|
std::string output;
|
|
int exitCode = runLogoscore("status --json", &output);
|
|
auto elapsed = std::chrono::steady_clock::now() - start;
|
|
|
|
auto secs = std::chrono::duration_cast<std::chrono::seconds>(elapsed).count();
|
|
EXPECT_LE(secs, 5) << "status should return within 5 seconds (took " << secs << "s). "
|
|
<< "Likely an RPC timeout or token key misconfiguration.";
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, LoadModule_NoDaemon_ReturnsFast) {
|
|
auto start = std::chrono::steady_clock::now();
|
|
std::string output;
|
|
int exitCode = runLogoscore("load-module test --json", &output);
|
|
auto elapsed = std::chrono::steady_clock::now() - start;
|
|
|
|
auto secs = std::chrono::duration_cast<std::chrono::seconds>(elapsed).count();
|
|
EXPECT_LE(secs, 5) << "load-module should return within 5 seconds (took " << secs << "s).";
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
TEST_F(CLITest, Stop_NoDaemon_ReturnsFast) {
|
|
auto start = std::chrono::steady_clock::now();
|
|
std::string output;
|
|
int exitCode = runLogoscore("stop --json", &output);
|
|
auto elapsed = std::chrono::steady_clock::now() - start;
|
|
|
|
auto secs = std::chrono::duration_cast<std::chrono::seconds>(elapsed).count();
|
|
EXPECT_LE(secs, 5) << "stop should return within 5 seconds (took " << secs << "s).";
|
|
EXPECT_NE(exitCode, 0);
|
|
}
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Relative path resolution — logos_core cannot load plugin metadata from
|
|
// relative paths (dlopen fails to resolve RPATH). logoscore must resolve
|
|
// --modules-dir to an absolute path before calling logos_core_add_modules_dir.
|
|
//
|
|
// These tests verify this by checking that the "Added plugins directory:"
|
|
// debug message contains an absolute path, even when the CLI receives a
|
|
// relative one.
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, DaemonMode_RelativePath_ResolvedToAbsolute) {
|
|
fs::path parentDir = fs::temp_directory_path() / "logoscore_test_relpath_daemon";
|
|
fs::path modulesDir = parentDir / "my_modules";
|
|
fs::create_directories(modulesDir);
|
|
|
|
// cd into parentDir, start daemon with relative "./my_modules"
|
|
std::string cmd = "cd " + parentDir.string() + " && HOME=" + parentDir.string()
|
|
+ " timeout 5 "
|
|
+ logoscoreBinary.string()
|
|
+ " -D --verbose --modules-dir ./my_modules 2>&1";
|
|
|
|
FILE* pipe = popen(cmd.c_str(), "r");
|
|
ASSERT_NE(pipe, nullptr);
|
|
std::string output;
|
|
char buffer[256];
|
|
while (fgets(buffer, sizeof(buffer), pipe))
|
|
output += buffer;
|
|
pclose(pipe);
|
|
|
|
std::string marker = "Added plugins directory:";
|
|
auto pos = output.find(marker);
|
|
ASSERT_NE(pos, std::string::npos) << "Should see plugins directory message. Output:\n" << output;
|
|
|
|
std::string afterMarker = output.substr(pos + marker.size());
|
|
bool isAbsolute = afterMarker.find("/my_modules") != std::string::npos;
|
|
bool isRelative = afterMarker.find("\"./my_modules\"") != std::string::npos;
|
|
EXPECT_TRUE(isAbsolute && !isRelative)
|
|
<< "Daemon relative --modules-dir should be resolved to absolute before passing to logos_core. "
|
|
<< "Output:\n" << output;
|
|
|
|
fs::remove_all(parentDir);
|
|
}
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Persistence path option
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, HelpCommand_ShowsPersistencePath) {
|
|
std::string output;
|
|
int exitCode = runLogoscore("--help", &output);
|
|
EXPECT_EQ(exitCode, 0);
|
|
EXPECT_NE(output.find("--persistence-path"), std::string::npos)
|
|
<< "Help should document --persistence-path option. Output:\n" << output;
|
|
}
|
|
|
|
// NOTE: module manifest discovery (with/without "type") was previously
|
|
// exercised through inline mode; that behaviour lives in liblogos and is
|
|
// covered there. The daemon path is verified by the integration tests.
|
|
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
// Inline mode removed — daemon-only flags must be rejected, not silently ignored
|
|
// ═════════════════════════════════════════════════════════════════════════════
|
|
|
|
TEST_F(CLITest, DaemonFlags_NoDaemonNoSubcommand_Rejected) {
|
|
// `logoscore -m <dir>` with no -D and no subcommand used to start inline
|
|
// mode; it must now fail with guidance toward the daemon/client workflow.
|
|
std::string output;
|
|
int exitCode = runLogoscore("--modules-dir /tmp/logoscore_test_x", &output);
|
|
EXPECT_EQ(exitCode, 1) << "Output:\n" << output;
|
|
EXPECT_NE(output.find("daemon"), std::string::npos)
|
|
<< "Should point at the daemon (-D) workflow. Output:\n" << output;
|
|
}
|
|
|
|
TEST_F(CLITest, DaemonFlags_WithClientSubcommand_Rejected) {
|
|
// Daemon-only flags alongside a client subcommand are a no-op trap; reject
|
|
// them before attempting the command, regardless of whether a daemon runs.
|
|
std::string output;
|
|
int exitCode = runLogoscore("--modules-dir /tmp/logoscore_test_x status", &output);
|
|
EXPECT_EQ(exitCode, 1) << "Output:\n" << output;
|
|
EXPECT_NE(output.find("daemon"), std::string::npos)
|
|
<< "Should reject -m with a client subcommand. Output:\n" << output;
|
|
}
|