Skip to content

Commit 96a2f55

Browse files
authored
Merge pull request DeusData#714 from DeusData/fix/640-project-arg-alias
fix(mcp): accept project_name alias + clearer no-store error (DeusData#640)
2 parents f957dff + 8b56c52 commit 96a2f55

2 files changed

Lines changed: 152 additions & 22 deletions

File tree

‎src/mcp/mcp.c‎

Lines changed: 61 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,26 @@ char *cbm_mcp_get_string_arg(const char *args_json, const char *key) {
705705
return result;
706706
}
707707

708+
/* Resolve the project argument, accepting the canonical "project" key plus the
709+
* aliases a caller naturally reaches for (#640): list_projects surfaces the
710+
* field as "name" and the not-found hint says "pass the project name", so
711+
* "project_name" is the usual guess; "project_id" / "projectName" are accepted
712+
* too. NOT bare "name" — index_repository uses "name" for an explicit
713+
* project-name override. Caller must free() the result. */
714+
static char *get_project_arg(const char *args_json) {
715+
char *p = cbm_mcp_get_string_arg(args_json, "project");
716+
if (!p) {
717+
p = cbm_mcp_get_string_arg(args_json, "project_name");
718+
}
719+
if (!p) {
720+
p = cbm_mcp_get_string_arg(args_json, "project_id");
721+
}
722+
if (!p) {
723+
p = cbm_mcp_get_string_arg(args_json, "projectName");
724+
}
725+
return p;
726+
}
727+
708728
int cbm_mcp_get_int_arg(const char *args_json, const char *key, int default_val) {
709729
yyjson_doc *doc = yyjson_read(args_json, strlen(args_json), 0);
710730
if (!doc) {
@@ -1039,7 +1059,8 @@ static char *build_project_list_error(const char *reason) {
10391059
if (count > 0) {
10401060
snprintf(buf, sizeof(buf),
10411061
"{\"error\":\"%s\",\"hint\":\"Use list_projects to see all indexed projects, "
1042-
"then pass the project name.\",\"available_projects\":[%s],\"count\":%d}",
1062+
"then pass it as the \\\"project\\\" "
1063+
"argument.\",\"available_projects\":[%s],\"count\":%d}",
10431064
reason, projects, count);
10441065
} else {
10451066
snprintf(buf, sizeof(buf),
@@ -1050,16 +1071,34 @@ static char *build_project_list_error(const char *reason) {
10501071
return heap_strdup(buf);
10511072
}
10521073

1053-
/* Bail with project list when no store is available. */
1054-
#define REQUIRE_STORE(store, project) \
1055-
do { \
1056-
if (!(store)) { \
1057-
char *_err = build_project_list_error("project not found or not indexed"); \
1058-
char *_res = cbm_mcp_text_result(_err, true); \
1059-
free(_err); \
1060-
free(project); \
1061-
return _res; \
1062-
} \
1074+
/* Distinct from "unknown project": the caller omitted the project argument
1075+
* entirely (no recognized key). Name the literal "project" key so the fix is
1076+
* obvious (#640). Caller must free() result. */
1077+
static char *build_missing_project_error(void) {
1078+
return heap_strdup("{\"error\":\"missing required argument: project\",\"hint\":\"Pass "
1079+
"the project as the \\\"project\\\" argument, e.g. "
1080+
"{\\\"project\\\":\\\"<name from list_projects>\\\"}. Run "
1081+
"list_projects to see indexed projects.\"}");
1082+
}
1083+
1084+
/* Pick the right no-store error: a NULL project means the argument was missing
1085+
* (clearer message); a non-NULL project that didn't resolve means it's
1086+
* unknown/unindexed (list the available ones). */
1087+
static char *build_no_store_error(const char *project) {
1088+
return project ? build_project_list_error("project not found or not indexed")
1089+
: build_missing_project_error();
1090+
}
1091+
1092+
/* Bail with the right error when no store is available. */
1093+
#define REQUIRE_STORE(store, project) \
1094+
do { \
1095+
if (!(store)) { \
1096+
char *_err = build_no_store_error(project); \
1097+
char *_res = cbm_mcp_text_result(_err, true); \
1098+
free(_err); \
1099+
free(project); \
1100+
return _res; \
1101+
} \
10631102
} while (0)
10641103

10651104
/* ── Tool handler implementations ─────────────────────────────── */
@@ -1200,7 +1239,7 @@ static char *verify_project_indexed(cbm_store_t *store, const char *project) {
12001239
}
12011240

12021241
static char *handle_get_graph_schema(cbm_mcp_server_t *srv, const char *args) {
1203-
char *project = cbm_mcp_get_string_arg(args, "project");
1242+
char *project = get_project_arg(args);
12041243
cbm_store_t *store = resolve_store(srv, project);
12051244
REQUIRE_STORE(store, project);
12061245

@@ -1668,7 +1707,7 @@ static bool run_semantic_query(yyjson_mut_doc *doc, yyjson_mut_val *root, const
16681707
}
16691708

16701709
static char *handle_search_graph(cbm_mcp_server_t *srv, const char *args) {
1671-
char *project = cbm_mcp_get_string_arg(args, "project");
1710+
char *project = get_project_arg(args);
16721711
cbm_store_t *store = resolve_store(srv, project);
16731712
REQUIRE_STORE(store, project);
16741713

@@ -1813,7 +1852,7 @@ static char *handle_search_graph(cbm_mcp_server_t *srv, const char *args) {
18131852

18141853
static char *handle_query_graph(cbm_mcp_server_t *srv, const char *args) {
18151854
char *query = cbm_mcp_get_string_arg(args, "query");
1816-
char *project = cbm_mcp_get_string_arg(args, "project");
1855+
char *project = get_project_arg(args);
18171856
cbm_store_t *store = resolve_store(srv, project);
18181857
int max_rows = cbm_mcp_get_int_arg(args, "max_rows", 0);
18191858

@@ -1891,7 +1930,7 @@ static char *handle_query_graph(cbm_mcp_server_t *srv, const char *args) {
18911930
}
18921931

18931932
static char *handle_index_status(cbm_mcp_server_t *srv, const char *args) {
1894-
char *project = cbm_mcp_get_string_arg(args, "project");
1933+
char *project = get_project_arg(args);
18951934
cbm_store_t *store = resolve_store(srv, project);
18961935
REQUIRE_STORE(store, project);
18971936

@@ -1935,7 +1974,7 @@ static char *handle_index_status(cbm_mcp_server_t *srv, const char *args) {
19351974

19361975
/* delete_project: just erase the .db file (and WAL/SHM). */
19371976
static char *handle_delete_project(cbm_mcp_server_t *srv, const char *args) {
1938-
char *name = cbm_mcp_get_string_arg(args, "project");
1977+
char *name = get_project_arg(args);
19391978
if (!name) {
19401979
return cbm_mcp_text_result("project is required", true);
19411980
}
@@ -2046,7 +2085,7 @@ static void append_cross_repo_summary(yyjson_mut_doc *doc, yyjson_mut_val *root,
20462085
}
20472086

20482087
static char *handle_get_architecture(cbm_mcp_server_t *srv, const char *args) {
2049-
char *project = cbm_mcp_get_string_arg(args, "project");
2088+
char *project = get_project_arg(args);
20502089
char *scope_path = cbm_mcp_get_string_arg(args, "path");
20512090
cbm_store_t *store = resolve_store(srv, project);
20522091
REQUIRE_STORE(store, project);
@@ -2598,7 +2637,7 @@ static void bfs_union_same_name(cbm_store_t *store, const cbm_node_t *nodes, int
25982637

25992638
static char *handle_trace_call_path(cbm_mcp_server_t *srv, const char *args) {
26002639
char *func_name = cbm_mcp_get_string_arg(args, "function_name");
2601-
char *project = cbm_mcp_get_string_arg(args, "project");
2640+
char *project = get_project_arg(args);
26022641
cbm_store_t *store = resolve_store(srv, project);
26032642
char *direction = cbm_mcp_get_string_arg(args, "direction");
26042643
char *mode = cbm_mcp_get_string_arg(args, "mode");
@@ -3460,7 +3499,7 @@ static char *build_snippet_response(cbm_mcp_server_t *srv, cbm_node_t *node,
34603499

34613500
static char *handle_get_code_snippet(cbm_mcp_server_t *srv, const char *args) {
34623501
char *qn = cbm_mcp_get_string_arg(args, "qualified_name");
3463-
char *project = cbm_mcp_get_string_arg(args, "project");
3502+
char *project = get_project_arg(args);
34643503
bool include_neighbors = cbm_mcp_get_bool_arg(args, "include_neighbors");
34653504

34663505
if (!qn) {
@@ -4176,7 +4215,7 @@ static bool compile_path_filter(const char *filter, cbm_regex_t *re) {
41764215

41774216
static char *handle_search_code(cbm_mcp_server_t *srv, const char *args) {
41784217
char *pattern = cbm_mcp_get_string_arg(args, "pattern");
4179-
char *project = cbm_mcp_get_string_arg(args, "project");
4218+
char *project = get_project_arg(args);
41804219
char *file_pattern = cbm_mcp_get_string_arg(args, "file_pattern");
41814220
char *path_filter = cbm_mcp_get_string_arg(args, "path_filter");
41824221
char *mode_str = cbm_mcp_get_string_arg(args, "mode");
@@ -4434,7 +4473,7 @@ static void detect_add_impacted_symbols(cbm_store_t *store, const char *project,
44344473
}
44354474

44364475
static char *handle_detect_changes(cbm_mcp_server_t *srv, const char *args) {
4437-
char *project = cbm_mcp_get_string_arg(args, "project");
4476+
char *project = get_project_arg(args);
44384477
char *base_branch = cbm_mcp_get_string_arg(args, "base_branch");
44394478
char *since = cbm_mcp_get_string_arg(args, "since");
44404479
char *scope = cbm_mcp_get_string_arg(args, "scope");
@@ -4674,7 +4713,7 @@ static char *adr_read_legacy_file(const char *root_path) {
46744713
"PATTERNS, TRADEOFFS, PHILOSOPHY."
46754714

46764715
static char *handle_manage_adr(cbm_mcp_server_t *srv, const char *args) {
4677-
char *project = cbm_mcp_get_string_arg(args, "project");
4716+
char *project = get_project_arg(args);
46784717
char *mode_str = cbm_mcp_get_string_arg(args, "mode");
46794718
char *content = cbm_mcp_get_string_arg(args, "content");
46804719

‎tests/test_mcp.c‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,95 @@ TEST(tool_get_architecture_emits_populated_sections) {
894894
PASS();
895895
}
896896

897+
/* Reproduce-first for #640: query handlers must accept the `project_name`
898+
* alias, not only the canonical `project` key. list_projects surfaces the field
899+
* as "name" and the error hint says "pass the project name", so a caller
900+
* naturally passes `project_name`. With no alias, the handler reads key
901+
* "project" -> NULL -> resolve_store bails before opening any .db -> "project
902+
* not found or not indexed" even though the project is indexed. Mirrors
903+
* tool_get_architecture_emits_populated_sections but with the alias key. */
904+
TEST(tool_get_architecture_accepts_project_name_alias_issue640) {
905+
cbm_mcp_server_t *srv = cbm_mcp_server_new(NULL);
906+
ASSERT_NOT_NULL(srv);
907+
908+
cbm_store_t *st = cbm_mcp_server_store(srv);
909+
ASSERT_NOT_NULL(st);
910+
911+
const char *proj = "alias640";
912+
cbm_mcp_server_set_project(srv, proj);
913+
cbm_store_upsert_project(st, proj, "/tmp/alias640");
914+
915+
cbm_node_t main_fn = {0};
916+
main_fn.project = proj;
917+
main_fn.label = "Function";
918+
main_fn.name = "main";
919+
main_fn.qualified_name = "alias640.cmd.main";
920+
main_fn.file_path = "cmd/main.go";
921+
main_fn.start_line = 1;
922+
main_fn.end_line = 3;
923+
main_fn.properties_json = "{\"is_entry_point\":true}";
924+
ASSERT_GT(cbm_store_upsert_node(st, &main_fn), 0);
925+
926+
/* Caller passes `project_name` (the natural guess) instead of `project`. */
927+
char *resp = cbm_mcp_server_handle(
928+
srv, "{\"jsonrpc\":\"2.0\",\"id\":640,\"method\":\"tools/call\","
929+
"\"params\":{\"name\":\"get_architecture\","
930+
"\"arguments\":{\"project_name\":\"alias640\",\"aspects\":[\"all\"]}}}");
931+
ASSERT_NOT_NULL(resp);
932+
char *inner = extract_text_content(resp);
933+
ASSERT_NOT_NULL(inner);
934+
935+
/* RED before the alias: inner is the "project not found" error.
936+
* GREEN after: the alias resolves and architecture sections surface. */
937+
ASSERT_NULL(strstr(inner, "project not found"));
938+
ASSERT_NOT_NULL(strstr(inner, "\"entry_points\""));
939+
940+
free(inner);
941+
free(resp);
942+
cbm_mcp_server_free(srv);
943+
PASS();
944+
}
945+
946+
/* Reproduce-first for #640: the alias must apply across query handlers, not
947+
* just get_architecture. search_graph with `project_name` must resolve too. */
948+
TEST(tool_search_graph_accepts_project_name_alias_issue640) {
949+
cbm_mcp_server_t *srv = cbm_mcp_server_new(NULL);
950+
ASSERT_NOT_NULL(srv);
951+
952+
cbm_store_t *st = cbm_mcp_server_store(srv);
953+
ASSERT_NOT_NULL(st);
954+
955+
const char *proj = "alias640b";
956+
cbm_mcp_server_set_project(srv, proj);
957+
cbm_store_upsert_project(st, proj, "/tmp/alias640b");
958+
959+
cbm_node_t fn = {0};
960+
fn.project = proj;
961+
fn.label = "Function";
962+
fn.name = "WidgetHandler";
963+
fn.qualified_name = "alias640b.svc.WidgetHandler";
964+
fn.file_path = "svc/widget.go";
965+
fn.start_line = 1;
966+
fn.end_line = 2;
967+
ASSERT_GT(cbm_store_upsert_node(st, &fn), 0);
968+
969+
char *resp = cbm_mcp_server_handle(
970+
srv, "{\"jsonrpc\":\"2.0\",\"id\":641,\"method\":\"tools/call\","
971+
"\"params\":{\"name\":\"search_graph\","
972+
"\"arguments\":{\"project_name\":\"alias640b\",\"name_pattern\":\"Widget.*\"}}}");
973+
ASSERT_NOT_NULL(resp);
974+
char *inner = extract_text_content(resp);
975+
ASSERT_NOT_NULL(inner);
976+
977+
ASSERT_NULL(strstr(inner, "project not found"));
978+
ASSERT_NOT_NULL(strstr(inner, "WidgetHandler"));
979+
980+
free(inner);
981+
free(resp);
982+
cbm_mcp_server_free(srv);
983+
PASS();
984+
}
985+
897986
/* Regression for #604: path scopes architecture totals and content. */
898987
TEST(tool_get_architecture_path_scoping) {
899988
cbm_mcp_server_t *srv = cbm_mcp_server_new(NULL);
@@ -2488,6 +2577,8 @@ SUITE(mcp) {
24882577
RUN_TEST(tool_delete_project_not_found);
24892578
RUN_TEST(tool_get_architecture_empty);
24902579
RUN_TEST(tool_get_architecture_emits_populated_sections);
2580+
RUN_TEST(tool_get_architecture_accepts_project_name_alias_issue640);
2581+
RUN_TEST(tool_search_graph_accepts_project_name_alias_issue640);
24912582
RUN_TEST(tool_get_architecture_path_scoping);
24922583
RUN_TEST(tool_query_graph_missing_query);
24932584

0 commit comments

Comments
 (0)