@wp-playground/cli 3.0.18 → 3.0.20

package/{run-cli-BBfr5tmj.js → run-cli-g3_uJkf5.js}

@@ -1,27 +1,27 @@
-import { logger as h, LogSeverity as A, errorLogPath as q } from "@php-wasm/logger";
-import { PHPResponse as V, consumeAPI as j, SupportedPHPVersions as ue, printDebugDetails as de, exposeAPI as fe, exposeSyncAPI as me } from "@php-wasm/universal";
-import { resolveRemoteBlueprint as he, resolveRuntimeConfiguration as ge, compileBlueprintV1 as ye, isBlueprintBundle as we, runBlueprintV1Steps as be } from "@wp-playground/blueprints";
-import { zipDirectory as ve, RecommendedPHPVersion as G } from "@wp-playground/common";
-import u, { mkdirSync as z } from "fs";
-import { Worker as X, MessageChannel as Pe } from "worker_threads";
-import { p as J, a as Se, e as ke } from "./mounts-D1_eXSTw.js";
-import xe from "express";
+import { logger as g, LogSeverity as N, errorLogPath as z } from "@php-wasm/logger";
+import { PHPResponse as O, consumeAPI as R, SupportedPHPVersions as me, printDebugDetails as he, exposeAPI as ge, exposeSyncAPI as we } from "@php-wasm/universal";
+import { resolveRemoteBlueprint as ye, resolveRuntimeConfiguration as X, compileBlueprintV1 as be, isBlueprintBundle as ve, runBlueprintV1Steps as Pe } from "@wp-playground/blueprints";
+import { zipDirectory as Se, RecommendedPHPVersion as ee } from "@wp-playground/common";
+import p, { mkdirSync as J } from "fs";
+import { Worker as Z, MessageChannel as xe } from "worker_threads";
+import { p as Y, a as G, e as ke } from "./mounts-ChxECdbN.js";
+import Ie from "express";
 import { FileLockManagerForNode as Ee } from "@php-wasm/node";
