@qwen-code/qwen-code 0.24.2 → 0.24.3

package/chunks/{modelConfigUtils-5AOF7V2F.js → modelConfigUtils-3MJ6OTIS.js}

@@ -4,84 +4,88 @@ import {
   collectProviderModelsForProtocol,
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-D4JFXQ6K.js";
+} from "./chunk-64T2EGVQ.js";
 import "./chunk-VYA224N4.js";
-import "./chunk-VE2U4MWB.js";
+import "./chunk-5AMF3QJJ.js";
 import "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
-import "./chunk-DYGOUAKK.js";
+import "./chunk-O4OOA2XB.js";
+import "./chunk-MNM5AZTY.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-MOTCWW3N.js";
-import "./chunk-OMHE7I7L.js";
-import "./chunk-7WIDY7UD.js";
+import "./chunk-G4DQHGSF.js";
+import "./chunk-WMHO25KU.js";
+import "./chunk-IODSADQ4.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-N7RPJIQD.js";
-import "./chunk-QTEONSAO.js";
-import "./chunk-KLL6VL42.js";
-import "./chunk-CK267TVO.js";
-import "./chunk-64LX7PWR.js";
-import "./chunk-E5JQUFYU.js";
-import "./chunk-UEILASYG.js";
 import "./chunk-W6VNPRE2.js";
-import "./chunk-QCCRC27E.js";
-import "./chunk-GI7MRANQ.js";
+import "./chunk-TW7KLLRI.js";
+import "./chunk-FPFIAK47.js";
+import "./chunk-OOGQBSTQ.js";
+import "./chunk-PPLSJANE.js";
+import "./chunk-ZWMLPCLV.js";
+import "./chunk-UEILASYG.js";
+import "./chunk-AV3FOXNF.js";
+import "./chunk-WJ6HMAU7.js";
 import "./chunk-V2XJJTAB.js";
+import "./chunk-V4VSJQKD.js";
+import "./chunk-BHU5SD32.js";
 import "./chunk-ZNU4EOFS.js";
-import "./chunk-R6MPLPS7.js";
-import "./chunk-T4D3QLUZ.js";
 import "./chunk-BVKUGIV3.js";
 import "./chunk-YDERQ7ZV.js";
 import "./chunk-TV2CMWO3.js";
 import "./chunk-ORREOG2Q.js";
-import "./chunk-IE7SAZGL.js";
-import "./chunk-VQUX7GWP.js";
+import "./chunk-Z6Y6SFX7.js";
+import "./chunk-LWQKWO5I.js";
 import "./chunk-27CVFKVI.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-65I7S4Z3.js";
+import "./chunk-CHBZHMBA.js";
+import "./chunk-4M7RD5QQ.js";
 import "./chunk-HEOH7JZY.js";
-import "./chunk-TWPJO254.js";
 import "./chunk-XIOVKC72.js";
+import "./chunk-W3RO6OK2.js";
 import "./chunk-MHXRBBKA.js";
+import "./chunk-L3KJT4ZZ.js";
+import "./chunk-JBUMBQAO.js";
 import "./chunk-GMYY5C2E.js";
 import "./chunk-5EZRLTLQ.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-DTAGMOBI.js";
-import "./chunk-W3RO6OK2.js";
-import "./chunk-JG23BJ7Y.js";
+import "./chunk-U5P7R5TF.js";
+import "./chunk-AJSG5SMC.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-L3KJT4ZZ.js";
-import "./chunk-ANKISCKU.js";
 import "./chunk-U6H3XTFA.js";
 import "./chunk-AO66AVEJ.js";
 import "./chunk-3RCEJIII.js";
-import "./chunk-2TK7KLDO.js";
-import "./chunk-AK35QRVW.js";
-import "./chunk-ACHCT36C.js";
-import "./chunk-O6GEWCJA.js";
-import "./chunk-CHEIIBT3.js";
+import "./chunk-JXNPH2EP.js";
+import "./chunk-IQQRNRQV.js";
+import "./chunk-QBLHSEIA.js";
 import "./chunk-ADN5KESB.js";
 import "./chunk-SK3RZOPS.js";
 import "./chunk-GO3DNGM3.js";
 import "./chunk-ELRMZTPF.js";
