@vltpkg/cli-js 1.5.0 → 1.6.1

package/{skills-YD2TB2VD.js → skills-7PYMTDER.js}

@@ -10,6 +10,7 @@ globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
+  editGitignore,
   filterNodesByQueryParts,
   load2 as load,
   lstat,
@@ -22,21 +23,23 @@ import {
   skillsDirs,
   unmountSkill,
   unshare
-} from "./chunk-2U4PVHP4.js";
-import "./chunk-SMXXFQPI.js";
-import "./chunk-C6ZVVEFV.js";
+} from "./chunk-C4RJ4NNS.js";
+import "./chunk-AHLBPSGQ.js";
+import {
+  Monorepo
+} from "./chunk-KURQHX54.js";
 import {
   splitDepID
-} from "./chunk-F7NPYSI2.js";
-import "./chunk-LUVDMEW4.js";
+} from "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-G3FZ2ZJK.js";
+import "./chunk-M242QVJS.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   parse
-} from "./chunk-6LZM3I4Q.js";
+} from "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 
@@ -144,6 +147,7 @@ var scan = (dir, pkgName) => {
   return found;
 };
 var rank = (node) => {
+  if (node.importer) return 0;
   let r = 2;
   for (const { from } of node.edgesIn) {
     if (from.mainImporter) return 0;
@@ -163,7 +167,7 @@ var aliasOf = (node) => {
   const n = (edges.find((e) => e.from.mainImporter) ?? edges.find((e) => e.from.importer))?.name;
   return n === node.name ? void 0 : n;
 };
-var scannable = (node) => !node.importer && node.inVltStore() && splitDepID(node.id)[0] !== "file";
+var scannable = (node) => node.importer ? !node.mainImporter : node.inVltStore() && splitDepID(node.id)[0] !== "file";
 var shipsSkills = (node) => scannable(node) && scan(realOr(resolve(node.projectRoot, node.location)), node.name).length > 0;
 var discoverSkills = (nodes, scurry, mounts = []) => {
   const key = (name, path) => `${lc(name)}\0${norm(path)}`;
@@ -220,49 +224,6 @@ var discoverSkills = (nodes, scurry, mounts = []) => {
   return { skills, scanned };
 };
 
-// ../../src/graph/src/skills/gitignore.ts
-import { lstatSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
-import { join } from "node:path";
-var GITIGNORE_BEGIN = "# >>> vlt agent skills (links into node_modules)";
-var GITIGNORE_END = "# <<< vlt agent skills";
-var sorted = (names) => [...names].sort((a, b) => a.localeCompare(b, "en")).map((n) => `/${n}`);
-var update = (file, { add, remove }) => {
-  const st = lstatSync(file, { throwIfNoEntry: false });
-  if (st && !st.isFile()) return "refused";
-  const text = st ? readFileSync2(file, "utf8") : "";
-  const eol = text.includes("\r\n") ? "\r\n" : "\n";
-  const lines = text.split(eol);
-  const begin = lines.findIndex((l) => l.trim() === GITIGNORE_BEGIN);
-  const end = lines.findIndex(
-    (l, i) => begin !== -1 && i > begin && l.trim() === GITIGNORE_END
-  );
-  let out;
-  if (end === -1) {
-    if (!add.length) return "ok";
-    out = (text && !text.endsWith(eol) ? text + eol : text) + [GITIGNORE_BEGIN, ...sorted(add), GITIGNORE_END].join(eol) + eol;
-  } else {
-    const rm = new Set(sorted(remove));
-    const block = lines.slice(begin + 1, end).filter((l) => !rm.has(l.trim()));
-    const have = new Set(block.map((l) => l.trim()));
-    lines.splice(
-      begin + 1,
-      end - begin - 1,
-      ...block,
-      ...sorted(add).filter((l) => !have.has(l))
-    );
-    out = lines.join(eol);
-  }
-  if (out !== text) writeFileSync(file, out);
-  return "ok";
-};
-var editGitignore = (dir, edit) => {
-  try {
-    return update(join(dir, ".gitignore"), edit);
-  } catch {
-    return "refused";
-  }
-};
-
 // ../../src/graph/src/skills/mask.ts
 var escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 var globRegExp = (pattern) => new RegExp(`^${pattern.split("*").map(escape).join(".*")}$`, "i");
@@ -316,6 +277,17 @@ var dirsOf = (o, create = false) => skillsDirs({
   env: o.env,
   create
 });
+var workspaceDirs = (graph, scurry) => [...graph.importers].filter((n) => !n.mainImporter).map((n) => ({
+  id: n.id,
+  path: realOr(n.resolvedLocation(scurry))
+}));
+var allWorkspaces = (m) => m ? [
+  ...Monorepo.load(m.projectRoot, {
+    config: m.config,
+    scurry: m.scurry,
+    packageJson: m.packageJson
+  }).values()
+].map((ws) => ({ id: ws.id, path: realOr(ws.fullpath) })) : [];
 var liveOwners = (mounts) => mounts.flatMap(
   (m) => m.owner && existsSync(m.target) ? [m.owner] : []
 );
@@ -347,7 +319,11 @@ var report = (dropped, unscanned) => unscanned && dropped.length ? {
 var listSkills = async (o) => {
   const { graph, nodes, parts, unscanned } = await selectNodes(o);
   const { targets, scan: scan2, skipped } = dirsOf(o);
-  const { skills } = discoverSkills(nodes, o.scurry, readMounts(scan2));
+  const { skills } = discoverSkills(
+    nodes,
+    o.scurry,
+    readMounts(scan2, { workspaces: workspaceDirs(graph, o.scurry) })
+  );
   const { picked, dropped } = pick(skills, parts, unscanned);
   return {
     project: graph.mainImporter.name,
@@ -375,7 +351,8 @@ var linkSkills = async (o) => {
     conflicts: [],
     dirs: targets.map((d) => d.dir)
   };
-  const mounts = readMounts(scan2);
+  const workspaces = workspaceDirs(graph, o.scurry);
+  const mounts = readMounts(scan2, { workspaces });
   const byName = new Map(
     mounts.map((m) => [`${m.dir.dir}\0${lc2(m.name)}`, m])
   );
@@ -431,7 +408,9 @@ var linkSkills = async (o) => {
   const gone = [];
   const foreign = [];
   const kept = /* @__PURE__ */ new Set();
+  const made = /* @__PURE__ */ new Set();
   const where = /* @__PURE__ */ new Map();
+  let every;
   for (const { dir, winner, losers, m } of picks) {
     if (winner) {
       if (m && m.name !== winner.skill) {
@@ -439,10 +418,16 @@ var linkSkills = async (o) => {
         gone.push(m);
       }
       const mount = `${dir.dir}/${winner.skill}`;
-      const r = mountSkill(winner, dir);
+      const r = mountSkill(winner, dir, m?.name === winner.skill);
+      if (r === "linked") made.add(mount);
       if (r === "conflict") {
         res.conflicts.push(mount);
-        foreign.push({ dir, name: winner.skill });
+        every ??= allWorkspaces(o.monorepo);
+        if (!readMounts([dir], { workspaces: every }).some(
+          (l) => l.name === winner.skill
+        )) {
+          foreign.push({ dir, name: winner.skill });
+        }
       } else {
         const k = `${winner.id}\0${winner.skill}`;
         const linked = where.get(k) ?? [];
@@ -455,7 +440,7 @@ var linkSkills = async (o) => {
     for (const s of losers)
       res.conflicts.push(`${dir.dir}/${s.skill} (${label(s)})`);
   }
-  const after = readMounts(scan2);
+  const after = readMounts(scan2, { workspaces, made });
   const present = [];
   for (const m of after) {
     if (o.apply ? kept.has(m.mount) : !stale(m)) {

package/{skills-LR6GXW3X.js → skills-YMMV6TMN.js}

@@ -11,21 +11,21 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   mermaidOutput
-} from "./chunk-4UH3KMTD.js";
+} from "./chunk-ZJE3OTP3.js";
 import {
   assertQuery,
   linkSkills,
   listSkills
-} from "./chunk-2U4PVHP4.js";
-import "./chunk-SMXXFQPI.js";
+} from "./chunk-C4RJ4NNS.js";
+import "./chunk-AHLBPSGQ.js";
 import {
   styleTextStdout
-} from "./chunk-WHWPAYZY.js";
-import "./chunk-X6JKMIOU.js";
-import "./chunk-4TSHLSRK.js";
+} from "./chunk-MSWOR3FV.js";
+import "./chunk-LGQVZTYR.js";
+import "./chunk-EYGOEAJM.js";
 import {
   commandUsage
-} from "./chunk-CW56EJIL.js";
+} from "./chunk-HT6FS4VB.js";
 import {
   configLabel,
   savedLine,
@@ -35,20 +35,24 @@ import {
 } from "./chunk-W4T5CGCO.js";
 import {
   configWriteTarget
-} from "./chunk-XCQCYB6G.js";
-import "./chunk-VR7NRWAD.js";
+} from "./chunk-AEVT3CHK.js";
+import "./chunk-IHERL3TA.js";
 import "./chunk-SRWDPPLX.js";
-import "./chunk-IFEZ6BFV.js";
-import "./chunk-C6ZVVEFV.js";
+import "./chunk-JV5XR5JQ.js";
+import "./chunk-EMTGRCSE.js";
+import "./chunk-KURQHX54.js";
 import "./chunk-4KCU2KZL.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-UZ6ICZE3.js";
-import "./chunk-CMLDLZZ3.js";
-import "./chunk-F7NPYSI2.js";
-import "./chunk-LUVDMEW4.js";
+import "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-G3FZ2ZJK.js";
-import "./chunk-5KW6AOTT.js";
+import "./chunk-M242QVJS.js";
+import "./chunk-4GMNWW4C.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
@@ -57,7 +61,7 @@ import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   asError
-} from "./chunk-6LZM3I4Q.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -154,9 +158,8 @@ var usage = () => commandUsage({
       \`.agents/skills\`, plus \`<folder>/skills\` for each agent folder
       at the project root (e.g. \`.claude/\`), or the \`skills-dir\`
       config. When packages ship skills with the same name, one is
-      linked and the others are reported. Only links made by vlt
-      (pointing into \`node_modules/.vlt\`) are ever replaced or
-      removed; anything else in the way is skipped.
+      linked and the others are reported. Only links made by vlt are
+      ever replaced or removed; anything else in the way is skipped.
 
       Use --target or a query after the subcommand to select packages
       using DSS query syntax. End a selector with

package/{src-34D4DOOH.js → src-2ZS4VHJP.js}

@@ -11,47 +11,52 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   loadCommand
-} from "./chunk-T2VBCUF5.js";
+} from "./chunk-N3V6EK5I.js";
 import {
   flushAndExit,
   indent,
   outputCommand,
   stderr,
   stdout
-} from "./chunk-WHWPAYZY.js";
-import {
-  loadPackageJson
-} from "./chunk-X6JKMIOU.js";
+} from "./chunk-MSWOR3FV.js";
+import "./chunk-LGQVZTYR.js";
 import {
   asRootError,
   findRootError
-} from "./chunk-4TSHLSRK.js";
+} from "./chunk-EYGOEAJM.js";
 import {
   Config
-} from "./chunk-XCQCYB6G.js";
-import "./chunk-VR7NRWAD.js";
+} from "./chunk-AEVT3CHK.js";
+import "./chunk-IHERL3TA.js";
 import "./chunk-SRWDPPLX.js";
-import "./chunk-IFEZ6BFV.js";
+import "./chunk-EMTGRCSE.js";
 import {
   setVltJsonOnly
-} from "./chunk-C6ZVVEFV.js";
+} from "./chunk-KURQHX54.js";
 import "./chunk-4KCU2KZL.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-UZ6ICZE3.js";
+import {
+  loadPackageJson
+} from "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
 import {
   getSortedCliOptions,
   getSortedKeys
-} from "./chunk-CMLDLZZ3.js";
-import "./chunk-F7NPYSI2.js";
-import "./chunk-LUVDMEW4.js";
+} from "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-5KW6AOTT.js";
+import "./chunk-4GMNWW4C.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-6IF3RJND.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import {
+  isError
+} from "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 
@@ -67,7 +72,7 @@ var loadVlt = async (cwd, argv) => {
   } catch (e) {
     const code = findRootError(e, { code: "ECONFIG" }) ? "ECONFIG" : "JACKSPEAK";
     const err = asRootError(e, { code });
-    const { found, path, wanted, name } = err.cause;
+    const { found, path, wanted, name, cause } = err.cause;
     const isConfigFile = typeof path === "string";
     const msg = isConfigFile ? `Problem in Config File ${path}` : code === "ECONFIG" ? "Config Error" : "Invalid Option Flag";
     const validOptions = wanted || code === "ECONFIG" ? void 0 : isConfigFile ? getSortedKeys() : getSortedCliOptions();
@@ -82,6 +87,7 @@ var loadVlt = async (cwd, argv) => {
       );
     }
     if (wanted) stderr(indent(`Wanted: ${format(wanted)}`));
+    if (isError(cause)) stderr(indent(`Cause: ${cause.message}`));
     if (validOptions) {
       stderr(indent("Valid Options:"));
       stderr(indent(validOptions.join("\n"), 4));
@@ -105,7 +111,7 @@ var run = async () => {
   }
   setVltJsonOnly(vlt.command === "ci");
   const { monorepo } = vlt.options;
-  if (vlt.get("workspace") === void 0) {
+  if (vlt.get("workspace") === void 0 && !vlt.globalRoot) {
     const ws = monorepo?.get(cwd);
     if (ws) {
       vlt.values.workspace = [ws.path];
@@ -130,7 +136,7 @@ var run = async () => {
     return flushAndExit(process.exitCode || 1);
   }
   if (vlt.command === "registry") {
-    const { dispatchRegistry } = await import("./registry-6HKQYSZX.js");
+    const { dispatchRegistry } = await import("./registry-ZGGWVLBM.js");
     await dispatchRegistry(vlt);
   }
   const command = await loadCommand(vlt.command);

package/{src-H6DFCAPH.js → src-A5ZJNOHN.js}

@@ -14,6 +14,7 @@ import {
   RegistryClient,
   cacheKey,
   clearRuntimeTokens,
+  defaultRegistryKey,
   deleteToken,
   getKC,
   getToken,
@@ -28,23 +29,23 @@ import {
   runtimeTokens,
   setRuntimeToken,
   setToken
-} from "./chunk-35EG6T3J.js";
+} from "./chunk-Q2UEILN6.js";
 import "./chunk-QNHBAGXQ.js";
 import {
   userAgent
-} from "./chunk-G3FZ2ZJK.js";
+} from "./chunk-M242QVJS.js";
 import {
   assertOk,
   registryErrorMessage,
   requestError,
   storeRoot
-} from "./chunk-5KW6AOTT.js";
+} from "./chunk-4GMNWW4C.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 export {
@@ -53,6 +54,7 @@ export {
   assertOk,
   cacheKey,
   clearRuntimeTokens,
+  defaultRegistryKey,
   deleteToken,
   getKC,
   getToken,

package/{src-LHDC4NJO.js → src-W2VQULRG.js}

@@ -28,7 +28,7 @@ import {
   unpackSync,
   unpackToStoreSync,
   verifyStoreEntry
-} from "./chunk-ISAMD2FE.js";
+} from "./chunk-N6HV7JWC.js";
 import {
   cloneAvailable,
   cloneDir
@@ -37,7 +37,7 @@ import {
   rimrafSync
 } from "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 

package/{token-OF63PFTQ.js → token-YKHELNVQ.js}

@@ -11,12 +11,12 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   commandUsage
-} from "./chunk-CW56EJIL.js";
+} from "./chunk-HT6FS4VB.js";
 import {
   requireRegistry
-} from "./chunk-UZ6ICZE3.js";
-import "./chunk-CMLDLZZ3.js";
-import "./chunk-LUVDMEW4.js";
+} from "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-6D3QAFNZ.js";
 import {
   RegistryClient,
   deleteToken,
@@ -25,16 +25,16 @@ import {
   normalizeRegistryKey,
   registryBase,
   setToken
-} from "./chunk-35EG6T3J.js";
+} from "./chunk-Q2UEILN6.js";
 import "./chunk-QNHBAGXQ.js";
-import "./chunk-G3FZ2ZJK.js";
-import "./chunk-5KW6AOTT.js";
+import "./chunk-M242QVJS.js";
+import "./chunk-4GMNWW4C.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -169,7 +169,8 @@ var views = {
 var listTokens = async (rc, registry, identity, alias) => {
   const localTok = await getToken(
     normalizeRegistryKey(registry),
-    identity
+    identity,
+    rc.defaultRegistryKey
   );
   if (!localTok) {
     return { registry, alias, tokens: [] };

package/{uninstall-B54FQ5KQ.js → uninstall-Q46HWR5S.js}

@@ -11,32 +11,48 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   parseRemoveArgs
-} from "./chunk-CS6AYPY5.js";
+} from "./chunk-BQMHDAYL.js";
 import {
   uninstall
-} from "./chunk-4UH3KMTD.js";
-import "./chunk-2U4PVHP4.js";
-import "./chunk-SMXXFQPI.js";
+} from "./chunk-ZJE3OTP3.js";
+import "./chunk-C4RJ4NNS.js";
+import "./chunk-AHLBPSGQ.js";
 import {
   commandUsage
-} from "./chunk-CW56EJIL.js";
-import "./chunk-IFEZ6BFV.js";
-import "./chunk-C6ZVVEFV.js";
+} from "./chunk-HT6FS4VB.js";
+import {
+  deferSelfRemove,
+  refuseSelfUninstall,
+  runningStoreDep
+} from "./chunk-DXED4ARV.js";
+import {
+  assertGlobalOptions,
+  parseGlobalRemoveArgs,
+  removeGlobalPackages,
+  resolveGlobalBinDir
+} from "./chunk-O6MQ7NN6.js";
+import "./chunk-BH5CVXNY.js";
+import "./chunk-JV5XR5JQ.js";
+import "./chunk-EMTGRCSE.js";
+import "./chunk-KURQHX54.js";
 import {
   lazyView
 } from "./chunk-4KCU2KZL.js";
-import "./chunk-UZ6ICZE3.js";
-import "./chunk-CMLDLZZ3.js";
-import "./chunk-F7NPYSI2.js";
-import "./chunk-LUVDMEW4.js";
+import "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-G3FZ2ZJK.js";
+import "./chunk-M242QVJS.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 
@@ -63,29 +79,49 @@ var usage = () => commandUsage({
     "allow-scripts": {
       value: "<query>",
       description: "Filter which packages are allowed to run lifecycle scripts using DSS query syntax."
+    },
+    global: {
+      description: "Uninstall global packages, removing their workspace and bins."
     }
   }
 });
 var views = {
-  json: (i) => i.graph.toJSON(),
+  json: (i) => "graph" in i ? i.graph.toJSON() : { self: i.self },
   human: lazyView(
-    async () => (await import("./reporter-UYVR2WMB.js")).InstallReporter
+    async () => (await import("./reporter-SNSM2TDC.js")).InstallReporter
   )
 };
 var command = async (conf) => {
+  if (conf.globalRoot) {
+    assertGlobalOptions(conf);
+    const refused = await refuseSelfUninstall(conf);
+    if (refused) return { self: refused };
+  }
   const { monorepo, scurry } = conf.options;
-  const { remove } = parseRemoveArgs(conf, scurry, monorepo);
+  const global = conf.globalRoot ? parseGlobalRemoveArgs(conf) : void 0;
+  const binDir = global ? await resolveGlobalBinDir(conf).catch(() => void 0) : void 0;
+  const { remove } = global ?? parseRemoveArgs(conf, scurry, monorepo);
   const allowScripts = conf.get("allow-scripts") ? String(conf.get("allow-scripts")) : ":not(*)";
+  const keep = conf.globalRoot ? await runningStoreDep(conf.globalRoot) : void 0;
   const { graph, skills } = await uninstall(
     {
       ...conf.options,
       allowScripts,
       allowSkills: conf.get("allow-skills"),
       skillsDirs: conf.get("skills-dir"),
-      lockfileOnly: conf.options["lockfile-only"]
+      lockfileOnly: conf.options["lockfile-only"],
+      ...keep ? { keepNodes: /* @__PURE__ */ new Set([keep]) } : null
     },
     remove
   );
+  if (global) {
+    await deferSelfRemove(conf.projectRoot, graph, keep);
+    await removeGlobalPackages(
+      conf.projectRoot,
+      global.dirs,
+      binDir?.dir ?? conf.globalBinDir
+    );
+  }
   return { graph, ...skills ? { skills } : null };
 };
 export {

package/{unpublish-CSHIGMDQ.js → unpublish-LBANPSJ5.js}

@@ -14,30 +14,30 @@ import {
 } from "./chunk-HOF7LEIC.js";
 import {
   commandUsage
-} from "./chunk-CW56EJIL.js";
+} from "./chunk-HT6FS4VB.js";
 import {
   resolveRegistry
-} from "./chunk-UZ6ICZE3.js";
-import "./chunk-CMLDLZZ3.js";
+} from "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
 import {
   Spec
-} from "./chunk-LUVDMEW4.js";
+} from "./chunk-6D3QAFNZ.js";
 import {
   RegistryClient,
   registryBase
-} from "./chunk-35EG6T3J.js";
+} from "./chunk-Q2UEILN6.js";
 import "./chunk-QNHBAGXQ.js";
-import "./chunk-G3FZ2ZJK.js";
+import "./chunk-M242QVJS.js";
 import {
   assertOk,
   requestError
-} from "./chunk-5KW6AOTT.js";
+} from "./chunk-4GMNWW4C.js";
 import "./chunk-SUU2WETN.js";
 import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-6LZM3I4Q.js";
+import "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";