@@ -6180,6 +6180,149 @@ TEST(cli_zed_mcp_jsonc_comments) {
61806180 PASS();
61816181}
61826182
6183+ #ifndef _WIN32
6184+ TEST(cli_install_agent_config_symlinks_issue2671) {
6185+ /* Refs #2671: dotfiles checkout pattern where agent config directory is a
6186+ * user-owned symlink into dotfiles under the user's home directory. */
6187+ char tmpdir[256];
6188+ snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-symlink-test-XXXXXX");
6189+ if (!cbm_mkdtemp(tmpdir))
6190+ FAIL("cbm_mkdtemp failed");
6191+
6192+ char dotfiles_zed[512];
6193+ snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
6194+ test_mkdirp(dotfiles_zed);
6195+ char dotfiles_settings[512];
6196+ snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
6197+ write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
6198+
6199+ #ifdef __APPLE__
6200+ char parent_dir[512];
6201+ snprintf(parent_dir, sizeof(parent_dir), "%s/Library/Application Support", tmpdir);
6202+ test_mkdirp(parent_dir);
6203+ char zed_link[512];
6204+ snprintf(zed_link, sizeof(zed_link), "%s/Zed", parent_dir);
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+ #endif
6212+
6213+ char *saved_xdg = save_test_env("XDG_CONFIG_HOME");
6214+ char xdg_dir[640];
6215+ snprintf(xdg_dir, sizeof(xdg_dir), "%s/.config", tmpdir);
6216+ cbm_setenv("XDG_CONFIG_HOME", xdg_dir, 1); /* Linux resolver prefers XDG */
6217+
6218+ /* Dangling symlink and symlink to a regular file must remain undetected. */
6219+ char dangling_target[512];
6220+ snprintf(dangling_target, sizeof(dangling_target), "%s/dotfiles/missing-zed", tmpdir);
6221+ ASSERT_EQ(symlink(dangling_target, zed_link), 0);
6222+ bool dangling_detected = cbm_detect_agents(tmpdir).zed;
6223+ ASSERT_EQ(cbm_unlink(zed_link), 0);
6224+
6225+ ASSERT_EQ(symlink(dotfiles_settings, zed_link), 0);
6226+ bool file_link_detected = cbm_detect_agents(tmpdir).zed;
6227+ ASSERT_EQ(cbm_unlink(zed_link), 0);
6228+
6229+ /* Symlink resolving to a directory not owned by the invoking user must be refused. */
6230+ char foreign_dir[512];
6231+ const char *unowned_target = "/";
6232+ if (geteuid() == 0) {
6233+ snprintf(foreign_dir, sizeof(foreign_dir), "%s/dotfiles/foreign-zed", tmpdir);
6234+ test_mkdirp(foreign_dir);
6235+ ASSERT_EQ(chown(foreign_dir, 65534, 65534), 0);
6236+ unowned_target = foreign_dir;
6237+ }
6238+ ASSERT_EQ(symlink(unowned_target, zed_link), 0);
6239+ bool unowned_target_detected = cbm_detect_agents(tmpdir).zed;
6240+ ASSERT_EQ(cbm_unlink(zed_link), 0);
6241+
6242+ ASSERT_EQ(symlink(dotfiles_zed, zed_link), 0);
6243+
6244+ cbm_cli_set_client_selection_for_testing("zed");
6245+ int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
6246+ cbm_cli_set_client_selection_for_testing(NULL);
6247+ restore_test_env("XDG_CONFIG_HOME", saved_xdg);
6248+
6249+ char *after = read_test_file_alloc(dotfiles_settings);
6250+ bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
6251+ bool has_original = after && strstr(after, "Ayu Dark") != NULL;
6252+ free(after);
6253+
6254+ struct stat st;
6255+ ASSERT_EQ(lstat(zed_link, &st), 0);
6256+ bool still_symlink = S_ISLNK(st.st_mode);
6257+
6258+ test_rmdir_r(tmpdir);
6259+ ASSERT(!dangling_detected);
6260+ ASSERT(!file_link_detected);
6261+ ASSERT(!unowned_target_detected);
6262+ ASSERT_EQ(rc, 0);
6263+ ASSERT(has_cbm);
6264+ ASSERT(has_original);
6265+ ASSERT(still_symlink);
6266+ PASS();
6267+ }
6268+
6269+ TEST(cli_install_agent_config_file_symlink_issue2671) {
6270+ char tmpdir[256];
6271+ snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm-file-symlink-test-XXXXXX");
6272+ if (!cbm_mkdtemp(tmpdir))
6273+ FAIL("cbm_mkdtemp failed");
6274+
6275+ char dotfiles_zed[512];
6276+ snprintf(dotfiles_zed, sizeof(dotfiles_zed), "%s/dotfiles/zed", tmpdir);
6277+ test_mkdirp(dotfiles_zed);
6278+ char dotfiles_settings[512];
6279+ snprintf(dotfiles_settings, sizeof(dotfiles_settings), "%s/settings.json", dotfiles_zed);
6280+ write_test_file(dotfiles_settings, "{\"theme\": \"Ayu Dark\"}\n");
6281+
6282+ #ifdef __APPLE__
6283+ char zed_dir[512];
6284+ snprintf(zed_dir, sizeof(zed_dir), "%s/Library/Application Support/Zed", tmpdir);
6285+ test_mkdirp(zed_dir);
6286+ char zed_settings_link[512];
6287+ snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
6288+ ASSERT_EQ(symlink("../../../dotfiles/zed/settings.json", zed_settings_link), 0);
6289+ #else
6290+ char zed_dir[512];
6291+ snprintf(zed_dir, sizeof(zed_dir), "%s/.config/zed", tmpdir);
6292+ test_mkdirp(zed_dir);
6293+ char zed_settings_link[512];
6294+ snprintf(zed_settings_link, sizeof(zed_settings_link), "%s/settings.json", zed_dir);
6295+ ASSERT_EQ(symlink("../../dotfiles/zed/settings.json", zed_settings_link), 0);
6296+ #endif
6297+
6298+ char *saved_xdg = save_test_env("XDG_CONFIG_HOME");
6299+ char xdg_dir[640];
6300+ snprintf(xdg_dir, sizeof(xdg_dir), "%s/.config", tmpdir);
6301+ cbm_setenv("XDG_CONFIG_HOME", xdg_dir, 1); /* Linux resolver prefers XDG */
6302+
6303+ cbm_cli_set_client_selection_for_testing("zed");
6304+ int rc = cbm_install_agent_configs(tmpdir, "/usr/local/bin/codebase-memory-mcp", false, false);
6305+ cbm_cli_set_client_selection_for_testing(NULL);
6306+ restore_test_env("XDG_CONFIG_HOME", saved_xdg);
6307+
6308+ char *after = read_test_file_alloc(dotfiles_settings);
6309+ bool has_cbm = after && strstr(after, "codebase-memory-mcp") != NULL;
6310+ bool has_original = after && strstr(after, "Ayu Dark") != NULL;
6311+ free(after);
6312+
6313+ struct stat st;
6314+ ASSERT_EQ(lstat(zed_settings_link, &st), 0);
6315+ bool still_symlink = S_ISLNK(st.st_mode);
6316+
6317+ test_rmdir_r(tmpdir);
6318+ ASSERT_EQ(rc, 0);
6319+ ASSERT(has_cbm);
6320+ ASSERT(has_original);
6321+ ASSERT(still_symlink);
6322+ PASS();
6323+ }
6324+ #endif
6325+
61836326/* ═══════════════════════════════════════════════════════════════════
61846327 * PATH management tests (port of TestCLI_InstallPATHAppend)
61856328 * ═══════════════════════════════════════════════════════════════════ */
@@ -19250,6 +19393,10 @@ SUITE(cli) {
1925019393 RUN_TEST(cli_zed_mcp_preserves_settings);
1925119394 RUN_TEST(cli_zed_mcp_uninstall);
1925219395 RUN_TEST(cli_zed_mcp_jsonc_comments);
19396+ #ifndef _WIN32
19397+ RUN_TEST(cli_install_agent_config_symlinks_issue2671);
19398+ RUN_TEST(cli_install_agent_config_file_symlink_issue2671);
19399+ #endif
1925319400
1925419401 /* PATH management (3 tests) */
1925519402 RUN_TEST(cli_ensure_path_append);
0 commit comments