wp-studio 1.7.10 → 1.7.11-beta1

package/dist/cli/process-manager-daemon.mjs

@@ -3,9 +3,11 @@ import fs__default, { createWriteStream } from "fs";
 import path__default from "path";
 import readline from "readline";
 import semver from "semver";
-import { g as SocketServer, b as PROCESS_MANAGER_CONTROL_SOCKET_PATH, a as PROCESS_MANAGER_EVENTS_SOCKET_PATH, h as PROCESS_MANAGER_LOGS_DIR, i as daemonRequestSchema, f as daemonEventSchema } from "./process-manager-ipc-BisO0qtU.mjs";
+import { g as SocketServer, b as PROCESS_MANAGER_CONTROL_SOCKET_PATH, a as PROCESS_MANAGER_EVENTS_SOCKET_PATH, h as PROCESS_MANAGER_LOGS_DIR, i as daemonRequestSchema, f as daemonEventSchema } from "./process-manager-ipc-GCdebuBH.mjs";
 const SOCKET_TIMEOUT_MS = 2500;
 const STOP_TIMEOUT_MS = 5e3;
+const STDERR_BUFFER_MAX_LINES = 100;
+const STDERR_BUFFER_MAX_BYTES = 16 * 1024;
 function formatLogDateTag(date) {
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, "0");
@@ -168,11 +170,15 @@ class ProcessManagerDaemon {
       stderrLogPath,
       stdoutStream,
       stderrStream,
+      stderrBuffer: [],
+      stderrBufferBytes: 0,
       settled: false
     };
     this.managedProcesses.set(pmId, managedProcess);
     this.pipeOutputWithTimestamp(child.stdout, stdoutStream);
