@vltpkg/cli-js 1.4.0 → 1.6.0

package/{chunk-FZUYGJZU.js → chunk-KVWGMSPW.js}

@@ -12,43 +12,47 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   generateDefaultHelp,
   generateFullHelp
-} from "./chunk-QCSUWACA.js";
-import {
-  flush,
-  trackCommand,
-  trackError
-} from "./chunk-G2YT2GWF.js";
+} from "./chunk-LGQVZTYR.js";
 import {
   parseError
-} from "./chunk-5Y4SYLJ2.js";
+} from "./chunk-EYGOEAJM.js";
+import {
+  isLazyView,
+  isViewClass,
+  loadLazyView
+} from "./chunk-4KCU2KZL.js";
+import {
+  sweepPendingRemove
+} from "./chunk-GCTREKA4.js";
+import {
+  globalCommands
+} from "./chunk-MCDLJZXT.js";
 import {
   hasConfiguredRegistry,
   hasNpmRegistry,
   missingNpmRegistryError,
   missingRegistryError
-} from "./chunk-THSYN5EK.js";
+} from "./chunk-7M2VTFLP.js";
 import {
-  isLazyView,
-  isViewClass,
-  loadLazyView
-} from "./chunk-4KCU2KZL.js";
+  defaultView
+} from "./chunk-EFHOWRKU.js";
 import {
   isGraphRunError,
   splitDepID
-} from "./chunk-PLG3OYCX.js";
-import {
-  defaultView
-} from "./chunk-WF6KLKRN.js";
+} from "./chunk-CAV7FKWQ.js";
 import {
   emitter
-} from "./chunk-U7TEQCBN.js";
+} from "./chunk-B6RIGNEO.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
 import {
   isErrorWithCause,
   isObject
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-BF5DRGRZ.js";
+import {
+  error
+} from "./chunk-WZWDS3W4.js";
 
 // ../../src/cli-sdk/src/print-err.ts
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -265,8 +269,11 @@ var printCode = (err, usage, stderr2, format) => {
       return {};
     }
     case "ECONFIG": {
-      const { found, wanted, validOptions } = err.cause;
+      const { found, wanted, validOptions, from } = err.cause;
       stderr2(`Config Error: ${err.message}`);
+      if (from) {
+        stderr2(indent(`From: ${format(from)}`));
+      }
       if (found) {
         stderr2(indent(`Found: ${format(found)}`));
       }
@@ -281,6 +288,105 @@ var printCode = (err, usage, stderr2, format) => {
   }
 };
 
+// ../../src/cli-sdk/src/telemetry.ts
+import { randomUUID } from "node:crypto";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { createRequire } from "node:module";
+var POSTHOG_API_KEY = "phc_k9xCAgC6sPIBLb5UhjhnGWpt1mos0hLV4mmEhZTGPpO";
+var POSTHOG_HOST = "https://us.i.posthog.com";
+var SHUTDOWN_TIMEOUT_MS = 2e3;
+var xdg = new XDG("vlt");
+var isOptedOut = () => process.env.DO_NOT_TRACK === "1" || process.env.VLT_TELEMETRY === "0";
+var getAnonymousId = () => {
+  const dir = xdg.data();
+  const file = xdg.data("telemetry-id");
+  try {
+    const existing = readFileSync2(file, "utf8").trim();
+    if (existing) return existing;
+  } catch {
+  }
+  const id = randomUUID();
+  try {
+    mkdirSync2(dir, { recursive: true });
+    writeFileSync2(file, id + "\n");
+  } catch {
+  }
+  return id;
+};
+var _posthog;
+var _initFailed = false;
+var getClient = () => {
+  if (_posthog) return _posthog;
+  if (_initFailed) return void 0;
+  try {
+    const req = createRequire(import.meta.url);
+    const { PostHog } = req("posthog-node");
+    _posthog = new PostHog(POSTHOG_API_KEY, {
+      host: POSTHOG_HOST,
+      // Buffer up to 20 events and flush every 10 s — but we always
+      // call shutdown at the end so this is just a safety net.
+      flushAt: 20,
+      flushInterval: 1e4
+    });
+    return _posthog;
+  } catch {
+    _initFailed = true;
+    return void 0;
+  }
+};
+var trackCommand = (ev, telemetryFlag) => {
+  if (telemetryFlag === false || isOptedOut()) return;
+  const ph = getClient();
+  if (!ph) return;
+  try {
+    ph.capture({
+      distinctId: getAnonymousId(),
+      event: "cli_command",
+      properties: { ...ev }
+    });
+  } catch {
+  }
+};
+var trackInstall = (ev, telemetryFlag) => {
+  if (telemetryFlag === false || isOptedOut()) return;
+  const ph = getClient();
+  if (!ph) return;
+  try {
+    ph.capture({
+      distinctId: getAnonymousId(),
+      event: "cli_install",
+      properties: { ...ev }
+    });
+  } catch {
+  }
+};
+var trackError = (ev, telemetryFlag) => {
+  if (telemetryFlag === false || isOptedOut()) return;
+  const ph = getClient();
+  if (!ph) return;
+  try {
+    ph.capture({
+      distinctId: getAnonymousId(),
+      event: "cli_error",
+      properties: { ...ev }
+    });
+  } catch {
+  }
+};
+var flush = () => {
+  const ph = _posthog;
+  if (!ph) return Promise.resolve();
+  _posthog = void 0;
+  return Promise.race([
+    ph.shutdown().catch(() => {
+    }),
+    new Promise((r) => {
+      const t = setTimeout(r, SHUTDOWN_TIMEOUT_MS);
+      if (typeof t === "object" && "unref" in t) t.unref();
+    })
+  ]);
+};
+
 // ../../src/cli-sdk/src/output.ts
 import {
   formatWithOptions as formatWithOptions2,
@@ -568,6 +674,16 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
   const telemetryEnabled = conf.values.telemetry;
   const commandName = conf.command;
   try {
+    if (conf.explicit.global && !conf.globalRoot) {
+      throw error(
+        `\`vlt ${conf.command}\` does not support --global`,
+        {
+          code: "EUSAGE",
+          found: conf.command,
+          validOptions: [...globalCommands]
+        }
+      );
+    }
     if (needsRegistry && !hasConfiguredRegistry(conf)) {
       throw missingRegistryError();
     }
@@ -576,6 +692,7 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
         conf.options["default-registry-alias"]
       );
     }
+    if (conf.globalRoot) await sweepPendingRemove(conf.globalRoot);
     const output = await onDone(await command(conf));
     stopRequestLog();
     const duration_ms = Date.now() - start;
@@ -641,6 +758,7 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
 
 export {
   indent,
+  trackInstall,
   stdout,
   stderr,
   flushAndExit,

package/{chunk-TO23PR7J.js → chunk-LCLRP64K.js}

@@ -13,24 +13,26 @@ import {
   Qn
 } from "./chunk-SRWDPPLX.js";
 import {
-  Monorepo,
-  PackageJson,
   clone,
   pickManifest,
   resolve,
   revs
-} from "./chunk-I7UMHYZX.js";
+} from "./chunk-EMTGRCSE.js";
+import {
+  Monorepo,
+  PackageJson
+} from "./chunk-TQQO2F56.js";
 import {
   Spec
-} from "./chunk-5IJTPZXP.js";
+} from "./chunk-6D3QAFNZ.js";
 import {
   registryErrorMessage,
   storeRoot,
   tokenRefusalAdvice
-} from "./chunk-SR2VOY5J.js";
+} from "./chunk-4GMNWW4C.js";
 import {
   logRequest
-} from "./chunk-U7TEQCBN.js";
+} from "./chunk-B6RIGNEO.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -39,7 +41,7 @@ import {
   brotliTarballUrl,
   integrityHex,
   tarballFormat
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -336,7 +338,7 @@ var PackageInfoClient = class {
   }
   async getRegistryClient() {
     if (this.#registryClient) return this.#registryClient;
-    this.#registryClientPromise ??= import("./src-I3GMULFP.js").then(({ RegistryClient }) => {
+    this.#registryClientPromise ??= import("./src-QO5G2S4O.js").then(({ RegistryClient }) => {
       this.#registryClient = new RegistryClient(this.options);
       return this.#registryClient;
     });
