Skip to content

Fix list_projects empty + trace_path qualified-name lookup #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nv-jwiley wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −7
Open

Fix list_projects empty + trace_path qualified-name lookup #298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/mcp/mcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,9 @@ static cbm_store_t *resolve_store(cbm_mcp_server_t *srv, const char *project) {
return srv->store;
}

/* Forward decl — definition lives below alongside list_projects. */
static bool is_project_db_file(const char *name, size_t len);

/* Scan cache dir for .db files, writing comma-separated quoted names into out.
* Returns the number of projects found. */
static int collect_db_project_names(const char *dir_path, char *out, size_t out_sz) {
Expand All @@ -785,10 +788,7 @@ static int collect_db_project_names(const char *dir_path, char *out, size_t out_
while ((entry = cbm_readdir(d)) != NULL) {
const char *n = entry->name;
size_t len = strlen(n);
if (len < MCP_MIN_DB_NAME || strcmp(n + len - MCP_DB_EXT, ".db") != 0) {
continue;
}
if (strncmp(n, "tmp-", SLEN("tmp-")) == 0 || strncmp(n, "_", SLEN("_")) == 0) {
if (!is_project_db_file(n, len)) {
continue;
}
if (count > 0 && offset < (int)out_sz - MCP_SEPARATOR) {
Expand Down Expand Up @@ -842,12 +842,18 @@ static char *build_project_list_error(const char *reason) {

/* ── Tool handler implementations ─────────────────────────────── */

/* Return true if filename is a valid project .db file (not temp/internal). */
/* Return true if filename is a valid project .db file (not temp/internal).
*
* NOTE: project names derived from `/tmp/...` source roots legitimately
* begin with `tmp-` (see cbm_project_name_from_path: "/tmp/bench/..." →
* "tmp-bench-..."), so we must NOT exclude the entire `tmp-` prefix. The
* `_` prefix is reserved for internal/hidden DBs, and `:memory:` is the
* SQLite in-memory marker (defensive — never appears as a real file). */
static bool is_project_db_file(const char *name, size_t len) {
if (len < MCP_MIN_DB_NAME || strcmp(name + len - MCP_DB_EXT, ".db") != 0) {
return false;
}
if (strncmp(name, "tmp-", SLEN("tmp-")) == 0 || strncmp(name, "_", SLEN("_")) == 0 ||
if (strncmp(name, "_", SLEN("_")) == 0 ||
strncmp(name, ":memory:", SLEN(":memory:")) == 0) {
return false;
}
Expand Down Expand Up @@ -1928,11 +1934,22 @@ static char *handle_trace_call_path(cbm_mcp_server_t *srv, const char *args) {
direction = heap_strdup("both");
}

/* Find the node by name */
/* Find the node by name. If that misses (caller passed a fully-qualified
* name like "module.func"), fall back to qualified_name lookup so the
* documented "fully qualify for precise match" UX actually works. */
cbm_node_t *nodes = NULL;
int node_count = 0;
cbm_store_find_nodes_by_name(store, project, func_name, &nodes, &node_count);

if (node_count == 0) {
cbm_node_t qn_node = {0};
if (cbm_store_find_node_by_qn(store, project, func_name, &qn_node) == CBM_STORE_OK) {
nodes = malloc(sizeof(cbm_node_t));
nodes[0] = qn_node;
node_count = 1;
}
}

if (node_count == 0) {
enum { HINT_BUF_SZ = 512 };
char hint[HINT_BUF_SZ];
Expand Down