Skip to content

fix(reconcile): map cargo binary to owning crate and probe post-reconcile binary #42

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
CybotTM merged 2 commits into from
Jul 30, 2026
Merged

fix(reconcile): map cargo binary to owning crate and probe post-reconcile binary #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1404a84
fix(reconcile): map cargo binary to owning crate and probe post-recon…
CybotTM Jul 30, 2026
7967919
Merge branch 'main' into fix/reconcile-cargo-crate-mapping
CybotTM Jul 30, 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
19 changes: 17 additions & 2 deletions skills/cli-tools/scripts/lib/reconcile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,17 @@ remove_installation() {
;;
cargo)
if command -v cargo >/dev/null 2>&1; then
echo "[$tool] Uninstalling cargo package: $tool" >&2
cargo uninstall "$tool" 2>/dev/null || true
# cargo uninstall needs the crate name, which can differ from the
# binary (git-delta installs `delta`, watchexec-cli installs
# `watchexec`) — map binary → owning crate via `cargo install --list`.
local crate
crate="$(cargo install --list 2>/dev/null | awk -v bin="$binary" -v tool="$tool" '
/^[^[:space:]]/ { pkg = $1 }
/^[[:space:]]/ { if ($1 == bin || $1 == tool) { print pkg; exit } }')"
crate="${crate:-$tool}"
echo "[$tool] Uninstalling cargo package: $crate" >&2
cargo uninstall "$crate" 2>/dev/null \
|| echo "[$tool] Warning: cargo uninstall $crate failed" >&2
fi
;;
npm)
Expand Down Expand Up @@ -297,6 +306,12 @@ reconcile_tool() {

# Verify installation
if command -v "$binary_name" >/dev/null 2>&1; then
# Presence is not function: a surviving wrapper script can depend on
# files the removed package owned (byobu's launcher sources
# /usr/lib/byobu), so probe that the binary actually runs.
if ! "$binary_name" --version >/dev/null 2>&1 && ! "$binary_name" version >/dev/null 2>&1; then
echo "[$tool] Warning: $binary_name is on PATH but does not run — the removal may have broken a wrapper that depended on the removed package" >&2
fi
local new_method
new_method="$(detect_install_method "$tool" "$binary_name")"
echo "[$tool] ✓ Reconciliation complete: now installed via $new_method" >&2
Expand Down
Loading