From bdff1bb770f9024c767b6cdc2d178268efd526ff Mon Sep 17 00:00:00 2001 From: Sascha Falk Date: Tue, 17 Nov 2026 11:23:42 +0100 Subject: [PATCH] fix(cli): honour --dir when uninstall checks agent entry ownership Signed-off-by: Sascha Falk --- src/cli/cli.c | 160 ++++++++++++++++++++--------------------------- tests/test_cli.c | 99 ++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 92 deletions(-) diff --git a/src/cli/cli.c b/src/cli/cli.c index 375499279..3e05f8793 100644 --- a/src/cli/cli.c +++ b/src/cli/cli.c @@ -1,4 +1,4 @@ -/* +/* * cli.c — CLI subcommand handlers for install, uninstall, update, version. * * Port of Go cmd/codebase-memory-mcp/ install/update logic. @@ -10154,15 +10154,6 @@ static void print_detected_registry_agents(const char *home, bool *any) { } } -static void cbm_agent_installed_binary_path(const char *home, char *binary_path, - size_t binary_path_size) { -#ifdef _WIN32 - snprintf(binary_path, binary_path_size, "%s/.local/bin/codebase-memory-mcp.exe", home); -#else - snprintf(binary_path, binary_path_size, "%s/.local/bin/codebase-memory-mcp", home); -#endif -} - static void install_managed_agent_instructions(const char *label, const char *instructions_path, bool dry_run) { if (g_install_plan) { @@ -12867,14 +12858,12 @@ typedef struct { const char *config_path; const char *instr_path; } mcp_uninstall_args_t; -static void uninstall_agent_mcp_instr(mcp_uninstall_args_t paths, bool dry_run, - int (*remove_fn)(const char *, const char *)) { +static void uninstall_agent_mcp_instr(mcp_uninstall_args_t paths, const char *installed_binary, + bool dry_run, int (*remove_fn)(const char *, const char *)) { const char *name = paths.name; const char *instr_path = paths.instr_path; if (!dry_run) { - char binary_path[CLI_BUF_1K]; - cbm_agent_installed_binary_path(cbm_get_home_dir(), binary_path, sizeof(binary_path)); - int remove_result = remove_fn(binary_path, paths.config_path); + int remove_result = remove_fn(installed_binary, paths.config_path); if (remove_result < CLI_OK) { record_agent_config_error(true, name, "mcp_uninstall", paths.config_path); } else if (remove_result > CLI_OK) { @@ -12942,18 +12931,17 @@ static void uninstall_codex_skills(const char *home, const char *config_dir, boo printf(" Codex CLI skills: %d removed\n", removed); } -static void uninstall_copilot_durable_context(const char *home, bool dry_run) { +static void uninstall_copilot_durable_context(const char *home, const char *installed_binary, + bool dry_run) { char config_dir[CLI_BUF_1K]; char hook_path[CLI_BUF_1K]; char skills_dir[CLI_BUF_1K]; char agent_path[CLI_BUF_1K]; - char binary_path[CLI_BUF_1K]; cbm_copilot_config_dir(home, config_dir, sizeof(config_dir)); snprintf(hook_path, sizeof(hook_path), "%s/hooks/codebase-memory-mcp.json", config_dir); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", config_dir); snprintf(agent_path, sizeof(agent_path), "%s/agents/codebase-memory.agent.md", config_dir); - cbm_agent_installed_binary_path(home, binary_path, sizeof(binary_path)); - if (!dry_run && cbm_remove_copilot_hooks(hook_path, binary_path) != CLI_OK) { + if (!dry_run && cbm_remove_copilot_hooks(hook_path, installed_binary) != CLI_OK) { record_agent_config_error(true, "Copilot", "lifecycle_hook_uninstall", hook_path); } uninstall_agent_skill("Copilot", skills_dir, dry_run); @@ -12961,7 +12949,7 @@ static void uninstall_copilot_durable_context(const char *home, bool dry_run) { (cbm_tiered_profile_set_t){ .label = "Copilot", .verify_path = agent_path, - .binary_path = binary_path, + .binary_path = installed_binary, .legacy_verify_content = legacy_copilot_verify_agent_content, .dialect = CBM_GRAPH_DIALECT_COPILOT, }, @@ -13250,11 +13238,10 @@ static void uninstall_omp_durable_context(const cbm_agent_registry_context_t *re dry_run); } -static void uninstall_agent_client_registry(const char *home, bool dry_run) { +static void uninstall_agent_client_registry(const char *home, const char *binary_path, + bool dry_run) { cbm_agent_registry_context_t registry; cbm_init_agent_registry_context(home, ®istry); - char binary_path[CLI_BUF_1K]; - cbm_agent_installed_binary_path(home, binary_path, sizeof(binary_path)); for (size_t index = 0U; index < cbm_agent_client_count(); index++) { const cbm_agent_client_profile_t *profile = cbm_agent_client_at(index); if (!profile || !cbm_agent_client_cleanup_candidate(profile->id, ®istry.options)) { @@ -13321,9 +13308,7 @@ static void uninstall_agent_client_registry(const char *home, bool dry_run) { /* Remove CLI agent configs (Codex, Gemini, OpenCode, Antigravity, Aider). */ /* Uninstall Gemini CLI config + hooks. */ -static void uninstall_gemini_config(const char *home, bool dry_run) { - char installed_binary[CLI_BUF_1K]; - cbm_agent_installed_binary_path(home, installed_binary, sizeof(installed_binary)); +static void uninstall_gemini_config(const char *home, const char *installed_binary, bool dry_run) { char cp[CLI_BUF_1K]; char ip[CLI_BUF_1K]; char ap[CLI_BUF_1K]; @@ -13362,19 +13347,17 @@ static void uninstall_gemini_config(const char *home, bool dry_run) { } static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char *home, - bool dry_run) { + const char *installed_binary, bool dry_run) { if (agents->codex) { char config_dir[CLI_BUF_1K]; char cp[CLI_BUF_1K]; char ip[CLI_BUF_1K]; char ap[CLI_BUF_1K]; - char installed_binary[CLI_BUF_1K]; cbm_codex_config_dir(home, config_dir, sizeof(config_dir)); snprintf(cp, sizeof(cp), "%s/config.toml", config_dir); snprintf(ip, sizeof(ip), "%s/AGENTS.md", config_dir); snprintf(ap, sizeof(ap), "%s/agents/codebase-memory.toml", config_dir); bool pointer_removed = uninstall_codex_activation_pointer(ip, dry_run); - cbm_agent_installed_binary_path(home, installed_binary, sizeof(installed_binary)); char hook_command[CLI_BUF_8K]; char hook_command_windows[CLI_BUF_8K]; bool hook_command_ok = cbm_build_augment_command(installed_binary, hook_command, @@ -13397,8 +13380,8 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char report_codex_activation_pointer_uninstall(ip, pointer_removed); goto codex_toml_done; } - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Codex CLI", cp, NULL}, dry_run, - cbm_remove_codex_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Codex CLI", cp, NULL}, installed_binary, + dry_run, cbm_remove_codex_mcp_owned); report_codex_activation_pointer_uninstall(ip, pointer_removed); if (!dry_run && cbm_reconcile_codex_hooks_command(cp, hook_command, hook_command_windows, @@ -13428,7 +13411,7 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char } } if (agents->gemini) { - uninstall_gemini_config(home, dry_run); + uninstall_gemini_config(home, installed_binary, dry_run); } if (agents->opencode) { char cp[CLI_BUF_1K]; @@ -13439,8 +13422,8 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char snprintf(ip, sizeof(ip), "%s/.config/opencode/AGENTS.md", home); snprintf(skills_dir, sizeof(skills_dir), "%s/.config/opencode/skills", home); snprintf(ap, sizeof(ap), "%s/.config/opencode/agents/codebase-memory.md", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenCode", cp, ip}, dry_run, - cbm_remove_opencode_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenCode", cp, ip}, installed_binary, + dry_run, cbm_remove_opencode_mcp_owned); uninstall_agent_skill("OpenCode", skills_dir, dry_run); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ @@ -13460,8 +13443,8 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char char ip[CLI_BUF_1K]; snprintf(cp, sizeof(cp), "%s/.gemini/config/mcp_config.json", home); snprintf(ip, sizeof(ip), "%s/.gemini/GEMINI.md", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Antigravity", cp, ip}, dry_run, - cbm_remove_antigravity_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Antigravity", cp, ip}, installed_binary, + dry_run, cbm_remove_antigravity_mcp_owned); if (!dry_run) { char sp[CLI_BUF_1K]; snprintf(sp, sizeof(sp), "%s/.gemini/antigravity-cli/settings.json", home); @@ -13489,9 +13472,7 @@ static void uninstall_cli_agents(const cbm_detected_agents_t *agents, const char /* Remove editor agent configs (Zed, KiloCode, VS Code, OpenClaw). */ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const char *home, - bool dry_run) { - char installed_binary[CLI_BUF_1K]; - cbm_agent_installed_binary_path(home, installed_binary, sizeof(installed_binary)); + const char *installed_binary, bool dry_run) { if (agents->zed) { char config_dir[CLI_BUF_1K]; char cp[CLI_BUF_1K]; @@ -13501,7 +13482,7 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c cbm_zed_instructions_path(home, ip, sizeof(ip)); snprintf(cp, sizeof(cp), "%s/settings.json", config_dir); snprintf(skills_dir, sizeof(skills_dir), "%s/.agents/skills", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Zed", cp, ip}, dry_run, + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Zed", cp, ip}, installed_binary, dry_run, cbm_remove_zed_mcp_owned); uninstall_agent_skill("Zed", skills_dir, dry_run); } @@ -13570,8 +13551,8 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c snprintf(code_user, sizeof(code_user), "%s/Code/User", cbm_app_config_dir()); #endif snprintf(cp, sizeof(cp), "%s/mcp.json", code_user); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"VS Code", cp, NULL}, dry_run, - cbm_remove_vscode_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"VS Code", cp, NULL}, installed_binary, + dry_run, cbm_remove_vscode_mcp_owned); uninstall_vscode_profile_configs(code_user, installed_binary, dry_run); } if (agents->cursor) { @@ -13581,8 +13562,8 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c snprintf(cp, sizeof(cp), "%s/.cursor/mcp.json", home); snprintf(skills_dir, sizeof(skills_dir), "%s/.cursor/skills", home); snprintf(ap, sizeof(ap), "%s/.cursor/agents/codebase-memory.md", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cursor", cp, NULL}, dry_run, - cbm_remove_editor_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cursor", cp, NULL}, installed_binary, + dry_run, cbm_remove_editor_mcp_owned); uninstall_agent_skill("Cursor", skills_dir, dry_run); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ @@ -13598,16 +13579,16 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c char ip[CLI_BUF_1K]; snprintf(cp, sizeof(cp), "%s/.codeium/windsurf/mcp_config.json", home); snprintf(ip, sizeof(ip), "%s/.codeium/windsurf/memories/global_rules.md", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Windsurf", cp, ip}, dry_run, - cbm_remove_editor_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Windsurf", cp, ip}, installed_binary, + dry_run, cbm_remove_editor_mcp_owned); } if (agents->openclaw) { char cp[CLI_BUF_1K]; if (cbm_openclaw_config_path(home, cp, sizeof(cp))) { char workspace[CLI_BUF_1K]; bool workspace_ok = cbm_openclaw_workspace_path(home, cp, workspace, sizeof(workspace)); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenClaw", cp, NULL}, dry_run, - cbm_remove_openclaw_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenClaw", cp, NULL}, + installed_binary, dry_run, cbm_remove_openclaw_mcp_owned); if (!dry_run && cbm_remove_openclaw_compaction(cp) != CLI_OK) { record_agent_config_error(true, "OpenClaw", "compaction_uninstall", cp); } @@ -13643,7 +13624,7 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c snprintf(ip, sizeof(ip), "%s/steering/codebase-memory.md", kiro_home); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", kiro_home); snprintf(ap, sizeof(ap), "%s/agents/codebase-memory.json", kiro_home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Kiro", cp, ip}, dry_run, + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Kiro", cp, ip}, installed_binary, dry_run, cbm_remove_editor_mcp_owned); uninstall_agent_skill("Kiro", skills_dir, dry_run); char *legacy_agent_content = cbm_build_legacy_kiro_verify_agent_content(installed_binary); @@ -13668,8 +13649,8 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c snprintf(cp, sizeof(cp), "%s/.junie/mcp/mcp.json", home); snprintf(skills_dir, sizeof(skills_dir), "%s/.junie/skills", home); snprintf(agent_path, sizeof(agent_path), "%s/.junie/agents/codebase-memory.md", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Junie", cp, NULL}, dry_run, - cbm_remove_junie_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Junie", cp, NULL}, installed_binary, + dry_run, cbm_remove_junie_mcp_owned); uninstall_agent_skill("Junie", skills_dir, dry_run); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ @@ -13683,20 +13664,16 @@ static void uninstall_editor_agents(const cbm_detected_agents_t *agents, const c } static void uninstall_additional_agents(const cbm_detected_agents_t *agents, const char *home, - bool dry_run) { - char installed_binary[CLI_BUF_1K]; - cbm_agent_installed_binary_path(home, installed_binary, sizeof(installed_binary)); + const char *installed_binary, bool dry_run) { if (agents->hermes) { char hermes_home[CLI_BUF_1K]; char cp[CLI_BUF_1K]; char skills_dir[CLI_BUF_1K]; - char binary_path[CLI_BUF_1K]; cbm_hermes_home_dir(home, hermes_home, sizeof(hermes_home)); snprintf(cp, sizeof(cp), "%s/config.yaml", hermes_home); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", hermes_home); - cbm_agent_installed_binary_path(home, binary_path, sizeof(binary_path)); - int hook_result = - dry_run ? CBM_YAML_IDENTITY_EDIT_OK : cbm_remove_hermes_context_hook(cp, binary_path); + int hook_result = dry_run ? CBM_YAML_IDENTITY_EDIT_OK + : cbm_remove_hermes_context_hook(cp, installed_binary); if (hook_result == CBM_YAML_IDENTITY_EDIT_FOREIGN) { printf(" hook: preserved modified pre_llm_call entry\n"); } else if (hook_result != CBM_YAML_IDENTITY_EDIT_OK) { @@ -13704,8 +13681,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con } else { printf(" hook: removed canonical pre_llm_call entry\n"); } - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Hermes", cp, NULL}, dry_run, - cbm_remove_hermes_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Hermes", cp, NULL}, installed_binary, + dry_run, cbm_remove_hermes_mcp_owned); uninstall_agent_skill("Hermes", skills_dir, dry_run); } if (agents->openhands) { @@ -13717,8 +13694,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(skills_dir, sizeof(skills_dir), "%s/.agents/skills", home); snprintf(settings_path, sizeof(settings_path), "%s/.openhands/settings.json", home); snprintf(profiles_dir, sizeof(profiles_dir), "%s/.openhands/agent-profiles", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenHands", cp, NULL}, dry_run, - cbm_remove_editor_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"OpenHands", cp, NULL}, installed_binary, + dry_run, cbm_remove_editor_mcp_owned); printf(" removed %d skill(s)\n", cbm_remove_skills(skills_dir, dry_run)); /* #1826 counterpart: undo the settings.json registration and every * agent profile's mcp_server_refs entry the install above added. */ @@ -13733,7 +13710,6 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con char ap[CLI_BUF_1K]; char session_hp[CLI_BUF_1K]; char coverage_hp[CLI_BUF_1K]; - char binary_path[CLI_BUF_1K]; snprintf(cp, sizeof(cp), "%s/.augment/settings.json", home); snprintf(ip, sizeof(ip), "%s/.augment/rules/codebase-memory.md", home); snprintf(ap, sizeof(ap), "%s/.augment/agents/codebase-memory.md", home); @@ -13744,14 +13720,13 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con /* The owned-document match must rebuild the scripts with the exact * binary path the install embedded — the managed canonical plain form * on Windows, not a hand-assembled default. */ - cbm_agent_installed_binary_path(home, binary_path, sizeof(binary_path)); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Augment/Auggie", cp, ip}, dry_run, - cbm_remove_editor_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Augment/Auggie", cp, ip}, + installed_binary, dry_run, cbm_remove_editor_mcp_owned); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ .label = "Augment/Auggie", .verify_path = ap, - .binary_path = binary_path, + .binary_path = installed_binary, .legacy_verify_content = legacy_augment_verify_agent_content, .dialect = CBM_GRAPH_DIALECT_AUGMENT, }, @@ -13763,7 +13738,7 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con if (cbm_remove_augment_coverage_hook(cp, coverage_hp) != CLI_OK) { record_agent_config_error(true, "Augment/Auggie", "coverage_hook_uninstall", cp); } - remove_augment_owned_hook_scripts(binary_path, session_hp, coverage_hp, true); + remove_augment_owned_hook_scripts(installed_binary, session_hp, coverage_hp, true); } printf(" removed SessionStart + PostToolUse hooks + dedicated subagent\n"); } @@ -13780,10 +13755,10 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(ide_cp, sizeof(ide_cp), "%s/settings/cline_mcp_settings.json", cline_data); snprintf(ip, sizeof(ip), "%s/rules/codebase-memory-mcp.md", cline_root); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", cline_root); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cline", cli_cp, ip}, dry_run, - cbm_remove_cline_mcp_owned); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cline IDE", ide_cp, NULL}, dry_run, - cbm_remove_cline_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cline", cli_cp, ip}, installed_binary, + dry_run, cbm_remove_cline_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Cline IDE", ide_cp, NULL}, + installed_binary, dry_run, cbm_remove_cline_mcp_owned); uninstall_agent_skill("Cline", skills_dir, dry_run); (void)remove_cline_context_hooks(cline_root, installed_binary, dry_run, true); } @@ -13803,8 +13778,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(ip, sizeof(ip), "%s/QWEN.md", qwen_home); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", qwen_home); snprintf(ap, sizeof(ap), "%s/agents/codebase-memory.md", qwen_home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Qwen Code", cp, ip}, dry_run, - cbm_remove_editor_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Qwen Code", cp, ip}, installed_binary, + dry_run, cbm_remove_editor_mcp_owned); if (!dry_run) { #ifdef _WIN32 bool windows = true; @@ -13832,11 +13807,11 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con cbm_copilot_config_dir(home, config_dir, sizeof(config_dir)); snprintf(cp, sizeof(cp), "%s/mcp-config.json", config_dir); snprintf(ip, sizeof(ip), "%s/copilot-instructions.md", config_dir); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Copilot CLI", cp, ip}, dry_run, - cbm_remove_copilot_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Copilot CLI", cp, ip}, installed_binary, + dry_run, cbm_remove_copilot_mcp_owned); } if (agents->vscode || agents->copilot_cli) { - uninstall_copilot_durable_context(home, dry_run); + uninstall_copilot_durable_context(home, installed_binary, dry_run); } if (agents->factory_droid) { char cp[CLI_BUF_1K]; @@ -13849,8 +13824,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(hp, sizeof(hp), "%s/.factory/hooks.json", home); snprintf(ap, sizeof(ap), "%s/.factory/droids/codebase-memory.md", home); snprintf(skills_dir, sizeof(skills_dir), "%s/.factory/skills", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Factory Droid", cp, ip}, dry_run, - cbm_remove_factory_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Factory Droid", cp, ip}, installed_binary, + dry_run, cbm_remove_factory_mcp_owned); if (!dry_run && cbm_remove_factory_hooks(hp, installed_binary) != CLI_OK) { record_agent_config_error(true, "Factory Droid", "context_hook_uninstall", hp); } @@ -13873,8 +13848,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con if (!dry_run && cbm_remove_crush_context_path(cp, ip) != CLI_OK) { record_agent_config_error(true, "Crush", "context_reference_uninstall", cp); } - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Crush", cp, ip}, dry_run, - cbm_remove_crush_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Crush", cp, ip}, installed_binary, + dry_run, cbm_remove_crush_mcp_owned); char legacy_ip[CLI_BUF_1K]; snprintf(legacy_ip, sizeof(legacy_ip), "%s/.config/crush/CRUSH.md", home); if (!dry_run && cbm_file_exists(legacy_ip) && @@ -13889,8 +13864,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con cbm_goose_config_dir(home, config_dir, sizeof(config_dir)); snprintf(cp, sizeof(cp), "%s/config.yaml", config_dir); snprintf(ip, sizeof(ip), "%s/.config/goose/.goosehints", home); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Goose", cp, ip}, dry_run, - cbm_remove_goose_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Goose", cp, ip}, installed_binary, + dry_run, cbm_remove_goose_mcp_owned); } if (agents->mistral_vibe) { char config_dir[CLI_BUF_1K]; @@ -13905,8 +13880,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(skills_dir, sizeof(skills_dir), "%s/skills", config_dir); snprintf(ap, sizeof(ap), "%s/agents/codebase-memory.toml", config_dir); snprintf(prompt_path, sizeof(prompt_path), "%s/prompts/codebase-memory.md", config_dir); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Mistral Vibe", cp, ip}, dry_run, - cbm_remove_vibe_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Mistral Vibe", cp, ip}, installed_binary, + dry_run, cbm_remove_vibe_mcp_owned); uninstall_agent_skill("Mistral Vibe", skills_dir, dry_run); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ @@ -13930,8 +13905,8 @@ static void uninstall_additional_agents(const cbm_detected_agents_t *agents, con snprintf(ip, sizeof(ip), "%s/rules/codebase-memory.md", config_dir); snprintf(skills_dir, sizeof(skills_dir), "%s/skills", config_dir); snprintf(ap, sizeof(ap), "%s/agents/codebase-memory.md", config_dir); - uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Grok Build", cp, ip}, dry_run, - cbm_remove_grok_mcp_owned); + uninstall_agent_mcp_instr((mcp_uninstall_args_t){"Grok Build", cp, ip}, installed_binary, + dry_run, cbm_remove_grok_mcp_owned); uninstall_agent_skill("Grok Build", skills_dir, dry_run); uninstall_tiered_agent_profiles( (cbm_tiered_profile_set_t){ @@ -14017,10 +13992,13 @@ static int cli_uninstall_activate(void *opaque) { if (activation->agents.claude_code) { uninstall_claude_code(activation->home, activation->bin_path, activation->dry_run); } - uninstall_cli_agents(&activation->agents, activation->home, activation->dry_run); - uninstall_editor_agents(&activation->agents, activation->home, activation->dry_run); - uninstall_additional_agents(&activation->agents, activation->home, activation->dry_run); - uninstall_agent_client_registry(activation->home, activation->dry_run); + uninstall_cli_agents(&activation->agents, activation->home, activation->bin_path, + activation->dry_run); + uninstall_editor_agents(&activation->agents, activation->home, activation->bin_path, + activation->dry_run); + uninstall_additional_agents(&activation->agents, activation->home, activation->bin_path, + activation->dry_run); + uninstall_agent_client_registry(activation->home, activation->bin_path, activation->dry_run); cbm_config_edit_path_follow_clear(); /* Agent-config failures are collected, never a gate: an entry the editors diff --git a/tests/test_cli.c b/tests/test_cli.c index df0a289d2..75ae30f85 100644 --- a/tests/test_cli.c +++ b/tests/test_cli.c @@ -1,4 +1,4 @@ -/* +/* * test_cli.c — Tests for CLI subcommands: install, uninstall, update, version. * * Port of Go test files: @@ -4442,6 +4442,102 @@ TEST(cli_uninstall_cleans_user_owned_symlinked_config) { } #endif +/* `install --dir=X` writes X's binary into every agent entry; `uninstall + * --dir=X` must recognise exactly those entries as its own. Before the fix + * every uninstall path except Claude Code compared against ~/.local/bin, so + * the entries were reported as foreign and left behind (Cursor covers the + * generic editor path, Amazon Q the client registry that also serves Visual + * Studio). No symlinks and no fd capture: this runs on Windows as well. */ +TEST(cli_uninstall_dir_removes_agent_entries_written_for_that_dir) { + char tmpdir[256]; + snprintf(tmpdir, sizeof(tmpdir), "/tmp/cli-uninstall-dir-XXXXXX"); + if (!cbm_mkdtemp(tmpdir)) { + FAIL("cbm_mkdtemp failed"); + } + char *old_home = NULL; + char *old_cache = NULL; + cli_activation_save_env(&old_home, &old_cache); + char *old_path = save_test_env("PATH"); + char *old_appdata = save_test_env("APPDATA"); + char *old_xdg = save_test_env("XDG_CONFIG_HOME"); + cbm_setenv("HOME", tmpdir, 1); + cbm_setenv("PATH", tmpdir, 1); + cbm_unsetenv("APPDATA"); + cbm_unsetenv("XDG_CONFIG_HOME"); + char cache_dir[512]; + snprintf(cache_dir, sizeof(cache_dir), "%s/cache", tmpdir); + cbm_setenv("CBM_CACHE_DIR", cache_dir, 1); + test_mkdirp(cache_dir); + + char bin_dir[512]; + char bin_target[640]; + char dir_arg[640]; + snprintf(bin_dir, sizeof(bin_dir), "%s/custom/bin", tmpdir); + test_mkdirp(bin_dir); +#ifdef _WIN32 + snprintf(bin_target, sizeof(bin_target), "%s/codebase-memory-mcp.exe", bin_dir); +#else + snprintf(bin_target, sizeof(bin_target), "%s/codebase-memory-mcp", bin_dir); +#endif + write_test_file(bin_target, "binary installed with --dir"); + snprintf(dir_arg, sizeof(dir_arg), "--dir=%s", bin_dir); + + char cursor_dir[512]; + char cursor_config[640]; + char amazon_dir[512]; + char amazon_config[640]; + snprintf(cursor_dir, sizeof(cursor_dir), "%s/.cursor", tmpdir); + snprintf(cursor_config, sizeof(cursor_config), "%s/mcp.json", cursor_dir); + snprintf(amazon_dir, sizeof(amazon_dir), "%s/.aws/amazonq/agents", tmpdir); + snprintf(amazon_config, sizeof(amazon_config), "%s/default.json", amazon_dir); + test_mkdirp(cursor_dir); + test_mkdirp(amazon_dir); + write_test_file(cursor_config, + "{\n \"mcpServers\": {\n \"keep\": {\"command\": \"x\"}\n }\n}\n"); + write_test_file(amazon_config, "{\"keep\":\"amazon\"}\n"); + + int install_rc = cbm_install_agent_configs(tmpdir, bin_target, false, false); + char *cursor_installed = read_test_file_alloc(cursor_config); + char *amazon_installed = read_test_file_alloc(amazon_config); + bool installed = cursor_installed && strstr(cursor_installed, "codebase-memory-mcp") && + amazon_installed && strstr(amazon_installed, "codebase-memory-mcp"); + + cli_activation_fake_t fake = {.mutation_reserve_result = 1}; + cbm_cli_activation_ops_t ops = cli_activation_fake_ops(&fake); + cbm_cli_set_activation_ops_for_test(&ops); + char *argv[] = {"--yes", dir_arg}; + int rc = cli_test_cmd_uninstall(2, argv); + cbm_cli_set_activation_ops_for_test(NULL); + cbm_set_auto_answer_for_test(0); + + struct stat state; + bool binary_gone = stat(bin_target, &state) != 0 && errno == ENOENT; + char *cursor_after = read_test_file_alloc(cursor_config); + char *amazon_after = read_test_file_alloc(amazon_config); + bool cursor_removed = cursor_after && !strstr(cursor_after, "codebase-memory-mcp") && + strstr(cursor_after, "\"keep\""); + bool amazon_removed = amazon_after && !strstr(amazon_after, "codebase-memory-mcp") && + strstr(amazon_after, "\"keep\""); + + cli_activation_restore_env(old_home, old_cache); + restore_test_env("PATH", old_path); + restore_test_env("APPDATA", old_appdata); + restore_test_env("XDG_CONFIG_HOME", old_xdg); + test_rmdir_r(tmpdir); + free(cursor_installed); + free(amazon_installed); + free(cursor_after); + free(amazon_after); + + ASSERT_EQ(install_rc, 0); + ASSERT_TRUE(installed); + ASSERT_EQ(rc, 0); + ASSERT_TRUE(binary_gone); + ASSERT_TRUE(cursor_removed); + ASSERT_TRUE(amazon_removed); + PASS(); +} + TEST(cli_activation_guard_is_bypassed_for_dry_run_and_plan) { char tmpdir[256]; snprintf(tmpdir, sizeof(tmpdir), "/tmp/cli-daemon-stateless-XXXXXX"); @@ -21376,6 +21472,7 @@ SUITE(cli) { RUN_TEST(cli_uninstall_removes_binary_and_index_when_agent_config_cleanup_fails); RUN_TEST(cli_uninstall_cleans_user_owned_symlinked_config); #endif + RUN_TEST(cli_uninstall_dir_removes_agent_entries_written_for_that_dir); RUN_TEST(cli_activation_guard_is_bypassed_for_dry_run_and_plan); #ifdef _WIN32 RUN_TEST(cli_windows_update_hands_off_to_install_script);