Merge PR #79: Fix VS Code compatibility (schema, install, protocol negotiation)

DeusData · DeusData · commit 92275ffa955b · 2026-03-20T19:52:59.000+01:00
diff --git a/src/cli/cli.c b/src/cli/cli.c
@@ -813,7 +813,7 @@ int cbm_remove_zed_mcp(const char *config_path) {
 /* ── Agent detection ──────────────────────────────────────────── */
 
 cbm_detected_agents_t cbm_detect_agents(const char *home_dir) {
-    cbm_detected_agents_t agents = {false, false, false, false, false, false, false, false};
+    cbm_detected_agents_t agents = {false, false, false, false, false, false, false, false, false};
     if (!home_dir || !home_dir[0]) {
         return agents;
     }
@@ -874,6 +874,16 @@ cbm_detected_agents_t cbm_detect_agents(const char *home_dir) {
         agents.kilocode = true;
     }
 
+    /* VS Code: User config dir */
+#ifdef __APPLE__
+    snprintf(path, sizeof(path), "%s/Library/Application Support/Code/User", home_dir);
+#else
+    snprintf(path, sizeof(path), "%s/.config/Code/User", home_dir);
+#endif
+    if (stat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
+        agents.vscode = true;
+    }
+
     return agents;
 }
 
@@ -2156,8 +2166,11 @@ int cbm_cmd_install(int argc, char **argv) {
     if (agents.kilocode) {
         printf(" KiloCode");
     }
+    if (agents.vscode) {
+        printf(" VS-Code");
+    }
     if (!agents.claude_code && !agents.codex && !agents.gemini && !agents.zed && !agents.opencode &&
-        !agents.antigravity && !agents.aider && !agents.kilocode) {
+        !agents.antigravity && !agents.aider && !agents.kilocode && !agents.vscode) {
         printf(" (none)");
     }
     printf("\n\n");
@@ -2318,7 +2331,23 @@ int cbm_cmd_install(int argc, char **argv) {
         printf("  instructions: %s\n", instr_path);
     }
 
-    /* Step 12: Ensure PATH */
+    /* Step 12: Install VS Code */
+    if (agents.vscode) {
+        printf("VS Code:\n");
+        char config_path[1024];
+#ifdef __APPLE__
+        snprintf(config_path, sizeof(config_path),
+                 "%s/Library/Application Support/Code/User/mcp.json", home);
+#else
+        snprintf(config_path, sizeof(config_path), "%s/.config/Code/User/mcp.json", home);
+#endif
+        if (!dry_run) {
+            cbm_install_vscode_mcp(self_path, config_path);
+        }
+        printf("  mcp: %s\n", config_path);
+    }
+
+    /* Step 13: Ensure PATH */
     char bin_dir[1024];
     snprintf(bin_dir, sizeof(bin_dir), "%s/.local/bin", home);
     const char *rc = cbm_detect_shell_rc(home);
@@ -2492,6 +2521,20 @@ int cbm_cmd_uninstall(int argc, char **argv) {
         printf("  removed instructions\n");
     }
 
+    if (agents.vscode) {
+        char config_path[1024];
+#ifdef __APPLE__
+        snprintf(config_path, sizeof(config_path),
+                 "%s/Library/Application Support/Code/User/mcp.json", home);
+#else
+        snprintf(config_path, sizeof(config_path), "%s/.config/Code/User/mcp.json", home);
+#endif
+        if (!dry_run) {
+            cbm_remove_vscode_mcp(config_path);
+        }
+        printf("VS Code: removed MCP config entry\n");
+    }
+
     /* Step 2: Remove indexes */
     int index_count = 0;
     const char *cache_dir = get_cache_dir(home);
diff --git a/src/cli/cli.h b/src/cli/cli.h
@@ -113,6 +113,7 @@ typedef struct {
     bool antigravity; /* ~/.gemini/antigravity/ exists */
     bool aider;       /* aider on PATH */
     bool kilocode;    /* KiloCode globalStorage dir exists */
+    bool vscode;      /* VS Code User config dir exists */
 } cbm_detected_agents_t;
 
 /* Detect which coding agents are installed.
diff --git a/src/mcp/mcp.c b/src/mcp/mcp.c
@@ -305,7 +305,8 @@ static const tool_def_t TOOLS[] = {
      "\"sections\":{\"type\":\"array\",\"items\":{\"type\":\"string\"}}}}"},
 
     {"ingest_traces", "Ingest runtime traces to enhance the knowledge graph",
-     "{\"type\":\"object\",\"properties\":{\"traces\":{\"type\":\"array\"},\"project\":{\"type\":"
+     "{\"type\":\"object\",\"properties\":{\"traces\":{\"type\":\"array\",\"items\":{\"type\":"
+     "\"object\"}},\"project\":{\"type\":"
      "\"string\"}},\"required\":[\"traces\"]}"},
 };
 
@@ -342,12 +343,44 @@ char *cbm_mcp_tools_list(void) {
     return out;
 }
 
-char *cbm_mcp_initialize_response(void) {
+/* Supported protocol versions, newest first. The server picks the newest
+ * version that it shares with the client (per MCP spec version negotiation). */
+static const char *SUPPORTED_PROTOCOL_VERSIONS[] = {
+    "2025-11-25",
+    "2025-06-18",
+    "2025-03-26",
+    "2024-11-05",
+};
+static const int SUPPORTED_VERSION_COUNT =
+    (int)(sizeof(SUPPORTED_PROTOCOL_VERSIONS) / sizeof(SUPPORTED_PROTOCOL_VERSIONS[0]));
+
+char *cbm_mcp_initialize_response(const char *params_json) {
+    /* Determine protocol version: if client requests a version we support,
+     * echo it back; otherwise respond with our latest. */
+    const char *version = SUPPORTED_PROTOCOL_VERSIONS[0]; /* default: latest */
+    if (params_json) {
+        yyjson_doc *pdoc = yyjson_read(params_json, strlen(params_json), 0);
+        if (pdoc) {
+            yyjson_val *pv =
+                yyjson_obj_get(yyjson_doc_get_root(pdoc), "protocolVersion");
+            if (pv && yyjson_is_str(pv)) {
+                const char *requested = yyjson_get_str(pv);
+                for (int i = 0; i < SUPPORTED_VERSION_COUNT; i++) {
+                    if (strcmp(requested, SUPPORTED_PROTOCOL_VERSIONS[i]) == 0) {
+                        version = SUPPORTED_PROTOCOL_VERSIONS[i];
+                        break;
+                    }
+                }
+            }
+            yyjson_doc_free(pdoc);
+        }
+    }
+
     yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
     yyjson_mut_val *root = yyjson_mut_obj(doc);
     yyjson_mut_doc_set_root(doc, root);
 
-    yyjson_mut_obj_add_str(doc, root, "protocolVersion", "2024-11-05");
+    yyjson_mut_obj_add_str(doc, root, "protocolVersion", version);
 
     yyjson_mut_val *impl = yyjson_mut_obj(doc);
     yyjson_mut_obj_add_str(doc, impl, "name", "codebase-memory-mcp");
@@ -2302,7 +2335,7 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
     char *result_json = NULL;
 
     if (strcmp(req.method, "initialize") == 0) {
-        result_json = cbm_mcp_initialize_response();
+        result_json = cbm_mcp_initialize_response(req.params_raw);
         start_update_check(srv);
         detect_session(srv);
         maybe_auto_index(srv);
diff --git a/src/mcp/mcp.h b/src/mcp/mcp.h
@@ -55,8 +55,9 @@ char *cbm_mcp_text_result(const char *text, bool is_error);
 /* Format the tools/list response. Returns heap-allocated JSON. */
 char *cbm_mcp_tools_list(void);
 
-/* Format the initialize response. Returns heap-allocated JSON. */
-char *cbm_mcp_initialize_response(void);
+/* Format the initialize response. params_json is the raw initialize params
+ * (used for protocol version negotiation). Returns heap-allocated JSON. */
+char *cbm_mcp_initialize_response(const char *params_json);
 
 /* ── Tool argument helpers ────────────────────────────────────── */
 
diff --git a/tests/test_mcp.c b/tests/test_mcp.c
@@ -98,11 +98,30 @@ TEST(jsonrpc_format_error) {
  * ══════════════════════════════════════════════════════════════════ */
 
 TEST(mcp_initialize_response) {
-    char *json = cbm_mcp_initialize_response();
+    /* Default (no params): returns latest supported version */
+    char *json = cbm_mcp_initialize_response(NULL);
     ASSERT_NOT_NULL(json);
     ASSERT_NOT_NULL(strstr(json, "codebase-memory-mcp"));
     ASSERT_NOT_NULL(strstr(json, "capabilities"));
     ASSERT_NOT_NULL(strstr(json, "tools"));
+    ASSERT_NOT_NULL(strstr(json, "2025-11-25"));
+    free(json);
+
+    /* Client requests a supported version: server echoes it */
+    json = cbm_mcp_initialize_response("{\"protocolVersion\":\"2024-11-05\"}");
+    ASSERT_NOT_NULL(json);
+    ASSERT_NOT_NULL(strstr(json, "2024-11-05"));
+    free(json);
+
+    json = cbm_mcp_initialize_response("{\"protocolVersion\":\"2025-06-18\"}");
+    ASSERT_NOT_NULL(json);
+    ASSERT_NOT_NULL(strstr(json, "2025-06-18"));
+    free(json);
+
+    /* Client requests unknown version: server returns its latest */
+    json = cbm_mcp_initialize_response("{\"protocolVersion\":\"9999-01-01\"}");
+    ASSERT_NOT_NULL(json);
+    ASSERT_NOT_NULL(strstr(json, "2025-11-25"));
     free(json);
     PASS();
 }
@@ -129,6 +148,35 @@ TEST(mcp_tools_list) {
     PASS();
 }
 
+TEST(mcp_tools_array_schemas_have_items) {
+    /* VS Code 1.112+ rejects array schemas without "items" (see
+     * https://github.com/microsoft/vscode/issues/248810).
+     * Walk every tool's inputSchema and verify that every "type":"array"
+     * property also contains "items". */
+    char *json = cbm_mcp_tools_list();
+    ASSERT_NOT_NULL(json);
+
+    /* Scan for all occurrences of "type":"array" — each must be followed
+     * by "items" before the next closing brace of that property. */
+    const char *p = json;
+    while ((p = strstr(p, "\"type\":\"array\"")) != NULL) {
+        /* Find the enclosing '}' for this property object */
+        const char *end = strchr(p, '}');
+        ASSERT_NOT_NULL(end);
+        /* "items" must appear between p and end */
+        size_t span = (size_t)(end - p);
+        char *segment = malloc(span + 1);
+        memcpy(segment, p, span);
+        segment[span] = '\0';
+        ASSERT_NOT_NULL(strstr(segment, "\"items\"")); /* array missing items */
+        free(segment);
+        p = end;
+    }
+
+    free(json);
+    PASS();
+}
+
 TEST(mcp_text_result) {
     char *json = cbm_mcp_text_result("{\"total\":5}", false);
     ASSERT_NOT_NULL(json);
@@ -1185,6 +1233,7 @@ SUITE(mcp) {
     /* MCP protocol helpers */
     RUN_TEST(mcp_initialize_response);
     RUN_TEST(mcp_tools_list);
+    RUN_TEST(mcp_tools_array_schemas_have_items);
     RUN_TEST(mcp_text_result);
     RUN_TEST(mcp_text_result_error);
 
