@wp-playground/cli 3.0.21 → 3.0.22

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

@@ -1,5 +1,5 @@
 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 { PHPResponse as _, consumeAPI as F, 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";
@@ -19,35 +19,35 @@ 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);
+import P from "jsonc-parser";
+async function _e(e) {
+  const o = Ie(), t = await new Promise((n, a) => {
+    const r = o.listen(e.port, () => {
+      const l = r.address();
+      l === null || typeof l == "string" ? a(new Error("Server address is not available")) : n(r);
     });
   });
-  o.use("/", async (n, r) => {
-    let a;
+  o.use("/", async (n, a) => {
+    let r;
     try {
-      a = await e.handleRequest({
+      r = await e.handleRequest({
         url: n.url,
         headers: He(n),
         method: n.method,
-        body: await _e(n)
+        body: await Oe(n)
       });
     } catch (l) {
-      g.error(l), a = O.forHttpCode(500);
+      g.error(l), r = _.forHttpCode(500);
     }
-    r.statusCode = a.httpStatusCode;
-    for (const l in a.headers)
-      r.setHeader(l, a.headers[l]);
-    r.end(a.bytes);
+    a.statusCode = r.httpStatusCode;
+    for (const l in r.headers)
+      a.setHeader(l, r.headers[l]);
+    a.end(r.bytes);
   });
   const s = t.address().port;
   return await e.onBind(t, s);
 }
-const _e = async (e) => await new Promise((o) => {
+const Oe = async (e) => await new Promise((o) => {
   const t = [];
   e.on("data", (i) => {
     t.push(i);
@@ -126,7 +126,7 @@ async function Xe({
           `Blueprint file at ${t} is not a valid JSON file`
         );
       }
-      const r = m.dirname(t), a = new je(r);
+      const a = m.dirname(t), r = new je(a);
       return new Be([
         new Me({
           "blueprint.json": n
@@ -143,7 +143,7 @@ async function Xe({
 
 You can allow this Blueprint to read files from the same parent directory by explicitly adding the --blueprint-may-read-adjacent-files option to your command.`
               );
-            return a.read(l);
+            return r.read(l);
           }
         }
       ]);
@@ -162,7 +162,7 @@ class Je {
     return "v2";
   }
   async bootAndSetUpInitialPlayground(o, t, i) {
-    const s = R(o);
+    const s = F(o);
     await s.useFileLockManager(t);
     const n = {
       ...this.args,
@@ -188,9 +188,9 @@ class Je {
     firstProcessId: i,
     nativeInternalDirPath: s
   }) {
-    const n = R(o.phpPort);
+    const n = F(o.phpPort);
     await n.useFileLockManager(t);
-    const r = {
+    const a = {
       ...this.args,
       phpVersion: this.phpVersion,
       siteUrl: this.siteUrl,
@@ -202,7 +202,7 @@ class Je {
       mountsBeforeWpInstall: this.args["mount-before-install"] || [],
       mountsAfterWpInstall: this.args.mount || []
     };
-    return await n.bootWorker(r), n;
+    return await n.bootWorker(a), 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(`
@@ -210,7 +210,7 @@ class Je {
 `));
   }
 }
-const _ = m.join(te.homedir(), ".wordpress-playground");
+const O = 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",
@@ -219,20 +219,20 @@ async function Ze(e) {
   );
 }
 async function ne(e, o, t) {
-  const i = m.join(_, o);
-  return T.existsSync(i) || (T.ensureDirSync(_), await Ye(e, i, t)), ie(i);
+  const i = m.join(O, o);
+  return T.existsSync(i) || (T.ensureDirSync(O), await Ye(e, i, t)), ie(i);
 }
 async function Ye(e, o, t) {
-  const s = (await t.monitorFetch(fetch(e))).body.getReader(), n = `${o}.partial`, r = T.createWriteStream(n);
+  const s = (await t.monitorFetch(fetch(e))).body.getReader(), n = `${o}.partial`, a = T.createWriteStream(n);
   for (; ; ) {
-    const { done: a, value: l } = await s.read();
-    if (l && r.write(l), a)
+    const { done: r, value: l } = await s.read();
+    if (l && a.write(l), r)
       break;
   }
-  r.close(), r.closed || await new Promise((a, l) => {
-    r.on("finish", () => {
-      T.renameSync(n, o), a(null);
-    }), r.on("error", (d) => {
+  a.close(), a.closed || await new Promise((r, l) => {
+    a.on("finish", () => {
+      T.renameSync(n, o), r(null);
+    }), a.on("error", (d) => {
       T.removeSync(n), l(d);
     });
   });
@@ -248,34 +248,34 @@ class Ge {
     return "v1";
   }
   async bootAndSetUpInitialPlayground(o, t, i) {
-    let s, n, r;
-    const a = new Fe();
+    let s, n, a;
+    const r = new Fe();
     if (this.args.wordpressInstallMode === "download-and-install") {
-      let k = !1;
-      a.addEventListener("progress", (j) => {
-        if (k)
+      let I = !1;
+      r.addEventListener("progress", (j) => {
+        if (I)
           return;
         const { loaded: x, total: f } = j.detail, B = Math.floor(
           Math.min(100, 100 * x / f)
         );
-        k = B === 100, this.writeProgressUpdate(
+        I = B === 100, this.writeProgressUpdate(
           process.stdout,
           `Downloading WordPress ${B}%...`,
-          k
+          I
         );
-      }), s = await De(this.args.wp), r = m.join(
-        _,
+      }), s = await De(this.args.wp), a = m.join(
+        O,
         `prebuilt-wp-content-for-wp-${s.version}.zip`
-      ), n = p.existsSync(r) ? ie(r) : await ne(
+      ), n = p.existsSync(a) ? ie(a) : await ne(
         s.releaseUrl,
         `${s.version}.zip`,
-        a
+        r
       ), g.log(
         `Resolved WordPress release URL: ${s?.releaseUrl}`
       );
     }
     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);
+    const l = this.args.skipSqliteSetup ? void 0 : await Ze(r), d = this.args.followSymlinks === !0, c = this.args.experimentalTrace === !0, u = this.args["mount-before-install"] || [], h = this.args.mount || [], b = F(o);
     await b.isConnected(), g.log("Booting WordPress...");
     const S = await X(
       this.getEffectiveBlueprint()
@@ -300,8 +300,8 @@ class Ge {
       // TODO: Consider supporting Xdebug for the initial worker via a dedicated flag.
       withXdebug: !1,
       nativeInternalDirPath: i
-    }), r && !this.args["mount-before-install"] && !p.existsSync(r) && (g.log("Caching preinstalled WordPress for the next boot..."), p.writeFileSync(
-      r,
+    }), a && !this.args["mount-before-install"] && !p.existsSync(a) && (g.log("Caching preinstalled WordPress for the next boot..."), p.writeFileSync(
+      a,
       await Se(b, "/wordpress")
     ), g.log("Cached!")), b;
   }
@@ -311,15 +311,15 @@ class Ge {
     firstProcessId: i,
     nativeInternalDirPath: s
   }) {
-    const n = R(
+    const n = F(
       o.phpPort
     );
     await n.isConnected();
-    const r = await X(
+    const a = await X(
       this.getEffectiveBlueprint()
     );
     return await n.useFileLockManager(t), await n.bootWorker({
-      phpVersion: r.phpVersion,
+      phpVersion: a.phpVersion,
       siteUrl: this.siteUrl,
       mountsBeforeWpInstall: this.args["mount-before-install"] || [],
       mountsAfterWpInstall: this.args.mount || [],
@@ -337,13 +337,13 @@ class Ge {
   async compileInputBlueprint(o) {
     const t = this.getEffectiveBlueprint(), i = new We();
     let s = "", n = !1;
-    return i.addEventListener("progress", (r) => {
+    return i.addEventListener("progress", (a) => {
       if (n)
         return;
-      n = r.detail.progress === 100;
-      const a = Math.floor(r.detail.progress);
-      s = r.detail.caption || s || "Running the Blueprint";
-      const l = `${s.trim()} – ${a}%`;
+      n = a.detail.progress === 100;
+      const r = Math.floor(a.detail.progress);
+      s = a.detail.caption || s || "Running the Blueprint";
+      const l = `${s.trim()} – ${r}%`;
       this.writeProgressUpdate(
         process.stdout,
         l,
@@ -393,14 +393,14 @@ async function Qe(e, o, t) {
     o,
     t
   )).map(
-    (n) => new Promise((r) => {
-      p.rm(n, { recursive: !0 }, (a) => {
-        a ? g.warn(
+    (n) => new Promise((a) => {
+      p.rm(n, { recursive: !0 }, (r) => {
+        r ? g.warn(
           `Failed to delete stale Playground temp dir: ${n}`,
-          a
+          r
         ) : g.info(
           `Deleted stale Playground temp dir: ${n}`
-        ), r();
+        ), a();
       });
     })
   );
@@ -431,14 +431,14 @@ async function tt(e, o, t) {
   );
   if (!n)
     return !1;
-  const r = {
+  const a = {
     executableName: n[1],
     pid: n[2]
   };
-  if (await ot(r.pid, r.executableName))
+  if (await ot(a.pid, a.executableName))
     return !1;
-  const a = Date.now() - o;
-  return p.statSync(t).mtime.getTime() < a;
+  const r = Date.now() - o;
+  return p.statSync(t).mtime.getTime() < r;
 }
 async function ot(e, o) {
   const [t] = await new Promise(
@@ -450,8 +450,8 @@ async function ot(e, o) {
           // Remove path from executable name in the results.
           clean: !0
         },
-        (n, r) => {
-          n ? s(n) : i(r);
+        (n, a) => {
+          n ? s(n) : i(a);
         }
       );
     }
@@ -500,14 +500,14 @@ const E = {
   suppressBooleanAttributes: !E.allowBooleanAttributes,
   format: !0,
   indentBy: "	"
-}, F = {
+}, W = {
   allowEmptyContent: !0,
   allowTrailingComma: !0
 };
 function st(e, o) {
-  const { name: t, host: i, port: s, mappings: n, ideKey: r } = o, a = new oe(E), l = (() => {
+  const { name: t, host: i, port: s, mappings: n, ideKey: a } = o, r = new oe(E), l = (() => {
     try {
-      return a.parse(e, !0);
+      return r.parse(e, !0);
     } catch {
       throw new Error("PhpStorm configuration file is not valid XML.");
     }
@@ -587,14 +587,14 @@ function st(e, o) {
         factoryName: "PHP Remote Debug",
         filter_connections: "FILTER",
         server_name: t,
-        session_id: r
+        session_id: a
       }
     };
     S.component === void 0 && (S.component = []), S.component.push(f);
   }
   const x = new re(se).build(l);
   try {
-    a.parse(x, !0);
+    r.parse(x, !0);
   } catch {
     throw new Error(
       "The resulting PhpStorm configuration file is not valid XML."
@@ -604,18 +604,18 @@ function st(e, o) {
 }
 function at(e, o) {
   const { name: t, mappings: i } = o, s = [];
-  let n = e, r = v.parseTree(n, s, F);
-  if (r === void 0 || s.length)
+  let n = e, a = P.parseTree(n, s, W);
+  if (a === void 0 || s.length)
     throw new Error("VS Code configuration file is not valid JSON.");
-  let a = v.findNodeAtLocation(r, ["configurations"]);
-  if (a === void 0 || a.children === void 0) {
-    const d = v.modify(n, ["configurations"], [], {});
-    n = v.applyEdits(n, d), r = v.parseTree(n, [], F), a = v.findNodeAtLocation(r, [
+  let r = P.findNodeAtLocation(a, ["configurations"]);
+  if (r === void 0 || r.children === void 0) {
+    const d = P.modify(n, ["configurations"], [], {});
+    n = P.applyEdits(n, d), a = P.parseTree(n, [], W), r = P.findNodeAtLocation(a, [
       "configurations"
     ]);
   }
-  const l = a?.children?.findIndex(
-    (d) => v.findNodeAtLocation(d, ["name"])?.value === t
+  const l = r?.children?.findIndex(
+    (d) => P.findNodeAtLocation(d, ["name"])?.value === t
   );
   if (l === void 0 || l < 0) {
     const d = {
@@ -626,7 +626,7 @@ function at(e, o) {
       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(
+    }, c = r?.children?.length || 0, u = P.modify(
       n,
       ["configurations", c],
       d,
@@ -650,9 +650,9 @@ async function lt({
   port: i,
   cwd: s,
   mounts: n,
-  ideKey: r = "PLAYGROUNDCLI"
+  ideKey: a = "PLAYGROUNDCLI"
 }) {
-  const a = it(s, n), l = [];
+  const r = it(s, n), l = [];
   if (o.includes("phpstorm")) {
     const d = ".idea/workspace.xml", c = m.join(
       s,
@@ -677,8 +677,8 @@ async function lt({
         host: t,
         port: i,
         projectDir: s,
-        mappings: a,
-        ideKey: r
+        mappings: r,
+        ideKey: a
       });
       p.writeFileSync(c, h);
     }
@@ -706,7 +706,7 @@ async function lt({
       const u = p.readFileSync(c, "utf-8"), h = at(u, {
         name: e,
         workspaceDir: s,
-        mappings: a
+        mappings: r
       });
       h !== u && (p.writeFileSync(c, h), l.push(d));
     }
@@ -716,7 +716,7 @@ async function lt({
 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 = (() => {
+    const s = p.readFileSync(t, "utf8"), n = new oe(E), a = (() => {
       try {
         return n.parse(s, !0);
       } catch {
@@ -724,7 +724,7 @@ async function ct(e, o) {
           "PhpStorm configuration file is not valid XML."
         );
       }
-    })(), d = r.find(
+    })(), d = a.find(
       (u) => !!u?.project
     )?.project?.find(
       (u) => !!u?.component && u?.[":@"]?.name === "PhpServers"
@@ -735,7 +735,7 @@ async function ct(e, o) {
     );
     if (c !== void 0 && c >= 0) {
       d.servers.splice(c, 1);
-      const h = new re(se).build(r);
+      const h = new re(se).build(a);
       try {
         n.parse(h, !0);
       } catch {
@@ -753,16 +753,16 @@ async function ct(e, o) {
   }
   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)
+    const s = [], n = p.readFileSync(i, "utf-8"), a = P.parseTree(n, s, W);
+    if (a === void 0 || s.length)
       throw new Error("VS Code configuration file is not valid JSON.");
-    const l = v.findNodeAtLocation(r, [
+    const l = P.findNodeAtLocation(a, [
       "configurations"
     ])?.children?.findIndex(
-      (d) => v.findNodeAtLocation(d, ["name"])?.value === e
+      (d) => P.findNodeAtLocation(d, ["name"])?.value === e
     );
     if (l !== void 0 && l >= 0) {
-      const d = v.modify(
+      const d = P.modify(
         n,
         ["configurations", l],
         void 0,
@@ -782,20 +782,20 @@ async function ct(e, o) {
   }
 }
 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: v.printParseErrorCode(r.error),
-      offset: r.offset,
-      length: r.length,
+  const t = [], i = P.applyEdits(e, o);
+  if (t.length = 0, P.parseTree(i, t, W), t.length) {
+    const s = t.map((a) => ({
+      message: P.printParseErrorCode(a.error),
+      offset: a.offset,
+      length: a.length,
       fragment: i.slice(
-        Math.max(0, r.offset - 20),
-        Math.min(i.length, r.offset + r.length + 10)
+        Math.max(0, a.offset - 20),
+        Math.min(i.length, a.offset + a.length + 10)
       )
     })).map(
-      (r) => `${r.message} at ${r.offset}:${r.length} (${r.fragment})`
+      (a) => `${a.message} at ${a.offset}:${a.length} (${a.fragment})`
     ), n = o.map(
-      (r) => `At ${r.offset}:${r.length} - (${r.content})`
+      (a) => `At ${a.offset}:${a.length} - (${a.content})`
     );
     throw new Error(
       `VS Code configuration file (.vscode/launch.json) is not valid a JSONC after Playground CLI modifications. This is likely a Playground CLI bug. Please report it at https://github.com/WordPress/wordpress-playground/issues and include the contents of your ".vscode/launch.json" file. 
@@ -819,9 +819,9 @@ const H = {
   Normal: { name: "normal", severity: N.Info },
   Debug: { name: "debug", severity: N.Debug }
 };
-async function At() {
+async function At(e) {
   try {
-    const e = $e(process.argv.slice(2)).usage("Usage: wp-playground <command> [options]").positional("command", {
+    const o = $e(e).usage("Usage: wp-playground <command> [options]").positional("command", {
       describe: "Command to run",
       choices: ["server", "run-blueprint", "build-snapshot"],
       demandOption: !0
@@ -982,21 +982,27 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
           );
         }
       if (r["auto-mount"]) {
-        let a = !1;
+        let l = !1;
         try {
-          a = p.statSync(r["auto-mount"]).isDirectory();
+          l = p.statSync(r["auto-mount"]).isDirectory();
         } catch {
-          a = !1;
+          l = !1;
         }
-        if (!a)
+        if (!l)
           throw new Error(
             `The specified --auto-mount path is not a directory: '${r["auto-mount"]}'.`
           );
       }
-      if (r["experimental-multi-worker"] !== void 0 && r["experimental-multi-worker"] <= 1)
-        throw new Error(
-          "The --experimental-multi-worker flag must be a positive integer greater than 1."
-        );
+      if (r["experimental-multi-worker"] !== void 0) {
+        if (r._[0] !== "server")
+          throw new Error(
+            "The --experimental-multi-worker flag is only supported when running the server command."
+          );
+        if (r["experimental-multi-worker"] <= 1)
+          throw new Error(
+            "The --experimental-multi-worker flag must be a positive integer greater than 1."
+          );
+      }
       if (r["experimental-blueprints-v2-runner"] === !0) {
         if (r.mode !== void 0) {
           if (r["wordpress-install-mode"] !== void 0)
@@ -1013,47 +1019,47 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
             );
         } else
           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;
+        const l = r.allow || [];
+        r.followSymlinks === !0 && l.push("follow-symlinks"), r["blueprint-may-read-adjacent-files"] === !0 && l.push("read-local-fs"), r.allow = l;
       } else if (r.mode !== void 0)
         throw new Error(
           "The --mode option requires the --experimentalBlueprintsV2Runner flag."
         );
       return !0;
     });
-    e.wrap(e.terminalWidth());
-    const o = await e.argv, t = o._[0];
-    ["run-blueprint", "server", "build-snapshot"].includes(t) || (e.showHelp(), process.exit(1));
-    const i = {
-      ...o,
-      command: t,
-      mount: [...o.mount || [], ...o["mount-dir"] || []],
+    o.wrap(o.terminalWidth());
+    const t = await o.argv, i = t._[0];
+    ["run-blueprint", "server", "build-snapshot"].includes(i) || (o.showHelp(), process.exit(1));
+    const s = {
+      ...t,
+      command: i,
+      mount: [...t.mount || [], ...t["mount-dir"] || []],
       "mount-before-install": [
-        ...o["mount-before-install"] || [],
-        ...o["mount-dir-before-install"] || []
+        ...t["mount-before-install"] || [],
+        ...t["mount-dir-before-install"] || []
       ]
-    }, s = await pt(i);
-    s === void 0 && process.exit(0);
-    const n = /* @__PURE__ */ (() => {
+    }, n = await pt(s);
+    n === void 0 && process.exit(0);
+    const a = /* @__PURE__ */ (() => {
       let r;
       return async () => {
-        r !== void 0 && (r = s[Symbol.asyncDispose]()), await r, process.exit(0);
+        r !== void 0 && (r = n[Symbol.asyncDispose]()), await r, process.exit(0);
       };
     })();
-    process.on("SIGINT", n), process.on("SIGTERM", n);
-  } catch (e) {
-    if (!(e instanceof Error))
-      throw e;
+    process.on("SIGINT", a), process.on("SIGTERM", a);
+  } catch (o) {
+    if (!(o instanceof Error))
+      throw o;
     if (process.argv.includes("--debug"))
-      he(e);
+      he(o);
     else {
-      const t = [];
-      let i = e;
+      const i = [];
+      let s = o;
       do
-        t.push(i.message), i = i.cause;
-      while (i instanceof Error);
+        i.push(s.message), s = s.cause;
+      while (s instanceof Error);
       console.error(
-        "\x1B[1m" + t.join(" caused by: ") + "\x1B[0m"
+        "\x1B[1m" + i.join(" caused by: ") + "\x1B[0m"
       );
     }
     process.exit(1);
@@ -1062,7 +1068,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
 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 = [];
+  const i = /* @__PURE__ */ new Map();
   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
@@ -1077,11 +1083,15 @@ async function pt(e) {
       "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 g.log("Starting a PHP server..."), Oe({
+  let a = !1, r = !0;
+  return g.log("Starting a PHP server..."), _e({
     port: e.port,
     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(
+      const c = "127.0.0.1", u = `http://${c}:${d}`, h = e["site-url"] || u, b = e.command === "server" ? e.experimentalMultiWorker ?? 1 : 1, S = e.command === "server" ? (
+        // Account for the initial worker
+        // which is discarded by the server after setup.
+        b + 1
+      ) : b, I = Math.floor(
         Number.MAX_SAFE_INTEGER / S
       ), j = "-playground-cli-site-", x = await Ke(
         j
@@ -1112,7 +1122,7 @@ async function pt(e) {
               ...e.mount || []
             ],
             ideKey: y?.ideKey
-          }), P = e.experimentalUnsafeIdeIntegration, I = P.includes("vscode"), C = P.includes("phpstorm");
+          }), v = e.experimentalUnsafeIdeIntegration, k = v.includes("vscode"), C = v.includes("phpstorm");
           console.log(""), console.log(M("Xdebug configured successfully")), console.log(
             K("Updated IDE config: ") + $.join(" ")
           ), console.log(
@@ -1121,7 +1131,7 @@ async function pt(e) {
                 " – you can set breakpoints and preview Playground's VFS structure in there."
               )
             )
-          ), console.log(""), I && (console.log(M("VS Code / Cursor instructions:")), console.log(
+          ), console.log(""), k && (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(
@@ -1158,8 +1168,8 @@ async function pt(e) {
         de,
         ce
       );
-      const W = m.join(x.path, "internal");
-      J(W);
+      const D = m.join(x.path, "internal");
+      J(D);
       const pe = [
         "wordpress",
         // Note: These dirs are from Emscripten's "default dirs" list:
@@ -1172,15 +1182,15 @@ async function pt(e) {
         "home"
       ];
       for (const w of pe) {
-        const y = (P) => P.vfsPath === `/${w}`;
+        const y = (v) => v.vfsPath === `/${w}`;
         if (!(e["mount-before-install"]?.some(y) || e.mount?.some(y))) {
-          const P = m.join(
+          const v = m.join(
             x.path,
             w
           );
-          J(P), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
+          J(v), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
             vfsPath: `/${w}`,
-            hostPath: P
+            hostPath: v
           });
         }
       }
@@ -1197,26 +1207,28 @@ async function pt(e) {
       let L;
       e["experimental-blueprints-v2-runner"] ? L = new Je(e, {
         siteUrl: h,
-        processIdSpaceLength: k
+        processIdSpaceLength: I
       }) : (L = new Ge(e, {
         siteUrl: h,
-        processIdSpaceLength: k
+        processIdSpaceLength: I
       }), typeof e.blueprint == "string" && (e.blueprint = await Xe({
         sourceString: e.blueprint,
         blueprintMayReadAdjacentFiles: e["blueprint-may-read-adjacent-files"] === !0
       })));
-      let D = !1;
-      const A = async function() {
-        D || (D = !0, await Promise.all(
-          i.map(async ({ playground: y, worker: $ }) => {
-            await y.dispose(), await $.terminate();
-          })
+      let A = !1;
+      const R = async function() {
+        A || (A = !0, await Promise.all(
+          [...i].map(
+            async ([y, $]) => {
+              await $.dispose(), await y.terminate();
+            }
+          )
         ), 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(
+          A || w === 0 && g.error(
             `Worker ${y} exited with code ${w}
 `
           );
@@ -1228,45 +1240,48 @@ async function pt(e) {
           n
         );
         {
-          const P = w.shift(), I = await L.bootAndSetUpInitialPlayground(
-            P.phpPort,
+          const v = w.shift(), k = await L.bootAndSetUpInitialPlayground(
+            v.phpPort,
             y,
-            W
+            D
           );
-          if (await I.isReady(), r = !0, g.log("Booted!"), o = new qe(I), !e["experimental-blueprints-v2-runner"]) {
+          if (i.set(
+            v.worker,
+            k
+          ), await k.isReady(), a = !0, g.log("Booted!"), o = new qe(k), !e["experimental-blueprints-v2-runner"]) {
             const C = await L.compileInputBlueprint(
               e["additional-blueprint-steps"] || []
             );
             C && (g.log("Running the Blueprint..."), await Pe(
               C,
-              I
+              k
             ), 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();
+            await mt(t, e.outfile), g.log(`WordPress exported to ${e.outfile}`), await R();
             return;
           } else if (e.command === "run-blueprint") {
-            g.log("Blueprint executed"), await A();
+            g.log("Blueprint executed"), await R();
             return;
           }
-          await o.removeWorker(I), await I.dispose(), await P.worker.terminate();
+          await o.removeWorker(k), await k.dispose(), await v.worker.terminate(), i.delete(v.worker);
         }
         g.log("Preparing workers...");
-        const $ = k;
+        const $ = I;
         return [t] = await Promise.all(
-          w.map(async (P, I) => {
-            const C = $ + I * k, fe = await Q(
+          w.map(async (v, k) => {
+            const C = $ + k * I, fe = await Q(
               n
             ), U = await L.bootPlayground({
-              worker: P,
+              worker: v,
               fileLockManagerPort: fe,
               firstProcessId: C,
-              nativeInternalDirPath: W
+              nativeInternalDirPath: D
             });
-            return i.push({
-              playground: U,
-              worker: P.worker
-            }), o.addWorker(U), U;
+            return i.set(
+              v.worker,
+              U
+            ), o.addWorker(U), U;
           })
         ), g.log(
           `WordPress is running on ${u} with ${b} worker(s)`
@@ -1277,24 +1292,24 @@ async function pt(e) {
           playground: t,
           server: l,
           serverUrl: u,
-          [Symbol.asyncDispose]: A,
+          [Symbol.asyncDispose]: R,
           workerThreadCount: b
         };
       } catch (w) {
         if (!e.debug)
           throw w;
         let y = "";
-        throw await t?.fileExists(z) && (y = await t.readFileAsText(z)), new Error(y, { cause: w });
+        throw await t?.fileExists(z) && (y = await t.readFileAsText(z)), await R(), new Error(y, { cause: w });
       }
     },
     async handleRequest(l) {
-      if (!r)
-        return O.forHttpCode(
+      if (!a)
+        return _.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
-      if (a) {
-        a = !1;
+      if (r) {
+        r = !1;
         const d = {
           "Content-Type": ["text/plain"],
           "Content-Length": ["0"],
@@ -1304,7 +1319,7 @@ async function pt(e) {
           "playground_auto_login_already_happened"
         ) && (d["Set-Cookie"] = [
           "playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/"
-        ]), new O(302, d, new Uint8Array());
+        ]), new _(302, d, new Uint8Array());
       }
       return await o.handleRequest(l);
     }
@@ -1313,24 +1328,24 @@ async function pt(e) {
 async function ut(e, o, t) {
   const i = [];
   for (let s = 0; s < e; s++) {
-    const n = await ft(o), r = (a) => {
+    const n = await ft(o), a = (r) => {
       t({
-        exitCode: a,
+        exitCode: r,
         workerIndex: s
       });
     };
     i.push(
       new Promise(
-        (a, l) => {
+        (r, l) => {
           n.once("message", function(d) {
-            d.command === "worker-script-initialized" && a({ worker: n, phpPort: d.phpPort });
+            d.command === "worker-script-initialized" && r({ worker: n, phpPort: d.phpPort });
           }), n.once("error", function(d) {
             console.error(d);
             const c = new Error(
               `Worker failed to load worker. ${d.message ? `Original error: ${d.message}` : ""}`
             );
             l(c);
-          }), n.once("exit", r);
+          }), n.once("exit", a);
         }
       )
     );
@@ -1373,4 +1388,4 @@ export {
   At as p,
   pt as r
 };
-//# sourceMappingURL=run-cli-g3_uJkf5.js.map
+//# sourceMappingURL=run-cli-LDWC8vQD.js.map