modal 0.10.2-dev.12 → 0.10.2-dev.13

package/README.md

@@ -51,6 +51,7 @@ We also provide a number of examples:
 - [Run a Sidecar and snapshot its filesystem](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-sidecar.ts)
 - [Persist a workspace across Sidecars](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-sidecar-directory-snapshot.ts)
 - [Mount a Volume in a Sidecar](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-sidecar-volume.ts)
+- [Mount a cloud bucket in a Sidecar](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-sidecar-cloud-bucket.ts)
 - [Take a snapshot of the filesystem of a Sandbox](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-filesystem-snapshot.ts)
 - [Snapshot the filesystem of a Sandbox when it exits](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-exit-snapshot.ts)
 - [Snapshot a directory, and mount it in a running Sandbox](https://github.com/modal-labs/modal-client/blob/main/js/examples/sandbox-directory-snapshot.ts)

package/dist/index.cjs

@@ -3417,6 +3417,56 @@ function cloudBucketMount_MetadataTTLTypeToJSON(object) {
       return "UNRECOGNIZED";
   }
 }
+function endpointGetInfoResponse_EndpointStatusFromJSON(object) {
+  switch (object) {
+    case 0:
+    case "ENDPOINT_STATUS_UNSPECIFIED":
+      return 0 /* ENDPOINT_STATUS_UNSPECIFIED */;
+    case 1:
+    case "ENDPOINT_STATUS_PROVISIONING":
+      return 1 /* ENDPOINT_STATUS_PROVISIONING */;
+    case 2:
+    case "ENDPOINT_STATUS_LIVE":
+      return 2 /* ENDPOINT_STATUS_LIVE */;
+    case 3:
+    case "ENDPOINT_STATUS_FAILED":
+      return 3 /* ENDPOINT_STATUS_FAILED */;
+    case 4:
+    case "ENDPOINT_STATUS_CANCELLING":
+      return 4 /* ENDPOINT_STATUS_CANCELLING */;
+    case 5:
+    case "ENDPOINT_STATUS_CANCELLED":
+      return 5 /* ENDPOINT_STATUS_CANCELLED */;
+    case 6:
+    case "ENDPOINT_STATUS_STOPPED":
+      return 6 /* ENDPOINT_STATUS_STOPPED */;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return -1 /* UNRECOGNIZED */;
+  }
+}
+function endpointGetInfoResponse_EndpointStatusToJSON(object) {
+  switch (object) {
+    case 0 /* ENDPOINT_STATUS_UNSPECIFIED */:
+      return "ENDPOINT_STATUS_UNSPECIFIED";
+    case 1 /* ENDPOINT_STATUS_PROVISIONING */:
+      return "ENDPOINT_STATUS_PROVISIONING";
+    case 2 /* ENDPOINT_STATUS_LIVE */:
+      return "ENDPOINT_STATUS_LIVE";
+    case 3 /* ENDPOINT_STATUS_FAILED */:
+      return "ENDPOINT_STATUS_FAILED";
+    case 4 /* ENDPOINT_STATUS_CANCELLING */:
+      return "ENDPOINT_STATUS_CANCELLING";
+    case 5 /* ENDPOINT_STATUS_CANCELLED */:
+      return "ENDPOINT_STATUS_CANCELLED";
+    case 6 /* ENDPOINT_STATUS_STOPPED */:
+      return "ENDPOINT_STATUS_STOPPED";
+    case -1 /* UNRECOGNIZED */:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
 function fileEntry_FileTypeFromJSON(object) {
   switch (object) {
     case 0:
@@ -18348,6 +18398,407 @@ var EndpointGetByNameResponse = {
     return message;
   }
 };
+function createBaseEndpointGetInfoRequest() {
+  return { endpointId: "" };
+}
+var EndpointGetInfoRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.endpointId !== "") {
+      writer.uint32(10).string(message.endpointId);
+    }
+    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 = createBaseEndpointGetInfoRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.endpointId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { endpointId: isSet5(object.endpointId) ? globalThis.String(object.endpointId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.endpointId !== "") {
+      obj.endpointId = message.endpointId;
+    }
+    return obj;
+  },
+  create(base) {
+    return EndpointGetInfoRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEndpointGetInfoRequest();
+    message.endpointId = object.endpointId ?? "";
+    return message;
+  }
+};
+function createBaseEndpointGetInfoResponse() {
+  return { info: void 0, metadata: void 0 };
+}
+var EndpointGetInfoResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.info !== void 0) {
+      EndpointGetInfoResponse_EndpointInfoSummary.encode(message.info, writer.uint32(10).fork()).join();
+    }
+    if (message.metadata !== void 0) {
+      EndpointGetInfoResponse_EndpointHandleMetadata.encode(message.metadata, 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 = createBaseEndpointGetInfoResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.info = EndpointGetInfoResponse_EndpointInfoSummary.decode(reader, reader.uint32());
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.metadata = EndpointGetInfoResponse_EndpointHandleMetadata.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      info: isSet5(object.info) ? EndpointGetInfoResponse_EndpointInfoSummary.fromJSON(object.info) : void 0,
+      metadata: isSet5(object.metadata) ? EndpointGetInfoResponse_EndpointHandleMetadata.fromJSON(object.metadata) : void 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.info !== void 0) {
+      obj.info = EndpointGetInfoResponse_EndpointInfoSummary.toJSON(message.info);
+    }
+    if (message.metadata !== void 0) {
+      obj.metadata = EndpointGetInfoResponse_EndpointHandleMetadata.toJSON(message.metadata);
+    }
+    return obj;
+  },
+  create(base) {
+    return EndpointGetInfoResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEndpointGetInfoResponse();
+    message.info = object.info !== void 0 && object.info !== null ? EndpointGetInfoResponse_EndpointInfoSummary.fromPartial(object.info) : void 0;
+    message.metadata = object.metadata !== void 0 && object.metadata !== null ? EndpointGetInfoResponse_EndpointHandleMetadata.fromPartial(object.metadata) : void 0;
+    return message;
+  }
+};
+function createBaseEndpointGetInfoResponse_EndpointInfoSummary() {
+  return {
+    name: "",
+    repoId: "",
+    revision: "",
+    serviceUrl: "",
+    requiresProxyAuth: false,
+    servingMode: 0,
+    status: 0,
+    lifecycle: void 0,
+    volumeId: "",
+    modelPath: ""
+  };
+}
+var EndpointGetInfoResponse_EndpointInfoSummary = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.name !== "") {
+      writer.uint32(10).string(message.name);
+    }
+    if (message.repoId !== "") {
+      writer.uint32(18).string(message.repoId);
+    }
+    if (message.revision !== "") {
+      writer.uint32(26).string(message.revision);
+    }
+    if (message.serviceUrl !== "") {
+      writer.uint32(34).string(message.serviceUrl);
+    }
+    if (message.requiresProxyAuth !== false) {
+      writer.uint32(40).bool(message.requiresProxyAuth);
+    }
+    if (message.servingMode !== 0) {
+      writer.uint32(48).int32(message.servingMode);
+    }
+    if (message.status !== 0) {
+      writer.uint32(56).int32(message.status);
+    }
+    if (message.lifecycle !== void 0) {
+      EndpointLifecycle.encode(message.lifecycle, writer.uint32(66).fork()).join();
+    }
+    if (message.volumeId !== "") {
+      writer.uint32(90).string(message.volumeId);
+    }
+    if (message.modelPath !== "") {
+      writer.uint32(98).string(message.modelPath);
+    }
+    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 = createBaseEndpointGetInfoResponse_EndpointInfoSummary();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.name = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.repoId = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.revision = reader.string();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.serviceUrl = reader.string();
+          continue;
+        }
+        case 5: {
+          if (tag !== 40) {
+            break;
+          }
+          message.requiresProxyAuth = reader.bool();
+          continue;
+        }
+        case 6: {
+          if (tag !== 48) {
+            break;
+          }
+          message.servingMode = reader.int32();
+          continue;
+        }
+        case 7: {
+          if (tag !== 56) {
+            break;
+          }
+          message.status = reader.int32();
+          continue;
+        }
+        case 8: {
+          if (tag !== 66) {
+            break;
+          }
+          message.lifecycle = EndpointLifecycle.decode(reader, reader.uint32());
+          continue;
+        }
+        case 11: {
+          if (tag !== 90) {
+            break;
+          }
+          message.volumeId = reader.string();
+          continue;
+        }
+        case 12: {
+          if (tag !== 98) {
+            break;
+          }
+          message.modelPath = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      name: isSet5(object.name) ? globalThis.String(object.name) : "",
+      repoId: isSet5(object.repoId) ? globalThis.String(object.repoId) : "",
+      revision: isSet5(object.revision) ? globalThis.String(object.revision) : "",
+      serviceUrl: isSet5(object.serviceUrl) ? globalThis.String(object.serviceUrl) : "",
+      requiresProxyAuth: isSet5(object.requiresProxyAuth) ? globalThis.Boolean(object.requiresProxyAuth) : false,
+      servingMode: isSet5(object.servingMode) ? endpointServingModeFromJSON(object.servingMode) : 0,
+      status: isSet5(object.status) ? endpointGetInfoResponse_EndpointStatusFromJSON(object.status) : 0,
+      lifecycle: isSet5(object.lifecycle) ? EndpointLifecycle.fromJSON(object.lifecycle) : void 0,
+      volumeId: isSet5(object.volumeId) ? globalThis.String(object.volumeId) : "",
+      modelPath: isSet5(object.modelPath) ? globalThis.String(object.modelPath) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.name !== "") {
+      obj.name = message.name;
+    }
+    if (message.repoId !== "") {
+      obj.repoId = message.repoId;
+    }
+    if (message.revision !== "") {
+      obj.revision = message.revision;
+    }
+    if (message.serviceUrl !== "") {
+      obj.serviceUrl = message.serviceUrl;
+    }
+    if (message.requiresProxyAuth !== false) {
+      obj.requiresProxyAuth = message.requiresProxyAuth;
+    }
+    if (message.servingMode !== 0) {
+      obj.servingMode = endpointServingModeToJSON(message.servingMode);
+    }
+    if (message.status !== 0) {
+      obj.status = endpointGetInfoResponse_EndpointStatusToJSON(message.status);
+    }
+    if (message.lifecycle !== void 0) {
+      obj.lifecycle = EndpointLifecycle.toJSON(message.lifecycle);
+    }
+    if (message.volumeId !== "") {
+      obj.volumeId = message.volumeId;
+    }
+    if (message.modelPath !== "") {
+      obj.modelPath = message.modelPath;
+    }
+    return obj;
+  },
+  create(base) {
+    return EndpointGetInfoResponse_EndpointInfoSummary.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEndpointGetInfoResponse_EndpointInfoSummary();
+    message.name = object.name ?? "";
+    message.repoId = object.repoId ?? "";
+    message.revision = object.revision ?? "";
+    message.serviceUrl = object.serviceUrl ?? "";
+    message.requiresProxyAuth = object.requiresProxyAuth ?? false;
+    message.servingMode = object.servingMode ?? 0;
+    message.status = object.status ?? 0;
+    message.lifecycle = object.lifecycle !== void 0 && object.lifecycle !== null ? EndpointLifecycle.fromPartial(object.lifecycle) : void 0;
+    message.volumeId = object.volumeId ?? "";
+    message.modelPath = object.modelPath ?? "";
+    return message;
+  }
+};
+function createBaseEndpointGetInfoResponse_EndpointHandleMetadata() {
+  return { appId: "", serverId: "", environmentName: "" };
+}
+var EndpointGetInfoResponse_EndpointHandleMetadata = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.appId !== "") {
+      writer.uint32(10).string(message.appId);
+    }
+    if (message.serverId !== "") {
+      writer.uint32(18).string(message.serverId);
+    }
+    if (message.environmentName !== "") {
+      writer.uint32(26).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 = createBaseEndpointGetInfoResponse_EndpointHandleMetadata();
+    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.serverId = reader.string();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.environmentName = 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) : "",
+      serverId: isSet5(object.serverId) ? globalThis.String(object.serverId) : "",
+      environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : ""
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.appId !== "") {
+      obj.appId = message.appId;
+    }
+    if (message.serverId !== "") {
+      obj.serverId = message.serverId;
+    }
+    if (message.environmentName !== "") {
+      obj.environmentName = message.environmentName;
+    }
+    return obj;
+  },
+  create(base) {
+    return EndpointGetInfoResponse_EndpointHandleMetadata.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseEndpointGetInfoResponse_EndpointHandleMetadata();
+    message.appId = object.appId ?? "";
+    message.serverId = object.serverId ?? "";
+    message.environmentName = object.environmentName ?? "";
+    return message;
+  }
+};
 function createBaseEndpointGetLifecycleRequest() {
   return { endpointId: "" };
 }