@@ -375,7 +377,7 @@ var PackageInfoClient = class {
   }
   async getTarPool() {
     if (this.#tarPool) return this.#tarPool;
-    this.#tarPoolPromise ??= import("./src-LUTN2ODD.js").then(
+    this.#tarPoolPromise ??= import("./src-W2VQULRG.js").then(
       ({ Pool }) => {
         this.#tarPool = new Pool();
         return this.#tarPool;
@@ -591,7 +593,7 @@ var PackageInfoClient = class {
       }
       case "remote": {
         const rc = await this.getRegistryClient();
-        const { CacheEntry: Entry, cacheKey } = await import("./src-I3GMULFP.js");
+        const { CacheEntry: Entry, cacheKey } = await import("./src-QO5G2S4O.js");
         const key = cacheKey("GET", new URL(r.resolved));
         const unzipped = (entry) => {
           try {
@@ -656,7 +658,7 @@ var PackageInfoClient = class {
         r.integrity = found;
         const buf = response.buffer();
         try {
-          await (await this.getTarPool()).unpack(buf, target);
+          await (await this.getTarPool()).unpack(buf, target, tarballFormat(r.resolved));
         } catch (er) {
           throw this.#resolveError(
             spec,
@@ -1199,7 +1201,7 @@ var PackageInfoClient = class {
           const buf = response.buffer();
           const integrity = storedIntegrity(response);
           try {
-            await (await this.getTarPool()).unpack(buf, dir);
+            await (await this.getTarPool()).unpack(buf, dir, tarballFormat(remoteURL));
           } catch (er) {
             throw this.#resolveError(
               s,

package/{chunk-QCSUWACA.js → chunk-LGQVZTYR.js}

@@ -12,43 +12,12 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   source_default
 } from "./chunk-WGDTG44V.js";
+import {
+  loadPackageJson
+} from "./chunk-E74WGW5C.js";
 import {
   commandAliases
-} from "./chunk-WF6KLKRN.js";
-
-// ../../node_modules/.vlt/~npm~package-json-from-dist@1.0.1/node_modules/package-json-from-dist/dist/esm/index.js
-import { readFileSync } from "node:fs";
-import { dirname, resolve, sep } from "node:path";
-import { fileURLToPath } from "node:url";
-var NM = `${sep}node_modules${sep}`;
-var STORE = `.store${sep}`;
-var PKG = `${sep}package${sep}`;
-var DIST = `${sep}dist${sep}`;
-var findPackageJson = (from, pathFromSrc = "../package.json") => {
-  const f = typeof from === "object" || from.startsWith("file://") ? fileURLToPath(from) : from;
-  const __dirname = dirname(f);
-  const nms = __dirname.lastIndexOf(NM);
-  if (nms !== -1) {
-    const nm = __dirname.substring(0, nms + NM.length);
-    const pkgDir = __dirname.substring(nms + NM.length);
-    if (pkgDir.startsWith(STORE)) {
-      const pkg = pkgDir.indexOf(PKG, STORE.length);
-      if (pkg) {
-        return resolve(nm, pkgDir.substring(0, pkg + PKG.length), "package.json");
-      }
-    }
-    const pkgName = pkgDir.startsWith("@") ? pkgDir.split(sep, 2).join(sep) : String(pkgDir.split(sep)[0]);
-    return resolve(nm, pkgName, "package.json");
-  } else {
-    const d = __dirname.lastIndexOf(DIST);
-    if (d !== -1) {
-      return resolve(__dirname.substring(0, d), "package.json");
-    } else {
-      return resolve(__dirname, pathFromSrc);
-    }
-  }
-};
-var loadPackageJson = (from, pathFromSrc = "../package.json") => JSON.parse(readFileSync(findPackageJson(from, pathFromSrc), "utf8"));
+} from "./chunk-EFHOWRKU.js";
 
 // ../../src/cli-sdk/src/custom-help.ts
 var { version } = loadPackageJson(
@@ -227,6 +196,10 @@ var commandHelp = {
     desc: "Configure your vlt.io account registries",
     defaultOrder: 0
   },
+  skills: {
+    args: "[list|link]",
+    desc: "Manage agent skills from installed packages"
+  },
   token: {
     args: "[add|rm]",
     desc: "Manage authentication tokens"
@@ -403,7 +376,6 @@ ${s("dim", `Run \`vlt help <command>\` for detailed information about a specific
 };
 
 export {
-  loadPackageJson,
   generateDefaultHelp,
   generateFullHelp
 };

package/{chunk-5RHABCYI.js → chunk-LP3ORD3D.js}

@@ -11,15 +11,17 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-TO23PR7J.js";
+} from "./chunk-LCLRP64K.js";
 import {
   Monorepo,
   PackageJson,
-  PathScurry
-} from "./chunk-I7UMHYZX.js";
+  PathScurry,
+  workspaceCache
+} from "./chunk-TQQO2F56.js";
 import {
-  resetCaches
-} from "./chunk-PLG3OYCX.js";
+  ensureGlobalProject,
+  globalCommands
+} from "./chunk-MCDLJZXT.js";
 import {
   commands,
   defaultValues,
@@ -28,16 +30,20 @@ import {
   isRecordField,
   recordFields,
   storeLinkers
-} from "./chunk-WF6KLKRN.js";
+} from "./chunk-EFHOWRKU.js";
+import {
+  resetCaches
+} from "./chunk-CAV7FKWQ.js";
 import {
   find,
   load,
   reload,
-  save
+  save,
+  unload
 } from "./chunk-HTOTG4TS.js";
 import {
   storeRoot
-} from "./chunk-SR2VOY5J.js";
+} from "./chunk-4GMNWW4C.js";
 import {
   cloneAvailable
 } from "./chunk-6IF3RJND.js";
@@ -51,14 +57,15 @@ import {
   getOptions,
   isObject,
   isRecordStringString
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
 
 // ../../src/cli-sdk/src/config/index.ts
 import { readFile, rm, writeFile } from "node:fs/promises";
-import { dirname } from "node:path";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, resolve } from "node:path";
 
 // ../../src/cli-sdk/src/config/merge.ts
 var merge = (base, add) => Object.fromEntries(
@@ -252,6 +259,7 @@ var recordsToPairs = (obj) => {
 };
 var kRecord = /* @__PURE__ */ Symbol("parsed key=value record");
 var envKey = (k) => `VLT_${k.replace(/[^a-zA-Z0-9]+/g, "_").toUpperCase()}`;
+var expandHome = (p) => p.replace(/^~(?=$|[\\/])/, homedir());
 var kParentEnv = "__VLT_INTERNAL_EXPLICIT";
 var parentEnv = () => {
   try {
@@ -292,7 +300,9 @@ var Config = class _Config {
     if (this.#options) return this.#options;
     const scurry = new PathScurry(this.projectRoot);
     const packageJson = new PackageJson();
-    const asRecords = pairsToRecords(this.parse().values);
+    const { path: _, ...asRecords } = pairsToRecords(
+      this.parse().values
+    );
     const extras = {
       projectRoot: this.projectRoot,
       signal: this.#abort.signal,
@@ -350,6 +360,7 @@ var Config = class _Config {
     this.projectRoot = projectRoot;
     this.#options = void 0;
     resetCaches();
+    workspaceCache.clear();
   }
   // memoized options() getter value
   #options;
@@ -376,6 +387,28 @@ var Config = class _Config {
    * `~/projects/xyz`, then the highest dir it will check is `~/projects`
    */
   projectRoot;
+  /**
+   * Global project root, set when `--global` switched to it.
+   */
+  globalRoot;
+  /**
+   * `--global-bin-dir` from cli, env or user config, set with
+   * `globalRoot`.
+   */
+  globalBinDir;
+  // the global project of the `setup` wizard, not switched to
+  #setupGlobal;
+  /**
+   * The global project (`--global-dir`, `--global-bin-dir`: cli > env >
+   * user config, never a project `vlt.json`): the one switched to by
+   * `--global`, or the one `vlt setup` offers PATH setup for.
+   */
+  globalProject() {
+    if (this.globalRoot) {
+      return { root: this.globalRoot, binDir: this.globalBinDir };
+    }
+    return this.#setupGlobal;
+  }
   /**
    * `Record<alias, canonical name>` to dereference command aliases.
    */
@@ -399,6 +432,10 @@ var Config = class _Config {
     const badLinker = process.env.VLT_STORE_LINKER;
     const fixLinker = badLinker !== void 0 && !storeLinkers.includes(badLinker);
     if (fixLinker) process.env.VLT_STORE_LINKER = "unpack";
+    const noModifyPath = process.env.VLT_NO_MODIFY_PATH;
+    if (noModifyPath !== void 0) {
+      process.env.VLT_NO_MODIFY_PATH = noModifyPath === "" || noModifyPath === "0" ? "0" : "1";
+    }
     const envKeys = Object.keys(defaultValues).filter(
       (k) => process.env[envKey(k)] !== void 0
     );
@@ -447,7 +484,20 @@ var Config = class _Config {
     if (cmdOrFallback !== "config") {
       assertSpecAliases(pairsToRecords(p.values));
     }
+    const binDirKey = envKey("global-bin-dir");
+    const keepBinDir = !this.globalRoot && !cliKeys.includes("global-bin-dir");
+    const binDirEnv = process.env[binDirKey];
     this.jack.writeEnv(p);
+    delete process.env[envKey("global")];
+    if (this.globalRoot) {
+      process.env[envKey("global-dir")] = this.globalRoot;
+      if (this.globalBinDir)
+        process.env[binDirKey] = this.globalBinDir;
+      else delete process.env[binDirKey];
+    } else if (keepBinDir) {
+      if (binDirEnv === void 0) delete process.env[binDirKey];
+      else process.env[binDirKey] = binDirEnv;
+    }
     process.env[kParentEnv] = JSON.stringify({
       explicit,
       env: Object.fromEntries(
@@ -724,13 +774,89 @@ var Config = class _Config {
   /**
    * Find the local config file and load both it and the user-level config in
    * the XDG config home.
+   *
+   * When `args` select a `--global` command, the global project is used
+   * instead of the current one.
    */
-  async loadConfigFile() {
+  async loadConfigFile(args) {
     await this.#maybeLoadConfigFile("user");
+    const g = args && this.#globalProject(args);
+    if (g?.switch) {
+      const { root } = g;
+      try {
+        ensureGlobalProject(root);
+      } catch (cause) {
+        throw error("Could not create the global project", {
+          code: "ECONFIG",
+          found: root,
+          cause
+        });
+      }
+      this.globalBinDir = g.binDir;
+      unload("project");
+      this.globalRoot = this.projectRoot = root;
+    } else if (g) {
+      this.#setupGlobal = { root: g.root, binDir: g.binDir };
+    }
     this.projectRoot = dirname(find("project", this.projectRoot));
     await this.#maybeLoadConfigFile("project");
     return this;
   }
+  // global project if `args` run a global command with --global, or
+  // `setup`. cli > env > user config, project config is not loaded yet.
+  // `switch`: use it as the project (not for the setup wizard)
+  #globalProject(args) {
+    const { values, positionals } = this.jack.parseRaw(args);
+    const cmd = getCommand(positionals[0]);
+    if (values.help || !cmd) return;
+    const setup = cmd === "setup";
+    if (!setup && !globalCommands.has(cmd)) return;
+    if (!setup) {
+      const env = process.env[envKey("global")];
+      const global = values.global ?? (env !== void 0 ? env === "1" : this.#defaults().global === true);
+      if (!global) return;
+    }
+    return {
+      root: this.#globalDir(values["global-dir"]),
+      binDir: this.#globalBinDir(args),
+      switch: !setup || values.path === true
+    };
+  }
+  #globalDir(cli) {
+    const dir = cli || process.env[envKey("global-dir")];
+    if (dir) return resolve(expandHome(dir));
+    const user = expandHome(
+      String(
+        this.#defaults()["global-dir"] || defaultValues["global-dir"]
+      )
+    );
+    if (!isAbsolute(user)) {
+      throw error("global-dir in the user config must be absolute", {
+        code: "ECONFIG",
+        found: user
+      });
+    }
+    return resolve(user);
+  }
+  // cli > env > user config, like `#globalProject`
+  #globalBinDir(args) {
+    const { values } = this.jack.parseRaw(args);
+    const dir = values["global-bin-dir"] || process.env[envKey("global-bin-dir")];
+    if (dir) return resolve(expandHome(dir));
+    const user = this.#defaults()["global-bin-dir"];
+    if (typeof user !== "string" || !user) return;
+    const p = expandHome(user);
+    if (!isAbsolute(p)) {
+      throw error(
+        "global-bin-dir in the user config must be absolute",
+        {
+          code: "ECONFIG",
+          found: p
+        }
+      );
+    }
+    return resolve(p);
+  }
   /**
    * Clear cached config values to force re-reading from updated files.
    * @internal
@@ -748,9 +874,9 @@ var Config = class _Config {
     this.values = void 0;
     this.positionals = void 0;
     this.command = void 0;
-    const { unload } = await import("./src-JC3ZUYWO.js");
-    unload("user");
-    unload("project");
+    const { unload: unload2 } = await import("./src-JC3ZUYWO.js");
+    unload2("user");
+    unload2("project");
     await this.#maybeLoadConfigFile("user");
     await this.#maybeLoadConfigFile("project");
     this.parse(this.#originalArgs);
@@ -763,10 +889,10 @@ var Config = class _Config {
    * Load the configuration and return a Promise to a
    * {@link Config} object
    */
-  static async load(projectRoot = process.cwd(), argv = process.argv, reload2 = false) {
+  static async load(projectRoot = process.cwd(), argv = process.argv, reload2 = false, allowGlobal = true) {
     if (this.#loaded && !reload2) return this.#loaded;
     const a = new _Config(definition, projectRoot);
-    const b = await a.loadConfigFile();
+    const b = await a.loadConfigFile(allowGlobal ? argv : void 0);
     this.#loaded = b.parse(argv);
     return this.#loaded;
   }