modal 0.3.22 → 0.3.24

package/dist/index.cjs

@@ -1632,6 +1632,9 @@ function dataFormatFromJSON(object) {
     case 3:
     case "DATA_FORMAT_GENERATOR_DONE":
       return 3 /* DATA_FORMAT_GENERATOR_DONE */;
+    case 4:
+    case "DATA_FORMAT_CBOR":
+      return 4 /* DATA_FORMAT_CBOR */;
     case -1:
     case "UNRECOGNIZED":
     default:
@@ -1648,6 +1651,8 @@ function dataFormatToJSON(object) {
       return "DATA_FORMAT_ASGI";
     case 3 /* DATA_FORMAT_GENERATOR_DONE */:
       return "DATA_FORMAT_GENERATOR_DONE";
+    case 4 /* DATA_FORMAT_CBOR */:
+      return "DATA_FORMAT_CBOR";
     case -1 /* UNRECOGNIZED */:
     default:
       return "UNRECOGNIZED";
@@ -14786,7 +14791,9 @@ function createBaseFunctionMessage() {
     flashServiceUrls: [],
     flashServiceLabel: "",
     enableGpuSnapshot: false,
-    startupTimeoutSecs: 0
+    startupTimeoutSecs: 0,
+    supportedInputFormats: [],
+    supportedOutputFormats: []
   };
 }
 var FunctionMessage = {
@@ -15010,6 +15017,16 @@ var FunctionMessage = {
     if (message.startupTimeoutSecs !== 0) {
       writer.uint32(688).uint32(message.startupTimeoutSecs);
     }
+    writer.uint32(698).fork();
+    for (const v of message.supportedInputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
+    writer.uint32(706).fork();
+    for (const v of message.supportedOutputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -15536,6 +15553,34 @@ var FunctionMessage = {
           message.startupTimeoutSecs = reader.uint32();
           continue;
         }
+        case 87: {
+          if (tag === 696) {
+            message.supportedInputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 698) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedInputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
+        case 88: {
+          if (tag === 704) {
+            message.supportedOutputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 706) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedOutputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -15624,7 +15669,9 @@ var FunctionMessage = {
       flashServiceUrls: globalThis.Array.isArray(object?.flashServiceUrls) ? object.flashServiceUrls.map((e) => globalThis.String(e)) : [],
       flashServiceLabel: isSet3(object.flashServiceLabel) ? globalThis.String(object.flashServiceLabel) : "",
       enableGpuSnapshot: isSet3(object.enableGpuSnapshot) ? globalThis.Boolean(object.enableGpuSnapshot) : false,
-      startupTimeoutSecs: isSet3(object.startupTimeoutSecs) ? globalThis.Number(object.startupTimeoutSecs) : 0
+      startupTimeoutSecs: isSet3(object.startupTimeoutSecs) ? globalThis.Number(object.startupTimeoutSecs) : 0,
+      supportedInputFormats: globalThis.Array.isArray(object?.supportedInputFormats) ? object.supportedInputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -15860,6 +15907,12 @@ var FunctionMessage = {
     if (message.startupTimeoutSecs !== 0) {
       obj.startupTimeoutSecs = Math.round(message.startupTimeoutSecs);
     }
+    if (message.supportedInputFormats?.length) {
+      obj.supportedInputFormats = message.supportedInputFormats.map((e) => dataFormatToJSON(e));
+    }
+    if (message.supportedOutputFormats?.length) {
+      obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -15953,6 +16006,8 @@ var FunctionMessage = {
     message.flashServiceLabel = object.flashServiceLabel ?? "";
     message.enableGpuSnapshot = object.enableGpuSnapshot ?? false;
     message.startupTimeoutSecs = object.startupTimeoutSecs ?? 0;
+    message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
+    message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
     return message;
   }
 };
@@ -17461,7 +17516,9 @@ function createBaseFunctionData() {
     experimentalOptions: {},
     flashServiceUrls: [],
     flashServiceLabel: "",
-    startupTimeoutSecs: 0
+    startupTimeoutSecs: 0,
+    supportedInputFormats: [],
+    supportedOutputFormats: []
   };
 }
 var FunctionData = {
@@ -17571,6 +17628,16 @@ var FunctionData = {
     if (message.startupTimeoutSecs !== 0) {
       writer.uint32(288).uint32(message.startupTimeoutSecs);
     }
+    writer.uint32(298).fork();
+    for (const v of message.supportedInputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
+    writer.uint32(306).fork();
+    for (const v of message.supportedOutputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -17831,6 +17898,34 @@ var FunctionData = {
           message.startupTimeoutSecs = reader.uint32();
           continue;
         }
+        case 37: {
+          if (tag === 296) {
+            message.supportedInputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 298) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedInputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
+        case 38: {
+          if (tag === 304) {
+            message.supportedOutputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 306) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedOutputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -17881,7 +17976,9 @@ var FunctionData = {
       }, {}) : {},
       flashServiceUrls: globalThis.Array.isArray(object?.flashServiceUrls) ? object.flashServiceUrls.map((e) => globalThis.String(e)) : [],
       flashServiceLabel: isSet3(object.flashServiceLabel) ? globalThis.String(object.flashServiceLabel) : "",
-      startupTimeoutSecs: isSet3(object.startupTimeoutSecs) ? globalThis.Number(object.startupTimeoutSecs) : 0
+      startupTimeoutSecs: isSet3(object.startupTimeoutSecs) ? globalThis.Number(object.startupTimeoutSecs) : 0,
+      supportedInputFormats: globalThis.Array.isArray(object?.supportedInputFormats) ? object.supportedInputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -18003,6 +18100,12 @@ var FunctionData = {
     if (message.startupTimeoutSecs !== 0) {
       obj.startupTimeoutSecs = Math.round(message.startupTimeoutSecs);
     }
+    if (message.supportedInputFormats?.length) {
+      obj.supportedInputFormats = message.supportedInputFormats.map((e) => dataFormatToJSON(e));
+    }
+    if (message.supportedOutputFormats?.length) {
+      obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -18058,6 +18161,8 @@ var FunctionData = {
     message.flashServiceUrls = object.flashServiceUrls?.map((e) => e) || [];
     message.flashServiceLabel = object.flashServiceLabel ?? "";
     message.startupTimeoutSecs = object.startupTimeoutSecs ?? 0;
+    message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
+    message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
     return message;
   }
 };
@@ -19788,7 +19893,9 @@ function createBaseFunctionHandleMetadata() {
     inputPlaneUrl: void 0,
     inputPlaneRegion: void 0,
     maxObjectSizeBytes: void 0,
-    ExperimentalFlashUrls: []
+    ExperimentalFlashUrls: [],
+    supportedInputFormats: [],
+    supportedOutputFormats: []
   };
 }
 var FunctionHandleMetadata = {
@@ -19835,6 +19942,16 @@ var FunctionHandleMetadata = {
     for (const v of message.ExperimentalFlashUrls) {
       writer.uint32(394).string(v);
     }
+    writer.uint32(402).fork();
+    for (const v of message.supportedInputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
+    writer.uint32(410).fork();
+    for (const v of message.supportedOutputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -19945,6 +20062,34 @@ var FunctionHandleMetadata = {
           message.ExperimentalFlashUrls.push(reader.string());
           continue;
         }
+        case 50: {
+          if (tag === 400) {
+            message.supportedInputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 402) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedInputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
+        case 51: {
+          if (tag === 408) {
+            message.supportedOutputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 410) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedOutputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -19974,7 +20119,9 @@ var FunctionHandleMetadata = {
       inputPlaneUrl: isSet3(object.inputPlaneUrl) ? globalThis.String(object.inputPlaneUrl) : void 0,
       inputPlaneRegion: isSet3(object.inputPlaneRegion) ? globalThis.String(object.inputPlaneRegion) : void 0,
       maxObjectSizeBytes: isSet3(object.maxObjectSizeBytes) ? globalThis.Number(object.maxObjectSizeBytes) : void 0,
-      ExperimentalFlashUrls: globalThis.Array.isArray(object?.ExperimentalFlashUrls) ? object.ExperimentalFlashUrls.map((e) => globalThis.String(e)) : []
+      ExperimentalFlashUrls: globalThis.Array.isArray(object?.ExperimentalFlashUrls) ? object.ExperimentalFlashUrls.map((e) => globalThis.String(e)) : [],
+      supportedInputFormats: globalThis.Array.isArray(object?.supportedInputFormats) ? object.supportedInputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -20027,6 +20174,12 @@ var FunctionHandleMetadata = {
     if (message.ExperimentalFlashUrls?.length) {
       obj.ExperimentalFlashUrls = message.ExperimentalFlashUrls;
     }
+    if (message.supportedInputFormats?.length) {
+      obj.supportedInputFormats = message.supportedInputFormats.map((e) => dataFormatToJSON(e));
+    }
+    if (message.supportedOutputFormats?.length) {
+      obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -20053,6 +20206,8 @@ var FunctionHandleMetadata = {
     message.inputPlaneRegion = object.inputPlaneRegion ?? void 0;
     message.maxObjectSizeBytes = object.maxObjectSizeBytes ?? void 0;
     message.ExperimentalFlashUrls = object.ExperimentalFlashUrls?.map((e) => e) || [];
+    message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
+    message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
     return message;
   }
 };
@@ -20860,7 +21015,9 @@ function createBaseFunctionPrecreateRequest() {
     useFunctionId: "",
     useMethodName: "",
     methodDefinitions: {},
-    functionSchema: void 0
+    functionSchema: void 0,
+    supportedInputFormats: [],
+    supportedOutputFormats: []
   };
 }
 var FunctionPrecreateRequest = {
@@ -20892,6 +21049,16 @@ var FunctionPrecreateRequest = {
     if (message.functionSchema !== void 0) {
       FunctionSchema.encode(message.functionSchema, writer.uint32(74).fork()).join();
     }
+    writer.uint32(82).fork();
+    for (const v of message.supportedInputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
+    writer.uint32(90).fork();
+    for (const v of message.supportedOutputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -20967,6 +21134,34 @@ var FunctionPrecreateRequest = {
           message.functionSchema = FunctionSchema.decode(reader, reader.uint32());
           continue;
         }
+        case 10: {
+          if (tag === 80) {
+            message.supportedInputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 82) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedInputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
+        case 11: {
+          if (tag === 88) {
+            message.supportedOutputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 90) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedOutputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -20988,7 +21183,9 @@ var FunctionPrecreateRequest = {
         acc[key] = MethodDefinition.fromJSON(value);
         return acc;
       }, {}) : {},
-      functionSchema: isSet3(object.functionSchema) ? FunctionSchema.fromJSON(object.functionSchema) : void 0
+      functionSchema: isSet3(object.functionSchema) ? FunctionSchema.fromJSON(object.functionSchema) : void 0,
+      supportedInputFormats: globalThis.Array.isArray(object?.supportedInputFormats) ? object.supportedInputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -21026,6 +21223,12 @@ var FunctionPrecreateRequest = {
     if (message.functionSchema !== void 0) {
       obj.functionSchema = FunctionSchema.toJSON(message.functionSchema);
     }
+    if (message.supportedInputFormats?.length) {
+      obj.supportedInputFormats = message.supportedInputFormats.map((e) => dataFormatToJSON(e));
+    }
+    if (message.supportedOutputFormats?.length) {
+      obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -21047,6 +21250,8 @@ var FunctionPrecreateRequest = {
       return acc;
     }, {});
     message.functionSchema = object.functionSchema !== void 0 && object.functionSchema !== null ? FunctionSchema.fromPartial(object.functionSchema) : void 0;
+    message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
+    message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
     return message;
   }
 };
@@ -24415,13 +24620,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);
     }
@@ -24447,6 +24655,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;
@@ -24478,7 +24693,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
@@ -24486,9 +24702,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;
     }
@@ -24505,7 +24724,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;
@@ -24792,7 +25012,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()) {
@@ -24805,6 +25025,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();
     }
@@ -24838,6 +25061,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;
@@ -24858,6 +25088,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)) : []
     };
   },
@@ -24872,6 +25103,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));
     }
@@ -24885,15 +25119,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);
     }
@@ -24918,6 +25163,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;
@@ -24963,6 +25215,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,
@@ -24972,6 +25225,9 @@ var MapStartOrContinueResponse = {
   },
   toJSON(message) {
     const obj = {};
+    if (message.mapToken !== "") {
+      obj.mapToken = message.mapToken;
+    }
     if (message.functionId !== "") {
       obj.functionId = message.functionId;
     }
@@ -24994,6 +25250,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;
@@ -25010,7 +25267,9 @@ function createBaseMethodDefinition() {
     webUrl: "",
     webUrlInfo: void 0,
     customDomainInfo: [],
-    functionSchema: void 0
+    functionSchema: void 0,
+    supportedInputFormats: [],
+    supportedOutputFormats: []
   };
 }
 var MethodDefinition = {
@@ -25036,6 +25295,16 @@ var MethodDefinition = {
     if (message.functionSchema !== void 0) {
       FunctionSchema.encode(message.functionSchema, writer.uint32(58).fork()).join();
     }
+    writer.uint32(66).fork();
+    for (const v of message.supportedInputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
+    writer.uint32(74).fork();
+    for (const v of message.supportedOutputFormats) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -25094,6 +25363,34 @@ var MethodDefinition = {
           message.functionSchema = FunctionSchema.decode(reader, reader.uint32());
           continue;
         }
+        case 8: {
+          if (tag === 64) {
+            message.supportedInputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 66) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedInputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
+        case 9: {
+          if (tag === 72) {
+            message.supportedOutputFormats.push(reader.int32());
+            continue;
+          }
+          if (tag === 74) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.supportedOutputFormats.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -25110,7 +25407,9 @@ var MethodDefinition = {
       webUrl: isSet3(object.webUrl) ? globalThis.String(object.webUrl) : "",
       webUrlInfo: isSet3(object.webUrlInfo) ? WebUrlInfo.fromJSON(object.webUrlInfo) : void 0,
       customDomainInfo: globalThis.Array.isArray(object?.customDomainInfo) ? object.customDomainInfo.map((e) => CustomDomainInfo.fromJSON(e)) : [],
-      functionSchema: isSet3(object.functionSchema) ? FunctionSchema.fromJSON(object.functionSchema) : void 0
+      functionSchema: isSet3(object.functionSchema) ? FunctionSchema.fromJSON(object.functionSchema) : void 0,
+      supportedInputFormats: globalThis.Array.isArray(object?.supportedInputFormats) ? object.supportedInputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -25136,6 +25435,12 @@ var MethodDefinition = {
     if (message.functionSchema !== void 0) {
       obj.functionSchema = FunctionSchema.toJSON(message.functionSchema);
     }
+    if (message.supportedInputFormats?.length) {
+      obj.supportedInputFormats = message.supportedInputFormats.map((e) => dataFormatToJSON(e));
+    }
+    if (message.supportedOutputFormats?.length) {
+      obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -25150,6 +25455,8 @@ var MethodDefinition = {
     message.webUrlInfo = object.webUrlInfo !== void 0 && object.webUrlInfo !== null ? WebUrlInfo.fromPartial(object.webUrlInfo) : void 0;
     message.customDomainInfo = object.customDomainInfo?.map((e) => CustomDomainInfo.fromPartial(e)) || [];
     message.functionSchema = object.functionSchema !== void 0 && object.functionSchema !== null ? FunctionSchema.fromPartial(object.functionSchema) : void 0;
+    message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
+    message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
     return message;
   }
 };
@@ -26689,7 +26996,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()) {
@@ -26714,6 +27030,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) {
@@ -26772,6 +27091,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;
@@ -26788,7 +27114,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) {
@@ -26814,6 +27141,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) {
@@ -26828,6 +27158,7 @@ var PTYInfo = {
     message.envColorterm = object.envColorterm ?? "";
     message.envTermProgram = object.envTermProgram ?? "";
     message.ptyType = object.ptyType ?? 0;
+    message.noTerminateOnIdleStdin = object.noTerminateOnIdleStdin ?? false;
     return message;
   }
 };
@@ -30324,6 +30655,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: "" };
 }
@@ -32454,6 +32921,108 @@ var SandboxTag = {
     return message;
   }
 };
+function createBaseSandboxTagsGetRequest() {
+  return { sandboxId: "" };
+}
+var SandboxTagsGetRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.sandboxId !== "") {
+      writer.uint32(10).string(message.sandboxId);
+    }
+    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 = createBaseSandboxTagsGetRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.sandboxId = 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) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.sandboxId !== "") {
+      obj.sandboxId = message.sandboxId;
+    }
+    return obj;
+  },
+  create(base) {
+    return SandboxTagsGetRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSandboxTagsGetRequest();
+    message.sandboxId = object.sandboxId ?? "";
+    return message;
+  }
+};
+function createBaseSandboxTagsGetResponse() {
+  return { tags: [] };
+}
+var SandboxTagsGetResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    for (const v of message.tags) {
+      SandboxTag.encode(v, writer.uint32(10).fork()).join();
+    }
+    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 = createBaseSandboxTagsGetResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.tags.push(SandboxTag.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { tags: globalThis.Array.isArray(object?.tags) ? object.tags.map((e) => SandboxTag.fromJSON(e)) : [] };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.tags?.length) {
+      obj.tags = message.tags.map((e) => SandboxTag.toJSON(e));
+    }
+    return obj;
+  },
+  create(base) {
+    return SandboxTagsGetResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSandboxTagsGetResponse();
+    message.tags = object.tags?.map((e) => SandboxTag.fromPartial(e)) || [];
+    return message;
+  }
+};
 function createBaseSandboxTagsSetRequest() {
   return { environmentName: "", sandboxId: "", tags: [] };
 }
@@ -40927,6 +41496,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxCreateConnectToken: {
+      name: "SandboxCreateConnectToken",
+      requestType: SandboxCreateConnectTokenRequest,
+      requestStream: false,
+      responseType: SandboxCreateConnectTokenResponse,
+      responseStream: false,
+      options: {}
+    },
     sandboxGetFromName: {
       name: "SandboxGetFromName",
       requestType: SandboxGetFromNameRequest,
@@ -41040,6 +41617,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxTagsGet: {
+      name: "SandboxTagsGet",
+      requestType: SandboxTagsGetRequest,
+      requestStream: false,
+      responseType: SandboxTagsGetResponse,
+      responseStream: false,
+      options: {}
+    },
     sandboxTagsSet: {
       name: "SandboxTagsSet",
       requestType: SandboxTagsSetRequest,
@@ -41764,6 +42349,13 @@ var Secret = class _Secret {
     }
   }
 };
+async function mergeEnvAndSecrets(env, secrets) {
+  const result = [...secrets || []];
+  if (env && Object.keys(env).length > 0) {
+    result.push(await Secret.fromObject(env));
+  }
+  return result;
+}
 
 // src/image.ts
 var import_nice_grpc3 = require("nice-grpc");
@@ -41781,6 +42373,7 @@ var Image2 = class _Image {
     this.#layers = layers || [
       {
         commands: [],
+        env: void 0,
         secrets: void 0,
         gpuConfig: void 0,
         forceBuild: false
@@ -41897,6 +42490,7 @@ var Image2 = class _Image {
     _Image.validateDockerfileCommands(commands);
     const newLayer = {
       commands: [...commands],
+      env: options?.env,
       secrets: options?.secrets,
       gpuConfig: options?.gpu ? parseGpuConfig(options.gpu) : void 0,
       forceBuild: options?.forceBuild
@@ -41918,7 +42512,8 @@ var Image2 = class _Image {
     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 mergedSecrets = await mergeEnvAndSecrets(layer.env, layer.secrets);
+      const secretIds = mergedSecrets.map((secret) => secret.secretId);
       const gpuConfig = layer.gpuConfig;
       let dockerfileCommands;
       let baseImages;
@@ -42237,6 +42832,37 @@ 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
+  });
+}
+async function buildContainerExecRequestProto(taskId, command, options) {
+  const mergedSecrets = await mergeEnvAndSecrets(
+    options?.env,
+    options?.secrets
+  );
+  const secretIds = mergedSecrets.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;
@@ -42278,6 +42904,23 @@ var Sandbox2 = class _Sandbox {
       throw err;
     }
   }
+  /** Get tags (key-value pairs) currently attached to this Sandbox from the server. */
+  async getTags() {
+    let resp;
+    try {
+      resp = await client.sandboxTagsGet({ sandboxId: this.sandboxId });
+    } catch (err) {
+      if (err instanceof import_nice_grpc5.ClientError && err.code === import_nice_grpc5.Status.INVALID_ARGUMENT) {
+        throw new InvalidError(err.details || err.message);
+      }
+      throw err;
+    }
+    const tags = {};
+    for (const tag of resp.tags) {
+      tags[tag.tagName] = tag.tagValue;
+    }
+    return tags;
+  }
   /** Returns a running Sandbox object from an ID.
    *
    * @returns Sandbox with ID
@@ -42341,14 +42984,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 = await buildContainerExecRequestProto(taskId, command, options);
+    const resp = await client.containerExec(req);
     return new ContainerProcess(resp.execId, options);
   }
   async #getTaskId() {
@@ -42735,6 +43372,118 @@ function parseGpuConfig(gpu) {
     gpuType: gpuType.toUpperCase()
   };
 }
+async function buildSandboxCreateRequestProto(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 mergedSecrets = await mergeEnvAndSecrets(options.env, options.secrets);
+  const secretIds = mergedSecrets.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;
@@ -42759,113 +43508,15 @@ var App2 = 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 = await buildSandboxCreateRequestProto(
+      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 import_nice_grpc6.ClientError && err.code === import_nice_grpc6.Status.ALREADY_EXISTS) {
         throw new AlreadyExistsError(err.details || err.message);
@@ -43796,7 +44447,7 @@ var Cls = class _Cls {
   /** Bind parameters to the Cls function. */
   async #bindParameters(params) {
     const serializedParams = encodeParameterSet(this.#schema, params);
-    const functionOptions = buildFunctionOptionsProto(this.#options);
+    const functionOptions = await buildFunctionOptionsProto(this.#options);
     const bindResp = await client.functionBindParams({
       functionId: this.#serviceFunctionId,
       serializedParams,
@@ -43821,7 +44472,7 @@ function mergeServiceOptions(base, diff) {
   const merged = { ...base ?? {}, ...filteredDiff };
   return Object.keys(merged).length === 0 ? void 0 : merged;
 }
-function buildFunctionOptionsProto(options) {
+async function buildFunctionOptionsProto(options) {
   if (!options) return void 0;
   const o = options ?? {};
   const gpuConfig = parseGpuConfig(o.gpu);
@@ -43830,7 +44481,8 @@ function buildFunctionOptionsProto(options) {
     memoryMb: o.memory,
     gpuConfig
   } : void 0;
-  const secretIds = o.secrets ? o.secrets.map((s) => s.secretId) : [];
+  const mergedSecrets = await mergeEnvAndSecrets(o.env, o.secrets);
+  const secretIds = mergedSecrets.map((s) => s.secretId);
   const volumeMounts = o.volumes ? Object.entries(o.volumes).map(([mountPath, volume]) => ({
     volumeId: volume.volumeId,
     mountPath,