magus-cli 7.10.3 → 7.10.5

package/src/services/resolver.ts

@@ -13,6 +13,7 @@ import semver from "semver";
 import { cliTools, isOwnedEntry } from "../data/cli-tools.js";
 import { getMarketplaceByName } from "../data/marketplaces.js";
 import { PREDEFINED_PROFILES } from "../data/predefined-profiles.js";
+import { presenceArgv } from "../data/tool-versions.js";
 import {
 	type InstallOption,
 	type Requirement,
@@ -258,13 +259,11 @@ export function pinOfBin(bin: SelectedBin): string | undefined {
 	return option && "version" in option ? option.version : undefined;
 }
 
-/** The catalogue's check line as argv: split once, here, never by a shell. */
-const splitCheck = (line: string): string[] => line.trim().split(/\s+/);
-
 /**
  * Map a manifest cliTools entry (name -> version) onto a requirement: the
  * catalogue's installer as one option (`npm`/`pip`/`go` are the profile-only
- * kinds), its check as argv, the pin carried in the option. A tool a plugin
+ * kinds), magus's own version command as the check (`presenceArgv`), the pin
+ * carried in the option. A tool a plugin
  * owns (`ownedBy`) is that plugin's declaration, passed in as `owned`, with
  * the pin applied to its chosen option. An unknown tool installs with bun
  * under its own name.
@@ -293,18 +292,13 @@ export function cliToolToBin(
 			: { ...owned, chosen: withPin(owned.chosen) };
 	}
 	const tool = cliTools.find((t) => t.name === name);
-	let option: InstallOption;
-	let check: string[];
-	if (tool && !isOwnedEntry(tool)) {
-		check = splitCheck(tool.checkCommand);
-		option =
-			tool.packageManager === "brew"
+	const check = presenceArgv(name);
+	const option: InstallOption =
+		tool && !isOwnedEntry(tool)
+			? tool.packageManager === "brew"
 				? { via: "brew", formula: tool.packageName }
-				: { via: tool.packageManager, package: tool.packageName };
-	} else {
-		check = [name, "--version"];
-		option = { via: "bun", package: name };
-	}
+				: { via: tool.packageManager, package: tool.packageName }
+			: { via: "bun", package: name };
 	const requirement: Requirement = { name, check, install: [withPin(option)] };
 	return (
 		selectBins([requirement], undefined)[0] ?? {