-import K, { cpus as Ie } from "os";
-import { jspi as Ce } from "wasm-feature-detect";
-import Le from "yargs";
-import g, { basename as $e } from "path";
-import { NodeJsFilesystem as We, OverlayFilesystem as Te, InMemoryFilesystem as Be, ZipFilesystem as je } from "@wp-playground/storage";
-import { EmscriptenDownloadMonitor as Re, ProgressTracker as Fe } from "@php-wasm/progress";
-import { resolveWordPressRelease as Me } from "@wp-playground/wordpress";
-import $ from "fs-extra";
-import { startBridge as De } from "@php-wasm/xdebug-bridge";
-import { dir as Ae, setGracefulCleanup as Ue } from "tmp-promise";
-import Ne from "ps-man";
-import { XMLParser as Q, XMLBuilder as ee } from "fast-xml-parser";
-import P from "jsonc-parser";
-async function Ve(e) {
-  const o = xe(), t = await new Promise((n, r) => {
+import te, { cpus as Ce } from "os";
+import { jspi as Le } from "wasm-feature-detect";
+import $e from "yargs";
+import m, { basename as Te } from "path";
+import { NodeJsFilesystem as je, OverlayFilesystem as Be, InMemoryFilesystem as Me, ZipFilesystem as Re } from "@wp-playground/storage";
+import { EmscriptenDownloadMonitor as Fe, ProgressTracker as We } from "@php-wasm/progress";
+import { resolveWordPressRelease as De } from "@wp-playground/wordpress";
+import T from "fs-extra";
+import { startBridge as Ae } from "@php-wasm/xdebug-bridge";
+import { dir as Ue, setGracefulCleanup as Ne } from "tmp-promise";
+import Ve from "ps-man";
+import { XMLParser as oe, XMLBuilder as re } from "fast-xml-parser";
+import v from "jsonc-parser";
+async function Oe(e) {
+  const o = Ie(), t = await new Promise((n, r) => {
     const a = o.listen(e.port, () => {
       const l = a.address();
       l === null || typeof l == "string" ? r(new Error("Server address is not available")) : n(a);
@@ -32,12 +32,12 @@ async function Ve(e) {
     try {
       a = await e.handleRequest({
         url: n.url,
-        headers: _e(n),
+        headers: He(n),
         method: n.method,
-        body: await Oe(n)
+        body: await _e(n)
       });
     } catch (l) {
-      h.error(l), a = V.forHttpCode(500);
+      g.error(l), a = O.forHttpCode(500);
     }
     r.statusCode = a.httpStatusCode;
     for (const l in a.headers)
@@ -47,21 +47,21 @@ async function Ve(e) {
   const s = t.address().port;
   return await e.onBind(t, s);
 }
-const Oe = async (e) => await new Promise((o) => {
+const _e = async (e) => await new Promise((o) => {
   const t = [];
   e.on("data", (i) => {
     t.push(i);
   }), e.on("end", () => {
     o(new Uint8Array(Buffer.concat(t)));
   });
-}), _e = (e) => {
+}), He = (e) => {
   const o = {};
   if (e.rawHeaders && e.rawHeaders.length)
     for (let t = 0; t < e.rawHeaders.length; t += 2)
       o[e.rawHeaders[t].toLowerCase()] = e.rawHeaders[t + 1];
   return o;
 };
-class He {
+class qe {
   constructor(o) {
     this.workerLoads = [], this.addWorker(o);
   }
@@ -71,6 +71,15 @@ class He {
       activeRequests: /* @__PURE__ */ new Set()
     });
   }
+  async removeWorker(o) {
+    const t = this.workerLoads.findIndex(
+      (s) => s.worker === o
+    );
+    if (t === -1)
+      return;
+    const [i] = this.workerLoads.splice(t, 1);
+    await Promise.allSettled(i.activeRequests);
+  }
   async handleRequest(o) {
     let t = this.workerLoads[0];
     for (let s = 1; s < this.workerLoads.length; s++) {
@@ -83,33 +92,33 @@ class He {
     });
   }
 }
-function qe(e) {
+function ze(e) {
   return /^latest$|^trunk$|^nightly$|^(?:(\d+)\.(\d+)(?:\.(\d+))?)((?:-beta(?:\d+)?)|(?:-RC(?:\d+)?))?$/.test(e);
 }
-async function ze({
+async function Xe({
   sourceString: e,
   blueprintMayReadAdjacentFiles: o
 }) {
   if (!e)
     return;
   if (e.startsWith("http://") || e.startsWith("https://"))
-    return await he(e);
-  let t = g.resolve(process.cwd(), e);
-  if (!u.existsSync(t))
+    return await ye(e);
+  let t = m.resolve(process.cwd(), e);
+  if (!p.existsSync(t))
     throw new Error(`Blueprint file does not exist: ${t}`);
-  const i = u.statSync(t);
-  if (i.isDirectory() && (t = g.join(t, "blueprint.json")), !i.isFile() && i.isSymbolicLink())
+  const i = p.statSync(t);
+  if (i.isDirectory() && (t = m.join(t, "blueprint.json")), !i.isFile() && i.isSymbolicLink())
     throw new Error(
       `Blueprint path is neither a file nor a directory: ${t}`
     );
-  const s = g.extname(t);
+  const s = m.extname(t);
   switch (s) {
     case ".zip":
-      return je.fromArrayBuffer(
-        u.readFileSync(t).buffer
+      return Re.fromArrayBuffer(
+        p.readFileSync(t).buffer
       );
     case ".json": {
-      const n = u.readFileSync(t, "utf-8");
+      const n = p.readFileSync(t, "utf-8");
       try {
         JSON.parse(n);
       } catch {
@@ -117,9 +126,9 @@ async function ze({
           `Blueprint file at ${t} is not a valid JSON file`
         );
       }
-      const r = g.dirname(t), a = new We(r);
-      return new Te([
-        new Be({
+      const r = m.dirname(t), a = new je(r);
+      return new Be([
+        new Me({
           "blueprint.json": n
         }),
         /**
@@ -145,15 +154,15 @@ You can allow this Blueprint to read files from the same parent directory by exp
       );
   }
 }
-class Xe {
+class Je {
   constructor(o, t) {
     this.lastProgressMessage = "", this.args = o, this.siteUrl = t.siteUrl, this.processIdSpaceLength = t.processIdSpaceLength, this.phpVersion = o.php;
   }
   getWorkerType() {
     return "v2";
   }
-  async bootPrimaryWorker(o, t, i) {
-    const s = j(o);
+  async bootAndSetUpInitialPlayground(o, t, i) {
+    const s = R(o);
     await s.useFileLockManager(t);
     const n = {
       ...this.args,
@@ -163,19 +172,23 @@ class Xe {
       processIdSpaceLength: this.processIdSpaceLength,
       trace: this.args.debug || !1,
       blueprint: this.args.blueprint,
-      withXdebug: !!this.args.xdebug,
-      xdebug: typeof this.args.xdebug == "object" ? this.args.xdebug : void 0,
+      // We do not enable Xdebug by default for the initial worker
+      // because we do not imagine users expect to hit breakpoints
+      // until Playground has fully booted.
+      // TODO: Consider supporting Xdebug for the initial worker via a dedicated flag.
+      withXdebug: !1,
+      xdebug: void 0,
       nativeInternalDirPath: i
     };
-    return await s.bootAsPrimaryWorker(n), s;
+    return await s.bootAndSetUpInitialWorker(n), s;
   }
-  async bootSecondaryWorker({
+  async bootPlayground({
     worker: o,
     fileLockManagerPort: t,
     firstProcessId: i,
     nativeInternalDirPath: s
   }) {
-    const n = j(o.phpPort);
+    const n = R(o.phpPort);
     await n.useFileLockManager(t);
     const r = {
       ...this.args,
@@ -189,7 +202,7 @@ class Xe {
       mountsBeforeWpInstall: this.args["mount-before-install"] || [],
       mountsAfterWpInstall: this.args.mount || []
     };
-    return await n.bootAsSecondaryWorker(r), n;
+    return await n.bootWorker(r), n;
   }
   writeProgressUpdate(o, t, i) {
     t !== this.lastProgressMessage && (this.lastProgressMessage = t, o.isTTY ? (o.cursorTo(0), o.write(t), o.clearLine(1), i && o.write(`
@@ -197,20 +210,20 @@ class Xe {
 `));
   }
 }
-const O = g.join(K.homedir(), ".wordpress-playground");
-async function Je(e) {
-  return await te(
+const _ = m.join(te.homedir(), ".wordpress-playground");
+async function Ze(e) {
+  return await ne(
     "https://github.com/WordPress/sqlite-database-integration/archive/refs/heads/develop.zip",
     "sqlite.zip",
     e
   );
 }
-async function te(e, o, t) {
-  const i = g.join(O, o);
-  return $.existsSync(i) || ($.ensureDirSync(O), await Ze(e, i, t)), oe(i);
+async function ne(e, o, t) {
+  const i = m.join(_, o);
+  return T.existsSync(i) || (T.ensureDirSync(_), await Ye(e, i, t)), ie(i);
 }
-async function Ze(e, o, t) {
-  const s = (await t.monitorFetch(fetch(e))).body.getReader(), n = `${o}.partial`, r = $.createWriteStream(n);
+async function Ye(e, o, t) {
+  const s = (await t.monitorFetch(fetch(e))).body.getReader(), n = `${o}.partial`, r = T.createWriteStream(n);
   for (; ; ) {
     const { done: a, value: l } = await s.read();
     if (l && r.write(l), a)
@@ -218,87 +231,95 @@ async function Ze(e, o, t) {
   }
   r.close(), r.closed || await new Promise((a, l) => {
     r.on("finish", () => {
-      $.renameSync(n, o), a(null);
-    }), r.on("error", (p) => {
-      $.removeSync(n), l(p);
+      T.renameSync(n, o), a(null);
+    }), r.on("error", (d) => {
+      T.removeSync(n), l(d);
     });
   });
 }
-function oe(e, o) {
-  return new File([$.readFileSync(e)], $e(e));
+function ie(e, o) {
+  return new File([T.readFileSync(e)], Te(e));
 }
-class Ye {
+class Ge {
   constructor(o, t) {
     this.lastProgressMessage = "", this.args = o, this.siteUrl = t.siteUrl, this.processIdSpaceLength = t.processIdSpaceLength;
   }
   getWorkerType() {
     return "v1";
   }
-  async bootPrimaryWorker(o, t, i) {
-    let s;
-    const n = new Re();
-    if (!this.args.skipWordPressSetup) {
-      let I = !1;
-      n.addEventListener("progress", (k) => {
-        if (I)
+  async bootAndSetUpInitialPlayground(o, t, i) {
+    let s, n, r;
+    const a = new Fe();
+    if (this.args.wordpressInstallMode === "download-and-install") {
+      let k = !1;
+      a.addEventListener("progress", (j) => {
+        if (k)
           return;
-        const { loaded: x, total: f } = k.detail, W = Math.floor(
+        const { loaded: x, total: f } = j.detail, B = Math.floor(
           Math.min(100, 100 * x / f)
         );
-        I = W === 100, this.writeProgressUpdate(
+        k = B === 100, this.writeProgressUpdate(
           process.stdout,
-          `Downloading WordPress ${W}%...`,
-          I
+          `Downloading WordPress ${B}%...`,
+          k
         );
-      }), s = await Me(this.args.wp), h.log(
+      }), s = await De(this.args.wp), r = m.join(
+        _,
+        `prebuilt-wp-content-for-wp-${s.version}.zip`
+      ), n = p.existsSync(r) ? ie(r) : await ne(
+        s.releaseUrl,
+        `${s.version}.zip`,
+        a
+      ), g.log(
         `Resolved WordPress release URL: ${s?.releaseUrl}`
       );
     }
-    const r = s && g.join(
-      O,
-      `prebuilt-wp-content-for-wp-${s.version}.zip`
-    ), a = s ? u.existsSync(r) ? oe(r) : await te(
-      s.releaseUrl,
-      `${s.version}.zip`,
-      n
-    ) : void 0;
-    h.log("Fetching SQLite integration plugin...");
-    const l = this.args.skipSqliteSetup ? void 0 : await Je(n), p = this.args.followSymlinks === !0, c = this.args.experimentalTrace === !0, d = this.args["mount-before-install"] || [], m = this.args.mount || [], b = j(o);
-    await b.isConnected(), h.log("Booting WordPress...");
-    const v = await ge(
+    g.log("Fetching SQLite integration plugin...");
+    const l = this.args.skipSqliteSetup ? void 0 : await Ze(a), d = this.args.followSymlinks === !0, c = this.args.experimentalTrace === !0, u = this.args["mount-before-install"] || [], h = this.args.mount || [], b = R(o);
+    await b.isConnected(), g.log("Booting WordPress...");
+    const S = await X(
       this.getEffectiveBlueprint()
     );
-    return await b.useFileLockManager(t), await b.bootAsPrimaryWorker({
-      phpVersion: v.phpVersion,
-      wpVersion: v.wpVersion,
+    return await b.useFileLockManager(t), await b.bootAndSetUpInitialWorker({
+      phpVersion: S.phpVersion,
+      wpVersion: S.wpVersion,
       siteUrl: this.siteUrl,
-      mountsBeforeWpInstall: d,
-      mountsAfterWpInstall: m,
-      wordPressZip: a && await a.arrayBuffer(),
+      mountsBeforeWpInstall: u,
+      mountsAfterWpInstall: h,
+      wordpressInstallMode: this.args.wordpressInstallMode || "download-and-install",
+      wordPressZip: n && await n.arrayBuffer(),
       sqliteIntegrationPluginZip: await l?.arrayBuffer(),
       firstProcessId: 0,
       processIdSpaceLength: this.processIdSpaceLength,
-      followSymlinks: p,
+      followSymlinks: d,
       trace: c,
       internalCookieStore: this.args.internalCookieStore,
-      withXdebug: !!this.args.xdebug,
+      // We do not enable Xdebug by default for the initial worker
+      // because we do not imagine users expect to hit breakpoints
+      // until Playground has fully booted.
+      // TODO: Consider supporting Xdebug for the initial worker via a dedicated flag.
+      withXdebug: !1,
       nativeInternalDirPath: i
-    }), s && !this.args["mount-before-install"] && !u.existsSync(r) && (h.log("Caching preinstalled WordPress for the next boot..."), u.writeFileSync(
+    }), r && !this.args["mount-before-install"] && !p.existsSync(r) && (g.log("Caching preinstalled WordPress for the next boot..."), p.writeFileSync(
       r,
-      await ve(b, "/wordpress")
-    ), h.log("Cached!")), b;
+      await Se(b, "/wordpress")
+    ), g.log("Cached!")), b;
   }
-  async bootSecondaryWorker({
+  async bootPlayground({
     worker: o,
     fileLockManagerPort: t,
     firstProcessId: i,
     nativeInternalDirPath: s
   }) {
-    const n = j(
+    const n = R(
       o.phpPort
     );
-    return await n.isConnected(), await n.useFileLockManager(t), await n.bootAsSecondaryWorker({
-      phpVersion: this.phpVersion,
+    await n.isConnected();
+    const r = await X(
+      this.getEffectiveBlueprint()
+    );
+    return await n.useFileLockManager(t), await n.bootWorker({
+      phpVersion: r.phpVersion,
       siteUrl: this.siteUrl,
       mountsBeforeWpInstall: this.args["mount-before-install"] || [],
       mountsAfterWpInstall: this.args.mount || [],
@@ -314,7 +335,7 @@ class Ye {
     }), await n.isReady(), n;
   }
   async compileInputBlueprint(o) {
-    const t = this.getEffectiveBlueprint(), i = new Fe();
+    const t = this.getEffectiveBlueprint(), i = new We();
     let s = "", n = !1;
     return i.addEventListener("progress", (r) => {
       if (n)
@@ -328,31 +349,31 @@ class Ye {
         l,
         n
       );
-    }), await ye(t, {
+    }), await be(t, {
       progress: i,
       additionalSteps: o
     });
   }
   getEffectiveBlueprint() {
     const o = this.args.blueprint;
-    return we(o) ? o : {
+    return ve(o) ? o : {
       login: this.args.login,
       ...o || {},
       preferredVersions: {
-        php: this.args.php ?? o?.preferredVersions?.php ?? G,
+        php: this.args.php ?? o?.preferredVersions?.php ?? ee,
         wp: this.args.wp ?? o?.preferredVersions?.wp ?? "latest",
         ...o?.preferredVersions || {}
       }
     };
   }
   writeProgressUpdate(o, t, i) {
-    this.args.verbosity !== _.Quiet.name && t !== this.lastProgressMessage && (this.lastProgressMessage = t, o.isTTY ? (o.cursorTo(0), o.write(t), o.clearLine(1), i && o.write(`
+    this.args.verbosity !== H.Quiet.name && t !== this.lastProgressMessage && (this.lastProgressMessage = t, o.isTTY ? (o.cursorTo(0), o.write(t), o.clearLine(1), i && o.write(`
 `)) : o.write(`${t}
 `));
   }
 }
-async function Ge(e, o = !0) {
-  const i = `${g.basename(process.argv0)}${e}${process.pid}-`, s = await Ae({
+async function Ke(e, o = !0) {
+  const i = `${m.basename(process.argv0)}${e}${process.pid}-`, s = await Ue({
     prefix: i,
     /*
      * Allow recursive cleanup on process exit.
@@ -364,20 +385,20 @@ async function Ge(e, o = !0) {
      */
     unsafeCleanup: !0
   });
-  return o && Ue(), s;
+  return o && Ne(), s;
 }
-async function Ke(e, o, t) {
-  const s = (await Qe(
+async function Qe(e, o, t) {
+  const s = (await et(
     e,
     o,
     t
   )).map(
     (n) => new Promise((r) => {
-      u.rm(n, { recursive: !0 }, (a) => {
-        a ? h.warn(
+      p.rm(n, { recursive: !0 }, (a) => {
+        a ? g.warn(
           `Failed to delete stale Playground temp dir: ${n}`,
           a
-        ) : h.info(
+        ) : g.info(
           `Deleted stale Playground temp dir: ${n}`
         ), r();
       });
@@ -385,24 +406,24 @@ async function Ke(e, o, t) {
   );
   await Promise.all(s);
 }
-async function Qe(e, o, t) {
+async function et(e, o, t) {
   try {
-    const i = u.readdirSync(t).map((n) => g.join(t, n)), s = [];
+    const i = p.readdirSync(t).map((n) => m.join(t, n)), s = [];
     for (const n of i)
-      await et(
+      await tt(
         e,
         o,
         n
       ) && s.push(n);
     return s;
   } catch (i) {
-    return h.warn(`Failed to find stale Playground temp dirs: ${i}`), [];
+    return g.warn(`Failed to find stale Playground temp dirs: ${i}`), [];
   }
 }
-async function et(e, o, t) {
-  if (!u.lstatSync(t).isDirectory())
+async function tt(e, o, t) {
+  if (!p.lstatSync(t).isDirectory())
     return !1;
-  const s = g.basename(t);
+  const s = m.basename(t);
   if (!s.includes(e))
     return !1;
   const n = s.match(
@@ -414,15 +435,15 @@ async function et(e, o, t) {
     executableName: n[1],
     pid: n[2]
   };
-  if (await tt(r.pid, r.executableName))
+  if (await ot(r.pid, r.executableName))
     return !1;
   const a = Date.now() - o;
-  return u.statSync(t).mtime.getTime() < a;
+  return p.statSync(t).mtime.getTime() < a;
 }
-async function tt(e, o) {
+async function ot(e, o) {
   const [t] = await new Promise(
     (i, s) => {
-      Ne.list(
+      Ve.list(
         {
           pid: e,
           name: o,
@@ -437,24 +458,24 @@ async function tt(e, o) {
   );
   return !!t && t.pid === e && t.command === o;
 }
-async function ot(e, o, t) {
+async function rt(e, o, t) {
   const i = t === "win32" ? (
     // On Windows, creating a 'dir' symlink can require elevated permissions.
     // In this case, let's make junction points because they function like
     // symlinks and do not require elevated permissions.
     "junction"
   ) : "dir";
-  u.symlinkSync(e, o, i);
+  p.symlinkSync(e, o, i);
 }
-async function rt(e) {
+async function nt(e) {
   try {
-    u.lstatSync(e).isSymbolicLink() && u.unlinkSync(e);
+    p.lstatSync(e).isSymbolicLink() && p.unlinkSync(e);
   } catch {
   }
 }
-function nt(e, o) {
+function it(e, o) {
   return o.filter((t) => {
-    const i = g.resolve(t.hostPath), s = g.join(e, g.sep);
+    const i = m.resolve(t.hostPath), s = m.join(e, m.sep);
     return (
       // If auto-mounting from the current directory,
       // the entire project directory can be mapped.
@@ -470,7 +491,7 @@ const E = {
   commentPropName: "__xmlComment",
   allowBooleanAttributes: !0,
   trimValues: !0
-}, re = {
+}, se = {
   ignoreAttributes: E.ignoreAttributes,
   attributeNamePrefix: E.attributeNamePrefix,
   preserveOrder: E.preserveOrder,
@@ -479,26 +500,25 @@ const E = {
   suppressBooleanAttributes: !E.allowBooleanAttributes,
   format: !0,
   indentBy: "	"
-}, R = {
+}, F = {
   allowEmptyContent: !0,
   allowTrailingComma: !0
 };
-function it(e, o) {
-  const { name: t, host: i, port: s, mappings: n, ideKey: r } = o, a = new Q(E), l = (() => {
+function st(e, o) {
+  const { name: t, host: i, port: s, mappings: n, ideKey: r } = o, a = new oe(E), l = (() => {
     try {
       return a.parse(e, !0);
     } catch {
       throw new Error("PhpStorm configuration file is not valid XML.");
     }
-  })(), p = {
+  })(), d = {
     server: [
       {
         path_mappings: n.map((f) => ({
           mapping: [],
           ":@": {
-            "local-root": `$PROJECT_DIR$/${f.hostPath.replace(
-              /^\.\/?/,
-              ""
+            "local-root": `$PROJECT_DIR$/${le(
+              m.relative(o.projectDir, f.hostPath)
             )}`,
             "remote-root": f.vfsPath
           }
@@ -530,28 +550,28 @@ function it(e, o) {
     project: [],
     ":@": { version: "4" }
   }, l.push(c));
-  let d = c.project?.find(
+  let u = c.project?.find(
     (f) => !!f?.component && f?.[":@"]?.name === "PhpServers"
   );
-  d === void 0 && (d = {
+  u === void 0 && (u = {
     component: [],
     ":@": { name: "PhpServers" }
-  }, c.project === void 0 && (c.project = []), c.project.push(d));
-  let m = d.component?.find(
+  }, c.project === void 0 && (c.project = []), c.project.push(u));
+  let h = u.component?.find(
     (f) => !!f?.servers
   );
-  m === void 0 && (m = { servers: [] }, d.component === void 0 && (d.component = []), d.component.push(m));
-  const b = m.servers?.findIndex(
+  h === void 0 && (h = { servers: [] }, u.component === void 0 && (u.component = []), u.component.push(h));
+  const b = h.servers?.findIndex(
     (f) => !!f?.server && f?.[":@"]?.name === t
   );
-  (b === void 0 || b < 0) && (m.servers === void 0 && (m.servers = []), m.servers.push(p));
-  let v = c.project?.find(
+  (b === void 0 || b < 0) && (h.servers === void 0 && (h.servers = []), h.servers.push(d));
+  let S = c.project?.find(
     (f) => !!f?.component && f?.[":@"]?.name === "RunManager"
   );
-  if (v === void 0 && (v = {
+  if (S === void 0 && (S = {
     component: [],
     ":@": { name: "RunManager" }
-  }, c.project === void 0 && (c.project = []), c.project.push(v)), (v.component?.findIndex(
+  }, c.project === void 0 && (c.project = []), c.project.push(S)), (S.component?.findIndex(
     (f) => !!f?.configuration && f?.[":@"]?.name === t
   ) ?? -1) < 0) {
     const f = {
@@ -570,9 +590,9 @@ function it(e, o) {
         session_id: r
       }
     };
-    v.component === void 0 && (v.component = []), v.component.push(f);
+    S.component === void 0 && (S.component = []), S.component.push(f);
   }
-  const x = new ee(re).build(l);
+  const x = new re(se).build(l);
   try {
     a.parse(x, !0);
   } catch {
@@ -582,35 +602,34 @@ function it(e, o) {
   }
   return x;
 }
-function st(e, o) {
+function at(e, o) {
   const { name: t, mappings: i } = o, s = [];
-  let n = e, r = P.parseTree(n, s, R);
+  let n = e, r = v.parseTree(n, s, F);
   if (r === void 0 || s.length)
     throw new Error("VS Code configuration file is not valid JSON.");
-  let a = P.findNodeAtLocation(r, ["configurations"]);
+  let a = v.findNodeAtLocation(r, ["configurations"]);
   if (a === void 0 || a.children === void 0) {
-    const p = P.modify(n, ["configurations"], [], {});
-    n = P.applyEdits(n, p), r = P.parseTree(n, [], R), a = P.findNodeAtLocation(r, [
+    const d = v.modify(n, ["configurations"], [], {});
+    n = v.applyEdits(n, d), r = v.parseTree(n, [], F), a = v.findNodeAtLocation(r, [
       "configurations"
     ]);
   }
   const l = a?.children?.findIndex(
-    (p) => P.findNodeAtLocation(p, ["name"])?.value === t
+    (d) => v.findNodeAtLocation(d, ["name"])?.value === t
   );
   if (l === void 0 || l < 0) {
-    const p = {
+    const d = {
       name: t,
       type: "php",
       request: "launch",
       port: 9003,
-      pathMappings: i.reduce((m, b) => (m[b.vfsPath] = `\${workspaceFolder}/${b.hostPath.replace(
-        /^\.\/?/,
-        ""
-      )}`, m), {})
-    }, c = a?.children?.length || 0, d = P.modify(
+      pathMappings: i.reduce((h, b) => (h[b.vfsPath] = `\${workspaceFolder}/${le(
+        m.relative(o.workspaceDir, b.hostPath)
+      )}`, h), {})
+    }, c = a?.children?.length || 0, u = v.modify(
       n,
       ["configurations", c],
-      p,
+      d,
       {
         formattingOptions: {
           insertSpaces: !0,
@@ -620,11 +639,11 @@ function st(e, o) {
         }
       }
     );
-    n = ne(n, d);
+    n = ae(n, u);
   }
   return n;
 }
-async function at({
+async function lt({
   name: e,
   ides: o,
   host: t,
@@ -633,15 +652,15 @@ async function at({
   mounts: n,
   ideKey: r = "PLAYGROUNDCLI"
 }) {
-  const a = nt(s, n), l = [];
+  const a = it(s, n), l = [];
   if (o.includes("phpstorm")) {
-    const p = ".idea/workspace.xml", c = g.join(
+    const d = ".idea/workspace.xml", c = m.join(
       s,
-      p
+      d
     );
-    if (!u.existsSync(c)) {
-      if (u.existsSync(g.dirname(c)))
-        u.writeFileSync(
+    if (!p.existsSync(c)) {
+      if (p.existsSync(m.dirname(c)))
+        p.writeFileSync(
           c,
           `<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
@@ -652,26 +671,27 @@ async function at({
           "PhpStorm IDE integration requested, but no '.idea' directory was found in the current working directory."
         );
     }
-    if (u.existsSync(c)) {
-      const d = u.readFileSync(c, "utf8"), m = it(d, {
+    if (p.existsSync(c)) {
+      const u = p.readFileSync(c, "utf8"), h = st(u, {
         name: e,
         host: t,
         port: i,
+        projectDir: s,
         mappings: a,
         ideKey: r
       });
-      u.writeFileSync(c, m);
+      p.writeFileSync(c, h);
     }
-    l.push(p);
+    l.push(d);
   }
   if (o.includes("vscode")) {
-    const p = ".vscode/launch.json", c = g.join(
+    const d = ".vscode/launch.json", c = m.join(
       s,
-      p
+      d
     );
-    if (!u.existsSync(c)) {
-      if (u.existsSync(g.dirname(c)))
-        u.writeFileSync(
+    if (!p.existsSync(c)) {
+      if (p.existsSync(m.dirname(c)))
+        p.writeFileSync(
           c,
           `{
     "configurations": []
@@ -682,20 +702,21 @@ async function at({
           "VS Code IDE integration requested, but no '.vscode' directory was found in the current working directory."
         );
     }
-    if (u.existsSync(c)) {
-      const d = u.readFileSync(c, "utf-8"), m = st(d, {
+    if (p.existsSync(c)) {
+      const u = p.readFileSync(c, "utf-8"), h = at(u, {
         name: e,
+        workspaceDir: s,
         mappings: a
       });
-      m !== d && (u.writeFileSync(c, m), l.push(p));
+      h !== u && (p.writeFileSync(c, h), l.push(d));
     }
   }
   return l;
 }
-async function lt(e, o) {
-  const t = g.join(o, ".idea/workspace.xml");
-  if (u.existsSync(t)) {
-    const s = u.readFileSync(t, "utf8"), n = new Q(E), r = (() => {
+async function ct(e, o) {
+  const t = m.join(o, ".idea/workspace.xml");
+  if (p.existsSync(t)) {
+    const s = p.readFileSync(t, "utf8"), n = new oe(E), r = (() => {
       try {
         return n.parse(s, !0);
       } catch {
@@ -703,45 +724,45 @@ async function lt(e, o) {
           "PhpStorm configuration file is not valid XML."
         );
       }
-    })(), p = r.find(
-      (d) => !!d?.project
+    })(), d = r.find(
+      (u) => !!u?.project
     )?.project?.find(
-      (d) => !!d?.component && d?.[":@"]?.name === "PhpServers"
+      (u) => !!u?.component && u?.[":@"]?.name === "PhpServers"
     )?.component?.find(
-      (d) => !!d?.servers
-    ), c = p?.servers?.findIndex(
-      (d) => !!d?.server && d?.[":@"]?.name === e
+      (u) => !!u?.servers
+    ), c = d?.servers?.findIndex(
+      (u) => !!u?.server && u?.[":@"]?.name === e
     );
     if (c !== void 0 && c >= 0) {
-      p.servers.splice(c, 1);
-      const m = new ee(re).build(r);
+      d.servers.splice(c, 1);
+      const h = new re(se).build(r);
       try {
-        n.parse(m, !0);
+        n.parse(h, !0);
       } catch {
         throw new Error(
           "The resulting PhpStorm configuration file is not valid XML."
         );
       }
-      m === `<?xml version="1.0" encoding="UTF-8"?>
+      h === `<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 	<component name="PhpServers">
 		<servers></servers>
 	</component>
-</project>` ? u.unlinkSync(t) : u.writeFileSync(t, m);
+</project>` ? p.unlinkSync(t) : p.writeFileSync(t, h);
     }
   }
-  const i = g.join(o, ".vscode/launch.json");
-  if (u.existsSync(i)) {
-    const s = [], n = u.readFileSync(i, "utf-8"), r = P.parseTree(n, s, R);
+  const i = m.join(o, ".vscode/launch.json");
+  if (p.existsSync(i)) {
+    const s = [], n = p.readFileSync(i, "utf-8"), r = v.parseTree(n, s, F);
     if (r === void 0 || s.length)
       throw new Error("VS Code configuration file is not valid JSON.");
-    const l = P.findNodeAtLocation(r, [
+    const l = v.findNodeAtLocation(r, [
       "configurations"
     ])?.children?.findIndex(
-      (p) => P.findNodeAtLocation(p, ["name"])?.value === e
+      (d) => v.findNodeAtLocation(d, ["name"])?.value === e
     );
     if (l !== void 0 && l >= 0) {
-      const p = P.modify(
+      const d = v.modify(
         n,
         ["configurations", l],
         void 0,
@@ -753,18 +774,18 @@ async function lt(e, o) {
 `
           }
         }
-      ), c = ne(n, p);
+      ), c = ae(n, d);
       c === `{
     "configurations": []
-}` ? u.unlinkSync(i) : u.writeFileSync(i, c);
+}` ? p.unlinkSync(i) : p.writeFileSync(i, c);
     }
   }
 }
-function ne(e, o) {
-  const t = [], i = P.applyEdits(e, o);
-  if (t.length = 0, P.parseTree(i, t, R), t.length) {
+function ae(e, o) {
+  const t = [], i = v.applyEdits(e, o);
+  if (t.length = 0, v.parseTree(i, t, F), t.length) {
     const s = t.map((r) => ({
-      message: P.printParseErrorCode(r.error),
+      message: v.printParseErrorCode(r.error),
       offset: r.offset,
       length: r.length,
       fragment: i.slice(
@@ -790,14 +811,17 @@ function ne(e, o) {
   }
   return i;
 }
-const _ = {
-  Quiet: { name: "quiet", severity: A.Fatal },
-  Normal: { name: "normal", severity: A.Info },
-  Debug: { name: "debug", severity: A.Debug }
+function le(e) {
+  return e.replaceAll(m.sep, m.posix.sep);
+}
+const H = {
+  Quiet: { name: "quiet", severity: N.Fatal },
+  Normal: { name: "normal", severity: N.Info },
+  Debug: { name: "debug", severity: N.Debug }
 };
-async function Dt() {
+async function At() {
   try {
-    const e = Le(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
+    const e = $e(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
       describe: "Command to run",
       choices: ["server", "run-blueprint", "build-snapshot"],
       demandOption: !0
@@ -815,8 +839,8 @@ async function Dt() {
     }).option("php", {
       describe: "PHP version to use.",
       type: "string",
-      default: G,
-      choices: ue
+      default: ee,
+      choices: me
     }).option("wp", {
       describe: "WordPress version to use.",
       type: "string",
@@ -825,24 +849,24 @@ async function Dt() {
       describe: "Mount a directory to the PHP runtime (can be used multiple times). Format: /host/path:/vfs/path",
       type: "array",
       string: !0,
-      coerce: J
+      coerce: Y
     }).option("mount-before-install", {
       describe: "Mount a directory to the PHP runtime before WordPress installation (can be used multiple times). Format: /host/path:/vfs/path",
       type: "array",
       string: !0,
-      coerce: J
+      coerce: Y
     }).option("mount-dir", {
       describe: 'Mount a directory to the PHP runtime (can be used multiple times). Format: "/host/path" "/vfs/path"',
       type: "array",
       nargs: 2,
-      array: !0
-      // coerce: parseMountDirArguments,
+      array: !0,
+      coerce: G
     }).option("mount-dir-before-install", {
       describe: 'Mount a directory before WordPress installation (can be used multiple times). Format: "/host/path" "/vfs/path"',
       type: "string",
       nargs: 2,
       array: !0,
-      coerce: Se
+      coerce: G
     }).option("login", {
       describe: "Should log the user in",
       type: "boolean",
@@ -854,10 +878,20 @@ async function Dt() {
       describe: 'Consent flag: Allow "bundled" resources in a local blueprint to read files in the same directory as the blueprint file.',
       type: "boolean",
       default: !1
-    }).option("skip-wordpress-setup", {
-      describe: "Do not download, unzip, and install WordPress. Useful for mounting a pre-configured WordPress directory at /wordpress.",
+    }).option("wordpress-install-mode", {
+      describe: "Control how Playground prepares WordPress before booting.",
+      type: "string",
+      default: "download-and-install",
+      choices: [
+        "download-and-install",
+        "install-from-existing-files",
+        "install-from-existing-files-if-needed",
+        "do-not-attempt-installing"
+      ]
+    }).option("skip-wordpress-install", {
+      describe: "[Deprecated] Use --wordpress-install-mode instead.",
       type: "boolean",
-      default: !1
+      hidden: !0
     }).option("skip-sqlite-setup", {
       describe: "Skip the SQLite integration plugin setup to allow the WordPress site to use MySQL.",
       type: "boolean",
@@ -870,7 +904,7 @@ async function Dt() {
     }).option("verbosity", {
       describe: "Output logs and progress messages.",
       type: "string",
-      choices: Object.values(_).map(
+      choices: Object.values(H).map(
         (r) => r.name
       ),
       default: "normal"
@@ -917,7 +951,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
     ).option("experimental-multi-worker", {
       describe: "Enable experimental multi-worker support which requires a /wordpress directory backed by a real filesystem. Pass a positive number to specify the number of workers to use. Otherwise, default to the number of CPUs minus 1.",
       type: "number",
-      coerce: (r) => r ?? Ie().length - 1
+      coerce: (r) => r ?? Ce().length - 1
     }).option("experimental-blueprints-v2-runner", {
       describe: "Use the experimental Blueprint V2 runner.",
       type: "boolean",
@@ -931,7 +965,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
       // Remove the "hidden" flag once Blueprint V2 is fully supported
       hidden: !0
     }).showHelpOnFail(!1).strictOptions().check(async (r) => {
-      if ((r["skip-wordpress-setup"] || r.skipWordpressSetup) && (r.skipWordPressSetup = !0), r.wp !== void 0 && !qe(r.wp))
+      if (r["skip-wordpress-install"] === !0 && (r["wordpress-install-mode"] = "do-not-attempt-installing", r.wordpressInstallMode = "do-not-attempt-installing"), r.wp !== void 0 && !ze(r.wp))
         try {
           new URL(r.wp);
         } catch {
@@ -950,7 +984,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
       if (r["auto-mount"]) {
         let a = !1;
         try {
-          a = u.statSync(r["auto-mount"]).isDirectory();
+          a = p.statSync(r["auto-mount"]).isDirectory();
         } catch {
           a = !1;
         }
@@ -965,9 +999,9 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
         );
       if (r["experimental-blueprints-v2-runner"] === !0) {
         if (r.mode !== void 0) {
-          if ("skip-wordpress-setup" in r)
+          if (r["wordpress-install-mode"] !== void 0)
             throw new Error(
-              "The --skipWordPressSetup option cannot be used with the --mode option. Use one or the other."
+              "The --wordpress-install-mode option cannot be used with the --mode option. Use one or the other."
             );
           if ("skip-sqlite-setup" in r)
             throw new Error(
@@ -978,7 +1012,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
               "The --mode option cannot be used with --auto-mount because --auto-mount automatically sets the mode."
             );
         } else
-          r["skip-wordpress-setup"] === !0 ? r.mode = "apply-to-existing-site" : r.mode = "create-new-site";
+          r["wordpress-install-mode"] === "do-not-attempt-installing" ? r.mode = "apply-to-existing-site" : r.mode = "create-new-site";
         const a = r.allow || [];
         r.followSymlinks === !0 && a.push("follow-symlinks"), r["blueprint-may-read-adjacent-files"] === !0 && a.push("read-local-fs"), r.allow = a;
       } else if (r.mode !== void 0)
@@ -1011,7 +1045,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
     if (!(e instanceof Error))
       throw e;
     if (process.argv.includes("--debug"))
-      de(e);
+      he(e);
     else {
       const t = [];
       let i = e;
@@ -1019,108 +1053,114 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
         t.push(i.message), i = i.cause;
       while (i instanceof Error);
       console.error(
-        "\x1B[1m" + t.join(" caused by ") + "\x1B[0m"
+        "\x1B[1m" + t.join(" caused by: ") + "\x1B[0m"
       );
     }
     process.exit(1);
   }
 }
-const U = (e) => process.stdout.isTTY ? "\x1B[1m" + e + "\x1B[0m" : e, ct = (e) => process.stdout.isTTY ? `\x1B[2m${e}\x1B[0m` : e, N = (e) => process.stdout.isTTY ? `\x1B[3m${e}\x1B[0m` : e, Z = (e) => process.stdout.isTTY ? `\x1B[33m${e}\x1B[0m` : e;
+const M = (e) => process.stdout.isTTY ? "\x1B[1m" + e + "\x1B[0m" : e, dt = (e) => process.stdout.isTTY ? `\x1B[2m${e}\x1B[0m` : e, V = (e) => process.stdout.isTTY ? `\x1B[3m${e}\x1B[0m` : e, K = (e) => process.stdout.isTTY ? `\x1B[33m${e}\x1B[0m` : e;
 async function pt(e) {
   let o, t;
   const i = [];
-  if (e.autoMount !== void 0 && (e.autoMount === "" && (e = { ...e, autoMount: process.cwd() }), e = ke(e)), e.quiet && (e.verbosity = "quiet", delete e.quiet), e.debug ? e.verbosity = "debug" : e.verbosity === "debug" && (e.debug = !0), e.verbosity) {
-    const l = Object.values(_).find(
-      (p) => p.name === e.verbosity
+  if (e.autoMount !== void 0 && (e.autoMount === "" && (e = { ...e, autoMount: process.cwd() }), e = ke(e)), e.wordpressInstallMode === void 0 && (e.wordpressInstallMode = "download-and-install"), e.quiet && (e.verbosity = "quiet", delete e.quiet), e.debug ? e.verbosity = "debug" : e.verbosity === "debug" && (e.debug = !0), e.verbosity) {
+    const l = Object.values(H).find(
+      (d) => d.name === e.verbosity
     ).severity;
-    h.setSeverityFilterLevel(l);
+    g.setSeverityFilterLevel(l);
   }
-  const s = K.platform() === "win32" ? (
+  const s = te.platform() === "win32" ? (
     // @TODO: Enable fs-ext here when it works with Windows.
     void 0
   ) : await import("fs-ext").then((l) => l.flockSync).catch(() => {
-    h.warn(
+    g.warn(
       "The fs-ext package is not installed. Internal file locking will not be integrated with host OS file locking."
     );
   }), n = new Ee(s);
   let r = !1, a = !0;
-  return h.log("Starting a PHP server..."), Ve({
+  return g.log("Starting a PHP server..."), Oe({
     port: e.port,
-    onBind: async (l, p) => {
-      const c = "127.0.0.1", d = `http://${c}:${p}`, m = e["site-url"] || d, b = e.experimentalMultiWorker ?? 1, v = Math.floor(
-        Number.MAX_SAFE_INTEGER / b
-      ), I = "-playground-cli-site-", k = await Ge(
-        I
+    onBind: async (l, d) => {
+      const c = "127.0.0.1", u = `http://${c}:${d}`, h = e["site-url"] || u, b = e.experimentalMultiWorker ?? 1, S = b + 1, k = Math.floor(
+        Number.MAX_SAFE_INTEGER / S
+      ), j = "-playground-cli-site-", x = await Ke(
+        j
       );
-      h.debug(`Native temp dir for VFS root: ${k.path}`);
-      const x = "WP Playground CLI - Listen for Xdebug", f = ".playground-xdebug-root", W = g.join(process.cwd(), f);
-      if (await rt(W), e.xdebug && e.experimentalUnsafeIdeIntegration) {
-        await ot(
-          k.path,
-          W,
+      g.debug(`Native temp dir for VFS root: ${x.path}`);
+      const f = "WP Playground CLI - Listen for Xdebug", B = ".playground-xdebug-root", q = m.join(process.cwd(), B);
+      if (await nt(q), e.xdebug && e.experimentalUnsafeIdeIntegration) {
+        await rt(
+          x.path,
+          q,
           process.platform
         );
-        const y = {
-          hostPath: `./${f}`,
+        const w = {
+          hostPath: m.join(".", m.sep, B),
           vfsPath: "/"
         };
         try {
-          await lt(x, process.cwd());
-          const w = typeof e.xdebug == "object" ? e.xdebug : void 0, L = await at({
-            name: x,
+          await ct(f, process.cwd());
+          const y = typeof e.xdebug == "object" ? e.xdebug : void 0, $ = await lt({
+            name: f,
             host: c,
-            port: p,
+            port: d,
             ides: e.experimentalUnsafeIdeIntegration,
             cwd: process.cwd(),
             mounts: [
-              y,
+              w,
               ...e["mount-before-install"] || [],
               ...e.mount || []
             ],
-            ideKey: w?.ideKey
-          }), S = e.experimentalUnsafeIdeIntegration, T = S.includes("vscode"), B = S.includes("phpstorm");
-          console.log(""), console.log(U("Xdebug configured successfully")), console.log(
-            Z("Updated IDE config: ") + L.join(" ")
+            ideKey: y?.ideKey
+          }), P = e.experimentalUnsafeIdeIntegration, I = P.includes("vscode"), C = P.includes("phpstorm");
+          console.log(""), console.log(M("Xdebug configured successfully")), console.log(
+            K("Updated IDE config: ") + $.join(" ")
           ), console.log(
-            Z("Playground source root: ") + ".playground-xdebug-root" + N(
-              ct(
+            K("Playground source root: ") + ".playground-xdebug-root" + V(
+              dt(
                 " – you can set breakpoints and preview Playground's VFS structure in there."
               )
             )
-          ), console.log(""), T && (console.log(U("VS Code / Cursor instructions:")), console.log(
-            "  1. Open the Run and Debug panel on the left sidebar"
+          ), console.log(""), I && (console.log(M("VS Code / Cursor instructions:")), console.log(
+            "  1. Ensure you have installed an IDE extension for PHP Debugging"
+          ), console.log(
+            `     (The ${M("PHP Debug")} extension by ${M(
+              "Xdebug"
+            )} has been a solid option)`
           ), console.log(
-            `  2. Select "${N(
-              x
+            "  2. Open the Run and Debug panel on the left sidebar"
+          ), console.log(
+            `  3. Select "${V(
+              f
             )}" from the dropdown`
           ), console.log('  3. Click "start debugging"'), console.log(
-            "  4. Set a breakpoint. For example, in .playground-xdebug-root/wordpress/index.php"
+            "  5. Set a breakpoint. For example, in .playground-xdebug-root/wordpress/index.php"
           ), console.log(
-            "  5. Visit Playground in your browser to hit the breakpoint"
-          ), B && console.log("")), B && (console.log(U("PhpStorm instructions:")), console.log(
-            `  1. Choose "${N(
-              x
+            "  6. Visit Playground in your browser to hit the breakpoint"
+          ), C && console.log("")), C && (console.log(M("PhpStorm instructions:")), console.log(
+            `  1. Choose "${V(
+              f
             )}" debug configuration in the toolbar`
           ), console.log("  2. Click the debug button (bug icon)`"), console.log(
             "  3. Set a breakpoint. For example, in .playground-xdebug-root/wordpress/index.php"
           ), console.log(
             "  4. Visit Playground in your browser to hit the breakpoint"
           )), console.log("");
-        } catch (w) {
+        } catch (y) {
           throw new Error("Could not configure Xdebug", {
-            cause: w
+            cause: y
           });
         }
       }
-      const ie = g.dirname(k.path), se = 2 * 24 * 60 * 60 * 1e3;
-      Ke(
-        I,
-        se,
-        ie
+      const ce = m.dirname(x.path), de = 2 * 24 * 60 * 60 * 1e3;
+      Qe(
+        j,
+        de,
+        ce
       );
-      const F = g.join(k.path, "internal");
-      z(F);
-      const ae = [
+      const W = m.join(x.path, "internal");
+      J(W);
+      const pe = [
         "wordpress",
         // Note: These dirs are from Emscripten's "default dirs" list:
         // https://github.com/emscripten-core/emscripten/blob/f431ec220e472e1f8d3db6b52fe23fb377facf30/src/lib/libfs.js#L1400-L1402
@@ -1131,140 +1171,140 @@ async function pt(e) {
         "tmp",
         "home"
       ];
-      for (const y of ae) {
-        const w = (S) => S.vfsPath === `/${y}`;
-        if (!(e["mount-before-install"]?.some(w) || e.mount?.some(w))) {
-          const S = g.join(
-            k.path,
-            y
+      for (const w of pe) {
+        const y = (P) => P.vfsPath === `/${w}`;
+        if (!(e["mount-before-install"]?.some(y) || e.mount?.some(y))) {
+          const P = m.join(
+            x.path,
+            w
           );
-          z(S), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
-            vfsPath: `/${y}`,
-            hostPath: S
+          J(P), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
+            vfsPath: `/${w}`,
+            hostPath: P
           });
         }
       }
       if (e["mount-before-install"])
-        for (const y of e["mount-before-install"])
-          h.debug(
-            `Mount before WP install: ${y.vfsPath} -> ${y.hostPath}`
+        for (const w of e["mount-before-install"])
+          g.debug(
+            `Mount before WP install: ${w.vfsPath} -> ${w.hostPath}`
           );
       if (e.mount)
-        for (const y of e.mount)
-          h.debug(
-            `Mount after WP install: ${y.vfsPath} -> ${y.hostPath}`
+        for (const w of e.mount)
+          g.debug(
+            `Mount after WP install: ${w.vfsPath} -> ${w.hostPath}`
           );
-      let C;
-      e["experimental-blueprints-v2-runner"] ? C = new Xe(e, {
-        siteUrl: m,
-        processIdSpaceLength: v
-      }) : (C = new Ye(e, {
-        siteUrl: m,
-        processIdSpaceLength: v
-      }), typeof e.blueprint == "string" && (e.blueprint = await ze({
+      let L;
+      e["experimental-blueprints-v2-runner"] ? L = new Je(e, {
+        siteUrl: h,
+        processIdSpaceLength: k
+      }) : (L = new Ge(e, {
+        siteUrl: h,
+        processIdSpaceLength: k
+      }), typeof e.blueprint == "string" && (e.blueprint = await Xe({
         sourceString: e.blueprint,
         blueprintMayReadAdjacentFiles: e["blueprint-may-read-adjacent-files"] === !0
       })));
-      let M = !1;
-      const D = async function() {
-        M || (M = !0, await Promise.all(
-          i.map(async ({ playground: w, worker: L }) => {
-            await w.dispose(), await L.terminate();
+      let D = !1;
+      const A = async function() {
+        D || (D = !0, await Promise.all(
+          i.map(async ({ playground: y, worker: $ }) => {
+            await y.dispose(), await $.terminate();
           })
-        ), l && await new Promise((w) => l.close(w)), await k.cleanup());
-      }, le = ut(
-        b,
-        C.getWorkerType(),
-        ({ exitCode: y, workerIndex: w }) => {
-          M || y === 0 && h.error(
-            `Worker ${w} exited with code ${y}
+        ), l && await new Promise((y) => l.close(y)), await x.cleanup());
+      }, ue = ut(
+        S,
+        L.getWorkerType(),
+        ({ exitCode: w, workerIndex: y }) => {
+          D || w === 0 && g.error(
+            `Worker ${y} exited with code ${w}
 `
           );
         }
       );
-      h.log(`Setting up WordPress ${e.wp}`);
+      g.log("Starting up workers");
       try {
-        const [y, ...w] = await le, L = await Y(
+        const w = await ue, y = await Q(
           n
         );
-        if (t = await C.bootPrimaryWorker(
-          y.phpPort,
-          L,
-          F
-        ), i.push({
-          playground: t,
-          worker: y.worker
-        }), await t.isReady(), r = !0, h.log("Booted!"), o = new He(t), !e["experimental-blueprints-v2-runner"]) {
-          const S = await C.compileInputBlueprint(
-            e["additional-blueprint-steps"] || []
-          );
-          S && (h.log("Running the Blueprint..."), await be(
-            S,
-            t
-          ), h.log("Finished running the blueprint"));
-        }
-        if (e.command === "build-snapshot") {
-          await ft(t, e.outfile), h.log(`WordPress exported to ${e.outfile}`), await D();
-          return;
-        } else if (e.command === "run-blueprint") {
-          h.log("Blueprint executed"), await D();
-          return;
-        }
-        if (e.experimentalMultiWorker && e.experimentalMultiWorker > 1) {
-          h.log("Preparing additional workers...");
-          const S = v;
-          await Promise.all(
-            w.map(async (T, B) => {
-              const ce = S + B * v, pe = await Y(n), H = await C.bootSecondaryWorker({
-                worker: T,
-                fileLockManagerPort: pe,
-                firstProcessId: ce,
-                nativeInternalDirPath: F
-              });
-              i.push({
-                playground: H,
-                worker: T.worker
-              }), o.addWorker(H);
-            })
+        {
+          const P = w.shift(), I = await L.bootAndSetUpInitialPlayground(
+            P.phpPort,
+            y,
+            W
           );
+          if (await I.isReady(), r = !0, g.log("Booted!"), o = new qe(I), !e["experimental-blueprints-v2-runner"]) {
+            const C = await L.compileInputBlueprint(
+              e["additional-blueprint-steps"] || []
+            );
+            C && (g.log("Running the Blueprint..."), await Pe(
+              C,
+              I
+            ), g.log("Finished running the blueprint"));
+          }
+          if (e.command === "build-snapshot") {
+            await mt(t, e.outfile), g.log(`WordPress exported to ${e.outfile}`), await A();
+            return;
+          } else if (e.command === "run-blueprint") {
+            g.log("Blueprint executed"), await A();
+            return;
+          }
+          await o.removeWorker(I), await I.dispose(), await P.worker.terminate();
         }
-        return h.log(
-          `WordPress is running on ${d} with ${b} worker(s)`
-        ), e.xdebug && e.experimentalDevtools && (await De({
+        g.log("Preparing workers...");
+        const $ = k;
+        return [t] = await Promise.all(
+          w.map(async (P, I) => {
+            const C = $ + I * k, fe = await Q(
+              n
+            ), U = await L.bootPlayground({
+              worker: P,
+              fileLockManagerPort: fe,
+              firstProcessId: C,
+              nativeInternalDirPath: W
+            });
+            return i.push({
+              playground: U,
+              worker: P.worker
+            }), o.addWorker(U), U;
+          })
+        ), g.log(
+          `WordPress is running on ${u} with ${b} worker(s)`
+        ), e.xdebug && e.experimentalDevtools && (await Ae({
           phpInstance: t,
           phpRoot: "/wordpress"
         })).start(), {
           playground: t,
           server: l,
-          serverUrl: d,
-          [Symbol.asyncDispose]: D,
+          serverUrl: u,
+          [Symbol.asyncDispose]: A,
           workerThreadCount: b
         };
-      } catch (y) {
+      } catch (w) {
         if (!e.debug)
-          throw y;
-        let w = "";
-        throw await t?.fileExists(q) && (w = await t.readFileAsText(q)), new Error(w, { cause: y });
+          throw w;
+        let y = "";
+        throw await t?.fileExists(z) && (y = await t.readFileAsText(z)), new Error(y, { cause: w });
       }
     },
     async handleRequest(l) {
       if (!r)
-        return V.forHttpCode(
+        return O.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
       if (a) {
         a = !1;
-        const p = {
+        const d = {
           "Content-Type": ["text/plain"],
           "Content-Length": ["0"],
           Location: [l.url]
         };
         return l.headers?.cookie?.includes(
           "playground_auto_login_already_happened"
-        ) && (p["Set-Cookie"] = [
+        ) && (d["Set-Cookie"] = [
           "playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/"
-        ]), new V(302, p, new Uint8Array());
+        ]), new O(302, d, new Uint8Array());
       }
       return await o.handleRequest(l);
     }
@@ -1273,7 +1313,7 @@ async function pt(e) {
 async function ut(e, o, t) {
   const i = [];
   for (let s = 0; s < e; s++) {
-    const n = await dt(o), r = (a) => {
+    const n = await ft(o), r = (a) => {
       t({
         exitCode: a,
         workerIndex: s
@@ -1282,12 +1322,12 @@ async function ut(e, o, t) {
     i.push(
       new Promise(
         (a, l) => {
-          n.once("message", function(p) {
-            p.command === "worker-script-initialized" && a({ worker: n, phpPort: p.phpPort });
-          }), n.once("error", function(p) {
-            console.error(p);
+          n.once("message", function(d) {
+            d.command === "worker-script-initialized" && a({ worker: n, phpPort: d.phpPort });
+          }), n.once("error", function(d) {
+            console.error(d);
             const c = new Error(
-              `Worker failed to load worker. ${p.message ? `Original error: ${p.message}` : ""}`
+              `Worker failed to load worker. ${d.message ? `Original error: ${d.message}` : ""}`
             );
             l(c);
           }), n.once("exit", r);
@@ -1297,14 +1337,14 @@ async function ut(e, o, t) {
   }
   return Promise.all(i);
 }
-async function dt(e) {
-  return e === "v1" ? new X(new URL("./worker-thread-v1.js", import.meta.url)) : new X(new URL("./worker-thread-v2.js", import.meta.url));
+async function ft(e) {
+  return e === "v1" ? new Z(new URL("./worker-thread-v1.js", import.meta.url)) : new Z(new URL("./worker-thread-v2.js", import.meta.url));
 }
-async function Y(e) {
-  const { port1: o, port2: t } = new Pe();
-  return await Ce() ? fe(e, null, o) : await me(e, o), t;
+async function Q(e) {
+  const { port1: o, port2: t } = new xe();
+  return await Le() ? ge(e, null, o) : await we(e, o), t;
 }
-async function ft(e, o) {
+async function mt(e, o) {
   await e.run({
     code: `<?php
 		$zip = new ZipArchive();
@@ -1326,11 +1366,11 @@ async function ft(e, o) {
 	`
   });
   const t = await e.readFileAsBuffer("/tmp/build.zip");
-  u.writeFileSync(o, t);
+  p.writeFileSync(o, t);
 }
 export {
-  _ as L,
-  Dt as p,
+  H as L,
+  At as p,
   pt as r
 };
-//# sourceMappingURL=run-cli-BBfr5tmj.js.map
+//# sourceMappingURL=run-cli-g3_uJkf5.js.map