modal 0.3.21 → 0.3.23

package/dist/index.js

@@ -24355,13 +24355,16 @@ var ListPagination = {
   }
 };
 function createBaseMapAwaitRequest() {
-  return { functionCallId: "", lastEntryId: "", requestedAt: 0, timeout: 0 };
+  return { functionCallId: void 0, mapToken: void 0, lastEntryId: "", requestedAt: 0, timeout: 0 };
 }
 var MapAwaitRequest = {
   encode(message, writer = new BinaryWriter()) {
-    if (message.functionCallId !== "") {
+    if (message.functionCallId !== void 0) {
       writer.uint32(10).string(message.functionCallId);
     }
+    if (message.mapToken !== void 0) {
+      writer.uint32(42).string(message.mapToken);
+    }
     if (message.lastEntryId !== "") {
       writer.uint32(18).string(message.lastEntryId);
     }
@@ -24387,6 +24390,13 @@ var MapAwaitRequest = {
           message.functionCallId = reader.string();
           continue;
         }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+          message.mapToken = reader.string();
+          continue;
+        }
         case 2: {
           if (tag !== 18) {
             break;
@@ -24418,7 +24428,8 @@ var MapAwaitRequest = {
   },
   fromJSON(object) {
     return {
-      functionCallId: isSet3(object.functionCallId) ? globalThis.String(object.functionCallId) : "",
+      functionCallId: isSet3(object.functionCallId) ? globalThis.String(object.functionCallId) : void 0,
+      mapToken: isSet3(object.mapToken) ? globalThis.String(object.mapToken) : void 0,
       lastEntryId: isSet3(object.lastEntryId) ? globalThis.String(object.lastEntryId) : "",
       requestedAt: isSet3(object.requestedAt) ? globalThis.Number(object.requestedAt) : 0,
       timeout: isSet3(object.timeout) ? globalThis.Number(object.timeout) : 0
@@ -24426,9 +24437,12 @@ var MapAwaitRequest = {
   },
   toJSON(message) {
     const obj = {};
-    if (message.functionCallId !== "") {
+    if (message.functionCallId !== void 0) {
       obj.functionCallId = message.functionCallId;
     }
+    if (message.mapToken !== void 0) {
+      obj.mapToken = message.mapToken;
+    }
     if (message.lastEntryId !== "") {
       obj.lastEntryId = message.lastEntryId;
     }
@@ -24445,7 +24459,8 @@ var MapAwaitRequest = {
   },
   fromPartial(object) {
     const message = createBaseMapAwaitRequest();
-    message.functionCallId = object.functionCallId ?? "";
+    message.functionCallId = object.functionCallId ?? void 0;
+    message.mapToken = object.mapToken ?? void 0;
     message.lastEntryId = object.lastEntryId ?? "";
     message.requestedAt = object.requestedAt ?? 0;
     message.timeout = object.timeout ?? 0;
@@ -24732,7 +24747,7 @@ var MapStartOrContinueItem = {
   }
 };
 function createBaseMapStartOrContinueRequest() {
-  return { functionId: "", parentInputId: "", functionCallId: void 0, items: [] };
+  return { functionId: "", parentInputId: "", functionCallId: void 0, mapToken: void 0, items: [] };
 }
 var MapStartOrContinueRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -24745,6 +24760,9 @@ var MapStartOrContinueRequest = {
     if (message.functionCallId !== void 0) {
       writer.uint32(26).string(message.functionCallId);
     }
+    if (message.mapToken !== void 0) {
+      writer.uint32(42).string(message.mapToken);
+    }
     for (const v of message.items) {
       MapStartOrContinueItem.encode(v, writer.uint32(34).fork()).join();
     }
@@ -24778,6 +24796,13 @@ var MapStartOrContinueRequest = {
           message.functionCallId = reader.string();
           continue;
         }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+          message.mapToken = reader.string();
+          continue;
+        }
         case 4: {
           if (tag !== 34) {
             break;
@@ -24798,6 +24823,7 @@ var MapStartOrContinueRequest = {
       functionId: isSet3(object.functionId) ? globalThis.String(object.functionId) : "",
       parentInputId: isSet3(object.parentInputId) ? globalThis.String(object.parentInputId) : "",
       functionCallId: isSet3(object.functionCallId) ? globalThis.String(object.functionCallId) : void 0,
+      mapToken: isSet3(object.mapToken) ? globalThis.String(object.mapToken) : void 0,
       items: globalThis.Array.isArray(object?.items) ? object.items.map((e) => MapStartOrContinueItem.fromJSON(e)) : []
     };
   },
@@ -24812,6 +24838,9 @@ var MapStartOrContinueRequest = {
     if (message.functionCallId !== void 0) {
       obj.functionCallId = message.functionCallId;
     }
+    if (message.mapToken !== void 0) {
+      obj.mapToken = message.mapToken;
+    }
     if (message.items?.length) {
       obj.items = message.items.map((e) => MapStartOrContinueItem.toJSON(e));
     }
@@ -24825,15 +24854,26 @@ var MapStartOrContinueRequest = {
     message.functionId = object.functionId ?? "";
     message.parentInputId = object.parentInputId ?? "";
     message.functionCallId = object.functionCallId ?? void 0;
+    message.mapToken = object.mapToken ?? void 0;
     message.items = object.items?.map((e) => MapStartOrContinueItem.fromPartial(e)) || [];
     return message;
   }
 };
 function createBaseMapStartOrContinueResponse() {
-  return { functionId: "", functionCallId: "", maxInputsOutstanding: 0, attemptTokens: [], retryPolicy: void 0 };
+  return {
+    mapToken: "",
+    functionId: "",
+    functionCallId: "",
+    maxInputsOutstanding: 0,
+    attemptTokens: [],
+    retryPolicy: void 0
+  };
 }
 var MapStartOrContinueResponse = {
   encode(message, writer = new BinaryWriter()) {
+    if (message.mapToken !== "") {
+      writer.uint32(50).string(message.mapToken);
+    }
     if (message.functionId !== "") {
       writer.uint32(10).string(message.functionId);
     }
@@ -24858,6 +24898,13 @@ var MapStartOrContinueResponse = {
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+          message.mapToken = reader.string();
+          continue;
+        }
         case 1: {
           if (tag !== 10) {
             break;
@@ -24903,6 +24950,7 @@ var MapStartOrContinueResponse = {
   },
   fromJSON(object) {
     return {
+      mapToken: isSet3(object.mapToken) ? globalThis.String(object.mapToken) : "",
       functionId: isSet3(object.functionId) ? globalThis.String(object.functionId) : "",
       functionCallId: isSet3(object.functionCallId) ? globalThis.String(object.functionCallId) : "",
       maxInputsOutstanding: isSet3(object.maxInputsOutstanding) ? globalThis.Number(object.maxInputsOutstanding) : 0,
@@ -24912,6 +24960,9 @@ var MapStartOrContinueResponse = {
   },
   toJSON(message) {
     const obj = {};
+    if (message.mapToken !== "") {
+      obj.mapToken = message.mapToken;
+    }
     if (message.functionId !== "") {
       obj.functionId = message.functionId;
     }
@@ -24934,6 +24985,7 @@ var MapStartOrContinueResponse = {
   },
   fromPartial(object) {
     const message = createBaseMapStartOrContinueResponse();
+    message.mapToken = object.mapToken ?? "";
     message.functionId = object.functionId ?? "";
     message.functionCallId = object.functionCallId ?? "";
     message.maxInputsOutstanding = object.maxInputsOutstanding ?? 0;
@@ -26629,7 +26681,16 @@ var ObjectDependency = {
   }
 };
 function createBasePTYInfo() {
-  return { enabled: false, winszRows: 0, winszCols: 0, envTerm: "", envColorterm: "", envTermProgram: "", ptyType: 0 };
+  return {
+    enabled: false,
+    winszRows: 0,
+    winszCols: 0,
+    envTerm: "",
+    envColorterm: "",
+    envTermProgram: "",
+    ptyType: 0,
+    noTerminateOnIdleStdin: false
+  };
 }
 var PTYInfo = {
   encode(message, writer = new BinaryWriter()) {
@@ -26654,6 +26715,9 @@ var PTYInfo = {
     if (message.ptyType !== 0) {
       writer.uint32(56).int32(message.ptyType);
     }
+    if (message.noTerminateOnIdleStdin !== false) {
+      writer.uint32(64).bool(message.noTerminateOnIdleStdin);
+    }
     return writer;
   },
   decode(input, length) {
@@ -26712,6 +26776,13 @@ var PTYInfo = {
           message.ptyType = reader.int32();
           continue;
         }
+        case 8: {
+          if (tag !== 64) {
+            break;
+          }
+          message.noTerminateOnIdleStdin = reader.bool();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -26728,7 +26799,8 @@ var PTYInfo = {
       envTerm: isSet3(object.envTerm) ? globalThis.String(object.envTerm) : "",
       envColorterm: isSet3(object.envColorterm) ? globalThis.String(object.envColorterm) : "",
       envTermProgram: isSet3(object.envTermProgram) ? globalThis.String(object.envTermProgram) : "",
-      ptyType: isSet3(object.ptyType) ? pTYInfo_PTYTypeFromJSON(object.ptyType) : 0
+      ptyType: isSet3(object.ptyType) ? pTYInfo_PTYTypeFromJSON(object.ptyType) : 0,
+      noTerminateOnIdleStdin: isSet3(object.noTerminateOnIdleStdin) ? globalThis.Boolean(object.noTerminateOnIdleStdin) : false
     };
   },
   toJSON(message) {
@@ -26754,6 +26826,9 @@ var PTYInfo = {
     if (message.ptyType !== 0) {
       obj.ptyType = pTYInfo_PTYTypeToJSON(message.ptyType);
     }
+    if (message.noTerminateOnIdleStdin !== false) {
+      obj.noTerminateOnIdleStdin = message.noTerminateOnIdleStdin;
+    }
     return obj;
   },
   create(base) {
@@ -26768,6 +26843,7 @@ var PTYInfo = {
     message.envColorterm = object.envColorterm ?? "";
     message.envTermProgram = object.envTermProgram ?? "";
     message.ptyType = object.ptyType ?? 0;
+    message.noTerminateOnIdleStdin = object.noTerminateOnIdleStdin ?? false;
     return message;
   }
 };
@@ -30264,6 +30340,142 @@ var Sandbox_ExperimentalOptionsEntry = {
     return message;
   }
 };
+function createBaseSandboxCreateConnectTokenRequest() {
+  return { sandboxId: "", metadata: "" };
+}
+var SandboxCreateConnectTokenRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.sandboxId !== "") {
+      writer.uint32(10).string(message.sandboxId);
+    }
+    if (message.metadata !== "") {
+      writer.uint32(18).string(message.metadata);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSandboxCreateConnectTokenRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.sandboxId = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.metadata = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      sandboxId: isSet3(object.sandboxId) ? globalThis.String(object.sandboxId) : "",
+      metadata: isSet3(object.metadata) ? globalThis.String(object.metadata) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.sandboxId !== "") {
+      obj.sandboxId = message.sandboxId;
+    }
+    if (message.metadata !== "") {
+      obj.metadata = message.metadata;
+    }
+    return obj;
+  },
+  create(base) {
+    return SandboxCreateConnectTokenRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSandboxCreateConnectTokenRequest();
+    message.sandboxId = object.sandboxId ?? "";
+    message.metadata = object.metadata ?? "";
+    return message;
+  }
+};
+function createBaseSandboxCreateConnectTokenResponse() {
+  return { url: "", token: "" };
+}
+var SandboxCreateConnectTokenResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.url !== "") {
+      writer.uint32(10).string(message.url);
+    }
+    if (message.token !== "") {
+      writer.uint32(18).string(message.token);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSandboxCreateConnectTokenResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.url = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.token = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      url: isSet3(object.url) ? globalThis.String(object.url) : "",
+      token: isSet3(object.token) ? globalThis.String(object.token) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.url !== "") {
+      obj.url = message.url;
+    }
+    if (message.token !== "") {
+      obj.token = message.token;
+    }
+    return obj;
+  },
+  create(base) {
+    return SandboxCreateConnectTokenResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSandboxCreateConnectTokenResponse();
+    message.url = object.url ?? "";
+    message.token = object.token ?? "";
+    return message;
+  }
+};
 function createBaseSandboxCreateRequest() {
   return { appId: "", definition: void 0, environmentName: "" };
 }
@@ -40867,6 +41079,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxCreateConnectToken: {
+      name: "SandboxCreateConnectToken",
+      requestType: SandboxCreateConnectTokenRequest,
+      requestStream: false,
+      responseType: SandboxCreateConnectTokenResponse,
+      responseStream: false,
+      options: {}
+    },
     sandboxGetFromName: {
       name: "SandboxGetFromName",
       requestType: SandboxGetFromNameRequest,
@@ -41718,11 +41938,20 @@ var Image2 = class _Image {
   #imageId;
   #tag;
   #imageRegistryConfig;
+  #layers;
   /** @ignore */
-  constructor(imageId, tag, imageRegistryConfig) {
+  constructor(imageId, tag, imageRegistryConfig, layers) {
     this.#imageId = imageId;
     this.#tag = tag;
     this.#imageRegistryConfig = imageRegistryConfig;
+    this.#layers = layers || [
+      {
+        commands: [],
+        secrets: void 0,
+        gpuConfig: void 0,
+        forceBuild: false
+      }
+    ];
   }
   get imageId() {
     return this.#imageId;
@@ -41807,6 +42036,42 @@ var Image2 = class _Image {
     }
     return new _Image("", tag, imageRegistryConfig);
   }
+  static validateDockerfileCommands(commands) {
+    for (const command of commands) {
+      const trimmed = command.trim().toUpperCase();
+      if (trimmed.startsWith("COPY ") && !trimmed.startsWith("COPY --FROM=")) {
+        throw new InvalidError(
+          "COPY commands that copy from local context are not yet supported."
+        );
+      }
+    }
+  }
+  /**
+   * Extend an image with arbitrary Dockerfile-like commands.
+   *
+   * Each call creates a new Image layer that will be built sequentially.
+   * The provided options apply only to this layer.
+   *
+   * @param commands - Array of Dockerfile commands as strings
+   * @param options - Optional configuration for this layer's build
+   * @returns A new Image instance
+   */
+  dockerfileCommands(commands, options) {
+    if (commands.length === 0) {
+      return this;
+    }
+    _Image.validateDockerfileCommands(commands);
+    const newLayer = {
+      commands: [...commands],
+      secrets: options?.secrets,
+      gpuConfig: options?.gpu ? parseGpuConfig(options.gpu) : void 0,
+      forceBuild: options?.forceBuild
+    };
+    return new _Image("", this.#tag, this.#imageRegistryConfig, [
+      ...this.#layers,
+      newLayer
+    ]);
+  }
   /**
    * Eagerly builds an Image on Modal.
    *
@@ -41816,58 +42081,75 @@ var Image2 = class _Image {
     if (this.imageId !== "") {
       return this;
     }
-    const resp = await client.imageGetOrCreate({
-      appId: app.appId,
-      image: {
-        dockerfileCommands: [`FROM ${this.#tag}`],
-        imageRegistryConfig: this.#imageRegistryConfig
-      },
-      builderVersion: imageBuilderVersion()
-    });
-    let result;
-    let metadata = void 0;
-    if (resp.result?.status) {
-      result = resp.result;
-      metadata = resp.metadata;
-    } else {
-      let lastEntryId = "";
-      let resultJoined = void 0;
-      while (!resultJoined) {
-        for await (const item of client.imageJoinStreaming({
-          imageId: resp.imageId,
-          timeout: 55,
-          lastEntryId
-        })) {
-          if (item.entryId) lastEntryId = item.entryId;
-          if (item.result?.status) {
-            resultJoined = item.result;
-            metadata = item.metadata;
-            break;
+    let baseImageId;
+    for (let i = 0; i < this.#layers.length; i++) {
+      const layer = this.#layers[i];
+      const secretIds = layer.secrets?.map((secret) => secret.secretId) || [];
+      const gpuConfig = layer.gpuConfig;
+      let dockerfileCommands;
+      let baseImages;
+      if (i === 0) {
+        dockerfileCommands = [`FROM ${this.#tag}`, ...layer.commands];
+        baseImages = [];
+      } else {
+        dockerfileCommands = ["FROM base", ...layer.commands];
+        baseImages = [{ dockerTag: "base", imageId: baseImageId }];
+      }
+      const resp = await client.imageGetOrCreate({
+        appId: app.appId,
+        image: Image.create({
+          dockerfileCommands,
+          imageRegistryConfig: this.#imageRegistryConfig,
+          secretIds,
+          gpuConfig,
+          contextFiles: [],
+          baseImages
+        }),
+        builderVersion: imageBuilderVersion(),
+        forceBuild: layer.forceBuild || false
+      });
+      let result;
+      if (resp.result?.status) {
+        result = resp.result;
+      } else {
+        let lastEntryId = "";
+        let resultJoined = void 0;
+        while (!resultJoined) {
+          for await (const item of client.imageJoinStreaming({
+            imageId: resp.imageId,
+            timeout: 55,
+            lastEntryId
+          })) {
+            if (item.entryId) lastEntryId = item.entryId;
+            if (item.result?.status) {
+              resultJoined = item.result;
+              break;
+            }
           }
         }
+        result = resultJoined;
       }
-      result = resultJoined;
-    }
-    void metadata;
-    if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with the exception:
+      if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with the exception:
 ${result.exception}`
-      );
-    } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
-      throw new Error(
-        `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
-      );
-    } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
-      throw new Error(
-        `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
-      );
-    } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
-      );
+        );
+      } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
+        throw new Error(
+          `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
+        );
+      } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
+        throw new Error(
+          `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
+        );
+      } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
+        );
+      }
+      baseImageId = resp.imageId;
     }
-    this.#imageId = resp.imageId;
+    this.#imageId = baseImageId;
     return this;
   }
   /** Delete an Image by ID. Warning: This removes an *entire Image*, and cannot be undone. */
@@ -42121,6 +42403,33 @@ var Tunnel = class {
     return [this.unencryptedHost, this.unencryptedPort];
   }
 };
+function defaultSandboxPTYInfo() {
+  return PTYInfo.create({
+    enabled: true,
+    winszRows: 24,
+    winszCols: 80,
+    envTerm: "xterm-256color",
+    envColorterm: "truecolor",
+    envTermProgram: "",
+    ptyType: 2 /* PTY_TYPE_SHELL */,
+    noTerminateOnIdleStdin: true
+  });
+}
+function containerExecRequestProto(taskId, command, options) {
+  const secretIds = options?.secrets ? options.secrets.map((secret) => secret.secretId) : [];
+  let ptyInfo;
+  if (options?.pty) {
+    ptyInfo = defaultSandboxPTYInfo();
+  }
+  return ContainerExecRequest.create({
+    taskId,
+    command,
+    workdir: options?.workdir,
+    timeoutSecs: options?.timeout ? options.timeout / 1e3 : 0,
+    secretIds,
+    ptyInfo
+  });
+}
 var Sandbox2 = class _Sandbox {
   sandboxId;
   stdin;
@@ -42225,14 +42534,8 @@ var Sandbox2 = class _Sandbox {
   }
   async exec(command, options) {
     const taskId = await this.#getTaskId();
-    const secretIds = options?.secrets ? options.secrets.map((secret) => secret.secretId) : [];
-    const resp = await client.containerExec({
-      taskId,
-      command,
-      workdir: options?.workdir,
-      timeoutSecs: options?.timeout ? options.timeout / 1e3 : 0,
-      secretIds
-    });
+    const req = containerExecRequestProto(taskId, command, options);
+    const resp = await client.containerExec(req);
     return new ContainerProcess(resp.execId, options);
   }
   async #getTaskId() {
@@ -42619,7 +42922,118 @@ function parseGpuConfig(gpu) {
     gpuType: gpuType.toUpperCase()
   };
 }
-var App = class _App {
+function sandboxCreateRequestProto(appId, imageId, options = {}) {
+  const gpuConfig = parseGpuConfig(options.gpu);
+  if (options.timeout && options.timeout % 1e3 !== 0) {
+    throw new Error(
+      `timeout must be a multiple of 1000ms, got ${options.timeout}`
+    );
+  }
+  if (options.idleTimeout && options.idleTimeout % 1e3 !== 0) {
+    throw new Error(
+      `idleTimeout must be a multiple of 1000ms, got ${options.idleTimeout}`
+    );
+  }
+  if (options.workdir && !options.workdir.startsWith("/")) {
+    throw new Error(
+      `workdir must be an absolute path, got: ${options.workdir}`
+    );
+  }
+  const volumeMounts = options.volumes ? Object.entries(options.volumes).map(([mountPath, volume]) => ({
+    volumeId: volume.volumeId,
+    mountPath,
+    allowBackgroundCommits: true,
+    readOnly: volume.isReadOnly
+  })) : [];
+  const cloudBucketMounts = options.cloudBucketMounts ? Object.entries(options.cloudBucketMounts).map(
+    ([mountPath, mount]) => cloudBucketMountToProto(mount, mountPath)
+  ) : [];
+  const openPorts = [];
+  if (options.encryptedPorts) {
+    openPorts.push(
+      ...options.encryptedPorts.map((port) => ({
+        port,
+        unencrypted: false
+      }))
+    );
+  }
+  if (options.h2Ports) {
+    openPorts.push(
+      ...options.h2Ports.map((port) => ({
+        port,
+        unencrypted: false,
+        tunnelType: 1 /* TUNNEL_TYPE_H2 */
+      }))
+    );
+  }
+  if (options.unencryptedPorts) {
+    openPorts.push(
+      ...options.unencryptedPorts.map((port) => ({
+        port,
+        unencrypted: true
+      }))
+    );
+  }
+  const secretIds = options.secrets ? options.secrets.map((secret) => secret.secretId) : [];
+  let networkAccess;
+  if (options.blockNetwork) {
+    if (options.cidrAllowlist) {
+      throw new Error(
+        "cidrAllowlist cannot be used when blockNetwork is enabled"
+      );
+    }
+    networkAccess = {
+      networkAccessType: 2 /* BLOCKED */,
+      allowedCidrs: []
+    };
+  } else if (options.cidrAllowlist) {
+    networkAccess = {
+      networkAccessType: 3 /* ALLOWLIST */,
+      allowedCidrs: options.cidrAllowlist
+    };
+  } else {
+    networkAccess = {
+      networkAccessType: 1 /* OPEN */,
+      allowedCidrs: []
+    };
+  }
+  const schedulerPlacement = SchedulerPlacement.create({
+    regions: options.regions ?? []
+  });
+  let ptyInfo;
+  if (options.pty) {
+    ptyInfo = defaultSandboxPTYInfo();
+  }
+  return SandboxCreateRequest.create({
+    appId,
+    definition: {
+      // Sleep default is implicit in image builder version <=2024.10
+      entrypointArgs: options.command ?? ["sleep", "48h"],
+      imageId,
+      timeoutSecs: options.timeout != void 0 ? options.timeout / 1e3 : 600,
+      idleTimeoutSecs: options.idleTimeout != void 0 ? options.idleTimeout / 1e3 : void 0,
+      workdir: options.workdir ?? void 0,
+      networkAccess,
+      resources: {
+        // https://modal.com/docs/guide/resources
+        milliCpu: Math.round(1e3 * (options.cpu ?? 0.125)),
+        memoryMb: options.memory ?? 128,
+        gpuConfig
+      },
+      volumeMounts,
+      cloudBucketMounts,
+      ptyInfo,
+      secretIds,
+      openPorts: openPorts.length > 0 ? { ports: openPorts } : void 0,
+      cloudProviderStr: options.cloud ?? "",
+      schedulerPlacement,
+      verbose: options.verbose ?? false,
+      proxyId: options.proxy?.proxyId,
+      name: options.name
+    }
+  });
+}
+var App2 = class _App {
   appId;
   name;
   /** @ignore */
@@ -42643,113 +43057,15 @@ var App = class _App {
     }
   }
   async createSandbox(image, options = {}) {
-    const gpuConfig = parseGpuConfig(options.gpu);
-    if (options.timeout && options.timeout % 1e3 !== 0) {
-      throw new Error(
-        `timeout must be a multiple of 1000ms, got ${options.timeout}`
-      );
-    }
-    if (options.idleTimeout && options.idleTimeout % 1e3 !== 0) {
-      throw new Error(
-        `idleTimeout must be a multiple of 1000ms, got ${options.idleTimeout}`
-      );
-    }
     await image.build(this);
-    if (options.workdir && !options.workdir.startsWith("/")) {
-      throw new Error(
-        `workdir must be an absolute path, got: ${options.workdir}`
-      );
-    }
-    const volumeMounts = options.volumes ? Object.entries(options.volumes).map(([mountPath, volume]) => ({
-      volumeId: volume.volumeId,
-      mountPath,
-      allowBackgroundCommits: true,
-      readOnly: volume.isReadOnly
-    })) : [];
-    const cloudBucketMounts = options.cloudBucketMounts ? Object.entries(options.cloudBucketMounts).map(
-      ([mountPath, mount]) => cloudBucketMountToProto(mount, mountPath)
-    ) : [];
-    const openPorts = [];
-    if (options.encryptedPorts) {
-      openPorts.push(
-        ...options.encryptedPorts.map((port) => ({
-          port,
-          unencrypted: false
-        }))
-      );
-    }
-    if (options.h2Ports) {
-      openPorts.push(
-        ...options.h2Ports.map((port) => ({
-          port,
-          unencrypted: false,
-          tunnelType: 1 /* TUNNEL_TYPE_H2 */
-        }))
-      );
-    }
-    if (options.unencryptedPorts) {
-      openPorts.push(
-        ...options.unencryptedPorts.map((port) => ({
-          port,
-          unencrypted: true
-        }))
-      );
-    }
-    const secretIds = options.secrets ? options.secrets.map((secret) => secret.secretId) : [];
-    let networkAccess;
-    if (options.blockNetwork) {
-      if (options.cidrAllowlist) {
-        throw new Error(
-          "cidrAllowlist cannot be used when blockNetwork is enabled"
-        );
-      }
-      networkAccess = {
-        networkAccessType: 2 /* BLOCKED */,
-        allowedCidrs: []
-      };
-    } else if (options.cidrAllowlist) {
-      networkAccess = {
-        networkAccessType: 3 /* ALLOWLIST */,
-        allowedCidrs: options.cidrAllowlist
-      };
-    } else {
-      networkAccess = {
-        networkAccessType: 1 /* OPEN */,
-        allowedCidrs: []
-      };
-    }
-    const schedulerPlacement = SchedulerPlacement.create({
-      regions: options.regions ?? []
-    });
+    const createReq = sandboxCreateRequestProto(
+      this.appId,
+      image.imageId,
+      options
+    );
     let createResp;
     try {
-      createResp = await client.sandboxCreate({
-        appId: this.appId,
-        definition: {
-          // Sleep default is implicit in image builder version <=2024.10
-          entrypointArgs: options.command ?? ["sleep", "48h"],
-          imageId: image.imageId,
-          timeoutSecs: options.timeout != void 0 ? options.timeout / 1e3 : 600,
-          idleTimeoutSecs: options.idleTimeout != void 0 ? options.idleTimeout / 1e3 : void 0,
-          workdir: options.workdir ?? void 0,
-          networkAccess,
-          resources: {
-            // https://modal.com/docs/guide/resources
-            milliCpu: Math.round(1e3 * (options.cpu ?? 0.125)),
-            memoryMb: options.memory ?? 128,
-            gpuConfig
-          },
-          volumeMounts,
-          cloudBucketMounts,
-          secretIds,
-          openPorts: openPorts.length > 0 ? { ports: openPorts } : void 0,
-          cloudProviderStr: options.cloud ?? "",
-          schedulerPlacement,
-          verbose: options.verbose ?? false,
-          proxyId: options.proxy?.proxyId,
-          name: options.name
-        }
-      });
+      createResp = await client.sandboxCreate(createReq);
     } catch (err) {
       if (err instanceof ClientError5 && err.code === Status5.ALREADY_EXISTS) {
         throw new AlreadyExistsError(err.details || err.message);
@@ -44167,7 +44483,7 @@ var Proxy2 = class _Proxy {
 };
 export {
   AlreadyExistsError,
-  App,
+  App2 as App,
   CloudBucketMount2 as CloudBucketMount,
   Cls,
   ClsInstance,