-import "./chunk-IQQRNRQV.js";
-import "./chunk-FDW5VK44.js";
-import "./chunk-QBLHSEIA.js";
+import "./chunk-2SENA3WV.js";
+import "./chunk-ELYIK7SN.js";
+import "./chunk-TWPJO254.js";
+import "./chunk-O6GEWCJA.js";
+import "./chunk-CHEIIBT3.js";
+import "./chunk-ACHCT36C.js";
+import "./chunk-I3K2QRZ5.js";
 import "./chunk-6C3D7BKK.js";
-import "./chunk-6FZEVPBU.js";
-import "./chunk-EDJCJMEW.js";
+import "./chunk-VZ6YDHDV.js";
 import "./chunk-MNU36NGH.js";
+import "./chunk-B3UM2NWK.js";
 import "./chunk-VNTJJ4WQ.js";
 import "./chunk-BQMSZSG6.js";
-import "./chunk-5XWVWTLB.js";
-import "./chunk-TDWH5KJE.js";
+import "./chunk-VM3RQNIN.js";
+import "./chunk-OU26ZZOL.js";
 import "./chunk-JX6XHPTX.js";
 import "./chunk-QCG3JVIW.js";
-import "./chunk-CXXHL3XJ.js";
+import "./chunk-XPXMRRG3.js";
 import "./chunk-IOISNXQ2.js";
 import "./chunk-QKXZOHHQ.js";
 import "./chunk-BKVPLSEI.js";
-import "./chunk-GPKTOXFJ.js";
-import "./chunk-3J43HE2J.js";
+import "./chunk-6LXGKCPH.js";
+import "./chunk-6GI7NAZS.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-Z72PLR74.js";
 import "./chunk-GC3J5W2O.js";
@@ -95,29 +99,31 @@ import "./chunk-DJ2GSRLV.js";
 import "./chunk-5YA6VPM3.js";
 import "./chunk-AKXWS6ON.js";
 import "./chunk-KP2FHIFR.js";
-import "./chunk-UZTJ5WJA.js";
-import "./chunk-TBVO3WMD.js";
-import "./chunk-IXWDQRM4.js";
-import "./chunk-5ETULJLP.js";
+import "./chunk-73R6BAOK.js";
+import "./chunk-WQ7QSGFJ.js";
+import "./chunk-HZU2DMPO.js";
 import "./chunk-VBT4BMCQ.js";
 import "./chunk-CFMZLE3L.js";
-import "./chunk-U5JK32FE.js";
 import "./chunk-UEYDN2YO.js";
 import "./chunk-HD7O6WLV.js";
+import "./chunk-7JDVJX7A.js";
 import "./chunk-EAJHTQOM.js";
+import "./chunk-5ETULJLP.js";
+import "./chunk-NXRQI7RF.js";
 import "./chunk-WZAD4ZNJ.js";
 import "./chunk-IC63SGIX.js";
-import "./chunk-GT3O7YG4.js";
+import "./chunk-CGIKEQFI.js";
 import "./chunk-XZA32HII.js";
 import "./chunk-J5LUMSAZ.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-TAANUOHC.js";
-import "./chunk-MYXULCXF.js";
+import "./chunk-LFIKUSEE.js";
+import "./chunk-GNGQGEZD.js";
 import "./chunk-WFNJIZ4G.js";
 import "./chunk-MF436P6L.js";
 import "./chunk-HDDAI7GZ.js";
 import "./chunk-RYSJNY4B.js";
-import "./chunk-TPDNW6O5.js";
+import "./chunk-5XEZQQG3.js";
+import "./chunk-YPKYQHFS.js";
 import "./chunk-YDWJUBSY.js";
 import "./chunk-RSWOFJBY.js";
 import "./chunk-MDWQFUV4.js";
@@ -127,7 +133,8 @@ import "./chunk-FTKXJMQV.js";
 import "./chunk-S5BHLTHK.js";
 import "./chunk-KSEKRQJO.js";
 import "./chunk-QFIRVSJL.js";
