Skip to content

Commit b94a7d7

Browse files
fix(cli): recognize symlinked agent config directories during detection (DeusData#2671)
Agent detection used POSIX lstat in dir_exists and rejected symlinks in cbm_agent_registry_path_exists, causing dotfiles setups with symlinked configuration directories (e.g. ~/Library/Application Support/Zed or ~/.cursor) to be reported as undetected and skipped during install. Use stat so valid directory symlinks are followed and detected while preserving dangling symlink rejection. Signed-off-by: Divakant Pandey <divakant01@gmail.com>
1 parent a3831c9 commit b94a7d7

2 files changed

Lines changed: 99 additions & 8 deletions

File tree

‎src/cli/cli.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2719,11 +2719,7 @@ int cbm_remove_zed_mcp_owned(const char *binary_path, const char *config_path) {
27192719

27202720
static bool dir_exists(const char *path) {
27212721
struct stat st;
2722-
#ifndef _WIN32
2723-
return lstat(path, &st) == 0 && S_ISDIR(st.st_mode);
2724-
#else
27252722
return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
2726-
#endif
27272723
}
27282724

27292725
/* Resolve the Claude Code config dir.
@@ -9301,11 +9297,7 @@ static const char *cbm_agent_registry_env_path(const char *env_name, const char
93019297
static bool cbm_agent_registry_path_exists(const char *path, const void *context) {
93029298
(void)context;
93039299
struct stat state;
9304-
#ifndef _WIN32
9305-
return path && path[0] && lstat(path, &state) == 0 && !S_ISLNK(state.st_mode);
9306-
#else
93079300
return path && path[0] && stat(path, &state) == 0;
9308-
#endif
93099301
}
93109302

93119303
static bool cbm_agent_registry_command_exists(const char *command, const void *context) {

‎tests/test_cli.c‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6180,6 +6180,103 @@ TEST(cli_zed_mcp_jsonc_comments) {
61806180
PASS();
61816181
}
61826182

6183+
TEST(cli_install_agent_config_symlinks_issue2671) {
6184+
/* Issue #2671: dotfiles checkout pattern where agent config directory or
6185+
* config file is a symlink into dotfiles under the user's home directory. */
6186+
char tmpdir[256];
6187+
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-symlink-test-XXXXXX");
6188+
if (!cbm_mkdtemp(tmpdir))
6189+
FAIL("cbm_mkdtemp failed");
6190+
6191+
char dotfiles_zed[512];
6192+
snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
6193+
test_mkdirp(dotfiles_zed);
6194+
char dotfiles_settings[512];
6195+
snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
6196+
write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
6197+
6198+
#ifdef __APPLE__
6199+
char parent_dir[512];
6200+
snprintf(parent_dir, sizeof(parent_dir), "%s/Library/Application Support", tmpdir);
6201+
test_mkdirp(parent_dir);
6202+
char zed_link[512];
6203+
snprintf(zed_link, sizeof(zed_link), "%s/Zed", parent_dir);
6204+
ASSERT_EQ(symlink(dotfiles_zed, zed_link), 0);
6205+
#else
6206+
char parent_dir[512];
6207+
snprintf(parent_dir, sizeof(parent_dir), "%s/.config", tmpdir);
6208+
test_mkdirp(parent_dir);
6209+
char zed_link[512];
6210+
snprintf(zed_link, sizeof(zed_link), "%s/zed", parent_dir);
6211+
ASSERT_EQ(symlink(dotfiles_zed, zed_link), 0);
6212+
#endif
6213+
6214+
cbm_cli_set_client_selection_for_testing("zed");
6215+
int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
6216+
cbm_cli_set_client_selection_for_testing(NULL);
6217+
6218+
char *after = read_test_file_alloc(dotfiles_settings);
6219+
bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
6220+
bool has_original = after && strstr(after, "Ayu Dark") != NULL;
6221+
free(after);
6222+
6223+
test_rmdir_r(tmpdir);
6224+
ASSERT_EQ(rc, 0);
6225+
ASSERT(has_cbm);
6226+
ASSERT(has_original);
6227+
PASS();
6228+
}
6229+
6230+
TEST(cli_install_agent_config_file_symlink_issue2671) {
6231+
char tmpdir[256];
6232+
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-file-symlink-test-XXXXXX");
6233+
if (!cbm_mkdtemp(tmpdir))
6234+
FAIL("cbm_mkdtemp failed");
6235+
6236+
char dotfiles_zed[512];
6237+
snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
6238+
test_mkdirp(dotfiles_zed);
6239+
char dotfiles_settings[512];
6240+
snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
6241+
write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
6242+
6243+
#ifdef __APPLE__
6244+
char zed_dir[512];
6245+
snprintf(zed_dir, sizeof(zed_dir), "%s/Library/Application Support/Zed", tmpdir);
6246+
test_mkdirp(zed_dir);
6247+
char zed_settings_link[512];
6248+
snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
6249+
ASSERT_EQ(symlink("../../../dotfiles/zed/settings.json", zed_settings_link), 0);
6250+
#else
6251+
char zed_dir[512];
6252+
snprintf(zed_dir, sizeof(zed_dir), "%s/.config/zed", tmpdir);
6253+
test_mkdirp(zed_dir);
6254+
char zed_settings_link[512];
6255+
snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
6256+
ASSERT_EQ(symlink("../../dotfiles/zed/settings.json", zed_settings_link), 0);
6257+
#endif
6258+
6259+
cbm_cli_set_client_selection_for_testing("zed");
6260+
int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
6261+
cbm_cli_set_client_selection_for_testing(NULL);
6262+
6263+
char *after = read_test_file_alloc(dotfiles_settings);
6264+
bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
6265+
bool has_original = after && strstr(after, "Ayu Dark") != NULL;
6266+
free(after);
6267+
6268+
struct stat st;
6269+
ASSERT_EQ(lstat(zed_settings_link, &st), 0);
6270+
bool still_symlink = S_ISLNK(st.st_mode);
6271+
6272+
test_rmdir_r(tmpdir);
6273+
ASSERT_EQ(rc, 0);
6274+
ASSERT(has_cbm);
6275+
ASSERT(has_original);
6276+
ASSERT(still_symlink);
6277+
PASS();
6278+
}
6279+
61836280
/* ═══════════════════════════════════════════════════════════════════
61846281
* PATH management tests (port of TestCLI_InstallPATHAppend)
61856282
* ═══════════════════════════════════════════════════════════════════ */
@@ -19154,6 +19251,8 @@ SUITE(cli) {
1915419251
RUN_TEST(cli_zed_mcp_preserves_settings);
1915519252
RUN_TEST(cli_zed_mcp_uninstall);
1915619253
RUN_TEST(cli_zed_mcp_jsonc_comments);
19254+
RUN_TEST(cli_install_agent_config_symlinks_issue2671);
19255+
RUN_TEST(cli_install_agent_config_file_symlink_issue2671);
1915719256

1915819257
/* PATH management (3 tests) */
1915919258
RUN_TEST(cli_ensure_path_append);

0 commit comments

Comments
 (0)