Skip to content

Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.

fix(cli): recognize symlinked agent config directories during detection (#2671)

Divakant Pandeyb94a7d7a32fe
diff --git a/src/cli/cli.c b/src/cli/cli.c
index 3db818c28..280fbfed1 100644
--- a/src/cli/cli.c
+++ b/src/cli/cli.c
@@ -2719,11 +2719,7 @@ int cbm_remove_zed_mcp_owned(const char *binary_path, const char *config_path) {
static bool dir_exists(const char *path) {
struct stat st;
-#ifndef _WIN32
- return lstat(path, &st) == 0 && S_ISDIR(st.st_mode);
-#else
return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
-#endif
}
/* Resolve the Claude Code config dir.
@@ -9301,11 +9297,7 @@ static const char *cbm_agent_registry_env_path(const char *env_name, const char
static bool cbm_agent_registry_path_exists(const char *path, const void *context) {
(void)context;
struct stat state;
-#ifndef _WIN32
- return path && path[0] && lstat(path, &state) == 0 && !S_ISLNK(state.st_mode);
-#else
return path && path[0] && stat(path, &state) == 0;
-#endif
}
static bool cbm_agent_registry_command_exists(const char *command, const void *context) {
diff --git a/tests/test_cli.c b/tests/test_cli.c
index e3383be78..18b243ab6 100644
--- a/tests/test_cli.c
+++ b/tests/test_cli.c
@@ -6180,6 +6180,103 @@ TEST(cli_zed_mcp_jsonc_comments) {
PASS();
}
+TEST(cli_install_agent_config_symlinks_issue2671) {
+ /* Issue #2671: dotfiles checkout pattern where agent config directory or
+ * config file is a symlink into dotfiles under the user's home directory. */
+ char tmpdir[256];
+ snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-symlink-test-XXXXXX");
+ if (!cbm_mkdtemp(tmpdir))
+ FAIL("cbm_mkdtemp failed");
+
+ char dotfiles_zed[512];
+ snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
+ test_mkdirp(dotfiles_zed);
+ char dotfiles_settings[512];
+ snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
+ write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
+
+#ifdef __APPLE__
+ char parent_dir[512];
+ snprintf(parent_dir, sizeof(parent_dir), "%s/Library/Application Support", tmpdir);
+ test_mkdirp(parent_dir);
+ char zed_link[512];
+ snprintf(zed_link, sizeof(zed_link), "%s/Zed", parent_dir);
+ ASSERT_EQ(symlink(dotfiles_zed, zed_link), 0);
+#else
+ char parent_dir[512];
+ snprintf(parent_dir, sizeof(parent_dir), "%s/.config", tmpdir);
+ test_mkdirp(parent_dir);
+ char zed_link[512];
+ snprintf(zed_link, sizeof(zed_link), "%s/zed", parent_dir);
+ ASSERT_EQ(symlink(dotfiles_zed, zed_link), 0);
+#endif
+
+ cbm_cli_set_client_selection_for_testing("zed");
+ int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
+ cbm_cli_set_client_selection_for_testing(NULL);
+
+ char *after = read_test_file_alloc(dotfiles_settings);
+ bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
+ bool has_original = after && strstr(after, "Ayu Dark") != NULL;
+ free(after);
+
+ test_rmdir_r(tmpdir);
+ ASSERT_EQ(rc, 0);
+ ASSERT(has_cbm);
+ ASSERT(has_original);
+ PASS();
+}
+
+TEST(cli_install_agent_config_file_symlink_issue2671) {
+ char tmpdir[256];
+ snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-file-symlink-test-XXXXXX");
+ if (!cbm_mkdtemp(tmpdir))
+ FAIL("cbm_mkdtemp failed");
+
+ char dotfiles_zed[512];
+ snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
+ test_mkdirp(dotfiles_zed);
+ char dotfiles_settings[512];
+ snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
+ write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
+
+#ifdef __APPLE__
+ char zed_dir[512];
+ snprintf(zed_dir, sizeof(zed_dir), "%s/Library/Application Support/Zed", tmpdir);
+ test_mkdirp(zed_dir);
+ char zed_settings_link[512];
+ snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
+ ASSERT_EQ(symlink("../../../dotfiles/zed/settings.json", zed_settings_link), 0);
+#else
+ char zed_dir[512];
+ snprintf(zed_dir, sizeof(zed_dir), "%s/.config/zed", tmpdir);
+ test_mkdirp(zed_dir);
+ char zed_settings_link[512];
+ snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
+ ASSERT_EQ(symlink("../../dotfiles/zed/settings.json", zed_settings_link), 0);
+#endif
+
+ cbm_cli_set_client_selection_for_testing("zed");
+ int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
+ cbm_cli_set_client_selection_for_testing(NULL);
+
+ char *after = read_test_file_alloc(dotfiles_settings);
+ bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
+ bool has_original = after && strstr(after, "Ayu Dark") != NULL;
+ free(after);
+
+ struct stat st;
+ ASSERT_EQ(lstat(zed_settings_link, &st), 0);
+ bool still_symlink = S_ISLNK(st.st_mode);
+
+ test_rmdir_r(tmpdir);
+ ASSERT_EQ(rc, 0);
+ ASSERT(has_cbm);
+ ASSERT(has_original);
+ ASSERT(still_symlink);
+ PASS();
+}
+
/* ═══════════════════════════════════════════════════════════════════
* PATH management tests (port of TestCLI_InstallPATHAppend)
* ═══════════════════════════════════════════════════════════════════ */
@@ -19154,6 +19251,8 @@ SUITE(cli) {
RUN_TEST(cli_zed_mcp_preserves_settings);
RUN_TEST(cli_zed_mcp_uninstall);
RUN_TEST(cli_zed_mcp_jsonc_comments);
+ RUN_TEST(cli_install_agent_config_symlinks_issue2671);
+ RUN_TEST(cli_install_agent_config_file_symlink_issue2671);
/* PATH management (3 tests) */
RUN_TEST(cli_ensure_path_append);