@mastra/blaxel 0.0.2 → 0.1.0-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @mastra/blaxel
 
+## 0.1.0-alpha.0
+
+### Minor Changes
+
+- Abort signal support in sandbox commands ([#13597](https://github.com/mastra-ai/mastra/pull/13597))
+  - Sandbox commands can now be cancelled via `abortSignal` in command options
+  - Partial stdout/stderr output is now preserved when a command is aborted or times out
+
+- Added background process management support for Blaxel sandboxes. Agents can now spawn, monitor, and kill long-running processes using the standard `ProcessHandle` interface. ([`79177b1`](https://github.com/mastra-ai/mastra/commit/79177b1fa8c9221196290d38f6ed5e4c592dc4e2))
+
+  **Example usage:**
+
+  ```typescript
+  const sandbox = new BlaxelSandbox({ timeout: '5m' });
+  const workspace = new Workspace({ sandbox });
+
+  // Process manager is available via sandbox.processes
+  const handle = await sandbox.processes.spawn('python server.py');
+
+  // Monitor output
+  handle.onStdout(data => console.log(data));
+
+  // Check status
+  const info = await sandbox.processes.list();
+
+  // Kill when done
+  await handle.kill();
+  ```
+
+  **Note:** Process stdin is not supported in Blaxel sandboxes.
+
+  **Additional improvements:**
+  - Fixed detection of expired sandboxes, ensuring operations automatically retry when a sandbox has timed out
+
+### Patch Changes
+
+- Fixed command timeouts in Blaxel sandboxes so long-running commands now respect configured limits. ([#13520](https://github.com/mastra-ai/mastra/pull/13520))
+
+  Changed the default Blaxel image to `blaxel/ts-app:latest` (Debian-based), which supports both S3 and GCS mounts out of the box.
+
+  Added distro detection for mount scripts so S3 mounts work on Alpine-based images (e.g. `blaxel/node:latest`) via `apk`, and GCS mounts give a clear error on Alpine since gcsfuse is unavailable.
+
+  Removed working directory from sandbox instructions to avoid breaking prompt caching.
+
+- Remove internal `processes` field from sandbox provider options ([#13597](https://github.com/mastra-ai/mastra/pull/13597))
+
+  The `processes` field is no longer exposed in constructor options for E2B, Daytona, and Blaxel sandbox providers. This field is managed internally and was not intended to be user-configurable.
+
+- Updated dependencies [[`504fc8b`](https://github.com/mastra-ai/mastra/commit/504fc8b9d0ddab717577ad3bf9c95ea4bd5377bd), [`f9c150b`](https://github.com/mastra-ai/mastra/commit/f9c150b7595ad05ad9cc9a11098e2944361e8c22), [`88de7e8`](https://github.com/mastra-ai/mastra/commit/88de7e8dfe4b7e1951a9e441bb33136e705ce24e), [`edee4b3`](https://github.com/mastra-ai/mastra/commit/edee4b37dff0af515fc7cc0e8d71ee39e6a762f0), [`3790c75`](https://github.com/mastra-ai/mastra/commit/3790c7578cc6a47d854eb12d89e6b1912867fe29), [`e7a235b`](https://github.com/mastra-ai/mastra/commit/e7a235be6472e0c870ed6c791ddb17c492dc188b), [`d51d298`](https://github.com/mastra-ai/mastra/commit/d51d298953967aab1f58ec965b644d109214f085), [`6dbeeb9`](https://github.com/mastra-ai/mastra/commit/6dbeeb94a8b1eebb727300d1a98961f882180794), [`d5f0d8d`](https://github.com/mastra-ai/mastra/commit/d5f0d8d6a03e515ddaa9b5da19b7e44b8357b07b), [`09c3b18`](https://github.com/mastra-ai/mastra/commit/09c3b1802ff14e243a8a8baea327440bc8cc2e32), [`b896379`](https://github.com/mastra-ai/mastra/commit/b8963791c6afa79484645fcec596a201f936b9a2), [`85c84eb`](https://github.com/mastra-ai/mastra/commit/85c84ebb78aebfcba9d209c8e152b16d7a00cb71), [`a89272a`](https://github.com/mastra-ai/mastra/commit/a89272a5d71939b9fcd284e6a6dc1dd091a6bdcf), [`ee9c8df`](https://github.com/mastra-ai/mastra/commit/ee9c8df644f19d055af5f496bf4942705f5a47b7), [`77b4a25`](https://github.com/mastra-ai/mastra/commit/77b4a254e51907f8ff3a3ba95596a18e93ae4b35), [`276246e`](https://github.com/mastra-ai/mastra/commit/276246e0b9066a1ea48bbc70df84dbe528daaf99), [`08ecfdb`](https://github.com/mastra-ai/mastra/commit/08ecfdbdad6fb8285deef86a034bdf4a6047cfca), [`d5f628c`](https://github.com/mastra-ai/mastra/commit/d5f628ca86c6f6f3ff1035d52f635df32dd81cab), [`524c0f3`](https://github.com/mastra-ai/mastra/commit/524c0f3c434c3d9d18f66338dcef383d6161b59c), [`c18a0e9`](https://github.com/mastra-ai/mastra/commit/c18a0e9cef1e4ca004b2963d35e4cfc031971eac), [`4bd21ea`](https://github.com/mastra-ai/mastra/commit/4bd21ea43d44d0a0427414fc047577f9f0aa3bec), [`115a7a4`](https://github.com/mastra-ai/mastra/commit/115a7a47db5e9896fec12ae6507501adb9ec89bf), [`22a48ae`](https://github.com/mastra-ai/mastra/commit/22a48ae2513eb54d8d79dad361fddbca97a155e8), [`3c6ef79`](https://github.com/mastra-ai/mastra/commit/3c6ef798481e00d6d22563be2de98818fd4dd5e0), [`9311c17`](https://github.com/mastra-ai/mastra/commit/9311c17d7a0640d9c4da2e71b814dc67c57c6369), [`7edf78f`](https://github.com/mastra-ai/mastra/commit/7edf78f80422c43e84585f08ba11df0d4d0b73c5), [`1c4221c`](https://github.com/mastra-ai/mastra/commit/1c4221cf6032ec98d0e094d4ee11da3e48490d96), [`d25b9ea`](https://github.com/mastra-ai/mastra/commit/d25b9eabd400167255a97b690ffbc4ee4097ded5), [`fe1ce5c`](https://github.com/mastra-ai/mastra/commit/fe1ce5c9211c03d561606fda95cbfe7df1d9a9b5), [`b03c0e0`](https://github.com/mastra-ai/mastra/commit/b03c0e0389a799523929a458b0509c9e4244d562), [`0a8366b`](https://github.com/mastra-ai/mastra/commit/0a8366b0a692fcdde56c4d526e4cf03c502ae4ac), [`85664e9`](https://github.com/mastra-ai/mastra/commit/85664e9fd857320fbc245e301f764f45f66f32a3), [`bc79650`](https://github.com/mastra-ai/mastra/commit/bc796500c6e0334faa158a96077e3fb332274869), [`9257d01`](https://github.com/mastra-ai/mastra/commit/9257d01d1366d81f84c582fe02b5e200cf9621f4), [`3a3a59e`](https://github.com/mastra-ai/mastra/commit/3a3a59e8ffaa6a985fe3d9a126a3f5ade11a6724), [`3108d4e`](https://github.com/mastra-ai/mastra/commit/3108d4e649c9fddbf03253a6feeb388a5fa9fa5a), [`0c33b2c`](https://github.com/mastra-ai/mastra/commit/0c33b2c9db537f815e1c59e2c898ffce2e395a79), [`191e5bd`](https://github.com/mastra-ai/mastra/commit/191e5bd29b82f5bda35243945790da7bc7b695c2), [`f77cd94`](https://github.com/mastra-ai/mastra/commit/f77cd94c44eabed490384e7d19232a865e13214c), [`e8135c7`](https://github.com/mastra-ai/mastra/commit/e8135c7e300dac5040670eec7eab896ac6092e30), [`daca48f`](https://github.com/mastra-ai/mastra/commit/daca48f0fb17b7ae0b62a2ac40cf0e491b2fd0b7), [`257d14f`](https://github.com/mastra-ai/mastra/commit/257d14faca5931f2e4186fc165b6f0b1f915deee), [`352f25d`](https://github.com/mastra-ai/mastra/commit/352f25da316b24cdd5b410fd8dddf6a8b763da2a), [`93477d0`](https://github.com/mastra-ai/mastra/commit/93477d0769b8a13ea5ed73d508d967fb23eaeed9), [`31c78b3`](https://github.com/mastra-ai/mastra/commit/31c78b3eb28f58a8017f1dcc795c33214d87feac), [`0bc0720`](https://github.com/mastra-ai/mastra/commit/0bc07201095791858087cc56f353fcd65e87ab54), [`36516ac`](https://github.com/mastra-ai/mastra/commit/36516aca1021cbeb42e74751b46a2614101f37c8), [`e947652`](https://github.com/mastra-ai/mastra/commit/e9476527fdecb4449e54570e80dfaf8466901254), [`3c6ef79`](https://github.com/mastra-ai/mastra/commit/3c6ef798481e00d6d22563be2de98818fd4dd5e0), [`9257d01`](https://github.com/mastra-ai/mastra/commit/9257d01d1366d81f84c582fe02b5e200cf9621f4), [`ec248f6`](https://github.com/mastra-ai/mastra/commit/ec248f6b56e8a037c066c49b2178e2507471d988)]:
+  - @mastra/core@1.9.0-alpha.0
+
 ## 0.0.2
 
 ### Patch Changes

package/LICENSE.md

@@ -1,3 +1,18 @@
+Portions of this software are licensed as follows:
+
+- All content that resides under any directory named "ee/" within this
+  repository, including but not limited to:
+  - `packages/core/src/auth/ee/`
+  - `packages/server/src/server/auth/ee/`
+    is licensed under the license defined in `ee/LICENSE`.
+
+- All third-party components incorporated into the Mastra Software are
+  licensed under the original license provided by the owner of the
+  applicable component.
+
+- Content outside of the above-mentioned directories or restrictions is
+  available under the "Apache License 2.0" as defined below.
+
 # Apache License 2.0
 
 Copyright (c) 2025 Kepler Software, Inc.

package/README.md

@@ -34,7 +34,7 @@ const agent = new Agent({
 | Option     | Type                                  | Default                      | Description                                            |
 | ---------- | ------------------------------------- | ---------------------------- | ------------------------------------------------------ |
 | `id`       | `string`                              | auto-generated               | Unique identifier for the sandbox instance             |
-| `image`    | `string`                              | `'blaxel/py-app:latest'`     | Docker image to use                                    |
+| `image`    | `string`                              | `'blaxel/ts-app:latest'`     | Docker image to use                                    |
 | `memory`   | `number`                              | `4096`                       | Memory allocation in MB                                |
 | `timeout`  | `string`                              | `'5m'`                       | Sandbox TTL as a duration string (e.g. `'5m'`, `'1h'`) |
 | `env`      | `Record<string, string>`              | —                            | Environment variables to set in the sandbox            |

package/dist/index.cjs

@@ -37,6 +37,16 @@ function validateEndpoint(endpoint) {
     throw new Error(`Invalid endpoint URL scheme: "${parsed.protocol}". Only http: and https: are allowed.`);
   }
 }
+async function detectPackageManager(sandbox) {
+  const result = await runCommand(
+    sandbox,
+    'which apt-get >/dev/null 2>&1 && echo "apt" || (which apk >/dev/null 2>&1 && echo "apk" || echo "unknown")'
+  );
+  const pm = result.stdout.trim();
+  if (pm === "apt") return "apt";
+  if (pm === "apk") return "apk";
+  return "unknown";
+}
 async function runCommand(sandbox, command, options) {
   const result = await sandbox.process.exec({
     command,
@@ -59,25 +69,45 @@ async function mountS3(mountPath, config, ctx) {
   if (checkResult.stdout.includes("not found")) {
     logger.warn(`${LOG_PREFIX} s3fs not found, attempting runtime installation...`);
     logger.info(`${LOG_PREFIX} Tip: For faster startup, pre-install s3fs in your sandbox image`);
-    const updateResult = await runCommand(sandbox, "apt-get update 2>&1", { timeout: 6e4 });
-    if (updateResult.exitCode !== 0) {
-      throw new Error(
-        `Failed to update package lists for s3fs installation.
+    const pm = await detectPackageManager(sandbox);
+    logger.debug(`${LOG_PREFIX} Detected package manager: ${pm}`);
+    if (pm === "apt") {
+      const updateResult = await runCommand(sandbox, "apt-get update 2>&1", { timeout: 6e4 });
+      if (updateResult.exitCode !== 0) {
+        throw new Error(
+          `Failed to update package lists for s3fs installation.
 Error details: ${updateResult.stderr || updateResult.stdout}`
+        );
+      }
+      const installResult = await runCommand(
+        sandbox,
+        "apt-get install -y s3fs fuse 2>&1 || apt-get install -y s3fs-fuse fuse 2>&1",
+        { timeout: 12e4 }
       );
-    }
-    const installResult = await runCommand(
-      sandbox,
-      "apt-get install -y s3fs fuse 2>&1 || apt-get install -y s3fs-fuse fuse 2>&1",
-      { timeout: 12e4 }
-    );
-    if (installResult.exitCode !== 0) {
-      throw new Error(
-        `Failed to install s3fs. For S3 mounting, your sandbox image needs s3fs and fuse packages.
+      if (installResult.exitCode !== 0) {
+        throw new Error(
+          `Failed to install s3fs. For S3 mounting, your sandbox image needs s3fs and fuse packages.
 
 Pre-install in your image: apt-get install -y s3fs fuse
 
 Error details: ${installResult.stderr || installResult.stdout}`
+        );
+      }
+    } else if (pm === "apk") {
+      const installResult = await runCommand(sandbox, "apk add --no-cache s3fs-fuse fuse 2>&1", { timeout: 12e4 });
+      if (installResult.exitCode !== 0) {
+        throw new Error(
+          `Failed to install s3fs on Alpine Linux. Ensure the Alpine community repository is enabled.
+
+Pre-install in your image: apk add --no-cache s3fs-fuse fuse
+
+Error details: ${installResult.stderr || installResult.stdout}`
+        );
+      }
+    } else {
+      throw new Error(
+        `Cannot install s3fs: no supported package manager found (need apt-get or apk).
+Use a Debian-based image (e.g. blaxel/ts-app:latest) or Alpine-based image (e.g. blaxel/node:latest), or pre-install s3fs in your custom image.`
       );
     }
   }
@@ -139,6 +169,26 @@ async function mountGCS(mountPath, config, ctx) {
   const checkResult = await runCommand(sandbox, 'which gcsfuse || echo "not found"');
   if (checkResult.stdout.includes("not found")) {
     logger.warn(`${LOG_PREFIX} gcsfuse not found, attempting runtime installation...`);
+    const pm = await detectPackageManager(sandbox);
+    logger.debug(`${LOG_PREFIX} Detected package manager: ${pm}`);
+    if (pm === "apk") {
+      throw new Error(
+        `gcsfuse is not available on Alpine Linux. Google only provides gcsfuse packages for Debian/Ubuntu.
+
+Use a Debian-based Blaxel image for GCS mounts:
+  new BlaxelSandbox({ image: 'blaxel/ts-app:latest' })
+  new BlaxelSandbox({ image: 'blaxel/py-app:latest' })`
+      );
+    }
+    if (pm !== "apt") {
+      throw new Error(
+        `Cannot install gcsfuse: no supported package manager found (need apt-get).
+gcsfuse is only available on Debian/Ubuntu-based images.
+
+Use a Debian-based Blaxel image:
+  new BlaxelSandbox({ image: 'blaxel/ts-app:latest' })`
+      );
+    }
     logger.info(`${LOG_PREFIX} Tip: For faster startup, pre-install gcsfuse in your sandbox image`);
     const codenameResult = await runCommand(
       sandbox,
@@ -209,6 +259,138 @@ ${installResult.stderr}`
     throw new Error(`Failed to mount GCS bucket: ${result.stderr || result.stdout}`);
   }
 }
+var BlaxelProcessHandle = class extends workspace.ProcessHandle {
+  pid;
+  _identifier;
+  _sandbox;
+  _startTime;
+  _exitCode;
+  _waitPromise = null;
+  _streamingDone = null;
+  _closeStream = null;
+  _killed = false;
+  constructor(pid, identifier, sandbox, startTime, options) {
+    super(options);
+    this.pid = pid;
+    this._identifier = identifier;
+    this._sandbox = sandbox;
+    this._startTime = startTime;
+  }
+  get exitCode() {
+    return this._exitCode;
+  }
+  /** @internal Set by the process manager after streaming starts. */
+  set streamControl(control) {
+    this._closeStream = control.close;
+    this._streamingDone = control.wait();
+    this._streamingDone.then(() => this._resolveExitCode()).catch(() => this._resolveExitCode());
+  }
+  /** Fetch exit code from Blaxel and set _exitCode. No-op if already set. */
+  async _resolveExitCode() {
+    if (this._exitCode !== void 0) return;
+    try {
+      const proc = await this._sandbox.process.get(this._identifier);
+      this._exitCode = proc.status === "completed" ? proc.exitCode ?? 0 : proc.exitCode ?? 1;
+    } catch {
+      if (this._exitCode === void 0) {
+        this._exitCode = 1;
+      }
+    }
+  }
+  async wait() {
+    if (!this._waitPromise) {
+      this._waitPromise = this._doWait();
+    }
+    return this._waitPromise;
+  }
+  async _doWait() {
+    if (this._streamingDone) {
+      await this._streamingDone.catch(() => {
+      });
+    }
+    if (this._killed) {
+      return {
+        success: false,
+        exitCode: this._exitCode ?? 137,
+        stdout: this.stdout,
+        stderr: this.stderr,
+        executionTimeMs: Date.now() - this._startTime
+      };
+    }
+    await this._resolveExitCode();
+    return {
+      success: this._exitCode === 0,
+      exitCode: this._exitCode ?? 1,
+      stdout: this.stdout,
+      stderr: this.stderr,
+      executionTimeMs: Date.now() - this._startTime
+    };
+  }
+  async kill() {
+    if (this._exitCode !== void 0) return false;
+    this._killed = true;
+    this._exitCode = 137;
+    this._closeStream?.();
+    try {
+      await this._sandbox.process.kill(this._identifier);
+    } catch {
+    }
+    return true;
+  }
+  async sendStdin(_data) {
+    throw new Error("Blaxel sandboxes do not support stdin");
+  }
+};
+var BlaxelProcessManager = class extends workspace.SandboxProcessManager {
+  constructor(opts = {}) {
+    super({ env: opts.env });
+  }
+  async spawn(command, options = {}) {
+    return this.sandbox.retryOnDead(async () => {
+      const blaxel = this.sandbox.instance;
+      const mergedEnv = { ...this.env, ...options.env };
+      const envs = Object.fromEntries(
+        Object.entries(mergedEnv).filter((entry) => entry[1] !== void 0)
+      );
+      const result = await blaxel.process.exec({
+        command,
+        waitForCompletion: false,
+        workingDir: options.cwd,
+        ...Object.keys(envs).length > 0 && { env: envs },
+        ...options.timeout && { timeout: Math.ceil(options.timeout / 1e3) }
+      });
+      const identifier = result.pid;
+      const pid = parseInt(identifier, 10);
+      const handle = new BlaxelProcessHandle(pid, identifier, blaxel, Date.now(), options);
+      const streamControl = blaxel.process.streamLogs(identifier, {
+        onStdout: (data) => handle.emitStdout(data),
+        onStderr: (data) => handle.emitStderr(data),
+        onError: (err) => {
+          const msg = err instanceof Error ? err.message : String(err);
+          handle.emitStderr(msg);
+        }
+      });
+      handle.streamControl = streamControl;
+      this._tracked.set(pid, handle);
+      return handle;
+    });
+  }
+  async list() {
+    const result = [];
+    for (const [pid, handle] of this._tracked) {
+      result.push({
+        pid,
+        command: handle.command,
+        running: handle.exitCode === void 0,
+        exitCode: handle.exitCode
+      });
+    }
+    return result;
+  }
+  async get(pid) {
+    return this._tracked.get(pid);
+  }
+};
 
 // src/sandbox/index.ts
 var SAFE_MOUNT_PATH = /^\/[a-zA-Z0-9_.\-/]+$/;
@@ -250,9 +432,13 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
   ports;
   // Non-optional (initialized by BaseSandbox)
   constructor(options = {}) {
-    super({ ...options, name: "BlaxelSandbox" });
+    super({
+      ...options,
+      name: "BlaxelSandbox",
+      processes: new BlaxelProcessManager({ env: options.env })
+    });
     this.id = options.id ?? this.generateId();
-    this.image = options.image ?? "blaxel/py-app:latest";
+    this.image = options.image ?? "blaxel/ts-app:latest";
     this.memory = options.memory ?? 4096;
     this.timeout = options.timeout;
     this.env = options.env ?? {};
@@ -595,7 +781,6 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
         image: this.image,
         memory: this.memory,
         ...this.timeout && { ttl: this.timeout },
-        envs: Object.entries(this.env).map(([name, value]) => ({ name, value })),
         labels: {
           ...this.labels,
           "mastra-sandbox-id": this.id
@@ -653,6 +838,13 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
    * Status management is handled by the base class.
    */
   async stop() {
+    if (this.processes) {
+      try {
+        const procs = await this.processes.list();
+        await Promise.all(procs.filter((p) => p.running).map((p) => this.processes.kill(p.pid)));
+      } catch {
+      }
+    }
     for (const mountPath of [...this.mounts.entries.keys()]) {
       try {
         await this.unmount(mountPath);
@@ -667,6 +859,13 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
    * Status management is handled by the base class.
    */
   async destroy() {
+    if (this.processes) {
+      try {
+        const procs = await this.processes.list();
+        await Promise.all(procs.filter((p) => p.running).map((p) => this.processes.kill(p.pid)));
+      } catch {
+      }
+    }
     for (const mountPath of [...this.mounts.entries.keys()]) {
       try {
         await this.unmount(mountPath);
@@ -717,7 +916,7 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
   getInstructions() {
     const mountCount = this.mounts.entries.size;
     const mountInfo = mountCount > 0 ? ` ${mountCount} filesystem(s) mounted via FUSE.` : "";
-    return `Cloud sandbox with /home/user as working directory.${mountInfo}`;
+    return `Cloud sandbox.${mountInfo}`;
   }
   // ---------------------------------------------------------------------------
   // Internal Helpers
@@ -737,8 +936,8 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
    */
   isSandboxDeadError(error) {
     if (!error) return false;
-    const errorStr = errorToString(error);
-    return errorStr.includes("TERMINATED") || errorStr.includes("sandbox was not found") || errorStr.includes("Sandbox not found");
+    const errorStr = errorToString(error).toLowerCase();
+    return errorStr.includes("terminated") || errorStr.includes("sandbox was not found") || errorStr.includes("sandbox not found") || errorStr.includes('"not found"');
   }
   /**
    * Handle sandbox timeout by clearing the instance and resetting state.
@@ -756,6 +955,31 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
     }
     this.status = "stopped";
   }
+  /**
+   * Execute an operation with automatic retry if the sandbox is found to be dead.
+   *
+   * When the Blaxel sandbox times out or crashes mid-operation, this method
+   * resets sandbox state, restarts it, and retries the operation once.
+   *
+   * @internal Used by BlaxelProcessManager to handle dead sandboxes during spawn.
+   */
+  async retryOnDead(fn) {
+    try {
+      return await fn();
+    } catch (error) {
+      if (this.isSandboxDeadError(error) && !this._isRetrying) {
+        this.handleSandboxTimeout();
+        this._isRetrying = true;
+        try {
+          await this.ensureRunning();
+          return await fn();
+        } finally {
+          this._isRetrying = false;
+        }
+      }
+      throw error;
+    }
+  }
   // ---------------------------------------------------------------------------
   // Command Execution
   // ---------------------------------------------------------------------------
@@ -770,26 +994,77 @@ var BlaxelSandbox = class extends workspace.MastraSandbox {
     const startTime = Date.now();
     const fullCommand = args.length > 0 ? `${command} ${args.map(shellQuote).join(" ")}` : command;
     this.logger.debug(`${LOG_PREFIX} Executing: ${fullCommand}`);
+    let capturedStdout = "";
+    let capturedStderr = "";
     try {
       const mergedEnv = { ...this.env, ...options.env };
       const envRecord = Object.fromEntries(
         Object.entries(mergedEnv).filter((entry) => entry[1] !== void 0)
       );
-      const result = await sandbox.process.exec({
+      const apiTimeout = options.timeout ? Math.ceil(options.timeout / 1e3) : void 0;
+      const execPromise = sandbox.process.exec({
         command: fullCommand,
         workingDir: options.cwd,
         env: envRecord,
         waitForCompletion: true,
-        ...options.timeout && { timeout: Math.ceil(options.timeout / 1e3) },
-        ...options.onStdout || options.onStderr ? {
-          onStdout: options.onStdout,
-          onStderr: options.onStderr
-        } : {}
+        ...apiTimeout && { timeout: apiTimeout },
+        onStdout: (data) => {
+          capturedStdout += data;
+          options.onStdout?.(data);
+        },
+        onStderr: (data) => {
+          capturedStderr += data;
+          options.onStderr?.(data);
+        }
       });
+      const racePromises = [];
+      let timer;
+      let abortHandler;
+      if (options.timeout) {
+        racePromises.push(
+          new Promise((_, reject) => {
+            timer = setTimeout(() => {
+              runCommand(sandbox, `pkill -f ${shellQuote(fullCommand)}`, { timeout: 5e3 }).catch(() => {
+              });
+              reject(new Error(`Command timed out after ${options.timeout}ms`));
+            }, options.timeout);
+          })
+        );
+      }
+      if (options.abortSignal) {
+        if (options.abortSignal.aborted) {
+          runCommand(sandbox, `pkill -f ${shellQuote(fullCommand)}`, { timeout: 5e3 }).catch(() => {
+          });
+          throw new Error("Process aborted");
+        }
+        racePromises.push(
+          new Promise((_, reject) => {
+            abortHandler = () => {
+              runCommand(sandbox, `pkill -f ${shellQuote(fullCommand)}`, { timeout: 5e3 }).catch(() => {
+              });
+              reject(new Error("Process aborted"));
+            };
+            options.abortSignal.addEventListener("abort", abortHandler, { once: true });
+          })
+        );
+      }
+      let result;
+      try {
+        if (racePromises.length > 0) {
+          result = await Promise.race([execPromise, ...racePromises]);
+        } else {
+          result = await execPromise;
+        }
+      } finally {
+        if (timer) clearTimeout(timer);
+        if (abortHandler && options.abortSignal) {
+          options.abortSignal.removeEventListener("abort", abortHandler);
+        }
+      }
       const executionTimeMs = Date.now() - startTime;
       const exitCode = result.exitCode ?? 0;
-      const stdout = result.stdout ?? "";
-      const stderr = result.stderr ?? "";
+      const stdout = capturedStdout || result.stdout || "";
+      const stderr = capturedStderr || result.stderr || "";
       this.logger.debug(`${LOG_PREFIX} Exit code: ${exitCode} (${executionTimeMs}ms)`);
       if (stdout) this.logger.debug(`${LOG_PREFIX} stdout:
 ${stdout}`);
@@ -815,13 +1090,11 @@ ${stderr}`);
         }
       }
       const executionTimeMs = Date.now() - startTime;
-      const stderr = errorToString(error);
-      this.logger.debug(`${LOG_PREFIX} Execution error (${executionTimeMs}ms): ${stderr}`);
       return {
         success: false,
         exitCode: 1,
-        stdout: "",
-        stderr,
+        stdout: capturedStdout,
+        stderr: capturedStderr || errorToString(error),
         executionTimeMs,
         command,
         args
@@ -830,6 +1103,7 @@ ${stderr}`);
   }
 };
 
+exports.BlaxelProcessManager = BlaxelProcessManager;
 exports.BlaxelSandbox = BlaxelSandbox;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map