modal 0.8.1 → 0.9.0

package/dist/index.cjs

@@ -2102,6 +2102,31 @@ function environmentRoleToJSON(object) {
       return "UNRECOGNIZED";
   }
 }
+function environmentTypeFromJSON(object) {
+  switch (object) {
+    case 0:
+    case "ENVIRONMENT_TYPE_UNSPECIFIED":
+      return 0 /* ENVIRONMENT_TYPE_UNSPECIFIED */;
+    case 1:
+    case "ENVIRONMENT_TYPE_PUBLIC":
+      return 1 /* ENVIRONMENT_TYPE_PUBLIC */;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return -1 /* UNRECOGNIZED */;
+  }
+}
+function environmentTypeToJSON(object) {
+  switch (object) {
+    case 0 /* ENVIRONMENT_TYPE_UNSPECIFIED */:
+      return "ENVIRONMENT_TYPE_UNSPECIFIED";
+    case 1 /* ENVIRONMENT_TYPE_PUBLIC */:
+      return "ENVIRONMENT_TYPE_PUBLIC";
+    case -1 /* UNRECOGNIZED */:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
 function execOutputOptionFromJSON(object) {
   switch (object) {
     case 0:
@@ -13485,14 +13510,54 @@ var ContainerReloadVolumesResponse = {
     return message;
   }
 };
+function createBaseContainerServerLifecycleReadyRequest() {
+  return {};
+}
+var ContainerServerLifecycleReadyRequest = {
+  encode(_, writer = new BinaryWriter()) {
+    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 = createBaseContainerServerLifecycleReadyRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(_) {
+    return {};
+  },
+  toJSON(_) {
+    const obj = {};
+    return obj;
+  },
+  create(base) {
+    return ContainerServerLifecycleReadyRequest.fromPartial(base ?? {});
+  },
+  fromPartial(_) {
+    const message = createBaseContainerServerLifecycleReadyRequest();
+    return message;
+  }
+};
 function createBaseContainerStopRequest() {
-  return { taskId: "" };
+  return { taskId: "", graceful: false };
 }
 var ContainerStopRequest = {
   encode(message, writer = new BinaryWriter()) {
     if (message.taskId !== "") {
       writer.uint32(10).string(message.taskId);
     }
+    if (message.graceful !== false) {
+      writer.uint32(16).bool(message.graceful);
+    }
     return writer;
   },
   decode(input, length) {
@@ -13509,6 +13574,13 @@ var ContainerStopRequest = {
           message.taskId = reader.string();
           continue;
         }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+          message.graceful = reader.bool();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -13518,13 +13590,19 @@ var ContainerStopRequest = {
     return message;
   },
   fromJSON(object) {
-    return { taskId: isSet5(object.taskId) ? globalThis.String(object.taskId) : "" };
+    return {
+      taskId: isSet5(object.taskId) ? globalThis.String(object.taskId) : "",
+      graceful: isSet5(object.graceful) ? globalThis.Boolean(object.graceful) : false
+    };
   },
   toJSON(message) {
     const obj = {};
     if (message.taskId !== "") {
       obj.taskId = message.taskId;
     }
+    if (message.graceful !== false) {
+      obj.graceful = message.graceful;
+    }
     return obj;
   },
   create(base) {
@@ -13533,6 +13611,7 @@ var ContainerStopRequest = {
   fromPartial(object) {
     const message = createBaseContainerStopRequest();
     message.taskId = object.taskId ?? "";
+    message.graceful = object.graceful ?? false;
     return message;
   }
 };
@@ -17580,8 +17659,280 @@ var EndpointStopResponse = {
     return message;
   }
 };
+function createBaseEnvironmentBillingSummaryRequest() {
+  return { startTimestamp: void 0, endTimestamp: void 0, environmentId: "" };
+}
+var EnvironmentBillingSummaryRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.startTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.startTimestamp), writer.uint32(10).fork()).join();
+    }
+    if (message.endTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.endTimestamp), writer.uint32(18).fork()).join();
+    }
+    if (message.environmentId !== "") {
+      writer.uint32(26).string(message.environmentId);
+    }
+    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 = createBaseEnvironmentBillingSummaryRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.startTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.endTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.environmentId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      startTimestamp: isSet5(object.startTimestamp) ? fromJsonTimestamp(object.startTimestamp) : void 0,
+      endTimestamp: isSet5(object.endTimestamp) ? fromJsonTimestamp(object.endTimestamp) : void 0,
+      environmentId: isSet5(object.environmentId) ? globalThis.String(object.environmentId) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.startTimestamp !== void 0) {
+      obj.startTimestamp = message.startTimestamp.toISOString();
+    }
+    if (message.endTimestamp !== void 0) {
+      obj.endTimestamp = message.endTimestamp.toISOString();
+    }
+    if (message.environmentId !== "") {
+      obj.environmentId = message.environmentId;
+    }
+    return obj;
+  },
+  create(base) {
+    return EnvironmentBillingSummaryRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEnvironmentBillingSummaryRequest();
+    message.startTimestamp = object.startTimestamp ?? void 0;
+    message.endTimestamp = object.endTimestamp ?? void 0;
+    message.environmentId = object.environmentId ?? "";
+    return message;
+  }
+};
+function createBaseEnvironmentBillingSummaryResponse() {
+  return { startTimestamp: void 0, endTimestamp: void 0, meteredCost: "", meteredCostBreakdown: {} };
+}
+var EnvironmentBillingSummaryResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.startTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.startTimestamp), writer.uint32(10).fork()).join();
+    }
+    if (message.endTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.endTimestamp), writer.uint32(18).fork()).join();
+    }
+    if (message.meteredCost !== "") {
+      writer.uint32(26).string(message.meteredCost);
+    }
+    Object.entries(message.meteredCostBreakdown).forEach(([key, value]) => {
+      EnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry.encode(
+        { key, value },
+        writer.uint32(34).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 = createBaseEnvironmentBillingSummaryResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.startTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.endTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.meteredCost = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          const entry4 = EnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry.decode(reader, reader.uint32());
+          if (entry4.value !== void 0) {
+            message.meteredCostBreakdown[entry4.key] = entry4.value;
+          }
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      startTimestamp: isSet5(object.startTimestamp) ? fromJsonTimestamp(object.startTimestamp) : void 0,
+      endTimestamp: isSet5(object.endTimestamp) ? fromJsonTimestamp(object.endTimestamp) : void 0,
+      meteredCost: isSet5(object.meteredCost) ? globalThis.String(object.meteredCost) : "",
+      meteredCostBreakdown: isObject2(object.meteredCostBreakdown) ? Object.entries(object.meteredCostBreakdown).reduce((acc, [key, value]) => {
+        acc[key] = String(value);
+        return acc;
+      }, {}) : {}
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.startTimestamp !== void 0) {
+      obj.startTimestamp = message.startTimestamp.toISOString();
+    }
+    if (message.endTimestamp !== void 0) {
+      obj.endTimestamp = message.endTimestamp.toISOString();
+    }
+    if (message.meteredCost !== "") {
+      obj.meteredCost = message.meteredCost;
+    }
+    if (message.meteredCostBreakdown) {
+      const entries = Object.entries(message.meteredCostBreakdown);
+      if (entries.length > 0) {
+        obj.meteredCostBreakdown = {};
+        entries.forEach(([k, v]) => {
+          obj.meteredCostBreakdown[k] = v;
+        });
+      }
+    }
+    return obj;
+  },
+  create(base) {
+    return EnvironmentBillingSummaryResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEnvironmentBillingSummaryResponse();
+    message.startTimestamp = object.startTimestamp ?? void 0;
+    message.endTimestamp = object.endTimestamp ?? void 0;
+    message.meteredCost = object.meteredCost ?? "";
+    message.meteredCostBreakdown = Object.entries(object.meteredCostBreakdown ?? {}).reduce(
+      (acc, [key, value]) => {
+        if (value !== void 0) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {}
+    );
+    return message;
+  }
+};
+function createBaseEnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry() {
+  return { key: "", value: "" };
+}
+var EnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    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 = createBaseEnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      key: isSet5(object.key) ? globalThis.String(object.key) : "",
+      value: isSet5(object.value) ? globalThis.String(object.value) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+  create(base) {
+    return EnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEnvironmentBillingSummaryResponse_MeteredCostBreakdownEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  }
+};
 function createBaseEnvironmentCreateRequest() {
-  return { name: "", isManaged: false, settings: void 0 };
+  return { name: "", isManaged: false, settings: void 0, environmentType: 0 };
 }
 var EnvironmentCreateRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -17594,6 +17945,9 @@ var EnvironmentCreateRequest = {
     if (message.settings !== void 0) {
       EnvironmentSettings.encode(message.settings, writer.uint32(26).fork()).join();
     }
+    if (message.environmentType !== 0) {
+      writer.uint32(32).int32(message.environmentType);
+    }
     return writer;
   },
   decode(input, length) {
@@ -17624,6 +17978,13 @@ var EnvironmentCreateRequest = {
           message.settings = EnvironmentSettings.decode(reader, reader.uint32());
           continue;
         }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+          message.environmentType = reader.int32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -17636,7 +17997,8 @@ var EnvironmentCreateRequest = {
     return {
       name: isSet5(object.name) ? globalThis.String(object.name) : "",
       isManaged: isSet5(object.isManaged) ? globalThis.Boolean(object.isManaged) : false,
-      settings: isSet5(object.settings) ? EnvironmentSettings.fromJSON(object.settings) : void 0
+      settings: isSet5(object.settings) ? EnvironmentSettings.fromJSON(object.settings) : void 0,
+      environmentType: isSet5(object.environmentType) ? environmentTypeFromJSON(object.environmentType) : 0
     };
   },
   toJSON(message) {
@@ -17650,6 +18012,9 @@ var EnvironmentCreateRequest = {
     if (message.settings !== void 0) {
       obj.settings = EnvironmentSettings.toJSON(message.settings);
     }
+    if (message.environmentType !== 0) {
+      obj.environmentType = environmentTypeToJSON(message.environmentType);
+    }
     return obj;
   },
   create(base) {
@@ -17660,6 +18025,7 @@ var EnvironmentCreateRequest = {
     message.name = object.name ?? "";
     message.isManaged = object.isManaged ?? false;
     message.settings = object.settings !== void 0 && object.settings !== null ? EnvironmentSettings.fromPartial(object.settings) : void 0;
+    message.environmentType = object.environmentType ?? 0;
     return message;
   }
 };
@@ -18347,7 +18713,8 @@ function createBaseEnvironmentListItem() {
     cycleBudgetDollars: void 0,
     effectiveCycleSpendLimit: 0,
     currentCycleUsage: 0,
-    spendLimitReached: false
+    spendLimitReached: false,
+    environmentType: 0
   };
 }
 var EnvironmentListItem = {
@@ -18394,6 +18761,9 @@ var EnvironmentListItem = {
     if (message.spendLimitReached !== false) {
       writer.uint32(112).bool(message.spendLimitReached);
     }
+    if (message.environmentType !== 0) {
+      writer.uint32(120).int32(message.environmentType);
+    }
     return writer;
   },
   decode(input, length) {
@@ -18501,6 +18871,13 @@ var EnvironmentListItem = {
           message.spendLimitReached = reader.bool();
           continue;
         }
+        case 15: {
+          if (tag !== 120) {
+            break;
+          }
+          message.environmentType = reader.int32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -18524,7 +18901,8 @@ var EnvironmentListItem = {
       cycleBudgetDollars: isSet5(object.cycleBudgetDollars) ? globalThis.Number(object.cycleBudgetDollars) : void 0,
       effectiveCycleSpendLimit: isSet5(object.effectiveCycleSpendLimit) ? globalThis.Number(object.effectiveCycleSpendLimit) : 0,
       currentCycleUsage: isSet5(object.currentCycleUsage) ? globalThis.Number(object.currentCycleUsage) : 0,
-      spendLimitReached: isSet5(object.spendLimitReached) ? globalThis.Boolean(object.spendLimitReached) : false
+      spendLimitReached: isSet5(object.spendLimitReached) ? globalThis.Boolean(object.spendLimitReached) : false,
+      environmentType: isSet5(object.environmentType) ? environmentTypeFromJSON(object.environmentType) : 0
     };
   },
   toJSON(message) {
@@ -18571,6 +18949,9 @@ var EnvironmentListItem = {
     if (message.spendLimitReached !== false) {
       obj.spendLimitReached = message.spendLimitReached;
     }
+    if (message.environmentType !== 0) {
+      obj.environmentType = environmentTypeToJSON(message.environmentType);
+    }
     return obj;
   },
   create(base) {
@@ -18592,6 +18973,7 @@ var EnvironmentListItem = {
     message.effectiveCycleSpendLimit = object.effectiveCycleSpendLimit ?? 0;
     message.currentCycleUsage = object.currentCycleUsage ?? 0;
     message.spendLimitReached = object.spendLimitReached ?? false;
+    message.environmentType = object.environmentType ?? 0;
     return message;
   }
 };
@@ -18649,7 +19031,7 @@ var EnvironmentListResponse = {
   }
 };
 function createBaseEnvironmentMetadata() {
-  return { name: "", settings: void 0 };
+  return { name: "", settings: void 0, environmentType: 0 };
 }
 var EnvironmentMetadata = {
   encode(message, writer = new BinaryWriter()) {
@@ -18659,6 +19041,9 @@ var EnvironmentMetadata = {
     if (message.settings !== void 0) {
       EnvironmentSettings.encode(message.settings, writer.uint32(18).fork()).join();
     }
+    if (message.environmentType !== 0) {
+      writer.uint32(24).int32(message.environmentType);
+    }
     return writer;
   },
   decode(input, length) {
@@ -18682,6 +19067,13 @@ var EnvironmentMetadata = {
           message.settings = EnvironmentSettings.decode(reader, reader.uint32());
           continue;
         }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+          message.environmentType = reader.int32();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -18693,7 +19085,8 @@ var EnvironmentMetadata = {
   fromJSON(object) {
     return {
       name: isSet5(object.name) ? globalThis.String(object.name) : "",
-      settings: isSet5(object.settings) ? EnvironmentSettings.fromJSON(object.settings) : void 0
+      settings: isSet5(object.settings) ? EnvironmentSettings.fromJSON(object.settings) : void 0,
+      environmentType: isSet5(object.environmentType) ? environmentTypeFromJSON(object.environmentType) : 0
     };
   },
   toJSON(message) {
@@ -18704,6 +19097,9 @@ var EnvironmentMetadata = {
     if (message.settings !== void 0) {
       obj.settings = EnvironmentSettings.toJSON(message.settings);
     }
+    if (message.environmentType !== 0) {
+      obj.environmentType = environmentTypeToJSON(message.environmentType);
+    }
     return obj;
   },
   create(base) {
@@ -18713,6 +19109,7 @@ var EnvironmentMetadata = {
     const message = createBaseEnvironmentMetadata();
     message.name = object.name ?? "";
     message.settings = object.settings !== void 0 && object.settings !== null ? EnvironmentSettings.fromPartial(object.settings) : void 0;
+    message.environmentType = object.environmentType ?? 0;
     return message;
   }
 };
@@ -21966,7 +22363,7 @@ var FunctionCallFromIdRequest = {
   }
 };
 function createBaseFunctionCallFromIdResponse() {
-  return { functionCallId: "", numInputs: 0 };
+  return { functionCallId: "", numInputs: 0, metadata: void 0 };
 }
 var FunctionCallFromIdResponse = {
   encode(message, writer = new BinaryWriter()) {
@@ -21976,6 +22373,9 @@ var FunctionCallFromIdResponse = {
     if (message.numInputs !== 0) {
       writer.uint32(16).int32(message.numInputs);
     }
+    if (message.metadata !== void 0) {
+      FunctionCallHandleMetadata.encode(message.metadata, writer.uint32(26).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -21999,6 +22399,13 @@ var FunctionCallFromIdResponse = {
           message.numInputs = reader.int32();
           continue;
         }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.metadata = FunctionCallHandleMetadata.decode(reader, reader.uint32());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -22010,7 +22417,8 @@ var FunctionCallFromIdResponse = {
   fromJSON(object) {
     return {
       functionCallId: isSet5(object.functionCallId) ? globalThis.String(object.functionCallId) : "",
-      numInputs: isSet5(object.numInputs) ? globalThis.Number(object.numInputs) : 0
+      numInputs: isSet5(object.numInputs) ? globalThis.Number(object.numInputs) : 0,
+      metadata: isSet5(object.metadata) ? FunctionCallHandleMetadata.fromJSON(object.metadata) : void 0
     };
   },
   toJSON(message) {
@@ -22021,6 +22429,9 @@ var FunctionCallFromIdResponse = {
     if (message.numInputs !== 0) {
       obj.numInputs = Math.round(message.numInputs);
     }
+    if (message.metadata !== void 0) {
+      obj.metadata = FunctionCallHandleMetadata.toJSON(message.metadata);
+    }
     return obj;
   },
   create(base) {
@@ -22030,6 +22441,7 @@ var FunctionCallFromIdResponse = {
     const message = createBaseFunctionCallFromIdResponse();
     message.functionCallId = object.functionCallId ?? "";
     message.numInputs = object.numInputs ?? 0;
+    message.metadata = object.metadata !== void 0 && object.metadata !== null ? FunctionCallHandleMetadata.fromPartial(object.metadata) : void 0;
     return message;
   }
 };
@@ -22116,6 +22528,74 @@ var FunctionCallGetDataRequest = {
     return message;
   }
 };
+function createBaseFunctionCallHandleMetadata() {
+  return { appId: "", functionId: "" };
+}
+var FunctionCallHandleMetadata = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.appId !== "") {
+      writer.uint32(10).string(message.appId);
+    }
+    if (message.functionId !== "") {
+      writer.uint32(18).string(message.functionId);
+    }
+    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 = createBaseFunctionCallHandleMetadata();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.appId = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.functionId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      appId: isSet5(object.appId) ? globalThis.String(object.appId) : "",
+      functionId: isSet5(object.functionId) ? globalThis.String(object.functionId) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.appId !== "") {
+      obj.appId = message.appId;
+    }
+    if (message.functionId !== "") {
+      obj.functionId = message.functionId;
+    }
+    return obj;
+  },
+  create(base) {
+    return FunctionCallHandleMetadata.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseFunctionCallHandleMetadata();
+    message.appId = object.appId ?? "";
+    message.functionId = object.functionId ?? "";
+    return message;
+  }
+};
 function createBaseFunctionCallInfo() {
   return {
     functionCallId: "",
@@ -25238,7 +25718,8 @@ function createBaseFunctionHandleMetadata() {
     maxObjectSizeBytes: void 0,
     ExperimentalFlashUrls: [],
     supportedInputFormats: [],
-    supportedOutputFormats: []
+    supportedOutputFormats: [],
+    appId: ""
   };
 }
 var FunctionHandleMetadata = {
@@ -25295,6 +25776,9 @@ var FunctionHandleMetadata = {
       writer.int32(v);
     }
     writer.join();
+    if (message.appId !== "") {
+      writer.uint32(418).string(message.appId);
+    }
     return writer;
   },
   decode(input, length) {
@@ -25433,6 +25917,13 @@ var FunctionHandleMetadata = {
           }
           break;
         }
+        case 52: {
+          if (tag !== 418) {
+            break;
+          }
+          message.appId = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -25464,7 +25955,8 @@ var FunctionHandleMetadata = {
       maxObjectSizeBytes: isSet5(object.maxObjectSizeBytes) ? globalThis.Number(object.maxObjectSizeBytes) : void 0,
       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)) : []
+      supportedOutputFormats: globalThis.Array.isArray(object?.supportedOutputFormats) ? object.supportedOutputFormats.map((e) => dataFormatFromJSON(e)) : [],
+      appId: isSet5(object.appId) ? globalThis.String(object.appId) : ""
     };
   },
   toJSON(message) {
@@ -25523,6 +26015,9 @@ var FunctionHandleMetadata = {
     if (message.supportedOutputFormats?.length) {
       obj.supportedOutputFormats = message.supportedOutputFormats.map((e) => dataFormatToJSON(e));
     }
+    if (message.appId !== "") {
+      obj.appId = message.appId;
+    }
     return obj;
   },
   create(base) {
@@ -25551,6 +26046,7 @@ var FunctionHandleMetadata = {
     message.ExperimentalFlashUrls = object.ExperimentalFlashUrls?.map((e) => e) || [];
     message.supportedInputFormats = object.supportedInputFormats?.map((e) => e) || [];
     message.supportedOutputFormats = object.supportedOutputFormats?.map((e) => e) || [];
+    message.appId = object.appId ?? "";
     return message;
   }
 };
@@ -26043,7 +26539,8 @@ function createBaseFunctionOptions() {
     cloudProviderStr: void 0,
     replaceCloudBucketMounts: false,
     cloudBucketMounts: [],
-    pinnedAppVersion: void 0
+    pinnedAppVersion: void 0,
+    routingRegion: void 0
   };
 }
 var FunctionOptions = {
@@ -26111,6 +26608,9 @@ var FunctionOptions = {
     if (message.pinnedAppVersion !== void 0) {
       writer.uint32(168).int32(message.pinnedAppVersion);
     }
+    if (message.routingRegion !== void 0) {
+      writer.uint32(178).string(message.routingRegion);
+    }
     return writer;
   },
   decode(input, length) {
@@ -26267,6 +26767,13 @@ var FunctionOptions = {
           message.pinnedAppVersion = reader.int32();
           continue;
         }
+        case 22: {
+          if (tag !== 178) {
+            break;
+          }
+          message.routingRegion = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -26297,7 +26804,8 @@ var FunctionOptions = {
       cloudProviderStr: isSet5(object.cloudProviderStr) ? globalThis.String(object.cloudProviderStr) : void 0,
       replaceCloudBucketMounts: isSet5(object.replaceCloudBucketMounts) ? globalThis.Boolean(object.replaceCloudBucketMounts) : false,
       cloudBucketMounts: globalThis.Array.isArray(object?.cloudBucketMounts) ? object.cloudBucketMounts.map((e) => CloudBucketMount.fromJSON(e)) : [],
-      pinnedAppVersion: isSet5(object.pinnedAppVersion) ? globalThis.Number(object.pinnedAppVersion) : void 0
+      pinnedAppVersion: isSet5(object.pinnedAppVersion) ? globalThis.Number(object.pinnedAppVersion) : void 0,
+      routingRegion: isSet5(object.routingRegion) ? globalThis.String(object.routingRegion) : void 0
     };
   },
   toJSON(message) {
@@ -26365,6 +26873,9 @@ var FunctionOptions = {
     if (message.pinnedAppVersion !== void 0) {
       obj.pinnedAppVersion = Math.round(message.pinnedAppVersion);
     }
+    if (message.routingRegion !== void 0) {
+      obj.routingRegion = message.routingRegion;
+    }
     return obj;
   },
   create(base) {
@@ -26393,6 +26904,7 @@ var FunctionOptions = {
     message.replaceCloudBucketMounts = object.replaceCloudBucketMounts ?? false;
     message.cloudBucketMounts = object.cloudBucketMounts?.map((e) => CloudBucketMount.fromPartial(e)) || [];
     message.pinnedAppVersion = object.pinnedAppVersion ?? void 0;
+    message.routingRegion = object.routingRegion ?? void 0;
     return message;
   }
 };
@@ -30192,7 +30704,7 @@ var ImageMetadata_PythonPackagesEntry = {
   }
 };
 function createBaseImagePublishRequest() {
-  return { imageId: "", tag: "", environmentName: "", isPublic: false };
+  return { imageId: "", tag: "", environmentName: "", allowPublic: false };
 }
 var ImagePublishRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -30205,8 +30717,8 @@ var ImagePublishRequest = {
     if (message.environmentName !== "") {
       writer.uint32(26).string(message.environmentName);
     }
-    if (message.isPublic !== false) {
-      writer.uint32(32).bool(message.isPublic);
+    if (message.allowPublic !== false) {
+      writer.uint32(32).bool(message.allowPublic);
     }
     return writer;
   },
@@ -30242,7 +30754,7 @@ var ImagePublishRequest = {
           if (tag !== 32) {
             break;
           }
-          message.isPublic = reader.bool();
+          message.allowPublic = reader.bool();
           continue;
         }
       }
@@ -30258,7 +30770,7 @@ var ImagePublishRequest = {
       imageId: isSet5(object.imageId) ? globalThis.String(object.imageId) : "",
       tag: isSet5(object.tag) ? globalThis.String(object.tag) : "",
       environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : "",
-      isPublic: isSet5(object.isPublic) ? globalThis.Boolean(object.isPublic) : false
+      allowPublic: isSet5(object.allowPublic) ? globalThis.Boolean(object.allowPublic) : false
     };
   },
   toJSON(message) {
@@ -30272,8 +30784,8 @@ var ImagePublishRequest = {
     if (message.environmentName !== "") {
       obj.environmentName = message.environmentName;
     }
-    if (message.isPublic !== false) {
-      obj.isPublic = message.isPublic;
+    if (message.allowPublic !== false) {
+      obj.allowPublic = message.allowPublic;
     }
     return obj;
   },
@@ -30285,7 +30797,7 @@ var ImagePublishRequest = {
     message.imageId = object.imageId ?? "";
     message.tag = object.tag ?? "";
     message.environmentName = object.environmentName ?? "";
-    message.isPublic = object.isPublic ?? false;
+    message.allowPublic = object.allowPublic ?? false;
     return message;
   }
 };
@@ -30426,7 +30938,7 @@ var ImageRegistryConfig = {
   }
 };
 function createBaseImageTagRevisionsItem() {
-  return { imageId: "", revisionId: "", createdAt: 0 };
+  return { imageId: "", revisionId: "", createdAt: 0, publishedBy: "" };
 }
 var ImageTagRevisionsItem = {
   encode(message, writer = new BinaryWriter()) {
@@ -30439,6 +30951,9 @@ var ImageTagRevisionsItem = {
     if (message.createdAt !== 0) {
       writer.uint32(25).double(message.createdAt);
     }
+    if (message.publishedBy !== "") {
+      writer.uint32(34).string(message.publishedBy);
+    }
     return writer;
   },
   decode(input, length) {
@@ -30469,6 +30984,13 @@ var ImageTagRevisionsItem = {
           message.createdAt = reader.double();
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.publishedBy = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -30481,7 +31003,8 @@ var ImageTagRevisionsItem = {
     return {
       imageId: isSet5(object.imageId) ? globalThis.String(object.imageId) : "",
       revisionId: isSet5(object.revisionId) ? globalThis.String(object.revisionId) : "",
-      createdAt: isSet5(object.createdAt) ? globalThis.Number(object.createdAt) : 0
+      createdAt: isSet5(object.createdAt) ? globalThis.Number(object.createdAt) : 0,
+      publishedBy: isSet5(object.publishedBy) ? globalThis.String(object.publishedBy) : ""
     };
   },
   toJSON(message) {
@@ -30495,6 +31018,9 @@ var ImageTagRevisionsItem = {
     if (message.createdAt !== 0) {
       obj.createdAt = message.createdAt;
     }
+    if (message.publishedBy !== "") {
+      obj.publishedBy = message.publishedBy;
+    }
     return obj;
   },
   create(base) {
@@ -30505,6 +31031,7 @@ var ImageTagRevisionsItem = {
     message.imageId = object.imageId ?? "";
     message.revisionId = object.revisionId ?? "";
     message.createdAt = object.createdAt ?? 0;
+    message.publishedBy = object.publishedBy ?? "";
     return message;
   }
 };
@@ -31922,6 +32449,112 @@ var MethodDefinition = {
     return message;
   }
 };
+function createBaseMountBatchedCheckExistenceRequest() {
+  return { sha256HexHashes: [] };
+}
+var MountBatchedCheckExistenceRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    for (const v of message.sha256HexHashes) {
+      writer.uint32(10).string(v);
+    }
+    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 = createBaseMountBatchedCheckExistenceRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.sha256HexHashes.push(reader.string());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      sha256HexHashes: globalThis.Array.isArray(object?.sha256HexHashes) ? object.sha256HexHashes.map((e) => globalThis.String(e)) : []
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.sha256HexHashes?.length) {
+      obj.sha256HexHashes = message.sha256HexHashes;
+    }
+    return obj;
+  },
+  create(base) {
+    return MountBatchedCheckExistenceRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseMountBatchedCheckExistenceRequest();
+    message.sha256HexHashes = object.sha256HexHashes?.map((e) => e) || [];
+    return message;
+  }
+};
+function createBaseMountBatchedCheckExistenceResponse() {
+  return { missingSha256HexHashes: [] };
+}
+var MountBatchedCheckExistenceResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    for (const v of message.missingSha256HexHashes) {
+      writer.uint32(10).string(v);
+    }
+    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 = createBaseMountBatchedCheckExistenceResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.missingSha256HexHashes.push(reader.string());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      missingSha256HexHashes: globalThis.Array.isArray(object?.missingSha256HexHashes) ? object.missingSha256HexHashes.map((e) => globalThis.String(e)) : []
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.missingSha256HexHashes?.length) {
+      obj.missingSha256HexHashes = message.missingSha256HexHashes;
+    }
+    return obj;
+  },
+  create(base) {
+    return MountBatchedCheckExistenceResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseMountBatchedCheckExistenceResponse();
+    message.missingSha256HexHashes = object.missingSha256HexHashes?.map((e) => e) || [];
+    return message;
+  }
+};
 function createBaseMountFile() {
   return { filename: "", sha256Hex: "", size: void 0, mode: void 0 };
 }
@@ -38259,7 +38892,7 @@ var SandboxCreateResponse = {
   }
 };
 function createBaseSandboxCreateV2Request() {
-  return { appId: "", definition: void 0, ephemeralSecrets: void 0 };
+  return { appId: "", definition: void 0, ephemeralSecrets: void 0, tags: [] };
 }
 var SandboxCreateV2Request = {
   encode(message, writer = new BinaryWriter()) {
@@ -38272,6 +38905,9 @@ var SandboxCreateV2Request = {
     if (message.ephemeralSecrets !== void 0) {
       StringMap.encode(message.ephemeralSecrets, writer.uint32(26).fork()).join();
     }
+    for (const v of message.tags) {
+      SandboxTag.encode(v, writer.uint32(34).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -38302,6 +38938,13 @@ var SandboxCreateV2Request = {
           message.ephemeralSecrets = StringMap.decode(reader, reader.uint32());
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.tags.push(SandboxTag.decode(reader, reader.uint32()));
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -38314,7 +38957,8 @@ var SandboxCreateV2Request = {
     return {
       appId: isSet5(object.appId) ? globalThis.String(object.appId) : "",
       definition: isSet5(object.definition) ? Sandbox.fromJSON(object.definition) : void 0,
-      ephemeralSecrets: isSet5(object.ephemeralSecrets) ? StringMap.fromJSON(object.ephemeralSecrets) : void 0
+      ephemeralSecrets: isSet5(object.ephemeralSecrets) ? StringMap.fromJSON(object.ephemeralSecrets) : void 0,
+      tags: globalThis.Array.isArray(object?.tags) ? object.tags.map((e) => SandboxTag.fromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -38328,6 +38972,9 @@ var SandboxCreateV2Request = {
     if (message.ephemeralSecrets !== void 0) {
       obj.ephemeralSecrets = StringMap.toJSON(message.ephemeralSecrets);
     }
+    if (message.tags?.length) {
+      obj.tags = message.tags.map((e) => SandboxTag.toJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -38338,6 +38985,7 @@ var SandboxCreateV2Request = {
     message.appId = object.appId ?? "";
     message.definition = object.definition !== void 0 && object.definition !== null ? Sandbox.fromPartial(object.definition) : void 0;
     message.ephemeralSecrets = object.ephemeralSecrets !== void 0 && object.ephemeralSecrets !== null ? StringMap.fromPartial(object.ephemeralSecrets) : void 0;
+    message.tags = object.tags?.map((e) => SandboxTag.fromPartial(e)) || [];
     return message;
   }
 };
@@ -38425,13 +39073,16 @@ var SandboxCreateV2Response = {
   }
 };
 function createBaseSandboxGetCommandRouterAccessRequest() {
-  return { sandboxId: "" };
+  return { sandboxId: void 0, taskId: void 0 };
 }
 var SandboxGetCommandRouterAccessRequest = {
   encode(message, writer = new BinaryWriter()) {
-    if (message.sandboxId !== "") {
+    if (message.sandboxId !== void 0) {
       writer.uint32(10).string(message.sandboxId);
     }
+    if (message.taskId !== void 0) {
+      writer.uint32(18).string(message.taskId);
+    }
     return writer;
   },
   decode(input, length) {
@@ -38448,6 +39099,13 @@ var SandboxGetCommandRouterAccessRequest = {
           message.sandboxId = reader.string();
           continue;
         }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.taskId = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -38457,13 +39115,19 @@ var SandboxGetCommandRouterAccessRequest = {
     return message;
   },
   fromJSON(object) {
-    return { sandboxId: isSet5(object.sandboxId) ? globalThis.String(object.sandboxId) : "" };
+    return {
+      sandboxId: isSet5(object.sandboxId) ? globalThis.String(object.sandboxId) : void 0,
+      taskId: isSet5(object.taskId) ? globalThis.String(object.taskId) : void 0
+    };
   },
   toJSON(message) {
     const obj = {};
-    if (message.sandboxId !== "") {
+    if (message.sandboxId !== void 0) {
       obj.sandboxId = message.sandboxId;
     }
+    if (message.taskId !== void 0) {
+      obj.taskId = message.taskId;
+    }
     return obj;
   },
   create(base) {
@@ -38471,7 +39135,8 @@ var SandboxGetCommandRouterAccessRequest = {
   },
   fromPartial(object) {
     const message = createBaseSandboxGetCommandRouterAccessRequest();
-    message.sandboxId = object.sandboxId ?? "";
+    message.sandboxId = object.sandboxId ?? void 0;
+    message.taskId = object.taskId ?? void 0;
     return message;
   }
 };
@@ -44022,7 +44687,7 @@ var SystemErrorMessage = {
   }
 };
 function createBaseTaskClusterHelloRequest() {
-  return { taskId: "", containerIp: "", imexHostIp: "" };
+  return { taskId: "", containerIp: "", imexHostIp: "", imexFabricId: "" };
 }
 var TaskClusterHelloRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -44035,6 +44700,9 @@ var TaskClusterHelloRequest = {
     if (message.imexHostIp !== "") {
       writer.uint32(26).string(message.imexHostIp);
     }
+    if (message.imexFabricId !== "") {
+      writer.uint32(34).string(message.imexFabricId);
+    }
     return writer;
   },
   decode(input, length) {
@@ -44065,6 +44733,13 @@ var TaskClusterHelloRequest = {
           message.imexHostIp = reader.string();
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.imexFabricId = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -44077,7 +44752,8 @@ var TaskClusterHelloRequest = {
     return {
       taskId: isSet5(object.taskId) ? globalThis.String(object.taskId) : "",
       containerIp: isSet5(object.containerIp) ? globalThis.String(object.containerIp) : "",
-      imexHostIp: isSet5(object.imexHostIp) ? globalThis.String(object.imexHostIp) : ""
+      imexHostIp: isSet5(object.imexHostIp) ? globalThis.String(object.imexHostIp) : "",
+      imexFabricId: isSet5(object.imexFabricId) ? globalThis.String(object.imexFabricId) : ""
     };
   },
   toJSON(message) {
@@ -44091,6 +44767,9 @@ var TaskClusterHelloRequest = {
     if (message.imexHostIp !== "") {
       obj.imexHostIp = message.imexHostIp;
     }
+    if (message.imexFabricId !== "") {
+      obj.imexFabricId = message.imexFabricId;
+    }
     return obj;
   },
   create(base) {
@@ -44101,6 +44780,7 @@ var TaskClusterHelloRequest = {
     message.taskId = object.taskId ?? "";
     message.containerIp = object.containerIp ?? "";
     message.imexHostIp = object.imexHostIp ?? "";
+    message.imexFabricId = object.imexFabricId ?? "";
     return message;
   }
 };
@@ -47289,6 +47969,147 @@ var VolumeCopyFilesRequest = {
     return message;
   }
 };
+function createBaseVolumeCreateOptions() {
+  return { experimentalOptions: {} };
+}
+var VolumeCreateOptions = {
+  encode(message, writer = new BinaryWriter()) {
+    Object.entries(message.experimentalOptions).forEach(([key, value]) => {
+      VolumeCreateOptions_ExperimentalOptionsEntry.encode({ key, value }, 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 = createBaseVolumeCreateOptions();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          const entry1 = VolumeCreateOptions_ExperimentalOptionsEntry.decode(reader, reader.uint32());
+          if (entry1.value !== void 0) {
+            message.experimentalOptions[entry1.key] = entry1.value;
+          }
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      experimentalOptions: isObject2(object.experimentalOptions) ? Object.entries(object.experimentalOptions).reduce((acc, [key, value]) => {
+        acc[key] = String(value);
+        return acc;
+      }, {}) : {}
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.experimentalOptions) {
+      const entries = Object.entries(message.experimentalOptions);
+      if (entries.length > 0) {
+        obj.experimentalOptions = {};
+        entries.forEach(([k, v]) => {
+          obj.experimentalOptions[k] = v;
+        });
+      }
+    }
+    return obj;
+  },
+  create(base) {
+    return VolumeCreateOptions.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseVolumeCreateOptions();
+    message.experimentalOptions = Object.entries(object.experimentalOptions ?? {}).reduce(
+      (acc, [key, value]) => {
+        if (value !== void 0) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {}
+    );
+    return message;
+  }
+};
+function createBaseVolumeCreateOptions_ExperimentalOptionsEntry() {
+  return { key: "", value: "" };
+}
+var VolumeCreateOptions_ExperimentalOptionsEntry = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    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 = createBaseVolumeCreateOptions_ExperimentalOptionsEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      key: isSet5(object.key) ? globalThis.String(object.key) : "",
+      value: isSet5(object.value) ? globalThis.String(object.value) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+  create(base) {
+    return VolumeCreateOptions_ExperimentalOptionsEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseVolumeCreateOptions_ExperimentalOptionsEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
+    return message;
+  }
+};
 function createBaseVolumeDeleteRequest() {
   return { volumeId: "", environmentName: "" };
 }
@@ -47884,7 +48705,14 @@ var VolumeGetFileResponse = {
   }
 };
 function createBaseVolumeGetOrCreateRequest() {
-  return { deploymentName: "", environmentName: "", objectCreationType: 0, appId: "", version: 0 };
+  return {
+    deploymentName: "",
+    environmentName: "",
+    objectCreationType: 0,
+    appId: "",
+    version: 0,
+    createOptions: void 0
+  };
 }
 var VolumeGetOrCreateRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -47903,6 +48731,9 @@ var VolumeGetOrCreateRequest = {
     if (message.version !== 0) {
       writer.uint32(48).int32(message.version);
     }
+    if (message.createOptions !== void 0) {
+      VolumeCreateOptions.encode(message.createOptions, writer.uint32(58).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -47947,6 +48778,13 @@ var VolumeGetOrCreateRequest = {
           message.version = reader.int32();
           continue;
         }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+          message.createOptions = VolumeCreateOptions.decode(reader, reader.uint32());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -47961,7 +48799,8 @@ var VolumeGetOrCreateRequest = {
       environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : "",
       objectCreationType: isSet5(object.objectCreationType) ? objectCreationTypeFromJSON(object.objectCreationType) : 0,
       appId: isSet5(object.appId) ? globalThis.String(object.appId) : "",
-      version: isSet5(object.version) ? volumeFsVersionFromJSON(object.version) : 0
+      version: isSet5(object.version) ? volumeFsVersionFromJSON(object.version) : 0,
+      createOptions: isSet5(object.createOptions) ? VolumeCreateOptions.fromJSON(object.createOptions) : void 0
     };
   },
   toJSON(message) {
@@ -47981,6 +48820,9 @@ var VolumeGetOrCreateRequest = {
     if (message.version !== 0) {
       obj.version = volumeFsVersionToJSON(message.version);
     }
+    if (message.createOptions !== void 0) {
+      obj.createOptions = VolumeCreateOptions.toJSON(message.createOptions);
+    }
     return obj;
   },
   create(base) {
@@ -47993,6 +48835,7 @@ var VolumeGetOrCreateRequest = {
     message.objectCreationType = object.objectCreationType ?? 0;
     message.appId = object.appId ?? "";
     message.version = object.version ?? 0;
+    message.createOptions = object.createOptions !== void 0 && object.createOptions !== null ? VolumeCreateOptions.fromPartial(object.createOptions) : void 0;
     return message;
   }
 };
@@ -50451,7 +51294,6 @@ function createBaseWorkspaceBillingReportItem() {
     interval: void 0,
     cost: "",
     tags: {},
-    costByResourceFloat: {},
     costByResource: {}
   };
 }
@@ -50475,9 +51317,6 @@ var WorkspaceBillingReportItem = {
     Object.entries(message.tags).forEach(([key, value]) => {
       WorkspaceBillingReportItem_TagsEntry.encode({ key, value }, writer.uint32(50).fork()).join();
     });
-    Object.entries(message.costByResourceFloat).forEach(([key, value]) => {
-      WorkspaceBillingReportItem_CostByResourceFloatEntry.encode({ key, value }, writer.uint32(58).fork()).join();
-    });
     Object.entries(message.costByResource).forEach(([key, value]) => {
       WorkspaceBillingReportItem_CostByResourceEntry.encode({ key, value }, writer.uint32(66).fork()).join();
     });
@@ -50535,16 +51374,6 @@ var WorkspaceBillingReportItem = {
           }
           continue;
         }
-        case 7: {
-          if (tag !== 58) {
-            break;
-          }
-          const entry7 = WorkspaceBillingReportItem_CostByResourceFloatEntry.decode(reader, reader.uint32());
-          if (entry7.value !== void 0) {
-            message.costByResourceFloat[entry7.key] = entry7.value;
-          }
-          continue;
-        }
         case 8: {
           if (tag !== 66) {
             break;
@@ -50574,10 +51403,6 @@ var WorkspaceBillingReportItem = {
         acc[key] = String(value);
         return acc;
       }, {}) : {},
-      costByResourceFloat: isObject2(object.costByResourceFloat) ? Object.entries(object.costByResourceFloat).reduce((acc, [key, value]) => {
-        acc[key] = Number(value);
-        return acc;
-      }, {}) : {},
       costByResource: isObject2(object.costByResource) ? Object.entries(object.costByResource).reduce((acc, [key, value]) => {
         acc[key] = String(value);
         return acc;
@@ -50610,15 +51435,6 @@ var WorkspaceBillingReportItem = {
         });
       }
     }
-    if (message.costByResourceFloat) {
-      const entries = Object.entries(message.costByResourceFloat);
-      if (entries.length > 0) {
-        obj.costByResourceFloat = {};
-        entries.forEach(([k, v]) => {
-          obj.costByResourceFloat[k] = v;
-        });
-      }
-    }
     if (message.costByResource) {
       const entries = Object.entries(message.costByResource);
       if (entries.length > 0) {
@@ -50646,15 +51462,6 @@ var WorkspaceBillingReportItem = {
       }
       return acc;
     }, {});
-    message.costByResourceFloat = Object.entries(object.costByResourceFloat ?? {}).reduce(
-      (acc, [key, value]) => {
-        if (value !== void 0) {
-          acc[key] = globalThis.Number(value);
-        }
-        return acc;
-      },
-      {}
-    );
     message.costByResource = Object.entries(object.costByResource ?? {}).reduce(
       (acc, [key, value]) => {
         if (value !== void 0) {
@@ -50735,23 +51542,23 @@ var WorkspaceBillingReportItem_TagsEntry = {
     return message;
   }
 };
-function createBaseWorkspaceBillingReportItem_CostByResourceFloatEntry() {
-  return { key: "", value: 0 };
+function createBaseWorkspaceBillingReportItem_CostByResourceEntry() {
+  return { key: "", value: "" };
 }
-var WorkspaceBillingReportItem_CostByResourceFloatEntry = {
+var WorkspaceBillingReportItem_CostByResourceEntry = {
   encode(message, writer = new BinaryWriter()) {
     if (message.key !== "") {
       writer.uint32(10).string(message.key);
     }
-    if (message.value !== 0) {
-      writer.uint32(17).double(message.value);
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
     }
     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 = createBaseWorkspaceBillingReportItem_CostByResourceFloatEntry();
+    const message = createBaseWorkspaceBillingReportItem_CostByResourceEntry();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -50763,10 +51570,10 @@ var WorkspaceBillingReportItem_CostByResourceFloatEntry = {
           continue;
         }
         case 2: {
-          if (tag !== 17) {
+          if (tag !== 18) {
             break;
           }
-          message.value = reader.double();
+          message.value = reader.string();
           continue;
         }
       }
@@ -50780,7 +51587,7 @@ var WorkspaceBillingReportItem_CostByResourceFloatEntry = {
   fromJSON(object) {
     return {
       key: isSet5(object.key) ? globalThis.String(object.key) : "",
-      value: isSet5(object.value) ? globalThis.Number(object.value) : 0
+      value: isSet5(object.value) ? globalThis.String(object.value) : ""
     };
   },
   toJSON(message) {
@@ -50788,38 +51595,57 @@ var WorkspaceBillingReportItem_CostByResourceFloatEntry = {
     if (message.key !== "") {
       obj.key = message.key;
     }
-    if (message.value !== 0) {
+    if (message.value !== "") {
       obj.value = message.value;
     }
     return obj;
   },
   create(base) {
-    return WorkspaceBillingReportItem_CostByResourceFloatEntry.fromPartial(base ?? {});
+    return WorkspaceBillingReportItem_CostByResourceEntry.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseWorkspaceBillingReportItem_CostByResourceFloatEntry();
+    const message = createBaseWorkspaceBillingReportItem_CostByResourceEntry();
     message.key = object.key ?? "";
-    message.value = object.value ?? 0;
+    message.value = object.value ?? "";
     return message;
   }
 };
-function createBaseWorkspaceBillingReportItem_CostByResourceEntry() {
-  return { key: "", value: "" };
+function createBaseWorkspaceBillingReportRequest() {
+  return {
+    startTimestamp: void 0,
+    endTimestamp: void 0,
+    resolution: "",
+    tagNames: [],
+    environmentIds: [],
+    appIds: []
+  };
 }
-var WorkspaceBillingReportItem_CostByResourceEntry = {
+var WorkspaceBillingReportRequest = {
   encode(message, writer = new BinaryWriter()) {
-    if (message.key !== "") {
-      writer.uint32(10).string(message.key);
+    if (message.startTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.startTimestamp), writer.uint32(10).fork()).join();
     }
-    if (message.value !== "") {
-      writer.uint32(18).string(message.value);
+    if (message.endTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.endTimestamp), writer.uint32(18).fork()).join();
+    }
+    if (message.resolution !== "") {
+      writer.uint32(26).string(message.resolution);
+    }
+    for (const v of message.tagNames) {
+      writer.uint32(34).string(v);
+    }
+    for (const v of message.environmentIds) {
+      writer.uint32(42).string(v);
+    }
+    for (const v of message.appIds) {
+      writer.uint32(50).string(v);
     }
     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 = createBaseWorkspaceBillingReportItem_CostByResourceEntry();
+    const message = createBaseWorkspaceBillingReportRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -50827,14 +51653,42 @@ var WorkspaceBillingReportItem_CostByResourceEntry = {
           if (tag !== 10) {
             break;
           }
-          message.key = reader.string();
+          message.startTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 2: {
           if (tag !== 18) {
             break;
           }
-          message.value = reader.string();
+          message.endTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.resolution = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.tagNames.push(reader.string());
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+          message.environmentIds.push(reader.string());
+          continue;
+        }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+          message.appIds.push(reader.string());
           continue;
         }
       }
@@ -50847,41 +51701,132 @@ var WorkspaceBillingReportItem_CostByResourceEntry = {
   },
   fromJSON(object) {
     return {
-      key: isSet5(object.key) ? globalThis.String(object.key) : "",
-      value: isSet5(object.value) ? globalThis.String(object.value) : ""
+      startTimestamp: isSet5(object.startTimestamp) ? fromJsonTimestamp(object.startTimestamp) : void 0,
+      endTimestamp: isSet5(object.endTimestamp) ? fromJsonTimestamp(object.endTimestamp) : void 0,
+      resolution: isSet5(object.resolution) ? globalThis.String(object.resolution) : "",
+      tagNames: globalThis.Array.isArray(object?.tagNames) ? object.tagNames.map((e) => globalThis.String(e)) : [],
+      environmentIds: globalThis.Array.isArray(object?.environmentIds) ? object.environmentIds.map((e) => globalThis.String(e)) : [],
+      appIds: globalThis.Array.isArray(object?.appIds) ? object.appIds.map((e) => globalThis.String(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
-    if (message.key !== "") {
-      obj.key = message.key;
+    if (message.startTimestamp !== void 0) {
+      obj.startTimestamp = message.startTimestamp.toISOString();
     }
-    if (message.value !== "") {
-      obj.value = message.value;
+    if (message.endTimestamp !== void 0) {
+      obj.endTimestamp = message.endTimestamp.toISOString();
+    }
+    if (message.resolution !== "") {
+      obj.resolution = message.resolution;
+    }
+    if (message.tagNames?.length) {
+      obj.tagNames = message.tagNames;
+    }
+    if (message.environmentIds?.length) {
+      obj.environmentIds = message.environmentIds;
+    }
+    if (message.appIds?.length) {
+      obj.appIds = message.appIds;
     }
     return obj;
   },
   create(base) {
-    return WorkspaceBillingReportItem_CostByResourceEntry.fromPartial(base ?? {});
+    return WorkspaceBillingReportRequest.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseWorkspaceBillingReportItem_CostByResourceEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
+    const message = createBaseWorkspaceBillingReportRequest();
+    message.startTimestamp = object.startTimestamp ?? void 0;
+    message.endTimestamp = object.endTimestamp ?? void 0;
+    message.resolution = object.resolution ?? "";
+    message.tagNames = object.tagNames?.map((e) => e) || [];
+    message.environmentIds = object.environmentIds?.map((e) => e) || [];
+    message.appIds = object.appIds?.map((e) => e) || [];
     return message;
   }
 };
-function createBaseWorkspaceBillingReportRequest() {
+function createBaseWorkspaceBillingSummaryRequest() {
+  return { startTimestamp: void 0, endTimestamp: void 0 };
+}
+var WorkspaceBillingSummaryRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.startTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.startTimestamp), writer.uint32(10).fork()).join();
+    }
+    if (message.endTimestamp !== void 0) {
+      Timestamp.encode(toTimestamp(message.endTimestamp), writer.uint32(18).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 = createBaseWorkspaceBillingSummaryRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.startTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.endTimestamp = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      startTimestamp: isSet5(object.startTimestamp) ? fromJsonTimestamp(object.startTimestamp) : void 0,
+      endTimestamp: isSet5(object.endTimestamp) ? fromJsonTimestamp(object.endTimestamp) : void 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.startTimestamp !== void 0) {
+      obj.startTimestamp = message.startTimestamp.toISOString();
+    }
+    if (message.endTimestamp !== void 0) {
+      obj.endTimestamp = message.endTimestamp.toISOString();
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceBillingSummaryRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceBillingSummaryRequest();
+    message.startTimestamp = object.startTimestamp ?? void 0;
+    message.endTimestamp = object.endTimestamp ?? void 0;
+    return message;
+  }
+};
+function createBaseWorkspaceBillingSummaryResponse() {
   return {
     startTimestamp: void 0,
     endTimestamp: void 0,
-    resolution: "",
-    tagNames: [],
-    environmentIds: [],
-    appIds: []
+    meteredCost: "",
+    planCost: "",
+    creditsApplied: "",
+    reservationsDiscount: "",
+    volumesDiscount: "",
+    billedCost: "",
+    meteredCostBreakdown: {}
   };
 }
-var WorkspaceBillingReportRequest = {
+var WorkspaceBillingSummaryResponse = {
   encode(message, writer = new BinaryWriter()) {
     if (message.startTimestamp !== void 0) {
       Timestamp.encode(toTimestamp(message.startTimestamp), writer.uint32(10).fork()).join();
@@ -50889,24 +51834,36 @@ var WorkspaceBillingReportRequest = {
     if (message.endTimestamp !== void 0) {
       Timestamp.encode(toTimestamp(message.endTimestamp), writer.uint32(18).fork()).join();
     }
-    if (message.resolution !== "") {
-      writer.uint32(26).string(message.resolution);
+    if (message.meteredCost !== "") {
+      writer.uint32(26).string(message.meteredCost);
     }
-    for (const v of message.tagNames) {
-      writer.uint32(34).string(v);
+    if (message.planCost !== "") {
+      writer.uint32(34).string(message.planCost);
     }
-    for (const v of message.environmentIds) {
-      writer.uint32(42).string(v);
+    if (message.creditsApplied !== "") {
+      writer.uint32(42).string(message.creditsApplied);
     }
-    for (const v of message.appIds) {
-      writer.uint32(50).string(v);
+    if (message.reservationsDiscount !== "") {
+      writer.uint32(50).string(message.reservationsDiscount);
+    }
+    if (message.volumesDiscount !== "") {
+      writer.uint32(58).string(message.volumesDiscount);
+    }
+    if (message.billedCost !== "") {
+      writer.uint32(66).string(message.billedCost);
     }
+    Object.entries(message.meteredCostBreakdown).forEach(([key, value]) => {
+      WorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry.encode(
+        { key, value },
+        writer.uint32(74).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 = createBaseWorkspaceBillingReportRequest();
+    const message = createBaseWorkspaceBillingSummaryResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -50928,28 +51885,52 @@ var WorkspaceBillingReportRequest = {
           if (tag !== 26) {
             break;
           }
-          message.resolution = reader.string();
+          message.meteredCost = reader.string();
           continue;
         }
         case 4: {
           if (tag !== 34) {
             break;
           }
-          message.tagNames.push(reader.string());
+          message.planCost = reader.string();
           continue;
         }
         case 5: {
           if (tag !== 42) {
             break;
           }
-          message.environmentIds.push(reader.string());
+          message.creditsApplied = reader.string();
           continue;
         }
         case 6: {
           if (tag !== 50) {
             break;
           }
-          message.appIds.push(reader.string());
+          message.reservationsDiscount = reader.string();
+          continue;
+        }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+          message.volumesDiscount = reader.string();
+          continue;
+        }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+          message.billedCost = reader.string();
+          continue;
+        }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+          const entry9 = WorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry.decode(reader, reader.uint32());
+          if (entry9.value !== void 0) {
+            message.meteredCostBreakdown[entry9.key] = entry9.value;
+          }
           continue;
         }
       }
@@ -50964,10 +51945,16 @@ var WorkspaceBillingReportRequest = {
     return {
       startTimestamp: isSet5(object.startTimestamp) ? fromJsonTimestamp(object.startTimestamp) : void 0,
       endTimestamp: isSet5(object.endTimestamp) ? fromJsonTimestamp(object.endTimestamp) : void 0,
-      resolution: isSet5(object.resolution) ? globalThis.String(object.resolution) : "",
-      tagNames: globalThis.Array.isArray(object?.tagNames) ? object.tagNames.map((e) => globalThis.String(e)) : [],
-      environmentIds: globalThis.Array.isArray(object?.environmentIds) ? object.environmentIds.map((e) => globalThis.String(e)) : [],
-      appIds: globalThis.Array.isArray(object?.appIds) ? object.appIds.map((e) => globalThis.String(e)) : []
+      meteredCost: isSet5(object.meteredCost) ? globalThis.String(object.meteredCost) : "",
+      planCost: isSet5(object.planCost) ? globalThis.String(object.planCost) : "",
+      creditsApplied: isSet5(object.creditsApplied) ? globalThis.String(object.creditsApplied) : "",
+      reservationsDiscount: isSet5(object.reservationsDiscount) ? globalThis.String(object.reservationsDiscount) : "",
+      volumesDiscount: isSet5(object.volumesDiscount) ? globalThis.String(object.volumesDiscount) : "",
+      billedCost: isSet5(object.billedCost) ? globalThis.String(object.billedCost) : "",
+      meteredCostBreakdown: isObject2(object.meteredCostBreakdown) ? Object.entries(object.meteredCostBreakdown).reduce((acc, [key, value]) => {
+        acc[key] = String(value);
+        return acc;
+      }, {}) : {}
     };
   },
   toJSON(message) {
@@ -50978,31 +51965,125 @@ var WorkspaceBillingReportRequest = {
     if (message.endTimestamp !== void 0) {
       obj.endTimestamp = message.endTimestamp.toISOString();
     }
-    if (message.resolution !== "") {
-      obj.resolution = message.resolution;
+    if (message.meteredCost !== "") {
+      obj.meteredCost = message.meteredCost;
     }
-    if (message.tagNames?.length) {
-      obj.tagNames = message.tagNames;
+    if (message.planCost !== "") {
+      obj.planCost = message.planCost;
     }
-    if (message.environmentIds?.length) {
-      obj.environmentIds = message.environmentIds;
+    if (message.creditsApplied !== "") {
+      obj.creditsApplied = message.creditsApplied;
     }
-    if (message.appIds?.length) {
-      obj.appIds = message.appIds;
+    if (message.reservationsDiscount !== "") {
+      obj.reservationsDiscount = message.reservationsDiscount;
+    }
+    if (message.volumesDiscount !== "") {
+      obj.volumesDiscount = message.volumesDiscount;
+    }
+    if (message.billedCost !== "") {
+      obj.billedCost = message.billedCost;
+    }
+    if (message.meteredCostBreakdown) {
+      const entries = Object.entries(message.meteredCostBreakdown);
+      if (entries.length > 0) {
+        obj.meteredCostBreakdown = {};
+        entries.forEach(([k, v]) => {
+          obj.meteredCostBreakdown[k] = v;
+        });
+      }
     }
     return obj;
   },
   create(base) {
-    return WorkspaceBillingReportRequest.fromPartial(base ?? {});
+    return WorkspaceBillingSummaryResponse.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseWorkspaceBillingReportRequest();
+    const message = createBaseWorkspaceBillingSummaryResponse();
     message.startTimestamp = object.startTimestamp ?? void 0;
     message.endTimestamp = object.endTimestamp ?? void 0;
-    message.resolution = object.resolution ?? "";
-    message.tagNames = object.tagNames?.map((e) => e) || [];
-    message.environmentIds = object.environmentIds?.map((e) => e) || [];
-    message.appIds = object.appIds?.map((e) => e) || [];
+    message.meteredCost = object.meteredCost ?? "";
+    message.planCost = object.planCost ?? "";
+    message.creditsApplied = object.creditsApplied ?? "";
+    message.reservationsDiscount = object.reservationsDiscount ?? "";
+    message.volumesDiscount = object.volumesDiscount ?? "";
+    message.billedCost = object.billedCost ?? "";
+    message.meteredCostBreakdown = Object.entries(object.meteredCostBreakdown ?? {}).reduce(
+      (acc, [key, value]) => {
+        if (value !== void 0) {
+          acc[key] = globalThis.String(value);
+        }
+        return acc;
+      },
+      {}
+    );
+    return message;
+  }
+};
+function createBaseWorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry() {
+  return { key: "", value: "" };
+}
+var WorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value !== "") {
+      writer.uint32(18).string(message.value);
+    }
+    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 = createBaseWorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.value = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      key: isSet5(object.key) ? globalThis.String(object.key) : "",
+      value: isSet5(object.value) ? globalThis.String(object.value) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value !== "") {
+      obj.value = message.value;
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceBillingSummaryResponse_MeteredCostBreakdownEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? "";
     return message;
   }
 };
@@ -51444,6 +52525,231 @@ var WorkspaceNameLookupResponse = {
     return message;
   }
 };
+function createBaseWorkspaceSetDefaultEnvironmentRequest() {
+  return { environmentName: "" };
+}
+var WorkspaceSetDefaultEnvironmentRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.environmentName !== "") {
+      writer.uint32(10).string(message.environmentName);
+    }
+    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 = createBaseWorkspaceSetDefaultEnvironmentRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.environmentName = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.environmentName !== "") {
+      obj.environmentName = message.environmentName;
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceSetDefaultEnvironmentRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceSetDefaultEnvironmentRequest();
+    message.environmentName = object.environmentName ?? "";
+    return message;
+  }
+};
+function createBaseWorkspaceSetImageBuilderVersionRequest() {
+  return { newImageBuilderVersion: "" };
+}
+var WorkspaceSetImageBuilderVersionRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.newImageBuilderVersion !== "") {
+      writer.uint32(10).string(message.newImageBuilderVersion);
+    }
+    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 = createBaseWorkspaceSetImageBuilderVersionRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.newImageBuilderVersion = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      newImageBuilderVersion: isSet5(object.newImageBuilderVersion) ? globalThis.String(object.newImageBuilderVersion) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.newImageBuilderVersion !== "") {
+      obj.newImageBuilderVersion = message.newImageBuilderVersion;
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceSetImageBuilderVersionRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceSetImageBuilderVersionRequest();
+    message.newImageBuilderVersion = object.newImageBuilderVersion ?? "";
+    return message;
+  }
+};
+function createBaseWorkspaceSetImageBuilderVersionResponse() {
+  return { imageBuilderVersion: "" };
+}
+var WorkspaceSetImageBuilderVersionResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.imageBuilderVersion !== "") {
+      writer.uint32(10).string(message.imageBuilderVersion);
+    }
+    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 = createBaseWorkspaceSetImageBuilderVersionResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.imageBuilderVersion = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      imageBuilderVersion: isSet5(object.imageBuilderVersion) ? globalThis.String(object.imageBuilderVersion) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.imageBuilderVersion !== "") {
+      obj.imageBuilderVersion = message.imageBuilderVersion;
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceSetImageBuilderVersionResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceSetImageBuilderVersionResponse();
+    message.imageBuilderVersion = object.imageBuilderVersion ?? "";
+    return message;
+  }
+};
+function createBaseWorkspaceSettingsResponse() {
+  return { defaultEnvironmentName: "", imageBuilderVersion: "" };
+}
+var WorkspaceSettingsResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.defaultEnvironmentName !== "") {
+      writer.uint32(10).string(message.defaultEnvironmentName);
+    }
+    if (message.imageBuilderVersion !== "") {
+      writer.uint32(18).string(message.imageBuilderVersion);
+    }
+    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 = createBaseWorkspaceSettingsResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.defaultEnvironmentName = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.imageBuilderVersion = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      defaultEnvironmentName: isSet5(object.defaultEnvironmentName) ? globalThis.String(object.defaultEnvironmentName) : "",
+      imageBuilderVersion: isSet5(object.imageBuilderVersion) ? globalThis.String(object.imageBuilderVersion) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.defaultEnvironmentName !== "") {
+      obj.defaultEnvironmentName = message.defaultEnvironmentName;
+    }
+    if (message.imageBuilderVersion !== "") {
+      obj.imageBuilderVersion = message.imageBuilderVersion;
+    }
+    return obj;
+  },
+  create(base) {
+    return WorkspaceSettingsResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseWorkspaceSettingsResponse();
+    message.defaultEnvironmentName = object.defaultEnvironmentName ?? "";
+    message.imageBuilderVersion = object.imageBuilderVersion ?? "";
+    return message;
+  }
+};
 var ModalClientDefinition = {
   name: "ModalClient",
   fullName: "modal.client.ModalClient",
@@ -51808,6 +53114,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    containerServerLifecycleReady: {
+      name: "ContainerServerLifecycleReady",
+      requestType: ContainerServerLifecycleReadyRequest,
+      requestStream: false,
+      responseType: Empty,
+      responseStream: false,
+      options: {}
+    },
     containerStop: {
       name: "ContainerStop",
       requestType: ContainerStopRequest,
@@ -51989,6 +53303,14 @@ var ModalClientDefinition = {
       options: {}
     },
     /** Environments */
+    environmentBillingSummary: {
+      name: "EnvironmentBillingSummary",
+      requestType: EnvironmentBillingSummaryRequest,
+      requestStream: false,
+      responseType: EnvironmentBillingSummaryResponse,
+      responseStream: false,
+      options: {}
+    },
     environmentCreate: {
       name: "EnvironmentCreate",
       requestType: EnvironmentCreateRequest,
@@ -52390,6 +53712,14 @@ var ModalClientDefinition = {
       options: {}
     },
     /** Mounts */
+    mountBatchedCheckExistence: {
+      name: "MountBatchedCheckExistence",
+      requestType: MountBatchedCheckExistenceRequest,
+      requestStream: false,
+      responseType: MountBatchedCheckExistenceResponse,
+      responseStream: false,
+      options: {}
+    },
     mountGetOrCreate: {
       name: "MountGetOrCreate",
       requestType: MountGetOrCreateRequest,
@@ -52594,6 +53924,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxGetFromNameV2: {
+      name: "SandboxGetFromNameV2",
+      requestType: SandboxGetFromNameRequest,
+      requestStream: false,
+      responseType: SandboxGetFromNameResponse,
+      responseStream: false,
+      options: {}
+    },
     sandboxGetLogs: {
       name: "SandboxGetLogs",
       requestType: SandboxGetLogsRequest,
@@ -52731,6 +54069,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxTagsGetV2: {
+      name: "SandboxTagsGetV2",
+      requestType: SandboxTagsGetRequest,
+      requestStream: false,
+      responseType: SandboxTagsGetResponse,
+      responseStream: false,
+      options: {}
+    },
     sandboxTagsSet: {
       name: "SandboxTagsSet",
       requestType: SandboxTagsSetRequest,
@@ -52739,6 +54085,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    sandboxTagsSetV2: {
+      name: "SandboxTagsSetV2",
+      requestType: SandboxTagsSetRequest,
+      requestStream: false,
+      responseType: Empty,
+      responseStream: false,
+      options: {}
+    },
     sandboxTerminate: {
       name: "SandboxTerminate",
       requestType: SandboxTerminateRequest,
@@ -53205,6 +54559,14 @@ var ModalClientDefinition = {
       responseStream: true,
       options: {}
     },
+    workspaceBillingSummary: {
+      name: "WorkspaceBillingSummary",
+      requestType: WorkspaceBillingSummaryRequest,
+      requestStream: false,
+      responseType: WorkspaceBillingSummaryResponse,
+      responseStream: false,
+      options: {}
+    },
     workspaceDashboardUrlGet: {
       name: "WorkspaceDashboardUrlGet",
       requestType: WorkspaceDashboardUrlRequest,
@@ -53228,6 +54590,30 @@ var ModalClientDefinition = {
       responseType: WorkspaceNameLookupResponse,
       responseStream: false,
       options: {}
+    },
+    workspaceSetDefaultEnvironment: {
+      name: "WorkspaceSetDefaultEnvironment",
+      requestType: WorkspaceSetDefaultEnvironmentRequest,
+      requestStream: false,
+      responseType: Empty,
+      responseStream: false,
+      options: {}
+    },
+    workspaceSetImageBuilderVersion: {
+      name: "WorkspaceSetImageBuilderVersion",
+      requestType: WorkspaceSetImageBuilderVersionRequest,
+      requestStream: false,
+      responseType: WorkspaceSetImageBuilderVersionResponse,
+      responseStream: false,
+      options: {}
+    },
+    workspaceSettings: {
+      name: "WorkspaceSettings",
+      requestType: Empty,
+      requestStream: false,
+      responseType: WorkspaceSettingsResponse,
+      responseStream: false,
+      options: {}
     }
   }
 };
@@ -53819,6 +55205,16 @@ var import_nice_grpc4 = require("nice-grpc");
 
 // src/secret.ts
 var import_nice_grpc2 = require("nice-grpc");
+var ENV_VAR_KEY_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+function validateEnvVarKeys(env) {
+  for (const key of Object.keys(env)) {
+    if (!ENV_VAR_KEY_REGEX.test(key)) {
+      throw new InvalidError(
+        `Secret key name ${JSON.stringify(key)} is invalid for environment variables. Only letters, numbers, and underscores are allowed, and the name may not start with a number.`
+      );
+    }
+  }
+}
 var SecretService = class {
   #client;
   constructor(client) {
@@ -53848,7 +55244,16 @@ var SecretService = class {
       throw err;
     }
   }
-  /** Create a {@link Secret} from a plain object of key-value pairs. */
+  /**
+   * Create a {@link Secret} from a plain object of key-value pairs.
+   *
+   * The returned Secret is lazy: no server-side Secret is created (and
+   * {@link Secret#secretId secretId} stays empty) until it is first used. When
+   * used with {@link Sandbox#exec Sandbox.exec()} or
+   * {@link SandboxService#experimentalCreate client.sandboxes.experimentalCreate()},
+   * the values are sent directly to the worker as environment variables,
+   * avoiding a `SecretGetOrCreate` round-trip entirely.
+   */
   async fromObject(entries, params) {
     for (const [, value] of Object.entries(entries)) {
       if (value == null || typeof value !== "string") {
@@ -53857,23 +55262,14 @@ var SecretService = class {
         );
       }
     }
-    try {
-      const resp = await this.#client.cpClient.secretGetOrCreate({
-        objectCreationType: 5 /* OBJECT_CREATION_TYPE_EPHEMERAL */,
-        envDict: entries,
-        environmentName: this.#client.environmentName(params?.environment)
-      });
-      this.#client.logger.debug(
-        "Created ephemeral Secret",
-        "secret_id",
-        resp.secretId
-      );
-      return new Secret(resp.secretId);
-    } catch (err) {
-      if (err instanceof import_nice_grpc2.ClientError && (err.code === import_nice_grpc2.Status.INVALID_ARGUMENT || err.code === import_nice_grpc2.Status.FAILED_PRECONDITION))
-        throw new InvalidError(err.details);
-      throw err;
-    }
+    validateEnvVarKeys(entries);
+    const envDict = { ...entries };
+    const environment = this.#client.environmentName(params?.environment);
+    return new Secret(
+      "",
+      void 0,
+      new SecretFromObjectHydrator(envDict, environment)
+    );
   }
   /**
    * Delete a named {@link Secret}.
@@ -53904,15 +55300,98 @@ var SecretService = class {
     }
   }
 };
+var SecretFromObjectHydrator = class {
+  envDict;
+  #environment;
+  constructor(envDict, environment) {
+    this.envDict = envDict;
+    this.#environment = environment;
+  }
+  async hydrate(client) {
+    try {
+      const resp = await client.cpClient.secretGetOrCreate({
+        objectCreationType: 5 /* OBJECT_CREATION_TYPE_EPHEMERAL */,
+        envDict: this.envDict,
+        environmentName: this.#environment
+      });
+      client.logger.debug(
+        "Created ephemeral Secret",
+        "secret_id",
+        resp.secretId
+      );
+      return resp.secretId;
+    } catch (err) {
+      if (err instanceof import_nice_grpc2.ClientError && (err.code === import_nice_grpc2.Status.INVALID_ARGUMENT || err.code === import_nice_grpc2.Status.FAILED_PRECONDITION))
+        throw new InvalidError(err.details);
+      throw err;
+    }
+  }
+};
 var Secret = class {
-  secretId;
+  #secretId;
   name;
+  // Resolves secretId lazily the first time it is needed. Undefined for Secrets
+  // constructed already-hydrated (e.g. from fromName), and not consulted again
+  // once secretId is set.
+  #hydrator;
+  // Caches the single in-flight (or successfully completed) hydration so the
+  // ephemeral Secret is created at most once, even if multiple callers hydrate
+  // the same Secret concurrently. Cleared on failure so a transient error
+  // doesn't permanently break the Secret; subsequent calls can retry.
+  #hydratePromise;
   /** @ignore */
-  constructor(secretId, name) {
-    this.secretId = secretId;
+  constructor(secretId, name, hydrator) {
+    this.#secretId = secretId;
     this.name = name;
+    this.#hydrator = hydrator;
+  }
+  /** The ID of the server-side Secret, or an empty string if not yet hydrated. */
+  get secretId() {
+    return this.#secretId;
+  }
+  /**
+   * The hydrator resolving a lazy Secret to a secretId, or `undefined` for
+   * Secrets that already reference a server-side Secret (e.g. from fromName).
+   *
+   * @internal
+   * @hidden
+   */
+  get _hydrator() {
+    return this.#hydrator;
+  }
+  /**
+   * Lazily create the ephemeral server-side Secret backing a fromObject Secret
+   * and populate {@link Secret#secretId secretId}. A no-op once secretId is set
+   * (e.g. for Secrets returned by fromName).
+   *
+   * @internal
+   * @hidden
+   */
+  async _hydrate(client) {
+    if (this.#secretId !== "" || this.#hydrator === void 0) {
+      return;
+    }
+    if (this.#hydratePromise === void 0) {
+      this.#hydratePromise = this.#doHydrate(client);
+    }
+    const promise = this.#hydratePromise;
+    try {
+      await promise;
+    } catch (err) {
+      if (this.#hydratePromise === promise) {
+        this.#hydratePromise = void 0;
+      }
+      throw err;
+    }
+  }
+  async #doHydrate(client) {
+    this.#secretId = await this.#hydrator.hydrate(client);
   }
 };
+function secretEnvDictHydrator(secret) {
+  const hydrator = secret?._hydrator;
+  return hydrator instanceof SecretFromObjectHydrator ? hydrator : void 0;
+}
 async function mergeEnvIntoSecrets(client, env, secrets) {
   const result = [...secrets || []];
   if (env && Object.keys(env).length > 0) {
@@ -53920,6 +55399,38 @@ async function mergeEnvIntoSecrets(client, env, secrets) {
   }
   return result;
 }
+async function hydrateSecrets(client, secrets) {
+  secrets.forEach((secret, i) => {
+    if (secret == null) {
+      throw new InvalidError(`secret at index ${i} must not be null`);
+    }
+  });
+  await Promise.all(secrets.map((secret) => secret._hydrate(client)));
+}
+function collectSecretIds(secrets) {
+  return secrets.map((secret, i) => {
+    if (secret == null) {
+      throw new InvalidError(`secret at index ${i} must not be null`);
+    }
+    if (secret.secretId === "") {
+      throw new InvalidError(`secret at index ${i} has not been hydrated`);
+    }
+    return secret.secretId;
+  });
+}
+function splitEnvDictAndResolvableSecrets(secrets) {
+  const envDict = {};
+  const resolvable = [];
+  for (const secret of secrets) {
+    const hydrator = secret != null ? secretEnvDictHydrator(secret) : void 0;
+    if (hydrator !== void 0) {
+      Object.assign(envDict, hydrator.envDict);
+    } else {
+      resolvable.push(secret);
+    }
+  }
+  return [envDict, resolvable];
+}
 
 // src/volume.ts
 var import_nice_grpc3 = require("nice-grpc");
@@ -54179,7 +55690,8 @@ var FunctionService = class {
       const resp = await this.#client.cpClient.functionGet({
         appName,
         objectTag: name,
-        environmentName: this.#client.environmentName(params.environment)
+        environmentName: this.#client.environmentName(params.environment),
+        appVersion: params.version
       });
       this.#client.logger.debug(
         "Retrieved Function",
@@ -54302,7 +55814,8 @@ async function buildFunctionOptionsProto(options) {
     maxConcurrentInputs: o.maxConcurrentInputs,
     targetConcurrentInputs: o.targetConcurrentInputs,
     batchMaxSize: o.batchMaxSize,
-    batchLingerMs: o.batchWaitMs
+    batchLingerMs: o.batchWaitMs,
+    routingRegion: o.routingRegion
   });
   return functionOptions;
 }
@@ -54367,6 +55880,7 @@ async function bindParameters(client, functionId, options = {}, schema = [], par
     options?.env,
     options?.secrets
   );
+  await hydrateSecrets(client, mergedSecrets);
   const mergedOptions = mergeServiceOptions(options, {
     secrets: mergedSecrets,
     env: void 0
@@ -54443,6 +55957,7 @@ var Function_ = class _Function_ {
    * and/or {@link Function_#withBatching withBatching}. */
   async instance() {
     let newFnId = this.functionId;
+    let handleMetadata = this.#handleMetadata;
     if (this.#options != null && Object.entries(this.#options).length > 0) {
       const boundF = await bindParameters(
         this.#client,
@@ -54450,12 +55965,13 @@ var Function_ = class _Function_ {
         this.#options
       );
       newFnId = boundF.boundFunctionId;
+      handleMetadata = boundF.handleMetadata;
     }
     return new _Function_(
       this.#client,
       newFnId,
       this.methodName,
-      this.#handleMetadata
+      handleMetadata
     );
   }
   // Execute a single input into a remote Function.
@@ -54606,7 +56122,8 @@ var ClsService = class {
       const serviceFunction = await this.#client.cpClient.functionGet({
         appName,
         objectTag: serviceFunctionName,
-        environmentName: this.#client.environmentName(params.environment)
+        environmentName: this.#client.environmentName(params.environment),
+        appVersion: params.version
       });
       const parameterInfo = serviceFunction.handleMetadata?.classParameterInfo;
       const schema = parameterInfo?.schema ?? [];
@@ -54655,15 +56172,17 @@ var Cls = class _Cls {
   /** Create a new instance of the Cls with parameters and/or runtime options. */
   async instance(parameters = {}) {
     let functionId;
+    let methodHandleMetadata;
     if (this.#schema.length === 0 && this.#serviceFunctionOptions === void 0) {
       functionId = this.#serviceFunctionId;
+      methodHandleMetadata = this.#serviceFunctionMetadata.methodHandleMetadata;
     } else {
-      functionId = await this.#bindParameters(parameters);
+      const bindResp = await this.#bindParameters(parameters);
+      functionId = bindResp.boundFunctionId;
+      methodHandleMetadata = bindResp.handleMetadata?.methodHandleMetadata ?? {};
     }
     const methods = /* @__PURE__ */ new Map();
-    for (const [name, methodMetadata] of Object.entries(
-      this.#serviceFunctionMetadata.methodHandleMetadata
-    )) {
+    for (const [name, methodMetadata] of Object.entries(methodHandleMetadata)) {
       methods.set(
         name,
         new Function_(this.#client, functionId, name, methodMetadata)
@@ -54709,14 +56228,13 @@ var Cls = class _Cls {
   }
   /** Bind parameters to the Cls function. */
   async #bindParameters(parameters) {
-    const bindResp = await bindParameters(
+    return await bindParameters(
       this.#client,
       this.#serviceFunctionId,
       this.#serviceFunctionOptions,
       this.#schema,
       parameters
     );
-    return bindResp.boundFunctionId;
   }
 };
 var ClsInstance = class {
@@ -55383,11 +56901,27 @@ var Queue = class _Queue {
 // src/image.ts
 var import_nice_grpc7 = require("nice-grpc");
 var import_nice_grpc8 = require("nice-grpc");
+
+// src/name_utils.ts
+var OBJECT_NAME_CHARSET = /^[a-zA-Z0-9\-_.]+$/;
+var APP_ID_PATTERN = /^ap-[a-zA-Z0-9]{22}$/;
+function isValidObjectName(name) {
+  return name.length <= 64 && OBJECT_NAME_CHARSET.test(name) && !APP_ID_PATTERN.test(name);
+}
+function checkObjectName(name, objectType) {
+  if (!isValidObjectName(name)) {
+    throw new InvalidError(
+      `Invalid ${objectType} name: '${name}'.
+
+Names may contain only alphanumeric characters, dashes, periods, and underscores, must be shorter than 64 characters, and cannot conflict with App ID strings.`
+    );
+  }
+}
+
+// src/image.ts
 var DEFAULT_IMAGE_TAG = "latest";
 function validateImageName(name) {
-  if (name === "") {
-    throw new InvalidError("Image name must be non-empty.");
-  }
+  checkObjectName(name, "Image");
   if (name.startsWith("im-")) {
     throw new InvalidError(
       "Image name cannot start with 'im-' (reserved for image IDs)."
@@ -55395,21 +56929,53 @@ function validateImageName(name) {
   }
 }
 function validateImageTag(tag) {
-  if (tag === "") {
-    throw new InvalidError("Image tag must be non-empty.");
-  }
+  checkObjectName(tag, "Image tag");
 }
 function parseNamedImageRef(value) {
   const separatorIndex = value.indexOf(":");
+  let imageName;
+  let tag;
   if (separatorIndex === -1) {
-    validateImageName(value);
-    return `${value}:${DEFAULT_IMAGE_TAG}`;
+    imageName = value;
+    tag = DEFAULT_IMAGE_TAG;
+  } else {
+    imageName = value.slice(0, separatorIndex);
+    tag = value.slice(separatorIndex + 1);
+  }
+  let prefix = "";
+  const lastSlashIndex = imageName.lastIndexOf("/");
+  if (lastSlashIndex !== -1) {
+    prefix = imageName.slice(0, lastSlashIndex);
+    const after = imageName.slice(lastSlashIndex + 1);
+    if (prefix === "") {
+      throw new InvalidError(
+        "Invalid Image name: '/' prefix must be non-empty."
+      );
+    }
+    if (after === "") {
+      throw new InvalidError(
+        "Invalid Image name: name after '/' must be non-empty."
+      );
+    }
+    imageName = after;
   }
-  const name = value.slice(0, separatorIndex);
-  const tag = value.slice(separatorIndex + 1);
-  validateImageName(name);
+  validateImageName(imageName);
   validateImageTag(tag);
-  return `${name}:${tag}`;
+  const fullName = prefix ? `${prefix}/${imageName}` : imageName;
+  return [prefix, `${fullName}:${tag}`];
+}
+function registryConfigBuilder(authType, secret) {
+  return async (client) => {
+    let secretId = "";
+    if (secret) {
+      await hydrateSecrets(client, [secret]);
+      secretId = secret.secretId;
+    }
+    return ImageRegistryConfig.create({
+      registryAuthType: authType,
+      secretId
+    });
+  };
 }
 var ImageService = class {
   #client;
@@ -55441,10 +57007,21 @@ var ImageService = class {
    * @param params - Optional environment.
    */
   async fromName(name, params = {}) {
-    const tag = parseNamedImageRef(name);
+    const [namespacePrefix, tag] = parseNamedImageRef(name);
+    let environmentName;
+    if (namespacePrefix) {
+      if (params.environment) {
+        throw new InvalidError(
+          "Cannot specify 'environment' when the image name contains a '/'."
+        );
+      }
+      environmentName = "";
+    } else {
+      environmentName = this.#client.environmentName(params.environment);
+    }
     try {
       const resp = await this.#client.cpClient.imageGetByTag({
-        environmentName: this.#client.environmentName(params.environment),
+        environmentName,
         tag
       });
       return new Image2(this.#client, resp.imageId, "");
@@ -55461,19 +57038,19 @@ var ImageService = class {
    * @param secret - Optional. A Secret containing credentials for registry authentication.
    */
   fromRegistry(tag, secret) {
-    let imageRegistryConfig;
+    let buildRegistryConfig;
     if (secret) {
       if (!(secret instanceof Secret)) {
         throw new TypeError(
           "secret must be a reference to an existing Secret, e.g. `await client.secrets.fromName('my_secret')`"
         );
       }
-      imageRegistryConfig = {
-        registryAuthType: 4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
-        secretId: secret.secretId
-      };
+      buildRegistryConfig = registryConfigBuilder(
+        4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
+        secret
+      );
     }
-    return new Image2(this.#client, "", tag, imageRegistryConfig);
+    return new Image2(this.#client, "", tag, buildRegistryConfig);
   }
   /**
    * Creates an {@link Image} from a raw registry tag, optionally using a {@link Secret} for authentication.
@@ -55482,19 +57059,16 @@ var ImageService = class {
    * @param secret - A Secret containing credentials for registry authentication.
    */
   fromAwsEcr(tag, secret) {
-    let imageRegistryConfig;
-    if (secret) {
-      if (!(secret instanceof Secret)) {
-        throw new TypeError(
-          "secret must be a reference to an existing Secret, e.g. `await client.secrets.fromName('my_secret')`"
-        );
-      }
-      imageRegistryConfig = {
-        registryAuthType: 1 /* REGISTRY_AUTH_TYPE_AWS */,
-        secretId: secret.secretId
-      };
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await client.secrets.fromName('my_secret')`"
+      );
     }
-    return new Image2(this.#client, "", tag, imageRegistryConfig);
+    const buildRegistryConfig = registryConfigBuilder(
+      1 /* REGISTRY_AUTH_TYPE_AWS */,
+      secret
+    );
+    return new Image2(this.#client, "", tag, buildRegistryConfig);
   }
   /**
    * Creates an {@link Image} from a raw registry tag, optionally using a {@link Secret} for authentication.
@@ -55503,19 +57077,16 @@ var ImageService = class {
    * @param secret - A Secret containing credentials for registry authentication.
    */
   fromGcpArtifactRegistry(tag, secret) {
-    let imageRegistryConfig;
-    if (secret) {
-      if (!(secret instanceof Secret)) {
-        throw new TypeError(
-          "secret must be a reference to an existing Secret, e.g. `await client.secrets.fromName('my_secret')`"
-        );
-      }
-      imageRegistryConfig = {
-        registryAuthType: 2 /* REGISTRY_AUTH_TYPE_GCP */,
-        secretId: secret.secretId
-      };
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await client.secrets.fromName('my_secret')`"
+      );
     }
-    return new Image2(this.#client, "", tag, imageRegistryConfig);
+    const buildRegistryConfig = registryConfigBuilder(
+      2 /* REGISTRY_AUTH_TYPE_GCP */,
+      secret
+    );
+    return new Image2(this.#client, "", tag, buildRegistryConfig);
   }
   /**
    * Delete an {@link Image} by ID.
@@ -55545,15 +57116,18 @@ var Image2 = class _Image {
   #tag;
   // Image ID of the parent image layer to use as `FROM base`.
   #baseImageId;
-  #imageRegistryConfig;
+  // When set, hydrates the registry-auth Secret (if any) and returns the
+  // ImageRegistryConfig for the base build layer. Runs at build time, since the
+  // Secret may be lazy. Undefined when not pulling from a private registry.
+  #buildRegistryConfig;
   #layers;
   /** @ignore */
-  constructor(client, imageId, tag, imageRegistryConfig, layers, baseImageId) {
+  constructor(client, imageId, tag, buildRegistryConfig, layers, baseImageId) {
     this.#client = client;
     this.#imageId = imageId;
     this.#tag = tag;
     this.#baseImageId = baseImageId || "";
-    this.#imageRegistryConfig = imageRegistryConfig;
+    this.#buildRegistryConfig = buildRegistryConfig;
     this.#layers = layers || [
       {
         commands: [],
@@ -55605,7 +57179,7 @@ var Image2 = class _Image {
       this.#client,
       "",
       this.#tag,
-      this.#imageRegistryConfig,
+      this.#buildRegistryConfig,
       [...layers, newLayer],
       baseImageId
     );
@@ -55631,6 +57205,7 @@ var Image2 = class _Image {
         layer.env,
         layer.secrets
       );
+      await hydrateSecrets(this.#client, mergedSecrets);
       const secretIds = mergedSecrets.map((secret) => secret.secretId);
       const gpuConfig = layer.gpuConfig;
       let dockerfileCommands;
@@ -55645,7 +57220,7 @@ var Image2 = class _Image {
         dockerfileCommands = ["FROM base", ...layer.commands];
         baseImages = [{ dockerTag: "base", imageId: baseImageId }];
       }
-      const imageRegistryConfig = i === 0 && !baseImageId ? this.#imageRegistryConfig : void 0;
+      const imageRegistryConfig = i === 0 && !baseImageId && this.#buildRegistryConfig ? await this.#buildRegistryConfig(this.#client) : void 0;
       const resp = await this.#client.cpClient.imageGetOrCreate({
         appId: app.appId,
         image: Image.create({
@@ -55712,17 +57287,27 @@ ${result.exception}`
    * @param params - Optional environment.
    */
   async publish(name, params = {}) {
-    const tag = parseNamedImageRef(name);
+    const [namespacePrefix, tag] = parseNamedImageRef(name);
     if (this.#imageId === "") {
       throw new InvalidError(
         "Cannot publish an image that has not been built yet. Call build() first."
       );
     }
-    const environmentName = this.#client.environmentName(params.environment);
+    let environmentName;
+    if (namespacePrefix) {
+      if (params.environment) {
+        throw new InvalidError(
+          "Cannot specify 'environment' when the image name contains a '/'."
+        );
+      }
+      environmentName = "";
+    } else {
+      environmentName = this.#client.environmentName(params.environment);
+    }
     await this.#client.cpClient.imagePublish({
       imageId: this.#imageId,
       environmentName,
-      isPublic: false,
+      allowPublic: false,
       tag
     });
   }
@@ -57930,8 +59515,45 @@ var TaskExecStdinWriteResponse = {
     return message;
   }
 };
+function createBaseTaskExecStdinWriteStreamEnd() {
+  return {};
+}
+var TaskExecStdinWriteStreamEnd = {
+  encode(_, writer = new BinaryWriter()) {
+    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 = createBaseTaskExecStdinWriteStreamEnd();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(_) {
+    return {};
+  },
+  toJSON(_) {
+    const obj = {};
+    return obj;
+  },
+  create(base) {
+    return TaskExecStdinWriteStreamEnd.fromPartial(base ?? {});
+  },
+  fromPartial(_) {
+    const message = createBaseTaskExecStdinWriteStreamEnd();
+    return message;
+  }
+};
 function createBaseTaskExecStdinWriteStreamRequest() {
-  return { start: void 0, data: void 0 };
+  return { start: void 0, data: void 0, end: void 0 };
 }
 var TaskExecStdinWriteStreamRequest = {
   encode(message, writer = new BinaryWriter()) {
@@ -57941,6 +59563,9 @@ var TaskExecStdinWriteStreamRequest = {
     if (message.data !== void 0) {
       writer.uint32(18).bytes(message.data);
     }
+    if (message.end !== void 0) {
+      TaskExecStdinWriteStreamEnd.encode(message.end, writer.uint32(26).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -57964,6 +59589,13 @@ var TaskExecStdinWriteStreamRequest = {
           message.data = reader.bytes();
           continue;
         }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.end = TaskExecStdinWriteStreamEnd.decode(reader, reader.uint32());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -57975,7 +59607,8 @@ var TaskExecStdinWriteStreamRequest = {
   fromJSON(object) {
     return {
       start: isSet6(object.start) ? TaskExecStdinWriteStreamStart.fromJSON(object.start) : void 0,
-      data: isSet6(object.data) ? bytesFromBase643(object.data) : void 0
+      data: isSet6(object.data) ? bytesFromBase643(object.data) : void 0,
+      end: isSet6(object.end) ? TaskExecStdinWriteStreamEnd.fromJSON(object.end) : void 0
     };
   },
   toJSON(message) {
@@ -57986,6 +59619,9 @@ var TaskExecStdinWriteStreamRequest = {
     if (message.data !== void 0) {
       obj.data = base64FromBytes3(message.data);
     }
+    if (message.end !== void 0) {
+      obj.end = TaskExecStdinWriteStreamEnd.toJSON(message.end);
+    }
     return obj;
   },
   create(base) {
@@ -57995,6 +59631,7 @@ var TaskExecStdinWriteStreamRequest = {
     const message = createBaseTaskExecStdinWriteStreamRequest();
     message.start = object.start !== void 0 && object.start !== null ? TaskExecStdinWriteStreamStart.fromPartial(object.start) : void 0;
     message.data = object.data ?? void 0;
+    message.end = object.end !== void 0 && object.end !== null ? TaskExecStdinWriteStreamEnd.fromPartial(object.end) : void 0;
     return message;
   }
 };
@@ -58501,6 +60138,94 @@ var TaskMountDirectoryRequest = {
     return message;
   }
 };
+function createBaseTaskReloadVolumesRequest() {
+  return { taskId: "" };
+}
+var TaskReloadVolumesRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.taskId !== "") {
+      writer.uint32(10).string(message.taskId);
+    }
+    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 = createBaseTaskReloadVolumesRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.taskId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { taskId: isSet6(object.taskId) ? globalThis.String(object.taskId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.taskId !== "") {
+      obj.taskId = message.taskId;
+    }
+    return obj;
+  },
+  create(base) {
+    return TaskReloadVolumesRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTaskReloadVolumesRequest();
+    message.taskId = object.taskId ?? "";
+    return message;
+  }
+};
+function createBaseTaskReloadVolumesResponse() {
+  return {};
+}
+var TaskReloadVolumesResponse = {
+  encode(_, writer = new BinaryWriter()) {
+    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 = createBaseTaskReloadVolumesResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(_) {
+    return {};
+  },
+  toJSON(_) {
+    const obj = {};
+    return obj;
+  },
+  create(base) {
+    return TaskReloadVolumesResponse.fromPartial(base ?? {});
+  },
+  fromPartial(_) {
+    const message = createBaseTaskReloadVolumesResponse();
+    return message;
+  }
+};
 function createBaseTaskSetNetworkAccessRequest() {
   return { taskId: "", networkAccess: void 0 };
 }
@@ -59146,6 +60871,15 @@ var TaskCommandRouterDefinition = {
       responseStream: false,
       options: {}
     },
+    /** Reload all Volumes mounted in the task to reflect their latest committed state. */
+    taskReloadVolumes: {
+      name: "TaskReloadVolumes",
+      requestType: TaskReloadVolumesRequest,
+      requestStream: false,
+      responseType: TaskReloadVolumesResponse,
+      responseStream: false,
+      options: {}
+    },
     /** Replace the task's outbound network allowlist (domains + CIDRs). */
     taskSetNetworkAccess: {
       name: "TaskSetNetworkAccess",
@@ -59536,8 +61270,9 @@ var AuthTokenManager = class {
 };
 
 // src/version.ts
+var SDK_VERSION = "0.9.0";
 function getSDKVersion() {
-  return true ? "0.8.1" : "0.0.0";
+  return SDK_VERSION;
 }
 
 // src/logger.ts
@@ -60433,6 +62168,40 @@ var TaskCommandRouterClientImpl = class _TaskCommandRouterClientImpl {
   async unmountDirectory(request) {
     await this.callUnary(() => this.stub.taskUnmountDirectory(request));
   }
+  async setNetworkAccess(request) {
+    await this.callUnary(() => this.stub.taskSetNetworkAccess(request));
+  }
+  /**
+   * Reload all Volumes mounted in the task to reflect their latest committed state.
+   *
+   * `timeoutMs` is the client-side deadline. If the reload does not complete
+   * within this window, the call is cancelled and a TimeoutError is thrown.
+   */
+  async reloadVolumes(request, options) {
+    const overallDeadlineMs = options?.timeoutMs !== void 0 ? Date.now() + options.timeoutMs : null;
+    try {
+      await callWithRetriesOnTransientErrors(
+        () => this.callWithAuthRetry(() => {
+          const remainingMs = overallDeadlineMs !== null ? Math.max(1, overallDeadlineMs - Date.now()) : options?.timeoutMs;
+          return this.stub.taskReloadVolumes(request, {
+            ...options,
+            timeoutMs: remainingMs
+          });
+        }),
+        10,
+        2,
+        10,
+        overallDeadlineMs,
+        () => this.closed,
+        [import_nice_grpc11.Status.DEADLINE_EXCEEDED, import_nice_grpc11.Status.CANCELLED]
+      );
+    } catch (err) {
+      if (overallDeadlineMs !== null && Date.now() >= overallDeadlineMs) {
+        throw new TimeoutError("Timeout expired");
+      }
+      throw err;
+    }
+  }
   async sandboxWaitUntilReady(taskId, timeoutMs) {
     const deadlineMs = Date.now() + timeoutMs;
     try {
@@ -60798,6 +62567,44 @@ function raiseStatError(returnCode, stderr, remotePath) {
 function makeStatCommand(remotePath) {
   return JSON.stringify({ Stat: { path: remotePath } });
 }
+function raiseWatchError(returnCode, stderr, remotePath) {
+  const payload = tryParseErrorPayload(stderr);
+  if (payload) {
+    logger.debug(
+      `sandbox-fs-tools watch error: path=${remotePath}, error_kind=${payload.error_kind}, message=${payload.message}, detail=${payload.detail}`
+    );
+    if (payload.error_kind === "NotFound")
+      throw new SandboxFilesystemNotFoundError(
+        `${payload.message}: ${remotePath}`
+      );
+    if (payload.error_kind === "PermissionDenied")
+      throw new SandboxFilesystemPermissionError(
+        `${payload.message}: ${remotePath}`
+      );
+    if (payload.error_kind === "NotSupported")
+      throw new InvalidError(
+        `${payload.message}: ${remotePath} - this operation is not supported for CloudBucketMounts`
+      );
+    throw new SandboxFilesystemError(payload.message);
+  }
+  const text = stderrToText(stderr);
+  if (text) logger.debug(`Unstructured modal-sandbox-fs-tools stderr: ${text}`);
+  throw new SandboxFilesystemError(
+    `Operation on '${remotePath}' failed with exit code ${returnCode}`
+  );
+}
+function makeWatchCommand(remotePath, opts) {
+  return JSON.stringify({
+    Watch: {
+      path: remotePath,
+      recursive: opts.recursive,
+      filter: opts.filter,
+      // The fs-tools wire protocol takes whole seconds; convert from the SDK's
+      // millisecond convention, truncating any sub-second remainder.
+      timeout_secs: opts.timeoutMs !== null ? Math.trunc(opts.timeoutMs / 1e3) : null
+    }
+  });
+}
 function raiseWriteFileError(returnCode, stderr, remotePath) {
   const payload = tryParseErrorPayload(stderr);
   if (payload) {
@@ -60891,6 +62698,36 @@ function parseFileEntry(raw) {
     symlinkTarget: raw.symlink_target ?? null
   };
 }
+var RUST_RENAME_VARIANTS = ["Rename", "RenameFrom", "RenameTo"];
+var VALID_EVENT_TYPES = /* @__PURE__ */ new Set([
+  "Access",
+  "Create",
+  "Modify",
+  "Remove",
+  "Unknown"
+]);
+function expandWatchFilter(filter) {
+  const result = [];
+  for (const eventType of filter) {
+    result.push(eventType);
+    if (eventType === "Modify") {
+      result.push(...RUST_RENAME_VARIANTS);
+    }
+  }
+  return result;
+}
+async function* readLines(stream) {
+  const decoder2 = new TextDecoder();
+  let buffer = "";
+  for await (const chunk of stream) {
+    buffer += typeof chunk === "string" ? chunk : decoder2.decode(chunk, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() ?? "";
+    for (const line of lines) yield line;
+  }
+  const tail = decoder2.decode(void 0, { stream: false });
+  if (buffer + tail) yield buffer + tail;
+}
 var WRITE_CHUNK_SIZE = 4 * 1024 * 1024;
 function toUint8Array(data) {
   if (data instanceof ArrayBuffer) return new Uint8Array(data);
@@ -61168,6 +63005,94 @@ var SandboxFilesystem = class {
     });
     return parseFileEntry(JSON.parse(stdout));
   }
+  /**
+   * Watch a path in the Sandbox for filesystem changes.
+   *
+   * `remotePath` must be an absolute path in the Sandbox. If it points to a
+   * file, events for that file are reported. If it points to a directory,
+   * events for entries directly inside it are reported. Set `recursive: true`
+   * to also receive events for all nested subdirectories. If `remotePath` is
+   * a symlink, it is followed and events reference paths under the resolved
+   * target.
+   *
+   * Yields {@link FileWatchEvent} objects as changes occur, until either the
+   * timeout elapses, the iterator is closed, or the Sandbox is terminated.
+   *
+   * Optionally restrict the kinds of events emitted to those included in
+   * `filter`. An undefined `filter` permits all types; passing an empty array
+   * suppresses all events.
+   *
+   * `timeoutMs` is truncated to whole seconds. Omit it to watch indefinitely.
+   * When the timeout elapses, the iterator stops without raising an exception.
+   *
+   * @throws {SandboxFilesystemNotFoundError} `remotePath` does not exist.
+   * @throws {SandboxFilesystemPermissionError} watch access is denied.
+   * @throws {InvalidError} the filesystem does not support watching.
+   * @throws {SandboxFilesystemError} the command fails for any other reason.
+   */
+  async *watch(remotePath, params = {}) {
+    validateAbsoluteRemotePath(remotePath, "watch");
+    checkForRenamedParams(params, { timeout: "timeoutMs" });
+    const { filter, recursive = false, timeoutMs } = params;
+    const process2 = await translateExecErrors(
+      "watch",
+      remotePath,
+      () => this.exec(
+        [
+          SANDBOX_FS_TOOLS_PATH,
+          makeWatchCommand(remotePath, {
+            recursive,
+            filter: filter !== void 0 ? expandWatchFilter(filter) : null,
+            timeoutMs: timeoutMs ?? null
+          })
+        ],
+        { mode: "text" }
+      )
+    );
+    let streamEnded = false;
+    try {
+      for await (const line of readLines(process2.stdout)) {
+        const trimmed = line.trim();
+        if (!trimmed) continue;
+        let data;
+        try {
+          data = JSON.parse(trimmed);
+        } catch {
+          continue;
+        }
+        const paths = data.paths ?? [];
+        if (paths.length === 0) continue;
+        let rawType = data.event_type;
+        if (typeof rawType !== "string") continue;
+        if (RUST_RENAME_VARIANTS.includes(rawType)) {
+          rawType = "Modify";
+        }
+        if (!VALID_EVENT_TYPES.has(rawType)) continue;
+        yield { eventType: rawType, paths };
+      }
+      streamEnded = true;
+    } catch (err) {
+      await translateExecErrors("watch", remotePath, () => {
+        throw err;
+      });
+      throw err;
+    } finally {
+      await process2.closeStdin().catch(() => {
+      });
+      if (streamEnded) {
+        await translateExecErrors("watch", remotePath, async () => {
+          const returnCode = await process2.wait();
+          if (returnCode !== 0) {
+            const stderr = await process2.stderr.readBytes();
+            raiseWatchError(returnCode, stderr, remotePath);
+          }
+        });
+      } else {
+        await process2.wait().catch(() => {
+        });
+      }
+    }
+  }
   /**
    * Write binary content to a file in the Sandbox.
    *
@@ -61278,7 +63203,13 @@ var SidecarService = class {
     const command = params?.command ?? [];
     validateExecArgs(command);
     validateWorkdir(params?.workdir);
-    const secretIds = (params?.secrets ?? []).map((secret) => secret.secretId);
+    validateEnvVarKeys(params?.env ?? {});
+    const [envDict, resolvableSecrets] = splitEnvDictAndResolvableSecrets(
+      params?.secrets ?? []
+    );
+    Object.assign(envDict, params?.env ?? {});
+    await hydrateSecrets(this.#access.client, resolvableSecrets);
+    const secretIds = collectSecretIds(resolvableSecrets);
     const [taskId, client] = await this.#access.commandRouter();
     let resp;
     try {
@@ -61288,7 +63219,7 @@ var SidecarService = class {
           containerName: name,
           imageId: image.imageId,
           args: command,
-          env: params?.env ?? {},
+          env: envDict,
           workdir: params?.workdir ?? "",
           secretIds
         })
@@ -61900,9 +63831,11 @@ async function buildSandboxCreateV2RequestProto(appId, imageId, params = {}) {
     throw new Error("custom domains are not supported by experimentalCreate");
   }
   const req = await buildSandboxCreateRequestProto(appId, imageId, params);
+  const ephemeralSecrets = params.env && Object.keys(params.env).length > 0 ? StringMap.create({ contents: params.env }) : void 0;
   return SandboxCreateV2Request.create({
     appId: req.appId,
-    definition: req.definition
+    definition: req.definition,
+    ephemeralSecrets
   });
 }
 var SandboxService = class {
@@ -61920,6 +63853,11 @@ var SandboxService = class {
       params.env,
       params.secrets
     );
+    await hydrateSandboxSecrets(
+      this.#client,
+      mergedSecrets,
+      params.cloudBucketMounts
+    );
     const mergedParams = {
       ...params,
       secrets: mergedSecrets,
@@ -61959,24 +63897,28 @@ var SandboxService = class {
    * supported.
    *
    * V2 sandboxes created with this method are not currently returned by
-   * {@link SandboxService#list client.sandboxes.list()} and cannot be looked up
-   * with {@link SandboxService#fromName client.sandboxes.fromName()}. Store
-   * {@link Sandbox#sandboxId sandbox.sandboxId} if you need to retrieve the
-   * sandbox later, and use {@link SandboxService#fromId client.sandboxes.fromId()}
-   * to reattach.
+   * {@link SandboxService#list client.sandboxes.list()}. A named Sandbox can be
+   * looked up with
+   * {@link SandboxService#experimentalFromName client.sandboxes.experimentalFromName()};
+   * otherwise store {@link Sandbox#sandboxId sandbox.sandboxId} and use
+   * {@link SandboxService#fromId client.sandboxes.fromId()} to reattach.
    */
   async experimentalCreate(app, image, params = {}) {
     await image.build(app);
-    const mergedSecrets = await mergeEnvIntoSecrets(
+    validateEnvVarKeys(params.env ?? {});
+    const [envDict, resolvableSecrets] = splitEnvDictAndResolvableSecrets(
+      params.secrets ?? []
+    );
+    Object.assign(envDict, params.env ?? {});
+    await hydrateSandboxSecrets(
       this.#client,
-      params.env,
-      params.secrets
+      resolvableSecrets,
+      params.cloudBucketMounts
     );
     const mergedParams = {
       ...params,
-      secrets: mergedSecrets,
-      env: void 0
-      // setting env to undefined just to clarify it's not needed anymore
+      secrets: resolvableSecrets,
+      env: envDict
     };
     const createReq = await buildSandboxCreateV2RequestProto(
       app.appId,
@@ -62044,6 +63986,35 @@ var SandboxService = class {
       throw err;
     }
   }
+  /**
+   * Get a running V2 {@link Sandbox} by name from a deployed {@link App}.
+   *
+   * This looks up V2 Sandboxes, i.e. Sandboxes created via
+   * {@link SandboxService#experimentalCreate client.sandboxes.experimentalCreate()}.
+   *
+   * EXPERIMENTAL: the API is subject to change.
+   *
+   * @param appName - Name of the deployed App
+   * @param name - Name of the Sandbox
+   * @param params - Optional parameters for getting the Sandbox
+   * @returns Promise that resolves to a Sandbox
+   */
+  async experimentalFromName(appName, name, params) {
+    try {
+      const resp = await this.#client.cpClient.sandboxGetFromNameV2({
+        sandboxName: name,
+        appName,
+        environmentName: this.#client.environmentName(params?.environment)
+      });
+      return new Sandbox2(this.#client, resp.sandboxId, { isV2: true });
+    } catch (err) {
+      if (err instanceof import_nice_grpc15.ClientError && err.code === import_nice_grpc15.Status.NOT_FOUND)
+        throw new NotFoundError(
+          `Sandbox with name '${name}' not found in App '${appName}'`
+        );
+      throw err;
+    }
+  }
   /**
    * List all {@link Sandbox}es for the current Environment or App ID (if specified).
    * If tags are specified, only Sandboxes that have at least those tags are returned.
@@ -62079,6 +64050,46 @@ var SandboxService = class {
       }
     }
   }
+  /**
+   * List the V2 {@link Sandbox}es in an {@link App}.
+   *
+   * This lists V2 Sandboxes, i.e. Sandboxes created via
+   * {@link SandboxService#experimentalCreate client.sandboxes.experimentalCreate()}.
+   * Such Sandboxes are not returned by
+   * {@link SandboxService#list client.sandboxes.list()}. If tags are specified,
+   * only Sandboxes that have at least those tags are returned.
+   *
+   * Yields {@link Sandbox} objects that are currently running in the App.
+   *
+   * EXPERIMENTAL: the API is subject to change.
+   */
+  async *experimentalList(params) {
+    if (!params?.appId) {
+      throw new InvalidError(
+        'experimentalList requires an `appId`:\n\nconst app = await modal.apps.fromName("my-app");\nmodal.sandboxes.experimentalList({ appId: app.appId });'
+      );
+    }
+    const tagsList = params.tags ? Object.entries(params.tags).map(([tagName, tagValue]) => ({
+      tagName,
+      tagValue
+    })) : [];
+    let beforeTimestamp = void 0;
+    while (true) {
+      const resp = await this.#client.cpClient.sandboxListV2({
+        appId: params.appId,
+        beforeTimestamp,
+        includeFinished: false,
+        tags: tagsList
+      });
+      if (!resp.sandboxes || resp.sandboxes.length === 0) {
+        return;
+      }
+      for (const info of resp.sandboxes) {
+        yield new Sandbox2(this.#client, info.id, { isV2: true });
+      }
+      beforeTimestamp = resp.sandboxes[resp.sandboxes.length - 1].createdAt;
+    }
+  }
 };
 var Tunnel = class {
   /** @ignore */
@@ -62136,6 +64147,17 @@ function validateWorkdir(workdir) {
     throw new InvalidError(`workdir must be an absolute path, got: ${workdir}`);
   }
 }
+async function hydrateSandboxSecrets(client, secrets, mounts) {
+  const toHydrate = [...secrets];
+  if (mounts) {
+    for (const mount of Object.values(mounts)) {
+      if (mount?.secret) {
+        toHydrate.push(mount.secret);
+      }
+    }
+  }
+  await hydrateSecrets(client, toHydrate);
+}
 function getReturnCode(result) {
   if (result === void 0 || result.status === 0 /* GENERIC_STATUS_UNSPECIFIED */) {
     return null;
@@ -62308,6 +64330,7 @@ var Sandbox2 = class _Sandbox {
     this.#ensureAttached();
     if (!this.#sidecars) {
       this.#sidecars = new SidecarService({
+        client: this.#client,
         exec: (command, params, containerId) => this.#execInternal(command, params, containerId),
         commandRouter: () => this.#getCommandRouter()
       });
@@ -62362,13 +64385,24 @@ var Sandbox2 = class _Sandbox {
   async #execInternal(command, params, containerId) {
     this.#ensureAttached();
     validateExecArgs(command);
+    validateEnvVarKeys(params?.env ?? {});
+    const [envDict, resolvableSecrets] = splitEnvDictAndResolvableSecrets(
+      params?.secrets ?? []
+    );
+    Object.assign(envDict, params?.env ?? {});
+    await hydrateSecrets(this.#client, resolvableSecrets);
+    const execParams = {
+      ...params,
+      env: envDict,
+      secrets: resolvableSecrets
+    };
     const [taskId, commandRouterClient] = await this.#getCommandRouter();
     const execId = (0, import_uuid2.v4)();
     const request = buildTaskExecStartRequestProto(
       taskId,
       execId,
       command,
-      params,
+      execParams,
       containerId
     );
     await commandRouterClient.execStart(request);
@@ -62674,6 +64708,53 @@ var Sandbox2 = class _Sandbox {
     });
     await commandRouterClient.unmountDirectory(request);
   }
+  /**
+   * Updates the outbound network policy of a running Sandbox.
+   *
+   * Established connections that the new policy no longer permits are terminated.
+   *
+   * @param params - Both `outboundCidrAllowlist` and `outboundDomainAllowlist` must be provided.
+   */
+  async updateNetworkPolicy(params) {
+    this.#ensureAttached();
+    if (params.outboundCidrAllowlist === void 0 || params.outboundDomainAllowlist === void 0) {
+      throw new InvalidError(
+        "updateNetworkPolicy currently requires both outboundCidrAllowlist and outboundDomainAllowlist to be set"
+      );
+    }
+    const [taskId, commandRouterClient] = await this.#getCommandRouter();
+    const request = TaskSetNetworkAccessRequest.create({
+      taskId,
+      networkAccess: NetworkAccess.create({
+        networkAccessType: 3 /* ALLOWLIST */,
+        allowedCidrs: params.outboundCidrAllowlist,
+        allowedDomains: params.outboundDomainAllowlist
+      })
+    });
+    await commandRouterClient.setNetworkAccess(request);
+  }
+  /**
+   * Reload all Volumes mounted in the Sandbox.
+   *
+   * Blocks until the Volumes have been reloaded, bounded by `timeoutMs` (55000
+   * by default). If the reload does not complete within that window, a
+   * `TimeoutError` is thrown; note that the reload may still complete in the
+   * background.
+   *
+   * @param params - Optional parameters; see {@link SandboxReloadVolumesParams}.
+   */
+  async reloadVolumes(params) {
+    this.#ensureAttached();
+    if (params?.timeoutMs !== void 0 && params.timeoutMs < 0) {
+      throw new InvalidError("`timeoutMs` must not be negative");
+    }
+    const timeoutMs = params?.timeoutMs || 55e3;
+    const [taskId, commandRouterClient] = await this.#getCommandRouter();
+    await commandRouterClient.reloadVolumes(
+      TaskReloadVolumesRequest.create({ taskId }),
+      { timeoutMs }
+    );
+  }
   /**
    * Snapshots and creates a new {@link Image} from a directory in the running sandbox.
    *