@vltpkg/cli-js 1.5.0 → 1.6.0

package/{chunk-4UH3KMTD.js → chunk-36UIE654.js}

@@ -51,20 +51,25 @@ import {
   shouldInstallDepType,
   symlinkSyncMkdirp,
   unshare
-} from "./chunk-2U4PVHP4.js";
+} from "./chunk-F5LZMLAQ.js";
 import {
   SecurityArchive,
   usesNpmRegistry
-} from "./chunk-SMXXFQPI.js";
+} from "./chunk-YTDABXPD.js";
+import {
+  RollbackRemove,
+  cmdShimIfExists,
+  readCmdShimIfExists
+} from "./chunk-JV5XR5JQ.js";
 import {
   detectLibc,
   getUser,
   platformCheck
-} from "./chunk-IFEZ6BFV.js";
+} from "./chunk-EMTGRCSE.js";
 import {
   Monorepo,
   PackageJson
-} from "./chunk-C6ZVVEFV.js";
+} from "./chunk-TQQO2F56.js";
 import {
   baseDepID,
   getTuple,
@@ -73,17 +78,17 @@ import {
   joinDepIDTuple,
   joinExtra,
   splitDepID
-} from "./chunk-F7NPYSI2.js";
+} from "./chunk-CAV7FKWQ.js";
 import {
   Spec as Spec2
-} from "./chunk-LUVDMEW4.js";
+} from "./chunk-6D3QAFNZ.js";
 import {
   load,
   walkUp
 } from "./chunk-HTOTG4TS.js";
 import {
   userAgent
-} from "./chunk-G3FZ2ZJK.js";
+} from "./chunk-GEQFMH5M.js";
 import {
   promiseSpawn
 } from "./chunk-SUU2WETN.js";
@@ -93,9 +98,6 @@ import {
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
-import {
-  rimraf
-} from "./chunk-PDWPFR5T.js";
 import {
   Spec,
   Version,
@@ -108,7 +110,7 @@ import {
   longDependencyTypes,
   normalizeManifest,
   parse
-} from "./chunk-6LZM3I4Q.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -141,15 +143,15 @@ var require_windows = __commonJS({
       }
       return false;
     }