-    this.pipeOutputWithTimestamp(child.stderr, stderrStream);
+    this.pipeOutputWithTimestamp(child.stderr, stderrStream, (line) => {
+      this.recordStderrLine(managedProcess, line);
+    });
     child.on("message", (raw) => {
       const event = daemonEventSchema.safeParse({
         type: "process-message",
@@ -186,7 +192,11 @@ class ProcessManagerDaemon {
       }
     });
     child.on("error", (error) => {
-      writeTimestampedLines(stderrStream, error.stack ?? error.message);
+      const errorText = error.stack ?? error.message;
+      writeTimestampedLines(stderrStream, errorText);
+      for (const line of errorText.split("\n")) {
+        this.recordStderrLine(managedProcess, line);
+      }
       void this.handleProcessExit(managedProcess);
     });
     child.on("exit", () => {
@@ -233,11 +243,13 @@ class ProcessManagerDaemon {
     this.managedProcesses.delete(managedProcess.pmId);
     managedProcess.stdoutStream.end();
     managedProcess.stderrStream.end();
+    const stderrTail = managedProcess.stderrBuffer.join("\n");
     await this.broadcastEvent({
       type: "process-event",
       payload: {
         process: { name: managedProcess.name, pm_id: managedProcess.pmId },
-        event: "exit"
+        event: "exit",
+        ...stderrTail ? { stderrTail } : {}
       }
     });
   }
@@ -262,7 +274,7 @@ class ProcessManagerDaemon {
   async broadcastEvent(event) {
     this.eventsServer.broadcast(event);
   }
-  pipeOutputWithTimestamp(input, target) {
+  pipeOutputWithTimestamp(input, target, onLine) {
     if (!input) {
       return;
     }
@@ -272,8 +284,20 @@ class ProcessManagerDaemon {
     });
     lineReader.on("line", (line) => {
       void target.write(timestampLogLine(line));
+      onLine?.(line);
     });
   }
+  recordStderrLine(managedProcess, line) {
+    managedProcess.stderrBuffer.push(line);
+    managedProcess.stderrBufferBytes += Buffer.byteLength(line, "utf8") + 1;
+    while (managedProcess.stderrBuffer.length > STDERR_BUFFER_MAX_LINES || managedProcess.stderrBufferBytes > STDERR_BUFFER_MAX_BYTES) {
+      const dropped = managedProcess.stderrBuffer.shift();
+      if (dropped === void 0) {
+        break;
+      }
+      managedProcess.stderrBufferBytes -= Buffer.byteLength(dropped, "utf8") + 1;
+    }
+  }
   toProcessDescription(managedProcess) {
     if (managedProcess.status === "stopped") {
       return {

package/dist/cli/{process-manager-ipc-BisO0qtU.mjs → process-manager-ipc-GCdebuBH.mjs}

@@ -417,7 +417,10 @@ const processEventSchema = z.object({
     z.literal("online"),
     z.literal("restart"),
     z.literal("stop")
-  ])
+  ]),
+  // Tail of the child's stderr captured during this invocation. Only populated on `exit`
+  // events; undefined for any other event.
+  stderrTail: z.string().optional()
 });
 const daemonProcessEventSchema = z.object({
   type: z.literal("process-event"),

package/dist/cli/proxy-daemon.mjs

@@ -3,7 +3,7 @@ import require$$1 from "https";
 import { createSecureContext } from "node:tls";
 import { domainToASCII } from "node:url";
 import httpProxy from "http-proxy";
-import { i as generateSiteCertificate, r as readCliConfig } from "./certificate-manager-SVYcCL_i.mjs";
+import { n as generateSiteCertificate, r as readCliConfig } from "./certificate-manager-v-yNLDFJ.mjs";
 let httpProxyServer = null;
 let httpsProxyServer = null;
 let isHttpProxyRunning = false;

package/dist/cli/{prune-pm-logs-COryxqeo.mjs → prune-pm-logs-Dm_Bwi7l.mjs}

@@ -1,6 +1,6 @@
 import fs__default from "fs";
 import path__default from "path";
-import { h as PROCESS_MANAGER_LOGS_DIR } from "./process-manager-ipc-BisO0qtU.mjs";
+import { h as PROCESS_MANAGER_LOGS_DIR } from "./process-manager-ipc-GCdebuBH.mjs";
 const RETENTION_DAYS = 14;
 const MS_PER_DAY = 24 * 60 * 60 * 1e3;
 const LOG_FILE_REGEX = /^.+-(?:out|error)(?:-\d{8})?\.log$/;

package/dist/cli/{resume-BwDwdJtq.mjs → resume-B8M2e-Ii.mjs}

@@ -1,8 +1,8 @@
-import { l as listAiSessions, g as getAiSessionsRootDirectory, a as loadAiSession } from "./paths-CqXGLB7R.mjs";
+import { l as listAiSessions, g as getAiSessionsRootDirectory, a as loadAiSession } from "./paths-D7DniT1Q.mjs";
 import { __ } from "@wordpress/i18n";
-import { J as JsonAdapter, A as AiChatUI, r as runCommand$1 } from "./index-BjzOJKPi.mjs";
-import { c as chooseSessionForAction } from "./helpers-oQuItT8n.mjs";
-import { L as LoggerError, d as Logger } from "./well-known-paths-BYA1Bw5o.mjs";
+import { J as JsonAdapter, A as AiChatUI, r as runCommand$1 } from "./index-jpyzVGrl.mjs";
+import { c as chooseSessionForAction } from "./helpers-CBl4GQzX.mjs";
+import { L as LoggerError, c as Logger } from "./certificate-manager-v-yNLDFJ.mjs";
 function resolveActiveSiteFromEvents(events) {
   let state;
   for (const event of events) {
@@ -14,17 +14,6 @@ function resolveActiveSiteFromEvents(events) {
         url: event.url,
         wpcomSiteId: event.wpcomSiteId
       };
-      continue;
-    }
-    if (event.type === "environment.selected" && state) {
-      const isLive = event.environment === "live";
-      state = {
-        name: state.name,
-        path: state.path,
-        remote: isLive,
-        url: isLive ? event.url : void 0,
-        wpcomSiteId: isLive ? event.wpcomSiteId : void 0
-      };
     }
   }
   return state;