@penvhq/launcher 0.11.0 → 0.13.0

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   httpFetcher,
   nodeSpawner,
   runLauncher
-} from "./chunk-USYQEKPW.js";
+} from "./chunk-QOQVOYJC.js";
 
 // src/bin.ts
 function readLine() {

package/dist/{chunk-USYQEKPW.js → chunk-QOQVOYJC.js}

@@ -277,7 +277,7 @@ var AddFlagError = class extends PenvError {
     super(
       "PENV_ADD_FLAG",
       `\`penv add\` does not understand \`${flag}\``,
-      `Run \`penv add <package>\` with \`${TRUST_YOUNG_FLAG}\`, \`--registry <url>\`, or \`${LOCAL_FLAG}\` \u2014 those are the three it takes.`
+      `Run \`penv add <package>\` with \`${TRUST_YOUNG_FLAG}\`, \`--registry <url>\`, \`${LOCAL_FLAG}\`, or \`${YES_FLAG}\` \u2014 those are the four it takes.`
     );
   }
 };
@@ -423,13 +423,13 @@ var AddNoDownloadError = class extends PenvError {
     );
   }
 };
-var AddNotInteractiveError = class extends PenvError {
-  name = "AddNotInteractiveError";
-  constructor(name) {
+var AddTrustUnattendedError = class extends PenvError {
+  name = "AddTrustUnattendedError";
+  constructor(name, ceremony) {
     super(
-      "PENV_ADD_NOT_INTERACTIVE",
-      `Adding ${name} rewrites ${MANIFEST_PATH}, and this run has nobody to decide that`,
-      `Run \`${addCommand(name)}\` from a terminal and commit what it writes. In CI, run \`${INSTALL_COMMAND}\` \u2014 it installs the versions the committed manifest already pins.`
+      "PENV_ADD_TRUST_UNATTENDED",
+      `Adding ${name} records ${ceremony}, and this run has nobody to write it`,
+      `Run \`${addCommand(name)}\` from a terminal, without \`${YES_FLAG}\` \u2014 the trust block is a line only a person can write. In CI, run \`${INSTALL_COMMAND}\`: it installs the versions the committed manifest already pins.`
     );
   }
 };
@@ -555,11 +555,11 @@ var UpgradeDeclinedError = class extends PenvError {
 };
 var UpgradeInstallFailedError = class extends PenvError {
   name = "UpgradeInstallFailedError";
-  constructor(command) {
+  constructor(manager, version) {
     super(
       "PENV_UPGRADE_INSTALL_FAILED",
-      `${command} did not finish, so ${MANIFEST_PATH} still pins the engine it pinned before`,
-      `Run \`${command}\` yourself, then run \`${UPGRADE_COMMAND}\` again \u2014 the pin and the dependency move together or not at all.`
+      `${manager} did not finish moving this project to ${ENGINE_PACKAGE} ${version}, so ${MANIFEST_PATH} still pins the engine it pinned before`,
+      `Read what ${manager} printed above \u2014 it names what it refused. Fix that and run \`${UPGRADE_COMMAND} ${version}\` again; the pin and the dependency move together or not at all.`
     );
   }
 };
@@ -1003,12 +1003,17 @@ function parseRequest(argv) {
   let registry;
   let trustYoung = false;
   let local = false;
+  let yes = false;
   for (let index = 0; index < argv.length; index += 1) {
     const token = argv[index] ?? "";
     if (token === LOCAL_FLAG) {
       local = true;
       continue;
     }
+    if (token === YES_FLAG) {
+      yes = true;
+      continue;
+    }
     if (token === TRUST_YOUNG_FLAG) {
       trustYoung = true;
       continue;
@@ -1048,7 +1053,10 @@ function parseRequest(argv) {
       throw new AddLocalFlagError(`\`${TRUST_YOUNG_FLAG}\``);
     }
   }
-  return { name, version, registry, trustYoung, local };
+  return { name, version, registry, trustYoung, local, yes };
+}
+function ceremonyFor(tier) {
+  return tier === "official" ? void 0 : "who publishes it and why you trust it";
 }
 function tierOf(request) {
   if (request.name.startsWith(OFFICIAL_SCOPE2)) {
@@ -1127,46 +1135,84 @@ function recordExtension(manifestFile, name, entry) {
   };
   return serializeManifest(next);
 }
-async function offerConfigEdit(options, name) {
+var NONE = /* @__PURE__ */ new Set(["", "none", "no", "n"]);
+var ALL = /* @__PURE__ */ new Set(["all", "a", "yes", "y"]);
+function chooseEnvironments(answer, offered) {
+  const normalized = answer.trim().toLowerCase();
+  if (NONE.has(normalized)) {
+    return { chosen: [], unknown: [] };
+  }
+  if (ALL.has(normalized)) {
+    return { chosen: offered, unknown: [] };
+  }
+  const chosen = [];
+  const unknown = [];
+  for (const token of normalized.split(/[\s,]+/).filter((part) => part !== "")) {
+    const match = offered.find((environment) => environment.toLowerCase() === token);
+    if (match === void 0) {
+      unknown.push(token);
+    } else {
+      chosen.push(match);
+    }
+  }
+  return { chosen, unknown };
+}
+function quoted(environments) {
+  return environments.map((environment) => `\`${environment}\``).join(", ");
+}
+function configAdvice(name, pointing, unpointed) {
+  const add2 = `Add \`type: ${JSON.stringify(name)}\``;
+  if (pointing.length === 0) {
+    return `${add2} to an environment in penv.config.ts.`;
+  }
+  return `${quoted(pointing)} already ${pointing.length === 1 ? "points" : "point"} at ${name}. ${add2} to ${quoted(unpointed)} in penv.config.ts if ${unpointed.length === 1 ? "it" : "they"} should too.`;
+}
+async function offerConfigEdit(options, name, ask) {
   const { io, root } = options;
   const configFile = findConfigFile(root);
-  const line = `Add \`type: ${JSON.stringify(name)}\` to an environment in penv.config.ts.`;
+  const blind = `Add \`type: ${JSON.stringify(name)}\` to an environment in penv.config.ts.`;
   if (configFile === void 0) {
-    io.out(line);
+    io.out(blind);
     return;
   }
   const shown = relative(root, configFile).split(sep2).join("/");
   let current = readFileSync4(configFile, "utf8");
   const entries = readProviderEntries(current);
   if (entries === void 0 || entries.length === 0) {
-    io.out(line);
+    io.out(blind);
     return;
   }
-  if (entries.every((entry) => entry.type === name)) {
+  const pointing = entries.filter((entry) => entry.type === name).map((entry) => entry.environment);
+  const offered = entries.filter((entry) => entry.type !== name).map((entry) => entry.environment);
+  if (offered.length === 0) {
     return;
   }
-  if (!io.interactive) {
-    io.out(line);
+  const advice = configAdvice(name, pointing, offered);
+  if (!ask) {
+    io.out(advice);
     return;
   }
-  for (const entry of entries) {
-    if (entry.type === name) {
-      continue;
-    }
-    if (!await io.confirm(`Point \`${entry.environment}\` at ${name} in ${shown}?`)) {
-      continue;
-    }
-    const next = setProviderType(current, entry.environment, name);
+  const { chosen, unknown } = chooseEnvironments(
+    await io.ask(`Point which of ${offered.join(", ")} at ${name} in ${shown}? all / none / names`),
+    offered
+  );
+  if (unknown.length > 0) {
+    io.out(`${shown} declares no ${unknown.join(", ")}, so nothing was repointed.`);
+    io.out(advice);
+    return;
+  }
+  for (const environment of chosen) {
+    const next = setProviderType(current, environment, name);
     if (next === void 0) {
-      io.out(`Add \`type: ${JSON.stringify(name)}\` to \`${entry.environment}\` in ${shown}.`);
+      io.out(`Add \`type: ${JSON.stringify(name)}\` to \`${environment}\` in ${shown}.`);
       continue;
     }
     current = next;
     writeFileSync3(configFile, current);
-    io.out(`\u2713 ${shown} points \`${entry.environment}\` at ${name}`);
+    io.out(`\u2713 ${shown} points \`${environment}\` at ${name}`);
   }
 }
-async function offerOnboarding(io, name, onboard) {
+async function offerOnboarding(io, name, onboard, ask) {
   if (onboard === void 0) {
     return void 0;
   }
@@ -1175,7 +1221,7 @@ async function offerOnboarding(io, name, onboard) {
     return void 0;
   }
   const command = `penv ${args.join(" ")}`;
-  if (io.interactive && await io.confirm(`Run \`${command}\` now?`)) {
+  if (ask && await io.confirm(`Run \`${command}\` now?`)) {
     return args;
   }
   io.out(`Run \`${command}\` to finish setting ${name} up.`);
@@ -1256,8 +1302,9 @@ async function addLocal(options, request) {
   io.out(`\u2713 ${request.name} resolves from this project and imports \u2014 nothing is pinned`);
   io.out(`\u2713 ${LOCAL_EXTENSIONS_PATH2} records it`);
   io.out(`\u2713 ${declaration} declares its config type`);
-  await offerConfigEdit(options, request.name);
-  return { onboard: await offerOnboarding(io, request.name, installed.onboard) };
+  const ask = io.interactive && !request.yes;
+  await offerConfigEdit(options, request.name, ask);
+  return { onboard: await offerOnboarding(io, request.name, installed.onboard, ask) };
 }
 async function add(options) {
   const { io, fetcher, home, root, manifestFile } = options;
@@ -1267,11 +1314,13 @@ async function add(options) {
   }
   const tier = tierOf(request);
   const now = (options.now ?? (() => /* @__PURE__ */ new Date()))();
+  const ask = io.interactive && !request.yes;
   if (options.noDownload === true) {
     throw new AddNoDownloadError(request.name);
   }
-  if (options.ci === true || !io.interactive) {
-    throw new AddNotInteractiveError(request.name);
+  const ceremony = ceremonyFor(tier);
+  if (ceremony !== void 0 && (options.ci === true || !ask)) {
+    throw new AddTrustUnattendedError(request.name, ceremony);
   }
   const release = await fetchRelease({
     name: request.name,
@@ -1313,8 +1362,8 @@ async function add(options) {
   io.out(`\u2713 ${release.name} ${release.version} installed \u2014 ${provenance}`);
   io.out(`\u2713 ${MANIFEST_PATH2} pins it`);
   io.out(`\u2713 ${declaration} declares its config type`);
-  await offerConfigEdit(options, release.name);
-  return { onboard: await offerOnboarding(io, release.name, installed.onboard) };
+  await offerConfigEdit(options, release.name, ask);
+  return { onboard: await offerOnboarding(io, release.name, installed.onboard, ask) };
 }
 
 // src/delegate.ts
@@ -1363,12 +1412,12 @@ function nodeSpawner() {
 // src/engine.ts
 import { existsSync as existsSync2, readFileSync as readFileSync5 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname4, join as join5, resolve as resolve3, sep as sep3 } from "path";
+import { dirname as dirname4, join as join4, resolve as resolve3, sep as sep3 } from "path";
 import { ENGINE_PACKAGE as ENGINE_PACKAGE2, PenvError as PenvError2 } from "@penvhq/core";
 var ENGINE_BIN = "penv-engine";
 function readPackageManifest(dir) {
   try {
-    return JSON.parse(readFileSync5(join5(dir, "package.json"), "utf8"));
+    return JSON.parse(readFileSync5(join4(dir, "package.json"), "utf8"));
   } catch {
     return void 0;
   }
@@ -1433,8 +1482,8 @@ var DEV_PIN_INTEGRITY = "sha512-development-build-not-a-published-release";
 var DEV_PIN_VERSION = "0.0.0-dev";
 var BUNDLED_ENGINE_PIN = {
   package: ENGINE_PACKAGE3,
-  version: "0.11.0",
-  integrity: "sha512-Y+WKyuPsX4U8/1j0e+VMUhj0LaGrp67YEoDAWyyinrgA+c8IM4H1blqje/YK4LsQwzQDQQDF9bhWIhfmDAWoxA=="
+  version: "0.13.0",
+  integrity: "sha512-gZ2AlzxmQ4c83OvWSRrBdVMAQdwcGqAoENSv4ZNyZuer0fpIEqiT/xUl2b1+t5JSW8EZto5JpilmBSfiNoWFWA=="
 };
 function assertReleasePin(pin) {
   if (pin.integrity === DEV_PIN_INTEGRITY || pin.version === DEV_PIN_VERSION) {
@@ -1451,7 +1500,7 @@ function releaseEnginePin(pin, ranVersion) {
 
 // src/project.ts
 import { existsSync as existsSync3 } from "fs";
-import { dirname as dirname5, join as join6, resolve as resolve4 } from "path";
+import { dirname as dirname5, join as join5, resolve as resolve4 } from "path";
 import { MANIFEST_PATH as MANIFEST_PATH3, stateDir } from "@penvhq/core";
 var MANIFEST_SEGMENTS = MANIFEST_PATH3.split("/");
 function findUp(cwd, matches) {
@@ -1468,8 +1517,8 @@ function findUp(cwd, matches) {
   }
 }
 function findProject(cwd) {
-  const root = findUp(cwd, (dir) => existsSync3(join6(dir, ...MANIFEST_SEGMENTS)));
-  return root === void 0 ? void 0 : { root, manifestFile: join6(root, ...MANIFEST_SEGMENTS) };
+  const root = findUp(cwd, (dir) => existsSync3(join5(dir, ...MANIFEST_SEGMENTS)));
+  return root === void 0 ? void 0 : { root, manifestFile: join5(root, ...MANIFEST_SEGMENTS) };
 }
 function findAdoptedRoot(cwd) {
   return findUp(cwd, (dir) => existsSync3(stateDir(dir)));
@@ -1567,9 +1616,14 @@ async function upgrade(options) {
     try {
       await (options.install ?? installWithPackageManager)(plan);
     } catch {
-      throw new UpgradeInstallFailedError(plan.command.join(" "));
+      throw new UpgradeInstallFailedError(plan.manager, release.version);
+    }
+    const moved = plan.steps.filter(
+      (entry) => !entry.satisfied && entry.packages.some((one) => one.name === RUNTIME_PACKAGE)
+    );
+    for (const step of moved) {
+      io.out(`\u2713 ${step.manifest} depends on ${RUNTIME_PACKAGE} ${release.version}`);
     }
-    io.out(`\u2713 package.json depends on ${RUNTIME_PACKAGE} ${release.version}`);
   }
   writeFileSync4(manifestFile, manifestText);
   io.out(`\u2713 ${MANIFEST_PATH4} pins ${ENGINE_PACKAGE4} ${release.version}`);
@@ -1582,12 +1636,13 @@ async function upgrade(options) {
 
 // src/launcher.ts
 import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join7 } from "path";
+import { join as join6 } from "path";
 import {
   MANIFEST_FORMAT,
   MANIFEST_PATH as MANIFEST_PATH6,
   PENV_HOME_VAR,
   PenvError as PenvError3,
+  packageEntry as packageEntry2,
   parseManifest as parseManifest2,
   penvHome,
   serializeManifest as serializeManifest3,
@@ -1596,7 +1651,7 @@ import {
 
 // src/help.ts
 import { RUNTIME_PACKAGE as RUNTIME_PACKAGE2 } from "@penvhq/cli/install";
-import { ENGINE_PACKAGE as ENGINE_PACKAGE5, EXTENSIONS_PATH as EXTENSIONS_PATH3, MANIFEST_PATH as MANIFEST_PATH5 } from "@penvhq/core";
+import { ENGINE_PACKAGE as ENGINE_PACKAGE5, EXTENSIONS_PATH as EXTENSIONS_PATH3, MANIFEST_PATH as MANIFEST_PATH5, OFFICIAL_SCOPE as OFFICIAL_SCOPE3 } from "@penvhq/core";
 function printLauncherCommands(io) {
   io.out("");
   io.out("LAUNCHER COMMANDS (penv itself, whatever engine a project pins)");
@@ -1622,10 +1677,15 @@ function printAddHelp(io) {
   io.out(
     `  ${TRUST_YOUNG_FLAG}      Add a release published less than ${MIN_PACKAGE_AGE_DAYS} days ago`
   );
+  io.out(`  ${YES_FLAG}              Ask nothing \u2014 the config and onboarding offers print instead`);
   io.out("");
   io.out(`Pins the release in ${MANIFEST_PATH5} and writes its type declaration to`);
   io.out(`${EXTENSIONS_PATH3}/. Both are committed, so \`${INSTALL_COMMAND}\` gives every machine`);
   io.out(`the bytes you reviewed. \`${LOCAL_FLAG}\` pins nothing and touches no manifest.`);
+  io.out("");
+  io.out(`An \`${OFFICIAL_SCOPE3}*\` package asks nothing, so it adds unattended. Anything else`);
+  io.out("records who publishes it and why you trust it, which needs a person at a terminal \u2014");
+  io.out(`\`${YES_FLAG}\` cannot write that line for you.`);
 }
 function printUpgradeHelp(io) {
   io.out("penv upgrade [version]");
@@ -1801,7 +1861,7 @@ async function adopt(options, forwarded, home, cwd, noDownload) {
   if (root === void 0) {
     return 0;
   }
-  const manifestFile = join7(root, ...MANIFEST_PATH6.split("/"));
+  const manifestFile = join6(root, ...MANIFEST_PATH6.split("/"));
   if (existsSync4(manifestFile)) {
     return 0;
   }
@@ -1857,12 +1917,14 @@ async function install(options, pins, home, broken) {
     if (state === "corrupt") {
       throw new PackageCorruptError(pin.name, pin.version, dir);
     }
-    if (state === "installed") {
-      options.io.out(`\u2713 ${pin.name} ${pin.version} already installed`);
-      continue;
+    if (state === "absent") {
+      await installPin({ home, kind, pin, fetcher: options.fetcher });
+    }
+    if (kind === "extensions") {
+      await assertLoadable(pin.name, packageEntry2(dir), false);
     }
-    await installPin({ home, kind, pin, fetcher: options.fetcher });
-    options.io.out(`\u2713 ${pin.name} ${pin.version} installed`);
+    const verb = state === "absent" ? "installed" : "already installed";
+    options.io.out(`\u2713 ${pin.name} ${pin.version} ${verb}`);
   }
   if (broken.length > 0) {
     report(new ManifestEntriesUnreadableError(broken), options.io);
@@ -1938,7 +2000,7 @@ export {
   ReleaseIncompleteError,
   PackageTooYoungError,
   AddNoDownloadError,
-  AddNotInteractiveError,
+  AddTrustUnattendedError,
   TrustDeclinedError,
   TrustPublisherMissingError,
   TrustReasonMissingError,
@@ -1985,4 +2047,4 @@ export {
   upgrade,
   runLauncher
 };
-//# sourceMappingURL=chunk-USYQEKPW.js.map
+//# sourceMappingURL=chunk-QOQVOYJC.js.map