-    function checkStat(stat3, path, options) {
-      if (!stat3.isSymbolicLink() && !stat3.isFile()) {
+    function checkStat(stat2, path, options) {
+      if (!stat2.isSymbolicLink() && !stat2.isFile()) {
         return false;
       }
       return checkPathExt(path, options);
     }
     function isexe(path, options, cb) {
-      fs.stat(path, function(er, stat3) {
-        cb(er, er ? false : checkStat(stat3, path, options));
+      fs.stat(path, function(er, stat2) {
+        cb(er, er ? false : checkStat(stat2, path, options));
       });
     }
     function sync(path, options) {
@@ -165,20 +167,20 @@ var require_mode = __commonJS({
     isexe.sync = sync;
     var fs = __require("node:fs");
     function isexe(path, options, cb) {
-      fs.stat(path, function(er, stat3) {
-        cb(er, er ? false : checkStat(stat3, options));
+      fs.stat(path, function(er, stat2) {
+        cb(er, er ? false : checkStat(stat2, options));
       });
     }
     function sync(path, options) {
       return checkStat(fs.statSync(path), options);
     }
-    function checkStat(stat3, options) {
-      return stat3.isFile() && checkMode(stat3, options);
+    function checkStat(stat2, options) {
+      return stat2.isFile() && checkMode(stat2, options);
     }
-    function checkMode(stat3, options) {
-      var mod = stat3.mode;
-      var uid = stat3.uid;
-      var gid = stat3.gid;
+    function checkMode(stat2, options) {
+      var mod = stat2.mode;
+      var uid = stat2.uid;
+      var gid = stat2.gid;
       var myUid = options.uid !== void 0 ? options.uid : process.getuid && process.getuid();
       var myGid = options.gid !== void 0 ? options.gid : process.getgid && process.getgid();
       var u = parseInt("100", 8);
@@ -212,12 +214,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve10, reject) {
+        return new Promise(function(resolve9, reject) {
           isexe(path, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve10(is);
+              resolve9(is);
             }
           });
         });
@@ -283,27 +285,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i) => new Promise((resolve10, reject) => {
+      const step = (i) => new Promise((resolve9, reject) => {
         if (i === pathEnv.length)
-          return opt.all && found.length ? resolve10(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve9(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
         const pCmd = path.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve10(subStep(p, i, 0));
+        resolve9(subStep(p, i, 0));
       });
-      const subStep = (p, i, ii) => new Promise((resolve10, reject) => {
+      const subStep = (p, i, ii) => new Promise((resolve9, reject) => {
         if (ii === pathExt.length)
-          return resolve10(step(i + 1));
+          return resolve9(step(i + 1));
         const ext = pathExt[ii];
         isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
           if (!er && is) {
             if (opt.all)
               found.push(p + ext);
             else
-              return resolve10(p + ext);
+              return resolve9(p + ext);
           }
-          return resolve10(subStep(p, i, ii + 1));
+          return resolve9(subStep(p, i, ii + 1));
         });
       });
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -595,7 +597,7 @@ var require_cross_spawn = __commonJS({
     var cp = __require("node:child_process");
     var parse3 = require_parse();
     var enoent = require_enoent();
-    function spawn4(command, args, options) {
+    function spawn3(command, args, options) {
       const parsed = parse3(command, args, options);
       const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
@@ -607,8 +609,8 @@ var require_cross_spawn = __commonJS({
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
       return result;
     }
-    module.exports = spawn4;
-    module.exports.spawn = spawn4;
+    module.exports = spawn3;
+    module.exports.spawn = spawn3;
     module.exports.sync = spawnSync;
     module.exports._parse = parse3;
     module.exports._enoent = enoent;
@@ -1094,28 +1096,28 @@ var nmBin = `${sep}node_modules${sep}.bin`;
 var addPaths = async (projectRoot, cwd, env, command) => {
   const { PATH = "" } = env;
   const PATHsplit = PATH.split(delimiter);
-  const paths2 = /* @__PURE__ */ new Set();
+  const paths = /* @__PURE__ */ new Set();
   for (const p of PATHsplit) {
     if (p.endsWith(nmBin)) {
-      paths2.add(p);
+      paths.add(p);
     }
   }
   for (const p of walkUp(cwd)) {
     const dotBin = resolve(p, "node_modules/.bin");
-    if (dirExists(dotBin)) paths2.add(dotBin);
+    if (dirExists(dotBin)) paths.add(dotBin);
     if (p === projectRoot) break;
   }
   for (const p of PATH.split(delimiter)) {
-    if (p) paths2.add(p);
+    if (p) paths.add(p);
   }
   if (command && hasNodeGypReference(command)) {
     try {
       const shimDir = await getNodeGypShimDir();
-      paths2.add(shimDir);
+      paths.add(shimDir);
     } catch {
     }
   }
-  env.PATH = [...paths2].join(delimiter);
+  env.PATH = [...paths].join(delimiter);
   return env;
 };
 var run = async (options) => runImpl(options, exec, "");
@@ -2061,73 +2063,6 @@ function mermaidOutput(options) {
   return "flowchart TD\n" + graphOutput + styleDefinition;
 }
 
-// ../../src/rollback-remove/src/index.ts
-import { spawn as spawn3 } from "node:child_process";
-import { rename } from "node:fs/promises";
-import { basename, dirname as dirname2 } from "node:path";
-
-// ../../src/rollback-remove/src/remove.ts
-import { resolve as resolve2 } from "node:path";
-var __CODE_SPLIT_SCRIPT_NAME = resolve2(import.meta.dirname, "rollback-remove-src-remove.js");
-
-// ../../src/rollback-remove/src/index.ts
-var isDeno = globalThis.Deno != void 0;
-var RollbackRemove = class {
-  #key = String(Math.random()).substring(2);
-  #paths = /* @__PURE__ */ new Map();
-  async rm(path) {
-    if (this.#paths.has(path)) return;
-    const target = `${dirname2(path)}/.VLT.DELETE.${this.#key}.${basename(path)}`;
-    try {
-      await rename(path, target);
-    } catch (e) {
-      if (e instanceof Error && "code" in e && /* c8 ignore start - very spurious weirdness on Windows */
-      (e.code === "ENOENT" || e.code === "EPERM")) {
-        return;
-      }
-      throw e;
-    }
-    this.#paths.set(path, target);
-  }
-  confirm() {
-    if (!this.#paths.size) return;
-    const env = { ...process.env };
-    const args = [];
-    const detached = !(isDeno && process.platform === "win32");
-    if (isDeno) {
-      args.push(
-        "--unstable-node-globals",
-        "--unstable-bare-node-builtins"
-      );
-    }
-    args.push(__CODE_SPLIT_SCRIPT_NAME);
-    const child = spawn3(process.execPath, args, {
-      stdio: ["pipe", "ignore", "ignore"],
-      detached,
-      env
-    });
-    for (const path of this.#paths.values()) {
-      child.stdin.write(`${path}\0`);
-    }
-    child.stdin.end();
-    if (detached) {
-      child.unref();
-    }
-    this.#paths.clear();
-  }
-  async rollback() {
-    const promises = [];
-    for (const [original, moved] of this.#paths) {
-      promises.push(
-        rimraf(original).catch(() => {
-        }).then(() => rename(moved, original))
-      );
-    }
-    await Promise.all(promises);
-    this.#paths.clear();
-  }
-};
-
 // ../../src/dss-breadcrumb/src/index.ts
 var passthroughComparator = () => () => true;
 var semverComparator = ({ range }) => ({ semver }) => {
@@ -2371,7 +2306,8 @@ var specificitySort = (breadcrumbs) => {
 };
 
 // ../../src/graph/src/modifiers.ts
-var matchesImporter = (item, importer) => item.importer && (item.value === ":project" || item.value === ":root" && importer.mainImporter || item.value === ":workspace" && importer.importer);
+var matchesImporter = (item, importer) => item.importer && importer.importer && (item.value === ":project" || item.value === ":workspace" || item.value === ":root" && importer.mainImporter);
+var isWorkspaceTarget = (item) => item.importer && item.value === ":workspace" && !!item.prev?.importer && !item.prev.name && !item.prev.prev;
 var matchesQualifier = (item, spec) => !!item?.comparator({ semver: spec.semver });
 var GraphModifier = class _GraphModifier {
   /** The loaded modifiers configuration */
@@ -2403,6 +2339,14 @@ var GraphModifier = class _GraphModifier {
   activeModifiers = /* @__PURE__ */ new Set();
   /** A set of all modifier string values loaded from vlt.json */
   modifierNames = /* @__PURE__ */ new Set();
+  /** Spec options used when expanding `:workspace` targets */
+  #options = {};
+  /** `<importer> > :workspace` modifiers, expanded once a graph is known */
+  #workspaceTargets = [];
+  /** Graphs whose workspaces were already expanded */
+  #expandedGraphs = /* @__PURE__ */ new WeakSet();
+  /** Workspace names already expanded */
+  #expandedNames = /* @__PURE__ */ new Set();
   constructor(options) {
     this.load(options);
   }
@@ -2424,16 +2368,27 @@ var GraphModifier = class _GraphModifier {
    * root's own b edge is still the manifest's to validate and heal.
    */
   targetsImporterEdge(importer, spec) {
-    for (const { breadcrumb } of this.#modifiers) {
-      const { last } = breadcrumb;
+    return !!this.importerEdgeModifier(importer, spec);
+  }
+  /**
+   * The modifier governing the direct `importer -> spec.name` edge, see
+   * {@link GraphModifier.targetsImporterEdge}. The most specific one
+   * wins, same as during the graph build.
+   */
+  importerEdgeModifier(importer, spec) {
+    this.#expandWorkspaceTargets(importer);
+    const found = [];
+    for (const mod of this.#modifiers) {
+      const { last } = mod.breadcrumb;
       if (last.name !== spec.name) continue;
       if (!matchesQualifier(last, spec)) continue;
       const { prev } = last;
-      if (!prev) return true;
-      if (prev.prev) continue;
-      if (matchesImporter(prev, importer)) return true;
+      if (!prev || !prev.prev && matchesImporter(prev, importer)) {
+        found.push(mod);
+      }
     }
-    return false;
+    const [best] = specificitySort(found.map((m) => m.breadcrumb));
+    return found.find((m) => m.breadcrumb === best);
   }
   /**
    * Selector of the modifier that wins the direct `importer -> spec.name`
@@ -2462,12 +2417,18 @@ var GraphModifier = class _GraphModifier {
    * Loads the modifiers defined in `vlt.json` into memory.
    */
   load(options) {
+    this.#options = options;
     for (const [key, value] of Object.entries(this.config)) {
       this.modifierNames.add(key);
       const breadcrumb = parseBreadcrumb(key);
       if (!breadcrumb.last.name) {
-        throw error("Could not find name in breadcrumb", {
-          found: key
+        if (isWorkspaceTarget(breadcrumb.last)) {
+          this.#workspaceTargets.push({ query: key, value });
+          continue;
+        }
+        throw error("Invalid modifier selector", {
+          found: key,
+          wanted: "a selector ending in #<name>, or :root, :project or :workspace followed by > :workspace"
         });
       }
       let mod;
@@ -2495,11 +2456,49 @@ var GraphModifier = class _GraphModifier {
         };
         this.#nodeModifiers.add(mod);
       }
-      this.#modifiers.add(mod);
-      if (breadcrumb.first.name) {
-        const initialSet = this.#initialEntries.get(breadcrumb.first.name) ?? /* @__PURE__ */ new Set();
-        initialSet.add(mod);
-        this.#initialEntries.set(breadcrumb.first.name, initialSet);
+      this.#register(mod);
+    }
+  }
+  /**
+   * Adds a modifier entry to the set of known modifiers.
+   */
+  #register(mod) {
+    this.#modifiers.add(mod);
+    const { name } = mod.breadcrumb.first;
+    if (name) {
+      const initialSet = this.#initialEntries.get(name) ?? /* @__PURE__ */ new Set();
+      initialSet.add(mod);
+      this.#initialEntries.set(name, initialSet);
+    }
+  }
+  /**
+   * Expands `<importer> > :workspace` modifiers into one
+   * `<importer> > #<name>` entry per named workspace of the node's graph.
+   */
+  #expandWorkspaceTargets(node) {
+    if (!this.#workspaceTargets.length) return;
+    const { graph } = node;
+    if (this.#expandedGraphs.has(graph)) return;
+    this.#expandedGraphs.add(graph);
+    for (const importer of graph.importers) {
+      const name = importer.manifest?.name;
+      if (importer.mainImporter || !name || this.#expandedNames.has(name)) {
+        continue;
+      }
+      this.#expandedNames.add(name);
+      for (const { query, value } of this.#workspaceTargets) {
+        const breadcrumb = parseBreadcrumb(query);
+        breadcrumb.last.name = name;
+        const mod = {
+          breadcrumb,
+          query,
+          refs: /* @__PURE__ */ new Set(),
+          spec: Spec2.parse(name, value, this.#options),
+          type: "edge",
+          value
+        };
+        this.#edgeModifiers.add(mod);
+        this.#register(mod);
       }
     }
   }
@@ -2509,6 +2508,7 @@ var GraphModifier = class _GraphModifier {
    * update the active entry to the current importer node.
    */
   tryImporter(importer) {
+    this.#expandWorkspaceTargets(importer);
     for (const modifier of this.#modifiers) {
       if (matchesImporter(modifier.breadcrumb.first, importer)) {
         const active = this.newModifier(importer, modifier);
@@ -2679,7 +2679,7 @@ import {
   readFileSync,
   writeFileSync
 } from "node:fs";
-import { basename as basename2, resolve as resolve3 } from "node:path";
+import { basename, resolve as resolve2 } from "node:path";
 
 // ../../src/init/src/get-author-from-git-user.ts
 var getAuthorFromGitUser = (user) => {
@@ -2706,7 +2706,7 @@ var template = ({ name, author }) => normalizeManifest({
 var GITIGNORE_ENTRY = "node_modules";
 var NPMIGNORE_ENTRY = "vlt.json";
 var ensureGitignore = (cwd) => {
-  const gitignorePath = resolve3(cwd, ".gitignore");
+  const gitignorePath = resolve2(cwd, ".gitignore");
   if (!existsSync(gitignorePath)) {
     writeFileSync(gitignorePath, `${GITIGNORE_ENTRY}
 `, "utf8");
@@ -2727,7 +2727,7 @@ var ensureGitignore = (cwd) => {
   return void 0;
 };
 var ensureNpmignore = (cwd) => {
-  const npmignorePath = resolve3(cwd, ".npmignore");
+  const npmignorePath = resolve2(cwd, ".npmignore");
   if (!existsSync(npmignorePath)) {
     writeFileSync(npmignorePath, `${NPMIGNORE_ENTRY}
 `, "utf8");
@@ -2753,7 +2753,7 @@ var init = async ({
   logger = stderr
 } = {}) => {
   const packageJson = new PackageJson();
-  const path = resolve3(cwd, "package.json");
+  const path = resolve2(cwd, "package.json");
   let existingData;
   try {
     existingData = packageJson.read(cwd);
@@ -2763,7 +2763,7 @@ var init = async ({
       throw err;
     }
   }
-  const name = basename2(cwd);
+  const name = basename(cwd);
   const templateData = template({
     name,
     author: author ?? getAuthorFromGitUser(await getUser().catch(() => void 0))
@@ -2802,14 +2802,23 @@ var removeSatisfiedSpecs = ({
       const edgeIsCatalog = edge.spec.type === "catalog";
       const depIsCatalog = dependency.spec.type === "catalog";
       if (edgeIsCatalog !== depIsCatalog) continue;
+      const mod = modifiers?.importerEdgeModifier(
+        importer,
+        dependency.spec
+      );
       if (satisfies(
         edge.to?.id,
-        dependency.spec,
+        mod?.type === "edge" ? mod.spec : dependency.spec,
         edge.from.location,
         graph.projectRoot,
         graph.monorepo
       )) {
-        if ((edge.spec.bareSpec !== dependency.spec.bareSpec || dependency.type !== "implicit" && edge.type !== dependency.type) && !modifiers?.targetsImporterEdge(importer, dependency.spec)) {
+        const typeChanged = dependency.type !== "implicit" && edge.type !== dependency.type;
+        if (mod) {
+          if (typeChanged) {
+            staleSpecs.set(edge, { ...dependency, spec: edge.spec });
+          }
+        } else if (edge.spec.bareSpec !== dependency.spec.bareSpec || typeChanged) {
           staleSpecs.set(edge, dependency);
         }
         dependencies.delete(name);
@@ -2900,8 +2909,8 @@ var getImporterSpecs = (options) => {
     if (graph.importers.has(node) || !node.id.startsWith("file"))
       continue;
     const nodePath = options.scurry.cwd.resolve(node.location);
-    const stat3 = nodePath.lstatSync();
-    if (stat3?.isDirectory()) {
+    const stat2 = nodePath.lstatSync();
+    if (stat2?.isDirectory()) {
       const manifest = options.packageJson.read(nodePath.fullpath());
       node.manifest = manifest;
       const addDeps = /* @__PURE__ */ new Map();
@@ -3341,7 +3350,7 @@ var canonicalizePeerIds = (graph, options = {}) => {
 
 // ../../src/graph/src/ideal/move-peer-store-dirs.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { rename as rename2 } from "node:fs/promises";
+import { rename } from "node:fs/promises";
 var movePeerStoreDirs = async (moves, {
   scurry,
   remover
@@ -3361,7 +3370,7 @@ var movePeerStoreDirs = async (moves, {
       }
       const tmp = scurry.resolve(store, `.VLT.MOVE.${key}.${to}`);
       try {
-        await rename2(src, tmp);
+        await rename(src, tmp);
       } catch {
         node.extracted = false;
         return;
@@ -3375,7 +3384,7 @@ var movePeerStoreDirs = async (moves, {
       const { node, tmp, dest } = s;
       try {
         await remover.rm(dest);
-        await rename2(tmp, dest);
+        await rename(tmp, dest);
       } catch {
         node.extracted = false;
         try {
@@ -4446,7 +4455,7 @@ var fetchManifestsForDeps = async (packageInfo, graph, fromNode, deps, scurry, o
   placementTasks.sort(compareByHasPeerDeps);
   return { placementTasks, reuseTasks, forkRequests };
 };
-var processPlacementTasks = async (graph, options, placementTasks, add, modifiers, scurry, packageInfo, extractPromises, actual2, seenExtracted, remover, transientAdd, transientRemove) => {
+var processPlacementTasks = async (graph, options, placementTasks, add, modifiers, scurry, packageInfo, extractPromises, actual2, seenExtracted, remover, transientAdd, transientRemove, explicit) => {
   const childDepsToProcess = [];
   for (const placementTask of placementTasks) {
     const { fetchTask, manifest } = placementTask;
@@ -4461,12 +4470,22 @@ var processPlacementTasks = async (graph, options, placementTasks, add, modifier
       type
     } = fetchTask;
     const additiveMap = fromNode.importer ? add : transientAdd?.get(fromNode.id);
+    const explicitKeys = explicit?.get(fromNode.id);
+    const wasExplicit = explicitKeys?.has(addKey(spec));
     spec = fixupAddedNames(additiveMap, manifest, options, spec);
+    if (wasExplicit) explicitKeys?.add(spec.name);
     if (!manifest) {
       if (!edgeOptional && fromNode.isOptional()) {
-        removeOptionalSubgraph(graph, fromNode);
+        for (const n of removeOptionalSubgraph(graph, fromNode)) {
+          for (const { from, name } of n.edgesIn) {
+            if (from.importer && !explicit?.get(from.id)?.has(name)) {
+              add?.delete(name);
+            }
+          }
+        }
         continue;
       } else if (edgeOptional) {
+        additiveMap?.delete(addKey(spec));
         continue;
       } else {
         throw error("failed to resolve dependency", {
@@ -4731,7 +4750,8 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
         seenExtracted,
         remover,
         transientAdd,
-        transientRemove
+        transientRemove,
+        explicit
       );
       levelResults.push(placed);
     }
@@ -5047,269 +5067,12 @@ var build3 = async (options) => {
 // ../../src/graph/src/reify/index.ts
 import { availableParallelism } from "node:os";
 
-// ../../src/cmd-shim/src/index.ts
-import {
-  chmod as chmod3,
-  mkdir as mkdir2,
-  readFile as readFile2,
-  stat as stat2,
-  writeFile as writeFile2
-} from "node:fs/promises";
-import { dirname as dirname4, isAbsolute, relative } from "node:path";
-
-// ../../src/cmd-shim/src/to-batch-syntax.ts
-var convertToSetCommand = (key, value) => convertToSetCommand_(key.trim(), value.trim());
-var convertToSetCommand_ = (key, value) => key && value ? `@SET ${key}=${replaceDollarWithPercentPair(value)}\r
-` : "";
-var extractVariableValuePairs = (declarations) => declarations.reduce(
-  (pairs, declaration) => {
-    const [key = "", val = ""] = declaration.split("=");
-    pairs[key] = val;
-    return pairs;
-  },
-  {}
-);
-var convertToSetCommands = (variableString) => Object.entries(extractVariableValuePairs(variableString.split(" "))).map(([key, val]) => convertToSetCommand(key, val)).join("");
-var replaceDollarWithPercentPair = (value) => {
-  const dollarExpressions = /\$\{?([^$@#?\- \t{}:]+)\}?/g;
-  let result = "";
-  let startIndex = 0;
-  do {
-    const match = dollarExpressions.exec(value);
-    if (match) {
-      const betweenMatches = value.substring(startIndex, match.index) || "";
-      result += betweenMatches + "%" + String(match[1]) + "%";
-      startIndex = dollarExpressions.lastIndex;
-    }
-  } while (dollarExpressions.lastIndex > 0);
-  result += value.slice(startIndex);
-  return result;
-};
-
-// ../../src/cmd-shim/src/read.ts
-import { lstat, readFile, readlink } from "node:fs/promises";
-import { dirname as dirname3, resolve as resolve4 } from "node:path";
-
-// ../../src/cmd-shim/src/paths.ts
-var paths = process.platform === "win32" ? (path) => [
-  path + ".cmd",
-  path + ".ps1",
-  path,
-  path + ".pwsh"
-] : (path) => [path];
-
-// ../../src/cmd-shim/src/read.ts
-var extractPath = (path, cmdshimContents) => {
-  if (/\.cmd$/i.test(path)) {
-    return extractPathFromCmd(cmdshimContents);
-  } else if (/\.(ps1|pwsh)$/i.test(path)) {
-    return extractPathFromPowershell(cmdshimContents);
-  } else {
-    return extractPathFromCygwin(cmdshimContents);
-  }
-};
-var extractPathFromPowershell = (cmdshimContents) => {
-  const matches = /"[$]basedir\/([^"]+?)"\s+[$]args/.exec(
-    cmdshimContents
-  );
-  return matches?.[1]?.replace(/\\/g, "/");
-};
-var extractPathFromCmd = (cmdshimContents) => {
-  const matches = /"%(?:~dp0|dp0%)\\([^"]+?)"\s+%[*]/.exec(
-    cmdshimContents
-  );
-  return matches?.[1]?.replace(/\\/g, "/");
-};
-var extractPathFromCygwin = (cmdshimContents) => {
-  const matches = /"[$]basedir\/([^"]+?)"\s+"[$]@"/.exec(
-    cmdshimContents
-  );
-  return matches?.[1]?.replace(/\\/g, "/");
-};
-var findCmdShimIfExists = async (path) => {
-  path = path.replace(/\.(cmd|pwsh|ps1)$/i, "");
-  for (const p of paths(path)) {
-    const result = await readCmdShimIfExists(p);
-    if (result) return [p, result];
-  }
-};
-var readCmdShimIfExists = async (path) => {
-  try {
-    const st = await lstat(path);
-    if (st.isSymbolicLink()) {
-      return resolve4(dirname3(path), await readlink(path));
-    }
-    const contents = await readFile(path);
-    const destination = extractPath(path, contents.toString());
-    if (destination) return resolve4(dirname3(path), destination);
-  } catch {
-  }
-};
-
-// ../../src/cmd-shim/src/index.ts
-var shebangExpr = /^#!\s*(?:\/usr\/bin\/env\s+(?:-S\s+)?((?:[^ \t=]+=[^ \t=]+\s+)*))?([^ \t]+)(.*)$/;
-var cmdShimIfExists = async (from, to, remover) => {
-  try {
-    await stat2(from);
-  } catch {
-    return;
-  }
-  await writeShim(from, to, remover);
-};
-var cmdShim = async (from, to, remover) => {
-  try {
-    await stat2(from);
-    await writeShim(from, to, remover);
-  } catch (er) {
-    throw error("Could not shim to executable file", {
-      path: from,
-      target: to,
-      cause: er
-    });
-  }
-};
-var writeShim = async (from, to, remover) => {
-  await Promise.all([
-    remover.rm(to),
-    remover.rm(to + ".cmd"),
-    remover.rm(to + ".ps1"),
-    remover.rm(to + ".pwsh")
-  ]);
-  await mkdir2(dirname4(to), { recursive: true });
-  const data = await readFile2(from, "utf8").catch(() => "");
-  if (!data) {
-    return await writeShim_(from, to);
-  }
-  const firstLine = data.trim().split(/\r*\n/)[0];
-  const shebang = firstLine?.match(shebangExpr) ?? void 0;
-  return writeShim_(
-    from,
-    to,
-    shebang?.[2],
-    shebang?.[3],
-    shebang?.[1]
-  );
-};
-var writeShim_ = async (from, to, prog, args, variables) => {
-  let shTarget = relative(dirname4(to), from);
-  const [dp0, basedir] = isAbsolute(shTarget) ? ["", ""] : ["%dp0%\\", "$basedir/"];
-  let target = shTarget.split("/").join("\\");
-  let longProg;
-  let shProg = prog?.split("\\").join("/");
-  let shLongProg;
-  let pwshProg = shProg && `"${shProg}$exe"`;
-  let pwshLongProg;
-  shTarget = shTarget.split("\\").join("/");
-  args = args || "";
-  variables = variables || "";
-  if (!prog) {
-    prog = `"${dp0}${target}"`;
-    shProg = `"${basedir}${shTarget}"`;
-    pwshProg = shProg;
-    args = "";
-    target = "";
-    shTarget = "";
-  } else {
-    longProg = `"%dp0%\\${prog}.exe"`;
-    shLongProg = `"$basedir/${prog}"`;
-    pwshLongProg = `"$basedir/${prog}$exe"`;
-    target = `"${dp0}${target}"`;
-    shTarget = `"${basedir}${shTarget}"`;
-  }
-  const head = "@ECHO off\r\nGOTO start\r\n:find_dp0\r\nSET dp0=%~dp0\r\nEXIT /b\r\n:start\r\nSETLOCAL\r\nCALL :find_dp0\r\n";
-  let cmd;
-  if (longProg) {
-    shLongProg = (shLongProg ?? "").trim();
-    args = args.trim();
-    const variablesBatch = convertToSetCommands(variables);
-    cmd = `${head}${variablesBatch}\r
-IF EXIST ${longProg} (\r
-  SET "_prog=${longProg.replace(/(^")|("$)/g, "")}"\r
-) ELSE (\r
-  SET "_prog=${prog.replace(/(^")|("$)/g, "")}"\r
-  SET PATHEXT=%PATHEXT:;.JS;=;%\r
-)\r
-\r
-endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%" ${args} ${target} %*\r
-`;
-  } else {
-    cmd = `${head}${prog} ${args} ${target} %*\r
-`;
-  }
-  let sh = `#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
-
-case \`uname\` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=\`cygpath -w "$basedir"\`
-        fi
-    ;;
-esac
-
-`;
-  if (shLongProg) {
-    sh += `if [ -x ${shLongProg} ]; then
-  exec ${variables}${shLongProg} ${args} ${shTarget} "$@"
-else 
-  exec ${variables}${shProg} ${args} ${shTarget} "$@"
-fi
-`;
-  } else {
-    sh += `exec ${shProg} ${args} ${shTarget} "$@"
-`;
-  }
-  let pwsh = '#!/usr/bin/env pwsh\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n\n$exe=""\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {\n  # Fix case when both the Windows and Linux builds of Node\n  # are installed in the same directory\n  $exe=".exe"\n}\n';
-  if (shLongProg) {
-    pwsh += `$ret=0
-if (Test-Path ${pwshLongProg}) {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${pwshLongProg} ${args} ${shTarget} $args
-  } else {
-    & ${pwshLongProg} ${args} ${shTarget} $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & ${pwshProg} ${args} ${shTarget} $args
-  } else {
-    & ${pwshProg} ${args} ${shTarget} $args
-  }
-  $ret=$LASTEXITCODE
-}
-exit $ret
-`;
-  } else {
-    pwsh += `# Support pipeline input
-if ($MyInvocation.ExpectingInput) {
-  $input | & ${pwshProg} ${args} ${shTarget} $args
-} else {
-  & ${pwshProg} ${args} ${shTarget} $args
-}
-exit $LASTEXITCODE
-`;
-  }
-  await Promise.all([
-    writeFile2(to + ".cmd", cmd, "utf8"),
-    writeFile2(to + ".ps1", pwsh, "utf8"),
-    writeFile2(to, sh, "utf8")
-  ]);
-  await chmodShim(to);
-};
-var chmodShim = async (to) => await Promise.all([
-  chmod3(to, 493),
-  chmod3(to + ".cmd", 493),
-  chmod3(to + ".ps1", 493)
-]);
-
 // ../../src/graph/src/reify/add-edge.ts
 import { symlinkSync } from "node:fs";
-import { dirname as dirname5, relative as relative2, resolve as resolve5 } from "node:path";
+import { dirname as dirname2, relative, resolve as resolve3 } from "node:path";
 var clobberSymlink = async (target, link, remover, type = "file") => {
   const symlinkType = type === "dir" && process.platform === "win32" ? "junction" : type;
-  const symlinkTarget = symlinkType === "junction" ? resolve5(dirname5(link), target) : target;
+  const symlinkTarget = symlinkType === "junction" ? resolve3(dirname2(link), target) : target;
   try {
     symlinkSyncMkdirp(symlinkTarget, link, symlinkType);
   } catch (er) {
@@ -5333,8 +5096,8 @@ var addEdge = async (edge, scurry, remover, bins) => {
   const binRoot = nm + sep2 + ".bin";
   const path = nm + sep2 + edge.spec.name.replace("/", sep2);
   const promises = [];
-  const target = relative2(
-    dirname5(path),
+  const target = relative(
+    dirname2(path),
     edge.to.resolvedLocation(scurry)
   );
   const p = clobberSymlink(target, path, remover, "dir");
@@ -5342,16 +5105,17 @@ var addEdge = async (edge, scurry, remover, bins) => {
   else promises.push(p);
   if (bins) {
     for (const [key, val] of Object.entries(bins)) {
-      const link = resolve5(binRoot, key);
-      const absTarget = resolve5(path, val);
-      const target2 = relative2(binRoot, absTarget);
-      promises.push(
-        process.platform === "win32" ? cmdShimIfExists(absTarget, link, remover) : clobberSymlink(target2, link, remover)
-      );
+      promises.push(linkBin(path, binRoot, key, val, remover));
     }
   }
   if (promises.length) await Promise.all(promises);
 };
+var linkBin = (path, binRoot, key, val, remover) => {
+  const link = resolve3(binRoot, key);
+  const absTarget = resolve3(path, val);
+  const target = relative(binRoot, absTarget);
+  return process.platform === "win32" ? cmdShimIfExists(absTarget, link, remover) : clobberSymlink(target, link, remover);
+};
 
 // ../../src/graph/src/reify/add-edges.ts
 var addEdges = (diff, scurry, remover) => {
@@ -5379,18 +5143,14 @@ var addNodes = (diff, scurry, remover, options, packageInfo) => {
 };
 
 // ../../src/graph/src/reify/delete-edge.ts
-import { resolve as resolve6 } from "node:path";
-var rmBinPosix = (remover, bin) => {
-  return [remover.rm(bin)];
-};
-var rmBinWin32 = (remover, bin) => {
-  return [
-    remover.rm(bin),
-    remover.rm(bin + ".cmd"),
-    remover.rm(bin + ".ps1")
-  ];
-};
-var rmBin = process.platform === "win32" ? rmBinWin32 : rmBinPosix;
+import { resolve as resolve4 } from "node:path";
+var binPathsPosix = (bin) => [bin];
+var binPathsWin32 = (bin) => [
+  bin,
+  bin + ".cmd",
+  bin + ".ps1"
+];
+var binPaths = process.platform === "win32" ? binPathsWin32 : binPathsPosix;
 var deleteEdge = async (edge, scurry, remover) => {
   const {
     spec: { name },
@@ -5404,9 +5164,12 @@ var deleteEdge = async (edge, scurry, remover) => {
   promises.push(remover.rm(path));
   const bins = to?.bins;
   if (bins) {
-    for (const key of Object.keys(bins)) {
-      const bin = resolve6(binRoot, key);
-      promises.push(...rmBin(remover, bin));
+    for (const [key, value] of Object.entries(bins)) {
+      for (const bin of binPaths(resolve4(binRoot, key))) {
+        const target = await readCmdShimIfExists(bin);
+        if (target && target !== resolve4(path, value)) continue;
+        promises.push(remover.rm(bin));
+      }
     }
   }
   await Promise.all(promises);
@@ -5424,6 +5187,37 @@ var deleteEdges = (diff, scurry, remover) => {
   return promises;
 };
 
+// ../../src/graph/src/reify/relink-bins.ts
+import { resolve as resolve5 } from "node:path";
+var relinkBins = (diff, scurry, remover) => {
+  const actions = [];
+  const seen = /* @__PURE__ */ new Set();
+  const { sep: sep2 } = scurry.cwd;
+  for (const deleted of diff.edges.delete) {
+    const node = diff.to.nodes.get(deleted.from.id);
+    const bins = deleted.to?.bins;
+    if (!node || !bins) continue;
+    const nm = node.nodeModules(scurry);
+    const binRoot = nm + sep2 + ".bin";
+    for (const key of Object.keys(bins)) {
+      const link = resolve5(binRoot, key);
+      if (seen.has(link)) continue;
+      seen.add(link);
+      for (const edge of node.edgesOut.values()) {
+        const val = edge.to?.bins?.[key];
+        if (!val) continue;
+        const path = nm + sep2 + edge.spec.name.replace("/", sep2);
+        actions.push(async () => {
+          if (await scurry.lstat(link)) return;
+          await linkBin(path, binRoot, key, val, remover);
+        });
+        break;
+      }
+    }
+  }
+  return actions;
+};
+
 // ../../src/graph/src/reify/check-needed-build.ts
 var nodeNeedsBuild = (node, scurry, packageJson) => {
   if (node.built) return false;
@@ -5467,13 +5261,15 @@ var carryBuildState = (diff) => {
 };
 
 // ../../src/graph/src/reify/delete-nodes.ts
-var deleteNodes = (diff, remover, scurry) => {
+var deleteNodes = (diff, remover, scurry, keep) => {
   const store = scurry.resolve("node_modules/.vlt");
   const { sep: sep2 } = scurry.cwd;
   const rmActions = [];
   for (const node of diff.nodes.delete) {
     if (!node.inVltStore()) continue;
-    rmActions.push(remover.rm(store + sep2 + node.id));
+    if (!keep?.has(node.id)) {
+      rmActions.push(remover.rm(store + sep2 + node.id));
+    }
     for (const edge of node.edgesIn) {
       rmActions.push(deleteEdge(edge, scurry, remover));
     }
@@ -5482,8 +5278,8 @@ var deleteNodes = (diff, remover, scurry) => {
 };
 
 // ../../src/graph/src/reify/internal-hoist.ts
-import { mkdir as mkdir3 } from "node:fs/promises";
-import { dirname as dirname6, relative as relative3 } from "node:path";
+import { mkdir as mkdir2 } from "node:fs/promises";
+import { dirname as dirname3, relative as relative2 } from "node:path";
 var pickNodeToHoist = (nodes) => {
   let pick = void 0;
   let pickNode = void 0;
@@ -5564,7 +5360,7 @@ var internalHoist = async (graph, options, remover) => {
   const hoistDir = scurry.cwd.resolve(
     "node_modules/.vlt/node_modules"
   );
-  await mkdir3(hoistDir.fullpath(), { recursive: true });
+  await mkdir2(hoistDir.fullpath(), { recursive: true });
   const removes = [];
   for (const entry of await hoistDir.readdir()) {
     const name = entry.name;
@@ -5598,7 +5394,7 @@ var internalHoist = async (graph, options, remover) => {
   for (const [name, { name: nodeName, id }] of links) {
     const target = vlt + sep2 + id + sep2 + "node_modules" + sep2 + native(nodeName);
     const path = hoistPath + sep2 + native(name);
-    symlinkSyncMkdirp(relative3(dirname6(path), target), path, "dir");
+    symlinkSyncMkdirp(relative2(dirname3(path), target), path, "dir");
   }
 };
 var checkExisting = async (name, entry, links, removes, scurry, remover) => {
@@ -5635,7 +5431,7 @@ var rollback = async (remover, diff, scurry) => {
 };
 
 // ../../src/graph/src/reify/update-importers-package-json.ts
-var addOrRemoveDeps = (nodeId, graph, addOrRemove, saveExact, savePrefix) => {
+var addOrRemoveDeps = (nodeId, graph, addOrRemove, saveExact, savePrefix, modifiers) => {
   const node = graph.nodes.get(nodeId);
   if (!node) {
     throw error("Failed to retrieve node", {
@@ -5680,7 +5476,10 @@ var addOrRemoveDeps = (nodeId, graph, addOrRemove, saveExact, savePrefix) => {
       }
       const edge = node.edgesOut.get(name);
       if (!edge?.to) {
-        throw error("Dependency node could not be found");
+        throw error(`Dependency node could not be found: ${name}`, {
+          spec: dep.spec,
+          from: node.location
+        });
       }
       const n = edge.to;
       const [nodeType] = splitDepID(n.id);
@@ -5706,7 +5505,7 @@ var addOrRemoveDeps = (nodeId, graph, addOrRemove, saveExact, savePrefix) => {
       );
       dependencies[name] = saveValue;
       manifestChanged = manifestChanged || saveValue !== existing;
-      if (saveValue !== edge.spec.bareSpec) {
+      if (saveValue !== edge.spec.bareSpec && !modifiers?.targetsImporterEdge(node, dep.spec)) {
         edge.spec = Spec2.parse(name, saveValue, dep.spec.options);
         graph.lockfileStale = true;
       }
@@ -5720,7 +5519,8 @@ var updatePackageJson = ({
   packageJson,
   remove,
   saveExact,
-  savePrefix
+  savePrefix,
+  modifiers
 }) => {
   const manifestsToUpdate = /* @__PURE__ */ new Set();
   const operations = /* @__PURE__ */ new Set([add, remove]);
@@ -5732,7 +5532,8 @@ var updatePackageJson = ({
           graph,
           operation,
           saveExact,
-          savePrefix
+          savePrefix,
+          modifiers
         );
         if (manifest) {
           manifestsToUpdate.add(manifest);
@@ -5768,7 +5569,8 @@ var reify = async (options) => {
       graph,
       packageJson: options.packageJson,
       saveExact: options.saveExact,
-      savePrefix: options.savePrefix
+      savePrefix: options.savePrefix,
+      modifiers: options.modifiers
     }) : void 0
   );
   const noModifiedDependencies = !options.add?.modifiedDependencies && !options.remove?.modifiedDependencies;
@@ -5825,6 +5627,8 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
   if (actions.length) await callLimit(actions, { limit });
   const edgeActions = addEdges(diff, scurry, remover);
   if (edgeActions.length) await callLimit(edgeActions, { limit });
+  const binActions = relinkBins(diff, scurry, remover);
+  if (binActions.length) await callLimit(binActions, { limit });
   await internalHoist(diff.to, options, remover);
   checkNeededBuild({ diff, scurry, packageJson });
   const allowScriptsNodes = await filterNodesByQuery(
@@ -5844,7 +5648,8 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
   const rmActions = deleteNodes(
     diff,
     remover,
-    scurry
+    scurry,
+    options.keepNodes
   );
   if (rmActions.length) await Promise.all(rmActions);
   saveImportersPackageJson?.();
@@ -5866,7 +5671,7 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
 
 // ../../src/graph/src/install.ts
 import { existsSync as existsSync5, rmSync as rmSync3 } from "node:fs";
-import { resolve as resolve9 } from "node:path";
+import { resolve as resolve8 } from "node:path";
 
 // ../../src/graph/src/lockfile/format-options-change.ts
 var redactUserinfo = (value) => {
@@ -5886,7 +5691,7 @@ var formatOptionsChange = ({
 
 // ../../src/graph/src/uninstall.ts
 import { existsSync as existsSync3, rmSync } from "node:fs";
-import { resolve as resolve7 } from "node:path";
+import { resolve as resolve6 } from "node:path";
 var uninstall = async (options, remove) => {
   const allowSkills = options.allowSkills === ":not(*)" ? void 0 : options.allowSkills;
   if (allowSkills) {
@@ -5926,7 +5731,8 @@ var uninstall = async (options, remove) => {
         remove?.modifiedDependencies ? updatePackageJson({
           ...options,
           remove,
-          graph
+          graph,
+          modifiers
         }) : void 0
       );
       saveImportersPackageJson?.();
@@ -5947,7 +5753,7 @@ var uninstall = async (options, remove) => {
     await remover.rollback().catch(() => {
     });
     try {
-      const hiddenLockfile = resolve7(
+      const hiddenLockfile = resolve6(
         options.projectRoot,
         "node_modules/.vlt-lock.json"
       );
@@ -5959,7 +5765,7 @@ var uninstall = async (options, remove) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-YD2TB2VD.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,
@@ -5970,7 +5776,7 @@ var uninstall = async (options, remove) => {
 
 // ../../src/graph/src/update.ts
 import { existsSync as existsSync4, rmSync as rmSync2 } from "node:fs";
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve7 } from "node:path";
 var startingGraph = (options, monorepo) => {
   const fresh = () => new Graph({ ...options, monorepo });
   if (!options.monorepo || !monorepo) return fresh();
@@ -6057,7 +5863,7 @@ var update = async (options) => {
     await remover.rollback().catch(() => {
     });
     try {
-      const hiddenLockfile = resolve8(
+      const hiddenLockfile = resolve7(
         options.projectRoot,
         "node_modules/.vlt-lock.json"
       );
@@ -6069,7 +5875,7 @@ var update = async (options) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-YD2TB2VD.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,
@@ -6169,7 +5975,7 @@ var install = async (options, add) => {
     assertSkillsDirs(options.projectRoot, options.skillsDirs);
   }
   if (options.expectLockfile || options.frozenLockfile) {
-    const lockfilePath = resolve9(options.projectRoot, "vlt-lock.json");
+    const lockfilePath = resolve8(options.projectRoot, "vlt-lock.json");
     if (!existsSync5(lockfilePath)) {
       throw error(
         "vlt-lock.json file is required when using --expect-lockfile, --frozen-lockfile, or ci command",
@@ -6293,7 +6099,7 @@ var install = async (options, add) => {
           `  ${edge.from.location}: ${edge.name} is removed by a graph modifier`
         );
       }
-      const lockfilePath = resolve9(
+      const lockfilePath = resolve8(
         options.projectRoot,
         "vlt-lock.json"
       );
@@ -6328,7 +6134,7 @@ var install = async (options, add) => {
   }
   const remover = new RollbackRemove();
   if (options.cleanInstall) {
-    const nodeModulesPath = resolve9(
+    const nodeModulesPath = resolve8(
       options.projectRoot,
       "node_modules"
     );
@@ -6374,6 +6180,7 @@ var install = async (options, add) => {
           ...options,
           add,
           graph,
+          modifiers,
           remove
         }) : void 0
       );
@@ -6397,7 +6204,7 @@ var install = async (options, add) => {
     await remover.rollback().catch(() => {
     });
     try {
-      const hiddenLockfile = resolve9(
+      const hiddenLockfile = resolve8(
         options.projectRoot,
         "node_modules/.vlt-lock.json"
       );
@@ -6409,7 +6216,7 @@ var install = async (options, add) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-YD2TB2VD.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,
@@ -6430,9 +6237,6 @@ export {
   jsonOutput,
   humanReadableOutput,
   mermaidOutput,
-  findCmdShimIfExists,
-  cmdShim,
-  RollbackRemove,
   GraphModifier,
   init,
   install,