@@ -61254,6 +61705,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    endpointGetInfo: {
+      name: "EndpointGetInfo",
+      requestType: EndpointGetInfoRequest,
+      requestStream: false,
+      responseType: EndpointGetInfoResponse,
+      responseStream: false,
+      options: {}
+    },
     endpointGetLifecycle: {
       name: "EndpointGetLifecycle",
       requestType: EndpointGetLifecycleRequest,
@@ -63433,6 +63892,16 @@ var CloudBucketMount2 = class {
     });
   }
 };
+function buildCloudBucketMountProtos(mounts) {
+  return Object.entries(mounts ?? {}).map(([mountPath, mount]) => {
+    if (!mount) {
+      throw new InvalidError(
+        `CloudBucketMount mounted at "${mountPath}" must not be null or undefined`
+      );
+    }
+    return mount.toProto(mountPath);
+  });
+}
 
 // src/secret.ts
 var import_nice_grpc2 = require("nice-grpc");
@@ -63466,7 +63935,7 @@ var SecretService = class {
         "secret_name",
         name
       );
-      return new Secret(resp.secretId, name);
+      return new Secret(resp.secretId, name, void 0, resp.metadata?.keys);
     } catch (err) {
       if (err instanceof import_nice_grpc2.ClientError && err.code === import_nice_grpc2.Status.NOT_FOUND)
         throw new NotFoundError(err.details);
@@ -63565,16 +64034,20 @@ var Secret = class {
   // constructed already-hydrated (e.g. from fromName), and not consulted again
   // once secretId is set.
   #hydrator;
+  // Names of the env vars a server-side Secret defines, as reported by the
+  // control plane on fromName. Undefined when unknown.
+  #keys;
   // 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, hydrator) {
+  constructor(secretId, name, hydrator, keys) {
     this.#secretId = secretId;
     this.name = name;
     this.#hydrator = hydrator;
+    this.#keys = keys !== void 0 ? new Set(keys) : void 0;
   }
   /** The ID of the server-side Secret, or an empty string if not yet hydrated. */
   get secretId() {
@@ -63590,6 +64063,16 @@ var Secret = class {
   get _hydrator() {
     return this.#hydrator;
   }
+  /**
+   * Names of the env vars this server-side Secret defines, or `undefined` if
+   * unknown (e.g. for lazy fromObject Secrets or Secrets constructed by id).
+   *
+   * @internal
+   * @hidden
+   */
+  get _keys() {
+    return this.#keys;
+  }
   /**
    * Lazily create the ephemeral server-side Secret backing a fromObject Secret
    * and populate {@link Secret#secretId secretId}. A no-op once secretId is set
@@ -63657,6 +64140,9 @@ function splitEnvDictAndResolvableSecrets(secrets) {
     if (hydrator !== void 0) {
       Object.assign(envDict, hydrator.envDict);
     } else {
+      for (const key of secret?._keys ?? []) {
+        delete envDict[key];
+      }
       resolvable.push(secret);
     }
   }
@@ -70947,7 +71433,11 @@ var MAIN_CONTAINER_NAME = "main";
 var CONTAINER_WAIT_POLL_TIMEOUT_SECONDS = 10;
 var CONTROL_PLANE_SIDECAR_CREATE_ENV_VAR = "MODAL_USE_CONTROL_PLANE_SIDECAR_CREATE";
 function useControlPlaneSidecarCreate(sandboxId) {
-  return getSandboxVersion(sandboxId) === "V2" /* V2 */ && process.env[CONTROL_PLANE_SIDECAR_CREATE_ENV_VAR] === "1";
+  if (getSandboxVersion(sandboxId) !== "V2" /* V2 */) {
+    return false;
+  }
+  const value = process.env[CONTROL_PLANE_SIDECAR_CREATE_ENV_VAR];
+  return value === void 0 || parseBooleanFlag(value);
 }
 function validateSidecarName(name) {
   if (name === "") {
@@ -71017,14 +71507,39 @@ var SidecarService = class {
         `experimentalMemoryReserveConsumeMiB must be a positive integer number of MiB, got: ${params.experimentalMemoryReserveConsumeMiB}`
       );
     }
+    const viaControlPlane = useControlPlaneSidecarCreate(
+      this.#access.sandboxId
+    );
+    const cloudBucketMountEntries = Object.entries(
+      params?.cloudBucketMounts ?? {}
+    );
+    if (cloudBucketMountEntries.length > 0) {
+      if (getSandboxVersion(this.#access.sandboxId) !== "V2" /* V2 */) {
+        throw new InvalidError(
+          "cloudBucketMounts are not supported in sidecars of V1 Sandboxes. A Sandbox is V1 when it has a GPU or MODAL_SANDBOX_V2=0 is set; contact Modal support for more information"
+        );
+      }
+      if (!viaControlPlane) {
+        throw new InvalidError(
+          `cloudBucketMounts are not supported in sidecars when ${CONTROL_PLANE_SIDECAR_CREATE_ENV_VAR}=0 is set; unset it to use them`
+        );
+      }
+    }
     validateEnvVarKeys(params?.env ?? {});
     const [envDict, resolvableSecrets] = splitEnvDictAndResolvableSecrets(
       params?.secrets ?? []
     );
     Object.assign(envDict, params?.env ?? {});
-    await hydrateSecrets(this.#access.client, resolvableSecrets);
+    await hydrateSandboxSecrets(
+      this.#access.client,
+      resolvableSecrets,
+      params?.cloudBucketMounts
+    );
     const secretIds = collectSecretIds(resolvableSecrets);
     const volumeMounts = buildSidecarVolumeMounts(params?.volumes);
+    const cloudBucketMounts = buildCloudBucketMountProtos(
+      params?.cloudBucketMounts
+    );
     const ptyInfo = params?.pty ? defaultSandboxPTYInfo() : void 0;
     const networkAccess = buildOutboundNetworkAccess(
       false,
@@ -71033,7 +71548,7 @@ var SidecarService = class {
     );
     let resp;
     try {
-      if (useControlPlaneSidecarCreate(this.#access.sandboxId)) {
+      if (viaControlPlane) {
         const ephemeralSecrets = Object.keys(envDict).length > 0 ? StringMap.create({ contents: envDict }) : void 0;
         resp = await this.#access.client.cpClient.sandboxContainerCreateV2(
           SandboxContainerCreateV2Request.create({
@@ -71045,6 +71560,7 @@ var SidecarService = class {
               workdir: params?.workdir ?? void 0,
               secretIds,
               volumeMounts,
+              cloudBucketMounts,
               networkAccess,
               ptyInfo,
               resources: params?.experimentalMemoryReserveConsumeMiB !== void 0 ? Resources.create({
@@ -71686,9 +72202,9 @@ async function buildSandboxCreateRequestProto(appId, imageId, params = {}) {
   const volumeMounts = params.volumes ? Object.entries(params.volumes).map(
     ([mountPath, volume]) => volumeToMountProto(mountPath, volume)
   ) : [];
-  const cloudBucketMounts = params.cloudBucketMounts ? Object.entries(params.cloudBucketMounts).map(
-    ([mountPath, mount]) => mount.toProto(mountPath)
-  ) : [];
+  const cloudBucketMounts = buildCloudBucketMountProtos(
+    params.cloudBucketMounts
+  );
   const openPorts = [];
   if (params.encryptedPorts) {
     openPorts.push(
@@ -72781,13 +73297,9 @@ var Sandbox2 = class {
     const timedOut = () => new TimeoutError(
       `Timed out waiting for task ID for Sandbox ${this.sandboxId}`
     );
-    const backoff = () => (0, import_promises3.setTimeout)(Math.max(0, Math.min(500, deadline - Date.now())), void 0, {
-      signal
-    });
+    const pollIntervalMs = 500;
+    const noTimeLeft = () => deadline - Date.now() <= pollIntervalMs;
     while (true) {
-      if (Date.now() >= deadline) {
-        throw timedOut();
-      }
       let resp;
       try {
         resp = await this.#sandboxGetTaskId(void 0, { signal });
@@ -72795,16 +73307,16 @@ var Sandbox2 = class {
         if (signal?.aborted || !isTransientTaskIDLookupError(err)) {
           throw err;
         }
-        if (Date.now() >= deadline) {
+        if (!retryTransient && Date.now() < deadline) {
+          throw err;
+        }
+        if (noTimeLeft()) {
           if (err instanceof import_nice_grpc12.ClientError && err.code === import_nice_grpc12.Status.INTERNAL) {
             throw err;
           }
           throw timedOut();
         }
-        if (!retryTransient) {
-          throw err;
-        }
-        await backoff();
+        await (0, import_promises3.setTimeout)(pollIntervalMs, void 0, { signal });
         continue;
       }
       if (resp.taskId) {
@@ -72816,7 +73328,10 @@ var Sandbox2 = class {
           resp.taskResult.exception || `Sandbox ${this.sandboxId} has already finished`
         );
       }
-      await backoff();
+      if (noTimeLeft()) {
+        throw timedOut();
+      }
+      await (0, import_promises3.setTimeout)(pollIntervalMs, void 0, { signal });
     }
   }
   async #getOrCreateCommandRouterClient(taskId) {
@@ -73805,7 +74320,7 @@ var AuthTokenManager = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.10.2-dev.12";
+var SDK_VERSION = "0.10.2-dev.13";
 function getSDKVersion() {
   return SDK_VERSION;
 }