@morty-build/cli 0.4.13 → 0.4.14

package/dist/{chunk-LZZG3QZL.js → chunk-LX4JLVDZ.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-SPF6MCPU.js";
+} from "./chunk-VQQB6Z6M.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -71284,6 +71284,33 @@ function readProcessTableWithPs(executable) {
     );
   });
 }
+function selectPosixProcessTree(entries, rootProcessId) {
+  const processIds = /* @__PURE__ */ new Set([rootProcessId]);
+  for (const entry of entries) {
+    if (entry.processGroupId === rootProcessId) {
+      processIds.add(entry.processId);
+    }
+  }
+  let previousSize = 0;
+  while (previousSize !== processIds.size) {
+    previousSize = processIds.size;
+    for (const entry of entries) {
+      if (processIds.has(entry.parentProcessId)) {
+        processIds.add(entry.processId);
+      }
+    }
+  }
+  return entries.filter((entry) => processIds.has(entry.processId)).map((entry) => ({
+    processGroupId: entry.processGroupId,
+    processId: entry.processId
+  }));
+}
+function posixProcessTreeCapture(readSynchronously, read) {
+  return async (root) => {
+    const entries = readSynchronously();
+    return selectPosixProcessTree(entries.length > 0 ? entries : await read(), root.processId);
+  };
+}
 function processExists(processId) {
   try {
     process.kill(processId, 0);
@@ -71445,7 +71472,7 @@ function processExists2(processId) {
 var linuxProcessPlatform = {
   ...posixOperations2,
   readProcessTable: readLinuxProcessTableWithFallback,
-  readProcessTableSynchronously: readLinuxProcessTableSynchronously,
+  captureProcessTree: posixProcessTreeCapture(readLinuxProcessTableSynchronously, readLinuxProcessTableWithFallback),
   processExists: processExists2
 };
 
@@ -71453,7 +71480,10 @@ var linuxProcessPlatform = {
 var macosProcessPlatform = {
   ...posixOperations2,
   readProcessTable: () => readProcessTableWithPs("/bin/ps"),
-  readProcessTableSynchronously: () => [],
+  captureProcessTree: posixProcessTreeCapture(
+    () => [],
+    () => readProcessTableWithPs("/bin/ps")
+  ),
   processExists
 };
 
@@ -71532,7 +71562,24 @@ function executableLaunch(command2, args) {
   }
   return { command: command2, arguments: args };
 }
-function readProcessTable() {
+function parseWindowsProcesses(output2) {
+  const processes = [];
+  for (const line of output2.split("\n")) {
+    const groups = /^\s*(?<pid>\d+)\s+(?<ppid>\d+)\s+(?<created>\d+)\s*$/.exec(line)?.groups;
+    if (groups === void 0) {
+      continue;
+    }
+    const processId = Number(groups["pid"]);
+    const parentProcessId = Number(groups["ppid"]);
+    const createdAt = Number(groups["created"]);
+    if (!Number.isSafeInteger(processId) || processId <= 0 || !Number.isSafeInteger(parentProcessId) || parentProcessId < 0 || !Number.isSafeInteger(createdAt)) {
+      continue;
+    }
+    processes.push({ processId, parentProcessId, createdAt });
+  }
+  return processes;
+}
+function readWindowsProcesses() {
   const systemRoot = environmentValue2(process.env, "SystemRoot");
   if (systemRoot === void 0) {
     return Promise.resolve([]);
@@ -71545,7 +71592,8 @@ function readProcessTable() {
         "-NoProfile",
         "-NonInteractive",
         "-Command",
-        "Get-CimInstance Win32_Process | ForEach-Object { '{0} {1} {0}' -f $_.ProcessId, $_.ParentProcessId }"
+        // Processes without a creation time, such as the System process, are never part of a spawned tree.
+        "Get-CimInstance Win32_Process | Where-Object { $_.CreationDate } | ForEach-Object { '{0} {1} {2}' -f $_.ProcessId, $_.ParentProcessId, ([DateTimeOffset]$_.CreationDate.ToUniversalTime()).ToUnixTimeMilliseconds() }"
       ],
       {
         encoding: "utf8",
@@ -71554,10 +71602,44 @@ function readProcessTable() {
         signal: AbortSignal.timeout(1e4),
         maxBuffer: 1024 * 1024
       },
-      (error62, stdout) => resolveTable(error62 === null ? parseProcessTable(stdout) : [])
+      (error62, stdout) => resolveTable(error62 === null ? parseWindowsProcesses(stdout) : [])
     );
   });
 }
+async function readProcessTable() {
+  return (await readWindowsProcesses()).map(({ processId, parentProcessId }) => ({
+    processId,
+    parentProcessId,
+    processGroupId: processId
+  }));
+}
+function selectWindowsProcessTree(processes, root) {
+  const running = new Map(processes.map((entry) => [entry.processId, entry]));
+  const members2 = /* @__PURE__ */ new Set();
+  if (root.state === "running" && running.has(root.processId)) {
+    members2.add(root.processId);
+  }
+  const belongsToTree = (entry) => {
+    const parent = running.get(entry.parentProcessId);
+    if (parent !== void 0 && parent.createdAt <= entry.createdAt) {
+      return members2.has(parent.processId);
+    }
+    return root.state === "exited" && entry.parentProcessId === root.processId && root.spawnedAt <= entry.createdAt && entry.createdAt <= root.exitedAt;
+  };
+  let previousSize = -1;
+  while (previousSize !== members2.size) {
+    previousSize = members2.size;
+    for (const entry of processes) {
+      if (!members2.has(entry.processId) && belongsToTree(entry)) {
+        members2.add(entry.processId);
+      }
+    }
+  }
+  return [...members2].map((processId) => ({ processGroupId: processId, processId }));
+}
+async function captureProcessTree(root) {
+  return selectWindowsProcessTree(await readWindowsProcesses(), root);
+}
 function signalCapturedProcesses2(processes, _rootProcessId, signal) {
   for (const identity2 of [...processes].reverse()) {
     try {
@@ -71582,7 +71664,7 @@ var windowsProcessPlatform = {
   signalCapturedProcesses: signalCapturedProcesses2,
   terminateProcess: terminateProcess2,
   readProcessTable,
-  readProcessTableSynchronously: () => [],
+  captureProcessTree,
   processExists
 };
 
@@ -71590,7 +71672,10 @@ var windowsProcessPlatform = {
 var fallbackPlatform2 = {
   ...posixOperations2,
   readProcessTable: () => readProcessTableWithPs("/usr/bin/ps"),
-  readProcessTableSynchronously: () => [],
+  captureProcessTree: posixProcessTreeCapture(
+    () => [],
+    () => readProcessTableWithPs("/usr/bin/ps")
+  ),
   processExists
 };
 var platforms2 = /* @__PURE__ */ new Map([
@@ -71696,29 +71781,25 @@ function appendBounded(chunks, chunk, currentBytes, limitBytes) {
   chunks.push(chunk);
   return nextBytes;
 }
-function readProcessTable2() {
-  return hostPlatform.readProcessTable();
-}
-function selectProcessTree(entries, rootProcessId) {
-  const processIds = /* @__PURE__ */ new Set([rootProcessId]);
-  for (const entry of entries) {
-    if (entry.processGroupId === rootProcessId) {
-      processIds.add(entry.processId);
-    }
+var lifetimes = /* @__PURE__ */ new WeakMap();
+function spawnProcess(command2, args, options) {
+  const spawnedAt = Date.now();
+  const child = spawn3(command2, [...args], options);
+  const processId = child.pid;
+  if (processId !== void 0) {
+    lifetimes.set(child, { state: "running", processId, spawnedAt });
+    child.once("exit", () => {
+      lifetimes.set(child, { state: "exited", processId, spawnedAt, exitedAt: Date.now() });
+    });
   }
-  let previousSize = 0;
-  while (previousSize !== processIds.size) {
-    previousSize = processIds.size;
-    for (const entry of entries) {
-      if (processIds.has(entry.parentProcessId)) {
-        processIds.add(entry.processId);
-      }
-    }
+  return child;
+}
+function spawnedProcess(child) {
+  const lifetime = lifetimes.get(child);
+  if (lifetime === void 0) {
+    throw new Error("Only a child started by spawnProcess has an identifiable process tree");
   }
-  return entries.filter((entry) => processIds.has(entry.processId)).map((entry) => ({
-    processGroupId: entry.processGroupId,
-    processId: entry.processId
-  }));
+  return lifetime;
 }
 function mergeProcessTrees(captured, current) {
   const processes = /* @__PURE__ */ new Map();
@@ -71730,15 +71811,11 @@ function mergeProcessTrees(captured, current) {
   }
   return [...processes.values()];
 }
-async function captureProcessTree(child) {
+async function captureProcessTree2(child) {
   if (child.pid === void 0) {
     return [];
   }
-  const entries = hostPlatform.readProcessTableSynchronously();
-  if (entries.length > 0) {
-    return selectProcessTree(entries, child.pid);
-  }
-  return selectProcessTree(await readProcessTable2(), child.pid);
+  return await hostPlatform.captureProcessTree(spawnedProcess(child));
 }
 async function waitForCapturedProcessesExit(processes, rootProcessId) {
   const processIds = processes.map((identity2) => identity2.processId).filter((processId) => processId !== rootProcessId);
@@ -71746,7 +71823,7 @@ async function waitForCapturedProcessesExit(processes, rootProcessId) {
     if (processIds.every((processId) => !hostPlatform.processExists(processId))) {
       return true;
     }
-    await readProcessTable2();
+    await hostPlatform.readProcessTable();
   }
   return processIds.every((processId) => !hostPlatform.processExists(processId));
 }
@@ -71756,7 +71833,7 @@ async function stopProcessTree(child, capturedProcesses = []) {
     return;
   }
   const childExited = child.exitCode !== null || child.signalCode !== null;
-  const processes = mergeProcessTrees(capturedProcesses, await captureProcessTree(child));
+  const processes = mergeProcessTrees(capturedProcesses, await captureProcessTree2(child));
   if (childExited && processes.length === 0) {
     return;
   }
@@ -71806,7 +71883,7 @@ async function runBoundedProcess(options) {
   options.signal.throwIfAborted();
   const outputLimitBytes = options.outputLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES;
   const launch = executableLaunch2(options.command, options.arguments);
-  const child = spawn3(launch.command, [...launch.arguments], {
+  const child = spawnProcess(launch.command, launch.arguments, {
     cwd: options.cwd,
     ...hostPlatform.spawnOptions,
     env: { ...options.environment },
@@ -71996,9 +72073,6 @@ var ClaudeCodeAgentSpecification = class extends InProcessAcpAgentSpecification
   };
 };
 
-// src/engine/acp/harness/codex/app-server-client.ts
-import { spawn as spawn4 } from "node:child_process";
-
 // src/engine/acp/harness/codex/app-server-protocol.ts
 import { isAbsolute as isAbsolute8 } from "node:path";
 var boundedText = (maximum) => external_exports.string().max(maximum);
@@ -72331,7 +72405,7 @@ var CodexAppServerClient = class {
   constructor(options) {
     this.#handlers = options.handlers;
     const launch = executableLaunch2(options.command, ["app-server"]);
-    this.#child = spawn4(launch.command, [...launch.arguments], {
+    this.#child = spawnProcess(launch.command, launch.arguments, {
       cwd: options.cwd,
       ...platformSpawnOptions,
       env: { ...process.env, ...options.environment },
@@ -72730,12 +72804,12 @@ function presentToolItem(item) {
     };
   }
   if (item.type === "collabAgentToolCall") {
-    const spawn6 = item.tool === "spawnAgent";
+    const spawn5 = item.tool === "spawnAgent";
     return {
       content: [],
       kind: "other",
       locations: [],
-      rawInput: spawn6 ? {
+      rawInput: spawn5 ? {
         model: item.model,
         prompt: item.prompt,
         reasoningEffort: item.reasoningEffort,
@@ -72743,10 +72817,10 @@ function presentToolItem(item) {
       } : { receiverThreadIds: item.receiverThreadIds, senderThreadId: item.senderThreadId },
       rawOutput: {
         agentsStates: item.agentsStates,
-        ...spawn6 ? { receiverThreadIds: item.receiverThreadIds } : {}
+        ...spawn5 ? { receiverThreadIds: item.receiverThreadIds } : {}
       },
       status: collaborationStatus(item.status),
-      title: spawn6 ? "Dispatch subagent" : "Wait for subagent"
+      title: spawn5 ? "Dispatch subagent" : "Wait for subagent"
     };
   }
   if (item.type === "subAgentActivity" && item.kind === "started") {
@@ -74929,7 +75003,7 @@ var CodexAcpAgent = class {
           this.#appServer.detach();
           const child = this.#appServer.child();
           try {
-            const captured = await captureProcessTree(child);
+            const captured = await captureProcessTree2(child);
             await stopProcessTree(child, captured);
           } finally {
             this.#connection?.close();
@@ -75070,7 +75144,7 @@ import { existsSync as existsSync8, readdirSync as readdirSync6, readFileSync as
 import { basename as basename5, dirname as dirname9, isAbsolute as isAbsolute12, join as join21 } from "node:path";
 
 // src/engine/acp/harness/pi/upstream/dist/pi-rpc/process.js
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import * as readline from "node:readline";
 
 // src/engine/acp/harness/pi/upstream/dist/pi-rpc/command.js
@@ -75187,7 +75261,7 @@ var PiRpcProcess = class _PiRpcProcess {
         args.push("--fork", params.origin.sessionPath);
         break;
     }
-    const child = spawn5(cmd, args, {
+    const child = spawn4(cmd, args, {
       cwd: params.cwd,
       stdio: "pipe",
       env: params.environment,
@@ -97907,4 +97981,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-LZZG3QZL.js.map
+//# sourceMappingURL=chunk-LX4JLVDZ.js.map