-import "./chunk-42QJ7NLB.js";
+import "./chunk-BVNEEYJM.js";
+import "./chunk-5R36APDE.js";
 import "./chunk-GYAL5QAR.js";
 import "./chunk-S34QJ6IR.js";
 import "./chunk-MORSIWAC.js";

package/chunks/{monitor-KQQHCVPC.js → monitor-SXFWYHEN.js}

@@ -2,45 +2,51 @@
 "use strict";
 import {
   MAX_CONCURRENT_MONITORS,
+  executeRuntimeShell,
   extractCommandRules,
   getMonitorOutputPath,
-  getShellContextEnvVars,
-  getShellPagerEnv,
   isShellCommandReadOnlyASTInDirectory
-} from "./chunk-VQUX7GWP.js";
+} from "./chunk-LWQKWO5I.js";
 import "./chunk-27CVFKVI.js";
 import "./chunk-GOFAQQZA.js";
-import {
-  sanitizeChildEnv
-} from "./chunk-65I7S4Z3.js";
+import "./chunk-CHBZHMBA.js";
+import "./chunk-4M7RD5QQ.js";
 import "./chunk-HEOH7JZY.js";
-import {
-  stripAnsi
-} from "./chunk-TWPJO254.js";
 import "./chunk-XIOVKC72.js";
+import "./chunk-W3RO6OK2.js";
 import "./chunk-MHXRBBKA.js";
+import "./chunk-L3KJT4ZZ.js";
+import "./chunk-JBUMBQAO.js";
 import "./chunk-GMYY5C2E.js";
 import "./chunk-5EZRLTLQ.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-DTAGMOBI.js";
-import "./chunk-W3RO6OK2.js";
-import "./chunk-JG23BJ7Y.js";
+import "./chunk-U5P7R5TF.js";
+import "./chunk-AJSG5SMC.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-L3KJT4ZZ.js";
-import "./chunk-ANKISCKU.js";
 import "./chunk-U6H3XTFA.js";
 import "./chunk-AO66AVEJ.js";
 import "./chunk-3RCEJIII.js";
-import "./chunk-2TK7KLDO.js";
-import "./chunk-AK35QRVW.js";
-import "./chunk-ACHCT36C.js";
-import "./chunk-O6GEWCJA.js";
-import "./chunk-CHEIIBT3.js";
+import "./chunk-JXNPH2EP.js";
+import "./chunk-IQQRNRQV.js";
+import "./chunk-QBLHSEIA.js";
 import "./chunk-ADN5KESB.js";
 import "./chunk-SK3RZOPS.js";
 import "./chunk-GO3DNGM3.js";
 import "./chunk-ELRMZTPF.js";
-import "./chunk-IQQRNRQV.js";
+import {
+  getShellContextEnvVars,
+  getShellPagerEnv
+} from "./chunk-2SENA3WV.js";
+import {
+  sanitizeChildEnv
+} from "./chunk-ELYIK7SN.js";
+import {
+  stripAnsi
+} from "./chunk-TWPJO254.js";
+import "./chunk-O6GEWCJA.js";
+import "./chunk-CHEIIBT3.js";
+import "./chunk-ACHCT36C.js";
 import {
   buildShellExecWarnings,
   getCommandRoot,
@@ -48,26 +54,25 @@ import {
   hasUnsafeMonitorBackgroundOperator,
   normalizeMonitorCommand,
   splitCommands
-} from "./chunk-FDW5VK44.js";
-import "./chunk-QBLHSEIA.js";
+} from "./chunk-I3K2QRZ5.js";
 import "./chunk-6C3D7BKK.js";
-import "./chunk-6FZEVPBU.js";
-import "./chunk-EDJCJMEW.js";
+import "./chunk-VZ6YDHDV.js";
 import "./chunk-MNU36NGH.js";
+import "./chunk-B3UM2NWK.js";
 import "./chunk-VNTJJ4WQ.js";
 import "./chunk-BQMSZSG6.js";
