@penvhq/cli 0.9.3 → 0.9.4

package/dist/index.cjs

@@ -114,7 +114,7 @@ var startChild = (invocation) => {
   const ended = new Promise((resolve9, reject) => {
     child.on("error", (cause) => {
       release();
-      reject(cannotStart(executable, cause));
+      reject(cannotStart(executable, cause, invocation.purpose));
     });
     child.on("exit", (code, signal) => {
       release();
@@ -135,8 +135,15 @@ function noCommand() {
     "Put the command after `--`, e.g. `penv run -- pnpm dev`."
   );
 }
-function cannotStart(executable, cause) {
+function cannotStart(executable, cause, purpose) {
   const detail = cause instanceof Error ? cause.message : String(cause);
+  if (purpose !== void 0) {
+    return new import_core.PenvError(
+      "PENV_COMMAND_NOT_STARTED",
+      `penv could not start \`${executable}\` to ${purpose}: ${detail}`,
+      `Check that \`${executable}\` runs on its own \u2014 penv starts it the way your shell does, so it has to be on PATH. Nothing was changed.`
+    );
+  }
   return new import_core.PenvError(
     "RUN_COMMAND_NOT_STARTED",
     `\`${executable}\` could not be started: ${detail}`,
@@ -165,12 +172,15 @@ function cmdCommandLine(resolved, args) {
     " "
   );
 }
-function extensions(env) {
+function extensions(env, platform) {
+  if (platform !== "win32") {
+    return [""];
+  }
   const declared = env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD";
-  return ["", ...declared.split(";").filter((extension) => extension.length > 0)];
+  return [...declared.split(";").filter((extension) => extension.length > 0), ""];
 }
-function findExecutable(executable, env) {
-  const candidates = extensions(env);
+function findExecutable(executable, env, platform = process.platform) {
+  const candidates = extensions(env, platform);
   const isFile = (path2) => (0, import_node_fs.existsSync)(path2) && (0, import_node_fs.statSync)(path2).isFile();
   if (executable.includes("/") || executable.includes("\\") || (0, import_node_path.isAbsolute)(executable)) {
     return candidates.map((extension) => executable + extension).find(isFile);
@@ -197,6 +207,7 @@ function escapeArgument(argument, doubleEscape) {
 // src/install.ts
 var import_meta = {};
 var RUNTIME_PACKAGE = "@penvhq/penv";
+var SCHEMA_PACKAGE = "zod";
 var LOCKFILES = [
   ["pnpm", "pnpm-lock.yaml"],
   ["yarn", "yarn.lock"],
@@ -211,13 +222,9 @@ var ADD = {
   bun: ["bun", "add", "--exact"]
 };
 function engineVersion() {
-  const manifest = new URL("../package.json", import_meta.url);
-  try {
-    const version = JSON.parse((0, import_node_fs2.readFileSync)(manifest, "utf8")).version;
-    if (typeof version === "string" && version.length > 0) {
-      return version;
-    }
-  } catch {
+  const version = ownManifest()?.version;
+  if (typeof version === "string" && version.length > 0) {
+    return version;
   }
   throw new import_core2.PenvError(
     "ENGINE_VERSION_UNREADABLE",
@@ -225,6 +232,29 @@ function engineVersion() {
     `Reinstall penv, then run \`penv init\` again.`
   );
 }
+function schemaPackageVersion() {
+  const peers = ownManifest()?.peerDependencies;
+  const declared = peers !== null && typeof peers === "object" && !Array.isArray(peers) ? peers[SCHEMA_PACKAGE] : void 0;
+  const floor = typeof declared === "string" ? declared.replace(/^[\^~>=\s]+/, "").trim() : "";
+  if (floor.length > 0) {
+    return floor;
+  }
+  throw new import_core2.PenvError(
+    "ENGINE_PEER_UNREADABLE",
+    `penv could not read its own \`${SCHEMA_PACKAGE}\` peer range, so it cannot say which ${SCHEMA_PACKAGE} this project needs`,
+    `Reinstall penv, then run \`penv init\` again.`
+  );
+}
+function ownManifest() {
+  try {
+    const parsed = JSON.parse(
+      (0, import_node_fs2.readFileSync)(new URL("../package.json", import_meta.url), "utf8")
+    );
+    return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function detectPackageManager(root) {
   for (const [manager, lockfile] of LOCKFILES) {
     if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(root, lockfile))) {
@@ -253,12 +283,12 @@ function manifestOf(root) {
     return void 0;
   }
 }
-function declaredVersion(root) {
+function declaredVersion(root, name) {
   const manifest = manifestOf(root);
   for (const field of ["dependencies", "devDependencies"]) {
     const block = manifest?.[field];
     if (block !== null && typeof block === "object" && !Array.isArray(block)) {
-      const version = block[RUNTIME_PACKAGE];
+      const version = block[name];
       if (typeof version === "string") {
         return version;
       }
@@ -271,27 +301,61 @@ function planInstall(root, version = engineVersion()) {
   const lockfile = LOCKFILES.find(
     ([name, file]) => name === manager && (0, import_node_fs2.existsSync)((0, import_node_path2.join)(root, file))
   )?.[1];
-  const declared = declaredVersion(root);
+  const runtimeDeclared = declaredVersion(root, RUNTIME_PACKAGE);
+  const zodDeclared = declaredVersion(root, SCHEMA_PACKAGE);
+  const packages = [
+    {
+      name: RUNTIME_PACKAGE,
+      version,
+      ...runtimeDeclared === void 0 ? {} : { declared: runtimeDeclared },
+      satisfied: runtimeDeclared === version
+    },
+    {
+      name: SCHEMA_PACKAGE,
+      version: schemaPackageVersion(),
+      ...zodDeclared === void 0 ? {} : { declared: zodDeclared },
+      // Any declared zod counts: which zod a project uses is the project's
+      // decision, and penv is here to make sure there is one, not to move it.
+      satisfied: zodDeclared !== void 0
+    }
+  ];
+  const pending = packages.filter((entry) => !entry.satisfied);
+  const specs = (pending.length === 0 ? packages : pending).map(
+    (entry) => `${entry.name}@${entry.version}`
+  );
   return {
     root,
     manager,
-    package: RUNTIME_PACKAGE,
-    version,
-    command: [...ADD[manager], `${RUNTIME_PACKAGE}@${version}`],
+    packages,
+    command: [...ADD[manager], ...specs],
     ...lockfile === void 0 ? {} : { lockfile },
-    ...declared === void 0 ? {} : { declared },
-    satisfied: declared === version
+    satisfied: pending.length === 0
   };
 }
+function describe(entry) {
+  return `${entry.name} ${entry.version}`;
+}
 function renderInstallPlan(plan2) {
   if (plan2.satisfied) {
-    return [`package.json already pins ${plan2.package} ${plan2.version} \u2014 nothing to install.`];
+    return [
+      `package.json already has ${plan2.packages.map(describe).join(" and ")} \u2014 nothing to install.`
+    ];
   }
-  const line = `"${plan2.package}": "${plan2.version}"`;
+  const pending = plan2.packages.filter((entry) => !entry.satisfied);
+  const added = pending.filter((entry) => entry.declared === void 0);
+  const replaced = pending.filter((entry) => entry.declared !== void 0);
   return [
     "package.json",
-    ...plan2.declared === void 0 ? ['  + "dependencies": {', `  +   ${line}`, "  + }"] : [`  - "${plan2.package}": "${plan2.declared}"`, `  + ${line}`],
-    ...plan2.lockfile === void 0 ? [] : [plan2.lockfile, `  + ${plan2.package}@${plan2.version}`],
+    ...added.length === 0 ? [] : [
+      '  + "dependencies": {',
+      ...added.map((entry) => `  +   "${entry.name}": "${entry.version}"`),
+      "  + }"
+    ],
+    ...replaced.flatMap((entry) => [
+      `  - "${entry.name}": "${entry.declared}"`,
+      `  + "${entry.name}": "${entry.version}"`
+    ]),
+    ...plan2.lockfile === void 0 ? [] : [plan2.lockfile, ...pending.map((entry) => `  + ${entry.name}@${entry.version}`)],
     "",
     `Run with: ${plan2.command.join(" ")}`
   ];
@@ -300,7 +364,8 @@ var installWithPackageManager = async (plan2) => {
   const child = startChild({
     command: plan2.command,
     env: process.env,
-    cwd: plan2.root
+    cwd: plan2.root,
+    purpose: `install ${plan2.packages.map(describe).join(" and ")}`
   });
   const ended = await child.ended;
   if (ended.exitCode !== 0 || ended.signal !== null) {
@@ -2139,20 +2204,20 @@ function readCutover(root) {
   if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw unreadable("it is not an object");
   }
-  const record = parsed;
-  if (record.format !== CUTOVER_FORMAT) {
+  const record2 = parsed;
+  if (record2.format !== CUTOVER_FORMAT) {
     throw unreadable(
-      `it is format ${JSON.stringify(record.format)}, and penv reads format ${CUTOVER_FORMAT}`
+      `it is format ${JSON.stringify(record2.format)}, and penv reads format ${CUTOVER_FORMAT}`
     );
   }
-  const files = record.files;
+  const files = record2.files;
   if (!Array.isArray(files) || files.some((name) => typeof name !== "string")) {
     throw unreadable("it lists no filenames");
   }
-  const environments = Array.isArray(record.environments) ? record.environments.filter((name) => typeof name === "string") : [];
+  const environments = Array.isArray(record2.environments) ? record2.environments.filter((name) => typeof name === "string") : [];
   return {
     format: CUTOVER_FORMAT,
-    movedAt: typeof record.movedAt === "string" ? record.movedAt : "",
+    movedAt: typeof record2.movedAt === "string" ? record2.movedAt : "",
     files,
     environments
   };
@@ -4156,8 +4221,8 @@ var getCommand = (0, import_citty12.defineCommand)({
 });
 
 // src/commands/import.ts
-var import_node_fs12 = require("fs");
-var import_node_path13 = require("path");
+var import_node_fs13 = require("fs");
+var import_node_path14 = require("path");
 var import_core26 = require("@penvhq/core");
 var import_citty14 = require("citty");
 
@@ -4392,12 +4457,94 @@ function draftFieldsAcross(sources, environments) {
 }
 
 // src/commands/init.ts
-var import_node_fs11 = require("fs");
-var import_node_path12 = require("path");
+var import_node_fs12 = require("fs");
+var import_node_path13 = require("path");
 var import_promises = require("readline/promises");
 var import_core25 = require("@penvhq/core");
 var import_citty13 = require("citty");
 
+// src/scaffold-undo.ts
+var import_node_fs11 = require("fs");
+var import_node_path12 = require("path");
+function record(path, files, dirs) {
+  let stats;
+  try {
+    stats = (0, import_node_fs11.statSync)(path);
+  } catch {
+    return;
+  }
+  if (stats.isDirectory()) {
+    dirs.add(path);
+    for (const entry of (0, import_node_fs11.readdirSync)(path)) {
+      record((0, import_node_path12.join)(path, entry), files, dirs);
+    }
+    return;
+  }
+  if (stats.isFile()) {
+    files.set(path, (0, import_node_fs11.readFileSync)(path));
+  }
+}
+function captureScaffold(root, paths) {
+  const files = /* @__PURE__ */ new Map();
+  const dirs = /* @__PURE__ */ new Set();
+  for (const path of paths) {
+    for (let dir = (0, import_node_path12.dirname)(path); dir.startsWith(root) && dir !== root; dir = (0, import_node_path12.dirname)(dir)) {
+      if ((0, import_node_fs11.existsSync)(dir)) {
+        dirs.add(dir);
+      }
+    }
+    record(path, files, dirs);
+  }
+  return { root, paths: [...paths], files, dirs };
+}
+function restoreScaffold(undo) {
+  for (const path of undo.paths) {
+    removeAdded(path, undo);
+  }
+  for (const path of undo.paths) {
+    pruneAncestors(path, undo);
+  }
+  for (const [file, contents] of undo.files) {
+    (0, import_node_fs11.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true });
+    (0, import_node_fs11.writeFileSync)(file, contents);
+  }
+}
+function removeAdded(path, undo) {
+  let stats;
+  try {
+    stats = (0, import_node_fs11.statSync)(path);
+  } catch {
+    return;
+  }
+  if (stats.isFile()) {
+    if (!undo.files.has(path)) {
+      (0, import_node_fs11.unlinkSync)(path);
+    }
+    return;
+  }
+  if (!stats.isDirectory()) {
+    return;
+  }
+  for (const entry of (0, import_node_fs11.readdirSync)(path)) {
+    removeAdded((0, import_node_path12.join)(path, entry), undo);
+  }
+  if (!undo.dirs.has(path) && (0, import_node_fs11.readdirSync)(path).length === 0) {
+    (0, import_node_fs11.rmdirSync)(path);
+  }
+}
+function pruneAncestors(path, undo) {
+  for (let dir = (0, import_node_path12.dirname)(path); dir.startsWith(undo.root) && dir !== undo.root; dir = (0, import_node_path12.dirname)(dir)) {
+    if (undo.dirs.has(dir)) {
+      return;
+    }
+    try {
+      (0, import_node_fs11.rmdirSync)(dir);
+    } catch {
+      return;
+    }
+  }
+}
+
 // src/seams.ts
 function nextjs({ alias, srcDir }) {
   return {
@@ -4553,7 +4700,7 @@ var NOT_ENVIRONMENTS2 = [...import_core25.RESERVED_TOKENS, "example", "sample",
 function suggestEnvironments(root) {
   let entries;
   try {
-    entries = (0, import_node_fs11.readdirSync)(root);
+    entries = (0, import_node_fs12.readdirSync)(root);
   } catch {
     return [];
   }
@@ -4597,8 +4744,8 @@ function configOf(decisions) {
   return { environments: decisions.environments, providers: {}, schemaFile: decisions.schemaFile };
 }
 function declaredIn(root) {
-  const file = (0, import_node_path12.join)(root, CONFIG_FILE);
-  if (!(0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, CONFIG_FILE);
+  if (!(0, import_node_fs12.existsSync)(file)) {
     return void 0;
   }
   return (0, import_core25.loadConfigFrom)(file);
@@ -5040,16 +5187,16 @@ function renderTsconfig(target, alias) {
 `;
 }
 function ensurePenvDir(root) {
-  const dir = (0, import_node_path12.resolve)(root, import_core25.PENV_DIR);
-  if ((0, import_node_fs11.existsSync)(dir)) {
+  const dir = (0, import_node_path13.resolve)(root, import_core25.PENV_DIR);
+  if ((0, import_node_fs12.existsSync)(dir)) {
     return { target: "penv-dir", action: "kept", text: `Found ${import_core25.PENV_DIR}/` };
   }
-  (0, import_node_fs11.mkdirSync)(dir, { recursive: true });
+  (0, import_node_fs12.mkdirSync)(dir, { recursive: true });
   return { target: "penv-dir", action: "created", text: `Created ${import_core25.PENV_DIR}/` };
 }
 function writeSchemaShapeFile(root, fields, draft, decisions = DEFAULT_DECISIONS) {
-  const file = (0, import_node_path12.join)(root, import_core25.SCHEMA_SHAPE_FILE);
-  if ((0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, import_core25.SCHEMA_SHAPE_FILE);
+  if ((0, import_node_fs12.existsSync)(file)) {
     return {
       target: "schema",
       action: "kept",
@@ -5066,7 +5213,7 @@ function writeSchemaShapeFile(root, fields, draft, decisions = DEFAULT_DECISIONS
       note: `(the shape lives there, from before the ${import_core25.SCHEMA_SHAPE_FILE} split \u2014 penv did not add a second one. To adopt the split: move the \`z.object\` (and any \`declare module\` block) into ${import_core25.SCHEMA_SHAPE_FILE}, leaving ${oldLayout} importing \`schema\` from it and calling \`load\`.)`
     };
   }
-  (0, import_node_fs11.writeFileSync)(file, renderSchemaShapeModule(fields, draft), "utf8");
+  (0, import_node_fs12.writeFileSync)(file, renderSchemaShapeModule(fields, draft), "utf8");
   return {
     target: "schema",
     action: "created",
@@ -5075,8 +5222,8 @@ function writeSchemaShapeFile(root, fields, draft, decisions = DEFAULT_DECISIONS
   };
 }
 function writeEnvFile(root, decisions = DEFAULT_DECISIONS) {
-  const file = (0, import_node_path12.join)(root, ...decisions.schemaFile.split("/"));
-  if ((0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, ...decisions.schemaFile.split("/"));
+  if ((0, import_node_fs12.existsSync)(file)) {
     return {
       target: "env",
       action: "kept",
@@ -5084,8 +5231,8 @@ function writeEnvFile(root, decisions = DEFAULT_DECISIONS) {
       note: "(yours \u2014 penv never regenerates it)"
     };
   }
-  (0, import_node_fs11.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true });
-  (0, import_node_fs11.writeFileSync)(file, renderEnvModule(decisions.schemaFile, decisions.inject), "utf8");
+  (0, import_node_fs12.mkdirSync)((0, import_node_path13.dirname)(file), { recursive: true });
+  (0, import_node_fs12.writeFileSync)(file, renderEnvModule(decisions.schemaFile, decisions.inject), "utf8");
   return {
     target: "env",
     action: "created",
@@ -5094,19 +5241,19 @@ function writeEnvFile(root, decisions = DEFAULT_DECISIONS) {
   };
 }
 function writeConfigFile(root, decisions = DEFAULT_DECISIONS) {
-  const file = (0, import_node_path12.join)(root, CONFIG_FILE);
-  if ((0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, CONFIG_FILE);
+  if ((0, import_node_fs12.existsSync)(file)) {
     return { target: "config", action: "kept", text: `Kept ${CONFIG_FILE}` };
   }
-  (0, import_node_fs11.writeFileSync)(file, renderConfigModule(decisions), "utf8");
+  (0, import_node_fs12.writeFileSync)(file, renderConfigModule(decisions), "utf8");
   return { target: "config", action: "created", text: `Generated ${CONFIG_FILE}` };
 }
 function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
   const alias = decisions.alias;
   const imports = alias.startsWith(IMPORTS_PREFIX);
-  const file = (0, import_node_path12.join)(root, imports ? PACKAGE_FILE : TSCONFIG_FILE);
+  const file = (0, import_node_path13.join)(root, imports ? PACKAGE_FILE : TSCONFIG_FILE);
   const where = imports ? PACKAGE_FILE : TSCONFIG_FILE;
-  if (!(0, import_node_fs11.existsSync)(file)) {
+  if (!(0, import_node_fs12.existsSync)(file)) {
     if (imports) {
       return {
         target: "tsconfig",
@@ -5115,14 +5262,14 @@ function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
         note: `(run \`npm init\` first, or use \`--alias @env\` to alias through ${TSCONFIG_FILE})`
       };
     }
-    (0, import_node_fs11.writeFileSync)(file, renderTsconfig(decisions.schemaFile, alias), "utf8");
+    (0, import_node_fs12.writeFileSync)(file, renderTsconfig(decisions.schemaFile, alias), "utf8");
     return {
       target: "tsconfig",
       action: "created",
       text: `Created ${TSCONFIG_FILE} with the ${alias} path alias`
     };
   }
-  const source = (0, import_node_fs11.readFileSync)(file, "utf8");
+  const source = (0, import_node_fs12.readFileSync)(file, "utf8");
   const edit = imports ? insertImportsAlias(source, decisions.schemaFile, alias) : insertEnvAlias(source, decisions.schemaFile, alias);
   if (edit.conflict !== void 0) {
     return {
@@ -5139,7 +5286,7 @@ function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
       text: `Kept the ${alias} alias in ${where}`
     };
   }
-  (0, import_node_fs11.writeFileSync)(file, edit.source, "utf8");
+  (0, import_node_fs12.writeFileSync)(file, edit.source, "utf8");
   return {
     target: "tsconfig",
     action: "updated",
@@ -5147,14 +5294,14 @@ function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
   };
 }
 function writeGitignore(root, decisions = DEFAULT_DECISIONS) {
-  const file = (0, import_node_path12.join)(root, ...import_core25.STATE_GITIGNORE_PATH.split("/"));
+  const file = (0, import_node_path13.join)(root, ...import_core25.STATE_GITIGNORE_PATH.split("/"));
   const wanted = (0, import_core25.renderStateGitignore)(configOf(decisions));
-  const existing = (0, import_node_fs11.existsSync)(file) ? (0, import_node_fs11.readFileSync)(file, "utf8") : void 0;
+  const existing = (0, import_node_fs12.existsSync)(file) ? (0, import_node_fs12.readFileSync)(file, "utf8") : void 0;
   if (existing === wanted) {
     return { target: "gitignore", action: "kept", text: `Kept ${import_core25.STATE_GITIGNORE_PATH}` };
   }
-  (0, import_node_fs11.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true });
-  (0, import_node_fs11.writeFileSync)(file, wanted, "utf8");
+  (0, import_node_fs12.mkdirSync)((0, import_node_path13.dirname)(file), { recursive: true });
+  (0, import_node_fs12.writeFileSync)(file, wanted, "utf8");
   return {
     target: "gitignore",
     action: existing === void 0 ? "created" : "updated",
@@ -5170,12 +5317,12 @@ function outdatedRuntimeWarning(root) {
   return `Injection needs @penvhq/penv ${INJECT_MIN_VERSION}+ \u2014 this project has ${version}, whose \`load\` ignores \`{ inject: true }\`. Upgrade, or process.env stays empty.`;
 }
 function installedPenvVersion(root) {
-  const file = (0, import_node_path12.join)(root, "node_modules", "@penvhq", "penv", "package.json");
-  if (!(0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, "node_modules", "@penvhq", "penv", "package.json");
+  if (!(0, import_node_fs12.existsSync)(file)) {
     return void 0;
   }
   try {
-    const version = JSON.parse((0, import_node_fs11.readFileSync)(file, "utf8")).version;
+    const version = JSON.parse((0, import_node_fs12.readFileSync)(file, "utf8")).version;
     return typeof version === "string" ? version : void 0;
   } catch {
     return void 0;
@@ -5215,11 +5362,11 @@ function writeSeam(root, decisions = DEFAULT_DECISIONS, framework = detectFramew
     };
   }
   const alsoNote = writeAlso(root, seam.also);
-  const file = (0, import_node_path12.join)(root, ...seam.file.split("/"));
+  const file = (0, import_node_path13.join)(root, ...seam.file.split("/"));
   const baseNotes = [...seam.notes, ...alsoNote === void 0 ? [] : [alsoNote]];
   const notes = baseNotes.length === 0 ? "" : `
 ${baseNotes.map((n) => `  ${n}`).join("\n")}`;
-  if ((0, import_node_fs11.existsSync)(file)) {
+  if ((0, import_node_fs12.existsSync)(file)) {
     return {
       target: "seam",
       action: "info",
@@ -5227,8 +5374,8 @@ ${baseNotes.map((n) => `  ${n}`).join("\n")}`;
       note: withWarning(`${seam.ifPresent}${notes}`, outdated)
     };
   }
-  (0, import_node_fs11.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true });
-  (0, import_node_fs11.writeFileSync)(file, seam.content, "utf8");
+  (0, import_node_fs12.mkdirSync)((0, import_node_path13.dirname)(file), { recursive: true });
+  (0, import_node_fs12.writeFileSync)(file, seam.content, "utf8");
   return {
     target: "seam",
     action: outdated === void 0 ? "created" : "info",
@@ -5240,12 +5387,12 @@ function writeAlso(root, also) {
   if (also === void 0) {
     return void 0;
   }
-  const file = (0, import_node_path12.join)(root, ...also.file.split("/"));
-  if ((0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, ...also.file.split("/"));
+  if ((0, import_node_fs12.existsSync)(file)) {
     return also.ifPresent;
   }
-  (0, import_node_fs11.mkdirSync)((0, import_node_path12.dirname)(file), { recursive: true });
-  (0, import_node_fs11.writeFileSync)(file, also.content, "utf8");
+  (0, import_node_fs12.mkdirSync)((0, import_node_path13.dirname)(file), { recursive: true });
+  (0, import_node_fs12.writeFileSync)(file, also.content, "utf8");
   return `Wrote ${also.file} to register it.`;
 }
 function withWarning(note, warning) {
@@ -5270,6 +5417,23 @@ function scaffold(root, fields, draft, decisions = DEFAULT_DECISIONS, framework
   const seam = writeSeam(root, decisions, framework);
   return seam === void 0 ? steps : [...steps, seam];
 }
+function scaffoldPaths(root, decisions = DEFAULT_DECISIONS, framework = detectFramework(root)?.name) {
+  const fileAt = (relative5) => (0, import_node_path13.join)(root, ...relative5.split("/"));
+  const seam = decisions.inject ? seamFor(framework, {
+    alias: decisions.alias,
+    srcDir: srcPrefix(root),
+    schemaFile: decisions.schemaFile
+  }) : void 0;
+  return [
+    fileAt(import_core25.PENV_DIR),
+    fileAt(import_core25.SCHEMA_SHAPE_FILE),
+    fileAt(decisions.schemaFile),
+    fileAt(CONFIG_FILE),
+    fileAt(TSCONFIG_FILE),
+    fileAt(PACKAGE_FILE),
+    ...seam?.kind === "scaffold" ? [fileAt(seam.file), ...seam.also === void 0 ? [] : [fileAt(seam.also.file)]] : []
+  ];
+}
 var DEVELOPMENT = "development";
 var LOCAL_PROVIDER = "@penvhq/provider-filesystem";
 function planAdoption(root) {
@@ -5332,7 +5496,7 @@ function planCutover(input) {
   const diagnostics = [];
   let variables = 0;
   for (const file of selected) {
-    const parsed = (0, import_core25.parseDotenv)((0, import_node_fs11.readFileSync)((0, import_node_path12.join)(root, file.name), "utf8"));
+    const parsed = (0, import_core25.parseDotenv)((0, import_node_fs12.readFileSync)((0, import_node_path13.join)(root, file.name), "utf8"));
     const fileRefs = refsForEntries(parsed.entries, file.name, config);
     adopted.push({ file, entries: parsed.entries, refs: fileRefs, scope: scopeOf(file) });
     refs.push(...fileRefs);
@@ -5443,17 +5607,27 @@ async function applyCutover(plan2, options = {}) {
   if (!plan2.install.satisfied) {
     await (options.install ?? installWithPackageManager)(plan2.install);
   }
-  const steps = scaffold(plan2.root, plan2.fields, true, plan2.decisions, plan2.framework);
-  const project = openProject(plan2.root);
-  const tree = localTree(project);
-  for (const adopted of plan2.adopted) {
-    writeEntries(tree, adopted.entries, adopted.refs, adopted.scope);
-  }
-  for (const environment of plan2.adopting) {
-    const check = await checkEnvironment(project, environment);
-    if (!check.result.ok) {
-      throw invalidAfterImport(check.result);
+  const undo = captureScaffold(plan2.root, scaffoldPaths(plan2.root, plan2.decisions, plan2.framework));
+  let steps;
+  try {
+    steps = scaffold(plan2.root, plan2.fields, true, plan2.decisions, plan2.framework);
+    const project = openProject(plan2.root);
+    const tree = localTree(project);
+    for (const adopted of plan2.adopted) {
+      writeEntries(tree, adopted.entries, adopted.refs, adopted.scope);
+    }
+    for (const environment of plan2.adopting) {
+      const check = await checkEnvironment(project, environment);
+      if (check.schema === void 0) {
+        throw draftNotLoaded(check.result);
+      }
+      if (!check.result.ok) {
+        throw invalidAfterImport(check.result);
+      }
     }
+  } catch (error) {
+    restoreScaffold(undo);
+    throw error;
   }
   const cutover = bundleDotenvFiles(
     plan2.root,
@@ -5462,13 +5636,24 @@ async function applyCutover(plan2, options = {}) {
   );
   return { plan: plan2, steps, moved: cutover.files, validated: plan2.adopting };
 }
+function issueLines(result2) {
+  return result2.issues.map((issue) => `  ${issue.subject}: ${issue.message}`).join("\n");
+}
+var SCAFFOLD_ROLLED_BACK = "penv put the project back as it found it \u2014 your dotenv files and everything else are exactly where they were.";
 function invalidAfterImport(result2) {
-  const lines = result2.issues.map((issue) => `  ${issue.subject}: ${issue.message}`).join("\n");
   return new import_core25.PenvError(
     "INIT_CUTOVER_INVALID",
-    `The imported values do not satisfy the draft schema for ${result2.environment}, so your dotenv files were left where they are:
-${lines}`,
-    `Correct ${import_core25.SCHEMA_SHAPE_FILE} or the values above, then run \`penv init\` again.`
+    `The imported values do not satisfy the draft schema for ${result2.environment}:
+${issueLines(result2)}`,
+    `Correct the values above, then run \`penv init\` again. ${SCAFFOLD_ROLLED_BACK}`
+  );
+}
+function draftNotLoaded(result2) {
+  return new import_core25.PenvError(
+    "INIT_DRAFT_NOT_LOADED",
+    `penv could not load the schema it drafted for ${result2.environment}, so nothing was checked against it:
+${issueLines(result2)}`,
+    `Fix the error above, then run \`penv init\` again. ${SCAFFOLD_ROLLED_BACK}`
   );
 }
 function renderSelection(plan2, selected = plan2.preselected) {
@@ -5531,7 +5716,7 @@ function renderCutover(result2) {
       const glyph = step.action === "conflicted" ? WARN : step.action === "info" ? "\u2192" : CHECK;
       return step.note === void 0 ? { glyph, text: step.text } : { glyph, text: step.text, note: step.note };
     }),
-    ...plan2.install.satisfied ? [] : [{ glyph: CHECK, text: `Installed ${plan2.install.package}`, note: plan2.install.version }],
+    ...plan2.install.packages.filter((entry) => !entry.satisfied).map((entry) => ({ glyph: CHECK, text: `Installed ${entry.name}`, note: entry.version })),
     {
       glyph: CHECK,
       text: `Imported ${plan2.fields.length} parameters`,
@@ -5555,12 +5740,12 @@ function dailyCommand(root) {
   return `penv run -- ${detectPackageManager(root)} ${devScript(root)}`;
 }
 function devScript(root) {
-  const file = (0, import_node_path12.join)(root, PACKAGE_FILE);
-  if (!(0, import_node_fs11.existsSync)(file)) {
+  const file = (0, import_node_path13.join)(root, PACKAGE_FILE);
+  if (!(0, import_node_fs12.existsSync)(file)) {
     return "dev";
   }
   try {
-    const scripts = JSON.parse((0, import_node_fs11.readFileSync)(file, "utf8")).scripts;
+    const scripts = JSON.parse((0, import_node_fs12.readFileSync)(file, "utf8")).scripts;
     if (scripts !== null && typeof scripts === "object" && !Array.isArray(scripts)) {
       const named = Object.keys(scripts);
       return ["dev", "start"].find((script) => named.includes(script)) ?? named[0] ?? "dev";
@@ -5570,7 +5755,7 @@ function devScript(root) {
   return "dev";
 }
 function runInit(options) {
-  const root = (0, import_node_path12.resolve)(options.cwd);
+  const root = (0, import_node_path13.resolve)(options.cwd);
   const decisions = options.decisions ?? planInit(root).decisions;
   return { root, decisions, steps: scaffold(root, [], false, decisions, options.framework) };
 }
@@ -5733,7 +5918,7 @@ var initCommand = (0, import_citty13.defineCommand)({
   },
   run({ args }) {
     return guard(async () => {
-      const root = (0, import_node_path12.resolve)(process.cwd());
+      const root = (0, import_node_path13.resolve)(process.cwd());
       if (args.action !== void 0) {
         runUndoAction(root, String(args.action));
         return;
@@ -5809,7 +5994,7 @@ function assertDeclared(segment, config) {
   throw new import_core26.UnknownEnvironmentError(segment, config.environments);
 }
 function scopeFromFilename(file, config) {
-  const name = (0, import_node_path13.basename)(file);
+  const name = (0, import_node_path14.basename)(file);
   const segments = name.split(".");
   const start = segments.indexOf(DOTENV_SEGMENT);
   if (start === -1) {
@@ -5893,7 +6078,7 @@ function environmentNamed(file, explicit) {
   if (explicit !== void 0 && explicit.trim().length > 0) {
     return explicit.trim();
   }
-  const segments = (0, import_node_path13.basename)(file).split(".");
+  const segments = (0, import_node_path14.basename)(file).split(".");
   const start = segments.indexOf(DOTENV_SEGMENT);
   if (start === -1) {
     return void 0;
@@ -5927,16 +6112,16 @@ function configInEffect(cwd, environment) {
   return { config: openProject(cwd).config, decisions };
 }
 function importDotenv(options) {
-  const cwd = (0, import_node_path13.resolve)(options.cwd);
-  const file = (0, import_node_path13.isAbsolute)(options.file) ? options.file : (0, import_node_path13.resolve)(cwd, options.file);
-  if (!(0, import_node_fs12.existsSync)(file)) {
+  const cwd = (0, import_node_path14.resolve)(options.cwd);
+  const file = (0, import_node_path14.isAbsolute)(options.file) ? options.file : (0, import_node_path14.resolve)(cwd, options.file);
+  if (!(0, import_node_fs13.existsSync)(file)) {
     throw new import_core26.PenvError(
       "IMPORT_FILE_MISSING",
       `There is no file at ${file} to import`,
       "Point `penv import` at an existing dotenv file, e.g. `penv import .env`."
     );
   }
-  const parsed = (0, import_core26.parseDotenv)((0, import_node_fs12.readFileSync)(file, "utf8"));
+  const parsed = (0, import_core26.parseDotenv)((0, import_node_fs13.readFileSync)(file, "utf8"));
   const { config, decisions } = configInEffect(cwd, environmentNamed(file, options.environment));
   const source = displayPath3(cwd, file);
   const named = scopeFromFilename(file, config);
@@ -5952,7 +6137,7 @@ function importDotenv(options) {
   const tree = localTree(project);
   writeEntries(tree, parsed.entries, refs, scope);
   const backup = `${file}${BACKUP_SUFFIX}`;
-  (0, import_node_fs12.copyFileSync)(file, backup);
+  (0, import_node_fs13.copyFileSync)(file, backup);
   return {
     root: project.root,
     file,
@@ -5966,7 +6151,7 @@ function importDotenv(options) {
   };
 }
 function displayPath3(root, file) {
-  const rel = (0, import_node_path13.relative)(root, file);
+  const rel = (0, import_node_path14.relative)(root, file);
   return rel === "" || rel.startsWith("..") ? file : rel.split("\\").join("/");
 }
 function keptSchemaStep(step, variables) {
@@ -6287,30 +6472,30 @@ var listCommand = (0, import_citty16.defineCommand)({
 });
 
 // src/commands/migrate.ts
-var import_node_fs13 = require("fs");
-var import_node_path14 = require("path");
+var import_node_fs14 = require("fs");
+var import_node_path15 = require("path");
 var import_promises2 = require("readline/promises");
 var import_core30 = require("@penvhq/core");
 var import_citty17 = require("citty");
 var OLD_GITIGNORE = `${import_core30.PENV_DIR}/.gitignore`;
 function planMigrate(cwd) {
   const { config, file } = (0, import_core30.loadConfig)(cwd);
-  const root = (0, import_node_path14.dirname)(file);
+  const root = (0, import_node_path15.dirname)(file);
   const entries = (0, import_core30.oldLayoutEntries)(root, config);
   const tree = (0, import_core30.recordsDir)(root);
   const collisions = collidingEntries(entries, tree);
   if (collisions.length > 0) {
     throw new import_core30.PenvError(
       "HALF_MIGRATED",
-      `${describe(collisions)} in both \`${import_core30.PENV_DIR}/\` and \`${import_core30.RECORDS_PATH}/\`, and penv cannot tell which copy is current`,
+      `${describe2(collisions)} in both \`${import_core30.PENV_DIR}/\` and \`${import_core30.RECORDS_PATH}/\`, and penv cannot tell which copy is current`,
       `Move what is left under \`${import_core30.PENV_DIR}/\` into \`${import_core30.RECORDS_PATH}/\` yourself, keeping the copy you want, then run \`penv validate\`.`
     );
   }
   const creates = [];
-  if (entries.length > 0 && !(0, import_node_fs13.existsSync)(tree)) {
+  if (entries.length > 0 && !(0, import_node_fs14.existsSync)(tree)) {
     creates.push(`${import_core30.RECORDS_PATH}/`);
   }
-  if (readIfPresent((0, import_node_path14.join)(root, ...import_core30.STATE_GITIGNORE_PATH.split("/"))) !== (0, import_core30.renderStateGitignore)(config)) {
+  if (readIfPresent((0, import_node_path15.join)(root, ...import_core30.STATE_GITIGNORE_PATH.split("/"))) !== (0, import_core30.renderStateGitignore)(config)) {
     creates.push(import_core30.STATE_GITIGNORE_PATH);
   }
   return {
@@ -6320,23 +6505,23 @@ function planMigrate(cwd) {
       to: `${import_core30.RECORDS_PATH}/${entry}`
     })),
     creates,
-    removes: (0, import_node_fs13.existsSync)((0, import_node_path14.join)(root, ...OLD_GITIGNORE.split("/"))) ? [OLD_GITIGNORE] : []
+    removes: (0, import_node_fs14.existsSync)((0, import_node_path15.join)(root, ...OLD_GITIGNORE.split("/"))) ? [OLD_GITIGNORE] : []
   };
 }
 function readIfPresent(file) {
-  return (0, import_node_fs13.existsSync)(file) ? (0, import_node_fs13.readFileSync)(file, "utf8") : void 0;
+  return (0, import_node_fs14.existsSync)(file) ? (0, import_node_fs14.readFileSync)(file, "utf8") : void 0;
 }
 function collidingEntries(entries, tree) {
   let held;
   try {
-    held = (0, import_node_fs13.readdirSync)(tree);
+    held = (0, import_node_fs14.readdirSync)(tree);
   } catch {
     return [];
   }
   const taken = new Set(held.map((name) => name.toLowerCase()));
   return entries.filter((entry) => taken.has(entry.toLowerCase())).sort();
 }
-function describe(names) {
+function describe2(names) {
   return names.length === 1 ? `\`${names[0]}\` is` : `${names.map((name) => `\`${name}\``).join(", ")} are`;
 }
 function isNoop(plan2) {
@@ -6348,18 +6533,18 @@ function applyMigrate(plan2) {
   }
   const { config } = (0, import_core30.loadConfig)(plan2.root);
   if (plan2.moves.length > 0) {
-    (0, import_node_fs13.mkdirSync)((0, import_core30.recordsDir)(plan2.root), { recursive: true });
+    (0, import_node_fs14.mkdirSync)((0, import_core30.recordsDir)(plan2.root), { recursive: true });
     for (const move of plan2.moves) {
-      (0, import_node_fs13.renameSync)((0, import_node_path14.join)(plan2.root, ...move.from.split("/")), (0, import_node_path14.join)(plan2.root, ...move.to.split("/")));
+      (0, import_node_fs14.renameSync)((0, import_node_path15.join)(plan2.root, ...move.from.split("/")), (0, import_node_path15.join)(plan2.root, ...move.to.split("/")));
     }
   }
   if (plan2.creates.includes(import_core30.STATE_GITIGNORE_PATH)) {
-    const ignore = (0, import_node_path14.join)(plan2.root, ...import_core30.STATE_GITIGNORE_PATH.split("/"));
-    (0, import_node_fs13.mkdirSync)((0, import_node_path14.dirname)(ignore), { recursive: true });
-    (0, import_node_fs13.writeFileSync)(ignore, (0, import_core30.renderStateGitignore)(config), "utf8");
+    const ignore = (0, import_node_path15.join)(plan2.root, ...import_core30.STATE_GITIGNORE_PATH.split("/"));
+    (0, import_node_fs14.mkdirSync)((0, import_node_path15.dirname)(ignore), { recursive: true });
+    (0, import_node_fs14.writeFileSync)(ignore, (0, import_core30.renderStateGitignore)(config), "utf8");
   }
   for (const removed of plan2.removes) {
-    (0, import_node_fs13.rmSync)((0, import_node_path14.join)(plan2.root, ...removed.split("/")), { force: true });
+    (0, import_node_fs14.rmSync)((0, import_node_path15.join)(plan2.root, ...removed.split("/")), { force: true });
   }
   return { ...plan2, status: "migrated" };
 }
@@ -6845,14 +7030,14 @@ var rotateCommand = (0, import_citty20.defineCommand)({
 });
 
 // src/commands/watch.ts
-var import_node_fs14 = require("fs");
-var import_node_path15 = require("path");
+var import_node_fs15 = require("fs");
+var import_node_path16 = require("path");
 var import_core34 = require("@penvhq/core");
 var import_citty21 = require("citty");
 var DEBOUNCE_MS2 = 100;
 function runWatch(options) {
   const project = openProject(options.cwd);
-  const configFile = (0, import_node_path15.basename)(project.configFile);
+  const configFile = (0, import_node_path16.basename)(project.configFile);
   const debounceMs = options.debounceMs ?? DEBOUNCE_MS2;
   const watchers = /* @__PURE__ */ new Set();
   let timer;
@@ -6905,22 +7090,22 @@ function runWatch(options) {
     watcher.close();
   }
   function armRecovery(target, recursive, only) {
-    const parent = (0, import_node_path15.dirname)(target);
-    const name = (0, import_node_path15.basename)(target);
+    const parent = (0, import_node_path16.dirname)(target);
+    const name = (0, import_node_path16.basename)(target);
     let recovery;
     try {
-      recovery = (0, import_node_fs14.watch)(parent, { recursive: false }, (_event, filename) => {
+      recovery = (0, import_node_fs15.watch)(parent, { recursive: false }, (_event, filename) => {
         if (closed || recovery === void 0) {
           return;
         }
-        if (!(0, import_node_fs14.existsSync)(parent)) {
+        if (!(0, import_node_fs15.existsSync)(parent)) {
           stop2(recovery);
           return;
         }
-        if (filename !== null && (0, import_node_path15.basename)(filename) !== name) {
+        if (filename !== null && (0, import_node_path16.basename)(filename) !== name) {
           return;
         }
-        if (!(0, import_node_fs14.existsSync)(target)) {
+        if (!(0, import_node_fs15.existsSync)(target)) {
           return;
         }
         stop2(recovery);
@@ -6940,11 +7125,11 @@ function runWatch(options) {
   }
   function addWatcher(target, recursive, only) {
     let watcher;
-    const listen = (useRecursive) => (0, import_node_fs14.watch)(target, { recursive: useRecursive }, (_event, filename) => {
+    const listen = (useRecursive) => (0, import_node_fs15.watch)(target, { recursive: useRecursive }, (_event, filename) => {
       if (closed) {
         return;
       }
-      if (!(0, import_node_fs14.existsSync)(target)) {
+      if (!(0, import_node_fs15.existsSync)(target)) {
         if (watcher !== void 0) {
           stop2(watcher);
         }
@@ -6952,7 +7137,7 @@ function runWatch(options) {
         schedule();
         return;
       }
-      if (only !== void 0 && (filename === null || (0, import_node_path15.basename)(filename) !== only)) {
+      if (only !== void 0 && (filename === null || (0, import_node_path16.basename)(filename) !== only)) {
         return;
       }
       schedule();
@@ -6979,11 +7164,11 @@ function runWatch(options) {
     watchers.add(watcher);
   }
   addWatcher(project.recordsDir, true);
-  addWatcher((0, import_node_path15.dirname)(project.configFile), false, configFile);
+  addWatcher((0, import_node_path16.dirname)(project.configFile), false, configFile);
   addWatcher(project.root, false, import_core34.SCHEMA_SHAPE_FILE);
   if ((0, import_core34.schemaInsideTree)(project.config) === void 0) {
-    const schemaFile = (0, import_node_path15.resolve)(project.root, (0, import_core34.schemaFileOf)(project.config));
-    addWatcher((0, import_node_path15.dirname)(schemaFile), false, (0, import_node_path15.basename)(schemaFile));
+    const schemaFile = (0, import_node_path16.resolve)(project.root, (0, import_core34.schemaFileOf)(project.config));
+    addWatcher((0, import_node_path16.dirname)(schemaFile), false, (0, import_node_path16.basename)(schemaFile));
   }
   void validate();
   return {