Skip to content

Harden vscode/cursor install-hooks when IDE CLI is not in PATH #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svarlamov merged 6 commits into from
Feb 8, 2026
Merged

Harden vscode/cursor install-hooks when IDE CLI is not in PATH #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af1394d
Initial plan
Copilot Feb 8, 2026
31d5da4
Harden vscode/cursor install-hooks by falling back to cli.js when CLI…
Copilot Feb 8, 2026
e623971
Fix fragile test assertions per code review feedback
Copilot Feb 8, 2026
43c614a
claude review fixes, fmt
svarlamov Feb 8, 2026
9d35104
fix windows test failure
svarlamov Feb 8, 2026
777627c
Merge branch 'main' into copilot/harden-vscode-cursor-install-hooks
svarlamov Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/mdm/agents/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use crate::mdm::hook_installer::{
HookCheckResult, HookInstaller, HookInstallerParams, InstallResult,
};
use crate::mdm::utils::{
MIN_CURSOR_VERSION, binary_exists, generate_diff, get_binary_version, home_dir,
install_vsc_editor_extension, is_vsc_editor_extension_installed, parse_version,
MIN_CURSOR_VERSION, generate_diff, get_editor_version, home_dir, install_vsc_editor_extension,
is_vsc_editor_extension_installed, parse_version, resolve_editor_cli,
settings_paths_for_products, should_process_settings_target, version_meets_requirement,
write_atomic,
};
Expand Down Expand Up @@ -44,23 +44,24 @@ impl HookInstaller for CursorInstaller {
}

fn check_hooks(&self, _params: &HookInstallerParams) -> Result<HookCheckResult, GitAiError> {
let has_binary = binary_exists("cursor");
let resolved_cli = resolve_editor_cli("cursor");
let has_cli = resolved_cli.is_some();
let has_dotfiles = home_dir().join(".cursor").exists();
let has_settings_targets = Self::settings_targets()
.iter()
.any(|path| should_process_settings_target(path));

if !has_binary && !has_dotfiles && !has_settings_targets {
if !has_cli && !has_dotfiles && !has_settings_targets {
return Ok(HookCheckResult {
tool_installed: false,
hooks_installed: false,
hooks_up_to_date: false,
});
}

// If we have the binary, check version
if has_binary
&& let Ok(version_str) = get_binary_version("cursor")
// If we have a CLI, check version
if let Some(cli) = &resolved_cli
&& let Ok(version_str) = get_editor_version(cli)
&& let Some(version) = parse_version(&version_str)
&& !version_meets_requirement(version, MIN_CURSOR_VERSION)
{
Expand Down Expand Up @@ -319,8 +320,8 @@ impl HookInstaller for CursorInstaller {
let mut results = Vec::new();

// Install VS Code extension
if binary_exists("cursor") {
match is_vsc_editor_extension_installed("cursor", "git-ai.git-ai-vscode") {
if let Some(cli) = resolve_editor_cli("cursor") {
match is_vsc_editor_extension_installed(&cli, "git-ai.git-ai-vscode") {
Ok(true) => {
results.push(InstallResult {
changed: false,
Expand All @@ -338,7 +339,7 @@ impl HookInstaller for CursorInstaller {
} else {
println!("Installing extensions...");
println!("\tInstalling extension 'git-ai.git-ai-vscode'...");
match install_vsc_editor_extension("cursor", "git-ai.git-ai-vscode") {
match install_vsc_editor_extension(&cli, "git-ai.git-ai-vscode") {
Ok(()) => {
results.push(InstallResult {
changed: true,
Expand Down
25 changes: 13 additions & 12 deletions src/mdm/agents/vscode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use crate::mdm::hook_installer::{
HookCheckResult, HookInstaller, HookInstallerParams, InstallResult, UninstallResult,
};
use crate::mdm::utils::{
MIN_CODE_VERSION, binary_exists, get_binary_version, home_dir, install_vsc_editor_extension,
is_github_codespaces, is_vsc_editor_extension_installed, parse_version,
MIN_CODE_VERSION, get_editor_version, home_dir, install_vsc_editor_extension,
is_github_codespaces, is_vsc_editor_extension_installed, parse_version, resolve_editor_cli,
settings_paths_for_products, should_process_settings_target, version_meets_requirement,
};
use crate::utils::debug_log;
Expand All @@ -28,23 +28,24 @@ impl HookInstaller for VSCodeInstaller {
}

fn check_hooks(&self, _params: &HookInstallerParams) -> Result<HookCheckResult, GitAiError> {
let has_binary = binary_exists("code");
let resolved_cli = resolve_editor_cli("code");
let has_cli = resolved_cli.is_some();
let has_dotfiles = home_dir().join(".vscode").exists();
let has_settings_targets = Self::settings_targets()
.iter()
.any(|path| should_process_settings_target(path));

if !has_binary && !has_dotfiles && !has_settings_targets {
if !has_cli && !has_dotfiles && !has_settings_targets {
return Ok(HookCheckResult {
tool_installed: false,
hooks_installed: false,
hooks_up_to_date: false,
});
}

// If we have the binary, check version
if has_binary
&& let Ok(version_str) = get_binary_version("code")
// If we have a CLI, check version
if let Some(cli) = &resolved_cli
&& let Ok(version_str) = get_editor_version(cli)
&& let Some(version) = parse_version(&version_str)
&& !version_meets_requirement(version, MIN_CODE_VERSION)
{
Expand All @@ -56,8 +57,8 @@ impl HookInstaller for VSCodeInstaller {

// VS Code hooks are installed via extension, not config files
// Check if extension is installed
if binary_exists("code") {
match is_vsc_editor_extension_installed("code", "git-ai.git-ai-vscode") {
if let Some(cli) = &resolved_cli {
match is_vsc_editor_extension_installed(cli, "git-ai.git-ai-vscode") {
Ok(true) => {
return Ok(HookCheckResult {
tool_installed: true,
Expand Down Expand Up @@ -121,8 +122,8 @@ impl HookInstaller for VSCodeInstaller {
}

// Install VS Code extension
if binary_exists("code") {
match is_vsc_editor_extension_installed("code", "git-ai.git-ai-vscode") {
if let Some(cli) = resolve_editor_cli("code") {
match is_vsc_editor_extension_installed(&cli, "git-ai.git-ai-vscode") {
Ok(true) => {
results.push(InstallResult {
changed: false,
Expand All @@ -138,7 +139,7 @@ impl HookInstaller for VSCodeInstaller {
message: "VS Code: Pending extension install".to_string(),
});
} else {
match install_vsc_editor_extension("code", "git-ai.git-ai-vscode") {
match install_vsc_editor_extension(&cli, "git-ai.git-ai-vscode") {
Ok(()) => {
results.push(InstallResult {
changed: true,
Expand Down
Loading
Loading