-import "./chunk-5XWVWTLB.js";
-import "./chunk-TDWH5KJE.js";
+import "./chunk-VM3RQNIN.js";
+import "./chunk-OU26ZZOL.js";
 import "./chunk-JX6XHPTX.js";
 import "./chunk-QCG3JVIW.js";
-import "./chunk-CXXHL3XJ.js";
+import "./chunk-XPXMRRG3.js";
 import "./chunk-IOISNXQ2.js";
 import "./chunk-QKXZOHHQ.js";
 import "./chunk-BKVPLSEI.js";
-import "./chunk-GPKTOXFJ.js";
+import "./chunk-6LXGKCPH.js";
 import {
   getCurrentAgentId
-} from "./chunk-3J43HE2J.js";
+} from "./chunk-6GI7NAZS.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-Z72PLR74.js";
 import "./chunk-GC3J5W2O.js";
@@ -80,24 +85,25 @@ import "./chunk-DJ2GSRLV.js";
 import "./chunk-5YA6VPM3.js";
 import "./chunk-AKXWS6ON.js";
 import "./chunk-KP2FHIFR.js";
-import "./chunk-UZTJ5WJA.js";
-import "./chunk-TBVO3WMD.js";
-import "./chunk-IXWDQRM4.js";
-import "./chunk-5ETULJLP.js";
+import "./chunk-73R6BAOK.js";
+import "./chunk-WQ7QSGFJ.js";
+import "./chunk-HZU2DMPO.js";
 import "./chunk-VBT4BMCQ.js";
 import "./chunk-CFMZLE3L.js";
-import "./chunk-U5JK32FE.js";
 import "./chunk-UEYDN2YO.js";
 import "./chunk-HD7O6WLV.js";
+import "./chunk-7JDVJX7A.js";
 import "./chunk-EAJHTQOM.js";
+import "./chunk-5ETULJLP.js";
+import "./chunk-NXRQI7RF.js";
 import "./chunk-WZAD4ZNJ.js";
 import "./chunk-IC63SGIX.js";
-import "./chunk-GT3O7YG4.js";
+import "./chunk-CGIKEQFI.js";
 import "./chunk-XZA32HII.js";
 import "./chunk-J5LUMSAZ.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-TAANUOHC.js";
-import "./chunk-MYXULCXF.js";
+import "./chunk-LFIKUSEE.js";
+import "./chunk-GNGQGEZD.js";
 import "./chunk-WFNJIZ4G.js";
 import "./chunk-MF436P6L.js";
 import "./chunk-HDDAI7GZ.js";
@@ -105,7 +111,8 @@ import "./chunk-RYSJNY4B.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation
-} from "./chunk-TPDNW6O5.js";
+} from "./chunk-5XEZQQG3.js";
+import "./chunk-YPKYQHFS.js";
 import "./chunk-YDWJUBSY.js";
 import {
   ToolDisplayNames,
@@ -113,7 +120,8 @@ import {
 } from "./chunk-RSWOFJBY.js";
 import "./chunk-XRL3EFYD.js";
 import "./chunk-QFIRVSJL.js";
-import "./chunk-42QJ7NLB.js";
+import "./chunk-BVNEEYJM.js";
+import "./chunk-5R36APDE.js";
 import {
   createDebugLogger,
   isSubpaths
@@ -202,6 +210,7 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
     return `Monitor: ${truncateDisplayDescription(desc)}`;
   }
   async getDefaultPermission() {
+    if (this.config.getShellExecutionSandbox?.()) return "ask";
     const normalized = normalizeMonitorCommand(this.params.command);
     const command = normalized.safetyCommand;
     const cwd = this.params.directory || this.config.getTargetDir?.() || process.cwd();
@@ -226,7 +235,8 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
     for (const sub of subCommands) {
       let isReadOnly = false;
       try {
-        isReadOnly = await isShellCommandReadOnlyASTInDirectory(sub, cwd);
+        if (!this.config.getShellExecutionSandbox?.())
+          isReadOnly = await isShellCommandReadOnlyASTInDirectory(sub, cwd);
       } catch (e) {
         debugLogger.warn(
           "AST read-only check failed for monitor sub-command, falling back to ask:",
@@ -335,37 +345,39 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
       ...ownerAgentId ? { ownerAgentId } : {}
     };
     const { executable, argsPrefix } = getShellConfiguration();
+    const sandboxed = Boolean(this.config.getShellExecutionSandbox?.());
     let child;
     try {
-      child = spawn(executable, [...argsPrefix, command], {
-        cwd: this.params.directory || this.config.getTargetDir(),
-        stdio: ["ignore", "pipe", "pipe"],
-        detached: true,
-        env: {
-          ...sanitizeChildEnv(process.env),
-          QWEN_CODE: "1",
-          TERM: "dumb",
-          // no color codes for streaming
-          ...getShellPagerEnv(this.config.getShellExecutionConfig().pager, {
-            includeGitPager: false,
-            platform: os.platform()
-          }),
-          ...getShellContextEnvVars()
-        }
-      });
+      if (!sandboxed)
+        child = spawn(executable, [...argsPrefix, command], {
+          cwd: this.params.directory || this.config.getTargetDir(),
+          stdio: ["ignore", "pipe", "pipe"],
+          detached: true,
+          env: {
+            ...sanitizeChildEnv(process.env),
+            QWEN_CODE: "1",
+            TERM: "dumb",
+            // no color codes for streaming
+            ...getShellPagerEnv(this.config.getShellExecutionConfig().pager, {
+              includeGitPager: false,
+              platform: os.platform()
+            }),
+            ...getShellContextEnvVars()
+          }
+        });
     } catch (err) {
       return {
         llmContent: `Monitor failed to start: ${getErrorMessage(err)}`,
         returnDisplay: `Monitor failed: ${getErrorMessage(err)}`
       };
     }
-    registration.pid = child.pid;
+    registration.pid = child?.pid;
     let exited = false;
     let earlySpawnError;
     const captureEarlySpawnError = /* @__PURE__ */ __name((err) => {
       earlySpawnError ??= err;
     }, "captureEarlySpawnError");
-    child.on("error", captureEarlySpawnError);
+    child?.on("error", captureEarlySpawnError);
     const stdoutBuf = { value: "" };
     const stderrBuf = { value: "" };
     let tokenBucket = THROTTLE_BURST_SIZE;
@@ -404,34 +416,33 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
       }
     }, "flushPartialLineBuffers");
     const killChildProcessGroup = /* @__PURE__ */ __name(() => {
-      if (exited || !child.pid) return;
+      const pid = child?.pid;
+      if (exited || !pid) return;
       if (process.platform === "win32") {
-        const tk = spawn(
-          "taskkill",
-          ["/pid", child.pid.toString(), "/f", "/t"],
-          { stdio: "ignore" }
-        );
+        const tk = spawn("taskkill", ["/pid", pid.toString(), "/f", "/t"], {
+          stdio: "ignore"
+        });
         tk.on(
           "error",
           (err) => debugLogger.warn(
-            `Monitor taskkill failed for pid ${child.pid}: ${getErrorMessage(err)}`
+            `Monitor taskkill failed for pid ${pid}: ${getErrorMessage(err)}`
           )
         );
       } else {
         try {
-          process.kill(-child.pid, "SIGTERM");
+          process.kill(-pid, "SIGTERM");
         } catch (err) {
           debugLogger.warn(
-            `Monitor ${monitorId} SIGTERM failed (pid=${child.pid}): ${getErrorMessage(err)}`
+            `Monitor ${monitorId} SIGTERM failed (pid=${pid}): ${getErrorMessage(err)}`
           );
         }
         setTimeout(() => {
-          if (!exited && child.pid) {
+          if (!exited) {
             try {
-              process.kill(-child.pid, "SIGKILL");
+              process.kill(-pid, "SIGKILL");
             } catch (err) {
               debugLogger.warn(
-                `Monitor ${monitorId} SIGKILL escalation failed (pid=${child.pid}): ${getErrorMessage(err)}`
+                `Monitor ${monitorId} SIGKILL escalation failed (pid=${pid}): ${getErrorMessage(err)}`
               );
             }
           }
@@ -451,10 +462,10 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
     } catch (err) {
       abortHandler();
       entryAc.signal.removeEventListener("abort", abortHandler);
-      child.stdout?.destroy?.();
-      child.stderr?.destroy?.();
-      child.removeListener("error", captureEarlySpawnError);
-      child.on("error", () => {
+      child?.stdout?.destroy?.();
+      child?.stderr?.destroy?.();
+      child?.removeListener("error", captureEarlySpawnError);
+      child?.on("error", () => {
       });
       return {
         llmContent: `Monitor failed to start: ${getErrorMessage(err)}`,
@@ -463,7 +474,9 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
     }
     const processLines = /* @__PURE__ */ __name((buffer, data) => {
       if (registration.status !== "running") return;
-      const text = stripAnsi(data.toString("utf-8"));
+      const text = stripAnsi(
+        typeof data === "string" ? data : data.toString("utf-8")
+      );
       buffer.value += text;
       if (!buffer.value.includes("\n") && buffer.value.length > PARTIAL_LINE_BUFFER_CAP) {
         const trimmed = buffer.value.trim();
@@ -482,8 +495,8 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
         throttledEmit(truncated);
       }
     }, "processLines");
-    child.stdout?.on("data", (data) => processLines(stdoutBuf, data));
-    child.stderr?.on("data", (data) => processLines(stderrBuf, data));
+    child?.stdout?.on("data", (data) => processLines(stdoutBuf, data));
+    child?.stderr?.on("data", (data) => processLines(stderrBuf, data));
     let cleanedUp = false;
     const cleanup = /* @__PURE__ */ __name(() => {
       if (cleanedUp) return;
@@ -526,10 +539,64 @@ var MonitorToolInvocation = class extends BaseToolInvocation {
         registry.fail(monitorId, getErrorMessage(err));
       }
     }, "onError");
-    child.on("exit", onExit);
-    child.on("close", onClose);
-    child.on("error", onError);
-    child.removeListener("error", captureEarlySpawnError);
+    child?.on("exit", onExit);
+    child?.on("close", onClose);
+    child?.on("error", onError);
+    child?.removeListener("error", captureEarlySpawnError);
+    if (sandboxed) {
+      try {
+        const shellExecutionConfig = this.config.getShellExecutionConfig();
+        const handle = await executeRuntimeShell(
+          this.config,
+          command,
+          this.params.directory || this.config.getTargetDir(),
+          (event) => {
+            if (event.type === "binary_detected") {
+              if (registration.status === "running") {
+                registry.fail(monitorId, "Binary output detected");
+                entryAc.abort();
+              }
+            } else if (event.type === "data" && typeof event.chunk === "string") {
+              processLines(
+                event.stream === "stderr" ? stderrBuf : stdoutBuf,
+                event.chunk
+              );
+            }
+          },
+          entryAc.signal,
+          false,
+          {
+            ...shellExecutionConfig,
+            maxBufferedOutputBytes: Math.min(
+              shellExecutionConfig.maxBufferedOutputBytes ?? PARTIAL_LINE_BUFFER_CAP,
+              PARTIAL_LINE_BUFFER_CAP
+            )
+          },
+          { streamStdout: true }
+        );
+        registration.pid = handle.pid;
+        void handle.result.then(
+          (result) => {
+            exited = true;
+            cleanup();
+            if (result.error) {
+              if (registration.status === "running")
+                registry.fail(monitorId, result.error.message);
+            } else {
+              settleFromExit(result.exitCode, result.signal);
+            }
+          },
+          (error) => onError(error instanceof Error ? error : new Error(String(error)))
+        );
+      } catch (error) {
+        onError(error instanceof Error ? error : new Error(String(error)));
+        return {
+          llmContent: `Monitor failed to start: ${getErrorMessage(error)}`,
+          returnDisplay: `Monitor failed: ${getErrorMessage(error)}`,
+          error: { message: getErrorMessage(error) }
+        };
+      }
+    }
     if (earlySpawnError) {
       onError(earlySpawnError);
       return {