modal 0.62.16__py3-none-any.whl → 0.72.11__py3-none-any.whl

modal_proto/api.proto

@@ -18,6 +18,7 @@ enum AppDisconnectReason {
   APP_DISCONNECT_REASON_KEYBOARD_INTERRUPT = 2;
   APP_DISCONNECT_REASON_ENTRYPOINT_COMPLETED = 3;
   APP_DISCONNECT_REASON_DEPLOYMENT_EXCEPTION = 4;
+  APP_DISCONNECT_REASON_REMOTE_EXCEPTION = 5;
 }
 
 // NOTE: make sure to update the frontend if we add a new state here
@@ -49,7 +50,7 @@ enum AppState {
   APP_STATE_DETACHED_DISCONNECTED = 8;
 
   // App is derived from another workspace. Acts as a static, immutable group of functions.
-  APP_STATE_DERIVED = 9;
+  APP_STATE_DERIVED = 9 [deprecated=true];
 }
 
 enum AppStopSource {
@@ -77,37 +78,29 @@ enum CheckpointStatus {
 enum ClientType {
   CLIENT_TYPE_UNSPECIFIED = 0;
   CLIENT_TYPE_CLIENT = 1;
-  CLIENT_TYPE_WORKER = 2 [deprecated=true];
+  CLIENT_TYPE_WORKER = 2;
   CLIENT_TYPE_CONTAINER = 3;
-  CLIENT_TYPE_SERVER = 4 [deprecated=true];
   CLIENT_TYPE_WEB_SERVER = 5;
 }
 
-message CloudBucketMount {
-  string bucket_name = 1;
-  string mount_path = 2;
-  string credentials_secret_id = 3;
-  bool read_only = 4;
-  bool requester_pays = 6;
-
-  enum BucketType {
-    UNSPECIFIED = 0;
-    S3 = 1;
-  }
-  BucketType bucket_type = 5;
-}
-
 enum CloudProvider {
   CLOUD_PROVIDER_UNSPECIFIED = 0;
   CLOUD_PROVIDER_AWS = 1;
   CLOUD_PROVIDER_GCP = 2;
   CLOUD_PROVIDER_AUTO = 3;
   CLOUD_PROVIDER_OCI = 4;
+  reserved 5, 6, 7, 8; // now unused internal experimental values
+}
+
+enum DNSRecordType {
+  DNS_RECORD_TYPE_A = 0;
+  DNS_RECORD_TYPE_TXT = 1;
+  DNS_RECORD_TYPE_CNAME = 2;
 }
 
 // Which data format a binary message is encoded with.
 enum DataFormat {
-  DATA_FORMAT_UNSPECIFIED = 0; // Equivalent to PICKLE in client version 0.52 and earlier.
+  DATA_FORMAT_UNSPECIFIED = 0;
   DATA_FORMAT_PICKLE = 1; // Cloudpickle
   DATA_FORMAT_ASGI = 2; // "Asgi" protobuf message
   DATA_FORMAT_GENERATOR_DONE = 3; // "GeneratorDone" protobuf message
@@ -119,10 +112,11 @@ enum DeploymentNamespace {
   DEPLOYMENT_NAMESPACE_GLOBAL = 3;
 }
 
-enum DNSRecordType {
-  DNS_RECORD_TYPE_A = 0;
-  DNS_RECORD_TYPE_TXT = 1;
-  DNS_RECORD_TYPE_CNAME = 2;
+enum ExecOutputOption {
+  EXEC_OUTPUT_OPTION_UNSPECIFIED = 0;
+  EXEC_OUTPUT_OPTION_DEVNULL = 1;
+  EXEC_OUTPUT_OPTION_PIPE = 2;
+  EXEC_OUTPUT_OPTION_STDOUT = 3;
 }
 
 enum FileDescriptor {
@@ -132,6 +126,14 @@ enum FileDescriptor {
   FILE_DESCRIPTOR_INFO = 3;
 }
 
+enum FunctionCallInvocationType {
+  FUNCTION_CALL_INVOCATION_TYPE_UNSPECIFIED = 0;
+  FUNCTION_CALL_INVOCATION_TYPE_SYNC_LEGACY = 1;
+  FUNCTION_CALL_INVOCATION_TYPE_ASYNC_LEGACY = 2;
+  FUNCTION_CALL_INVOCATION_TYPE_ASYNC = 3;
+  FUNCTION_CALL_INVOCATION_TYPE_SYNC = 4;
+}
+
 enum FunctionCallType {
   FUNCTION_CALL_TYPE_UNSPECIFIED = 0;
   FUNCTION_CALL_TYPE_UNARY = 1;
@@ -144,12 +146,11 @@ enum GPUType {
   GPU_TYPE_A100 = 2;
   GPU_TYPE_A10G = 3;
   GPU_TYPE_ANY = 4;
-  GPU_TYPE_A100_20G = 5 [deprecated=true];
-  GPU_TYPE_A100_40GB_MANY = 6 [deprecated=true];
-  GPU_TYPE_INFERENTIA2 = 7 [deprecated=true];
   GPU_TYPE_A100_80GB = 8;
   GPU_TYPE_L4 = 9;
   GPU_TYPE_H100 = 10;
+  GPU_TYPE_L40S = 11;
+  GPU_TYPE_H200 = 12;
 }
 
 enum ObjectCreationType {
@@ -161,11 +162,31 @@ enum ObjectCreationType {
   OBJECT_CREATION_TYPE_EPHEMERAL = 5;
 }
 
+enum ParameterType {
+  PARAM_TYPE_UNSPECIFIED = 0;
+  PARAM_TYPE_STRING = 1;
+  PARAM_TYPE_INT = 2;
+}
+
 enum ProgressType {
   IMAGE_SNAPSHOT_UPLOAD = 0;  // TODO(erikbern): shouldn't be zero, and needs prefix
   FUNCTION_QUEUED = 1;  // TODO(erikbern): needs_prefix
 }
 
+enum ProxyIpStatus {
+  PROXY_IP_STATUS_UNSPECIFIED = 0;
+  PROXY_IP_STATUS_CREATING = 1;
+  PROXY_IP_STATUS_ONLINE = 2;
+  PROXY_IP_STATUS_TERMINATED = 3;
+  PROXY_IP_STATUS_UNHEALTHY = 4;
+}
+
+enum ProxyType {
+  PROXY_TYPE_UNSPECIFIED = 0;
+  PROXY_TYPE_LEGACY = 1;
+  PROXY_TYPE_VPROX = 2;
+}
+
 enum RateLimitInterval {
   RATE_LIMIT_INTERVAL_UNSPECIFIED = 0;
   RATE_LIMIT_INTERVAL_SECOND = 1;
@@ -180,6 +201,29 @@ enum RegistryAuthType {
   REGISTRY_AUTH_TYPE_STATIC_CREDS = 4;
 }
 
+enum SeekWhence {
+  SEEK_SET = 0;
+  SEEK_CUR = 1;
+  SEEK_END = 2;
+}
+
+enum SystemErrorCode {
+  SYSTEM_ERROR_CODE_UNSPECIFIED = 0;
+  SYSTEM_ERROR_CODE_PERM = 1;           // EPERM: Operation not permitted
+  SYSTEM_ERROR_CODE_NOENT = 2;          // ENOENT: No such file or directory
+  SYSTEM_ERROR_CODE_IO = 5;             // EIO: Input/output error
+  SYSTEM_ERROR_CODE_NXIO = 6;           // ENXIO: No such device or address
+  SYSTEM_ERROR_CODE_NOMEM = 12;         // ENOMEM: Out of memory
+  SYSTEM_ERROR_CODE_ACCES = 13;         // EACCES: Permission denied
+  SYSTEM_ERROR_CODE_EXIST = 17;         // EEXIST: File exists
+  SYSTEM_ERROR_CODE_NOTDIR = 20;        // ENOTDIR: Not a directory
+  SYSTEM_ERROR_CODE_ISDIR = 21;         // EISDIR: Is a directory
+  SYSTEM_ERROR_CODE_INVAL = 22;         // EINVAL: Invalid argument
+  SYSTEM_ERROR_CODE_MFILE = 24;         // EMFILE: Too many open files
+  SYSTEM_ERROR_CODE_FBIG = 27;          // EFBIG: File too large
+  SYSTEM_ERROR_CODE_NOSPC = 28;         // ENOSPC: No space left on device
+}
+
 enum TaskState {
   TASK_STATE_UNSPECIFIED = 0;
   TASK_STATE_CREATED = 6;
@@ -195,6 +239,20 @@ enum TaskState {
   TASK_STATE_LOADING_CHECKPOINT_IMAGE = 11;
 }
 
+enum VolumeFsVersion {
+  VOLUME_FS_VERSION_UNSPECIFIED = 0;
+  VOLUME_FS_VERSION_V1 = 1;
+  VOLUME_FS_VERSION_V2 = 2;
+}
+
+enum WebhookAsyncMode {
+  WEBHOOK_ASYNC_MODE_UNSPECIFIED = 0;
+  reserved 1; // unused REDIRECT mode
+  WEBHOOK_ASYNC_MODE_DISABLED = 2; // No longer used by client
+  WEBHOOK_ASYNC_MODE_TRIGGER = 3; // No longer used by client (previously used when wait_for_response=False)
+  WEBHOOK_ASYNC_MODE_AUTO = 4; // The default
+}
+
 enum WebhookType {
   WEBHOOK_TYPE_UNSPECIFIED = 0;
   WEBHOOK_TYPE_ASGI_APP = 1;
@@ -203,14 +261,6 @@ enum WebhookType {
   WEBHOOK_TYPE_WEB_SERVER = 4;
 }
 
-enum WebhookAsyncMode {
-  WEBHOOK_ASYNC_MODE_UNSPECIFIED = 0;
-  reserved 1; // unused REDIRECT mode
-  WEBHOOK_ASYNC_MODE_DISABLED = 2; // no redirect, fail after timeout
-  WEBHOOK_ASYNC_MODE_TRIGGER = 3; // return immediately, roughly same as old wait_for_response=False
-  WEBHOOK_ASYNC_MODE_AUTO = 4; // redirect to polling endpoint if execution time nears the http timeout
-}
-
 message AppClientDisconnectRequest {
   string app_id = 1;
   AppDisconnectReason reason = 2;
@@ -220,46 +270,49 @@ message AppClientDisconnectRequest {
 message AppCreateRequest {
   string client_id = 1 [ (modal.options.audit_target_attr) = true ];
   string description = 2;    // Human readable label for the app
-  bool detach = 3 [deprecated=true]; // replaced by app_state in 0.55.3904
-  bool initializing = 4 [deprecated=true]; // replaced by app_state in 0.55.3904
   string environment_name = 5;
   AppState app_state = 6;
 }
 
 message AppCreateResponse {
   string app_id = 1;
-  string app_logs_url = 2;
+  string app_page_url = 2;
+  string app_logs_url = 3;
 }
 
-message AppStopRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
-  AppStopSource source = 2;
-}
-
-
 message AppDeployRequest {
   string app_id = 1 [ (modal.options.audit_target_attr) = true ];
   DeploymentNamespace namespace = 2;
   string name = 3;
   string object_entity = 4;
   AppDeployVisibility visibility = 5;
+  string tag = 6;
 }
 
 message AppDeployResponse {
   string url = 1;
 }
 
-message AppDeploySingleObjectRequest {
-  string name = 1;
-  DeploymentNamespace namespace = 2;
-  string environment_name = 3;
-  string object_id = 4;
+message AppDeploymentHistory {
+  string app_id = 1;
+  uint32 version = 2;
+  string client_version = 3;
+  double deployed_at = 4;
+  string deployed_by = 5;
+  string deployed_by_avatar_url = 9;
+  string tag = 6;
+  uint32 rollback_version = 7;
+  bool rollback_allowed = 8;
 }
 
-message AppDeploySingleObjectResponse {
+message AppDeploymentHistoryRequest {
   string app_id = 1;
 }
 
+message AppDeploymentHistoryResponse {
+  repeated AppDeploymentHistory app_deployment_histories = 1;
+}
+
 message AppGetByDeploymentNameRequest {
   DeploymentNamespace namespace = 1;
   string name = 2;
@@ -270,6 +323,14 @@ message AppGetByDeploymentNameResponse {
   string app_id = 1;
 }
 
+message AppGetLayoutRequest {
+  string app_id = 1;
+}
+
+message AppGetLayoutResponse {
+  AppLayout app_layout = 1;
+}
+
 message AppGetLogsRequest {
   string app_id = 1;
   float timeout = 2;
@@ -280,44 +341,87 @@ message AppGetLogsRequest {
   FileDescriptor file_descriptor = 8;
 }
 
-message AppGetObjectsRequest {
-  string app_id = 1;
-  bool include_unindexed = 2;
-}
-
 message AppGetObjectsItem {
   string tag = 1;
   Object object = 6;
 }
 
+message AppGetObjectsRequest {
+  string app_id = 1;
+  bool include_unindexed = 2;
+  bool only_class_function = 3; // True starting with 0.67.x clients, which don't create method placeholder functions
+}
+
 message AppGetObjectsResponse {
   repeated AppGetObjectsItem items = 2;
 }
 
+message AppGetOrCreateRequest {
+  string app_name = 1;
+  string environment_name = 2;
+  ObjectCreationType object_creation_type = 3;
+}
+
+message AppGetOrCreateResponse {
+  string app_id = 1;
+}
+
 message AppHeartbeatRequest {
   string app_id = 1;
 }
 
+message AppLayout {
+  repeated Object objects = 1;
+  map<string, string> function_ids = 2;  // tag -> function id
+  map<string, string> class_ids = 3;  // tag -> class id
+}
+
 message AppListRequest {
   string environment_name = 1;
 }
 
 message AppListResponse {
-  repeated AppStats apps = 1;
+  message AppListItem {
+    string app_id = 1;
+    string description = 3;
+    AppState state = 4;
+    double created_at = 5;
+    double stopped_at = 6;
+    int32 n_running_tasks = 8;
+    string name = 10;
+  }
+  repeated AppListItem apps = 1;
 }
 
-message AppLookupObjectRequest {
-  DeploymentNamespace namespace = 2;
-  string app_name = 3;
-  string object_tag = 4;
-  string object_id = 5;
-  string object_entity = 6;
-  string environment_name = 7;
+message AppLookupRequest {
+  string app_name = 2;
+  string environment_name = 3;
 }
 
-message AppLookupObjectResponse {
-  Object object = 6;
-  string app_id = 7;
+message AppLookupResponse {
+  string app_id = 1;
+}
+
+message AppPublishRequest {
+  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 2;
+  string deployment_tag = 3;  // Additional metadata to identify a deployment
+  AppState app_state = 4;  // Published app will be in this state
+  map<string, string> function_ids = 5;  // function_name -> function_id
+  map<string, string> class_ids = 6;  // class_name -> class_id
+  map<string, string> definition_ids = 7;  // function_id -> definition_id
+  uint32 rollback_version = 8;  // Unused by client, but used internally
+  string client_version = 9;  // Unused by client, but used internally
+}
+
+message AppPublishResponse {
+  string url = 1;
+  repeated Warning server_warnings = 3;
+}
+
+message AppRollbackRequest {
+  string app_id = 1;
+  int32 version = 2;  // signed as we support negative "roll back n versions" requests
 }
 
 message AppSetObjectsRequest {
@@ -326,19 +430,12 @@ message AppSetObjectsRequest {
   string client_id = 3;
   repeated string unindexed_object_ids = 4;
   AppState new_app_state = 5; // promotes an app from initializing to this new state
-  string single_object_id = 6;
+  reserved 6;
 }
 
-message AppStats {
-  string app_id = 1;
-  string description = 3;
-  AppState state = 4;
-  double created_at = 5;
-  double stopped_at = 6;
-  int32 n_running_tasks = 8;
-  string object_entity = 9;
-  string name = 10;
-  double deployed_at = 11;
+message AppStopRequest {
+  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  AppStopSource source = 2;
 }
 
 // A web endpoint connection-related message.
@@ -490,16 +587,33 @@ message BlobGetResponse {
   string download_url = 1;
 }
 
+message BuildFunction {
+  string definition = 1;
+  bytes globals = 2;
+  FunctionInput input = 3;
+}
+
+message CancelInputEvent {
+  repeated string input_ids = 1;
+  bool terminate_containers = 2;
+}
+
 message CheckpointInfo {
   string checksum = 1;
   CheckpointStatus status = 2;
   string checkpoint_id = 3;
+  string runtime_fingerprint = 4;
+  int64 size = 5;
+  bool checksum_is_file_index = 6;
+  string original_task_id = 7;
 }
 
 message ClassCreateRequest {
   string app_id = 1  [ (modal.options.audit_target_attr) = true ];
   string existing_class_id = 2;
   repeated ClassMethod methods = 3;
+  reserved 4; // removed class_function_id
+  bool only_class_function = 5; // True starting with 0.67.x clients, which don't create method placeholder functions
 }
 
 message ClassCreateResponse {
@@ -515,15 +629,19 @@ message ClassGetRequest {
 
   bool lookup_published = 8; // Lookup class on app published by another workspace
   string workspace_name = 9;
+  bool only_class_function = 10; // True starting with 0.67.x clients, which don't create method placeholder functions
 }
 
 message ClassGetResponse {
   string class_id = 1;
   ClassHandleMetadata handle_metadata = 2;
+  repeated Warning server_warnings = 3;
 }
 
 message ClassHandleMetadata {
   repeated ClassMethod methods = 1;
+  string class_function_id = 2;
+  FunctionHandleMetadata class_function_metadata = 3;
 }
 
 message ClassMethod {
@@ -534,26 +652,67 @@ message ClassMethod {
   FunctionHandleMetadata function_handle_metadata = 3;
 }
 
-message ClientCreateRequest {
-  ClientType client_type = 1  [ (modal.options.audit_target_attr) = true ];
-  string version = 2;
+message ClassParameterInfo {
+  enum ParameterSerializationFormat {
+    PARAM_SERIALIZATION_FORMAT_UNSPECIFIED = 0;
+    PARAM_SERIALIZATION_FORMAT_PICKLE = 1; // legacy format - pickle of (args, kwargs) tuple
+    PARAM_SERIALIZATION_FORMAT_PROTO = 2; // new format using api.FunctionParameterSet
+  }
+  ParameterSerializationFormat format = 1;
+  repeated ClassParameterSpec schema = 2; // only set for PARAM_SERIALIZATION_FORMAT_PROTO
+}
+
+message ClassParameterSet {
+  // NOTE: adding additional *fields* here can invalidate function lookups
+  //  since we use the serialized message as the bound function identifier
+  //  for parameter-bound classes. Modify with *caution*
+  repeated ClassParameterValue parameters = 1;
+}
+
+message ClassParameterSpec {
+  string name = 1;
+  ParameterType type = 2;
+  bool has_default = 3;
+  oneof default_oneof {
+    string string_default = 4;
+    int64 int_default = 5;
+  }
 }
 
-message ClientCreateResponse {
-  string client_id = 1;
-  string error = 2;
-  string deprecation_warning = 3;
+message ClassParameterValue {
+  // NOTE: adding additional *fields* here can invalidate function lookups
+  //  since we use the serialized message as the bound function identifier
+  //  for parameter-bound classes. Modify with *caution*
+  string name = 1;
+  ParameterType type = 2;
+  oneof value_oneof {
+    string string_value = 3;
+    int64 int_value = 4;
+  }
 }
 
 message ClientHelloResponse {
   string warning = 1;
-  string image_builder_version = 2;
+  string image_builder_version = 2;  // Deprecated, no longer used in client
+  repeated Warning server_warnings = 4;
 }
 
-message ClientHeartbeatRequest {
-  string client_id = 1;
-  string current_input_id = 3;
-  double current_input_started_at = 4;
+message CloudBucketMount {
+  enum BucketType {
+    UNSPECIFIED = 0;
+    S3 = 1;
+    R2 = 2;
+    GCP = 3;
+  }
+
+  string bucket_name = 1;
+  string mount_path = 2;
+  string credentials_secret_id = 3;
+  bool read_only = 4;
+  BucketType bucket_type = 5;
+  bool requester_pays = 6;
+  optional string bucket_endpoint_url = 7;
+  optional string key_prefix = 8;
 }
 
 message ContainerArguments {  // This is used to pass data from the worker to the container
@@ -567,24 +726,25 @@ message ContainerArguments {  // This is used to pass data from the worker to th
   string runtime = 11;
   string environment_name = 13;
   optional string checkpoint_id = 14;
+  AppLayout app_layout = 15;
 }
 
-message CancelInputEvent {
-  repeated string input_ids = 1;
-}
-
-message ContainerHeartbeatResponse {
-  optional CancelInputEvent cancel_input_event = 1;
+message ContainerCheckpointRequest {
+  string checkpoint_id = 1;
 }
 
-message ContainerHeartbeatRequest {
-  string current_input_id = 1;
-  double current_input_started_at = 2;
-  bool supports_graceful_input_cancellation = 3; // implicitly also means we support long polling. Can be removed once v0.57 is no longer supported
+message ContainerExecGetOutputRequest {
+  string exec_id = 1;
+  float timeout = 2;
+  uint64 last_batch_index = 3;
+  FileDescriptor file_descriptor = 4;
+  // Old clients (up to 0.65.39) expect string output. Newer clients stream raw bytes
+  bool get_raw_bytes = 5;
 }
 
-message ContainerCheckpointRequest {
-  string checkpoint_id = 1;
+message ContainerExecPutInputRequest {
+  string exec_id = 1;
+  RuntimeInputMessage input = 2;
 }
 
 message ContainerExecRequest {
@@ -594,21 +754,145 @@ message ContainerExecRequest {
   // Send SIGTERM to running container on exit of exec command.
   bool terminate_container_on_exit = 4;
   bool runtime_debug = 5; // For internal debugging use only.
+  ExecOutputOption stdout_output = 6;
+  ExecOutputOption stderr_output = 7;
+  uint32 timeout_secs = 8;
+  optional string workdir = 9;
+  repeated string secret_ids = 10;
 }
 
-message ContainerExecGetOutputRequest {
+message ContainerExecResponse {
+  string exec_id = 1;
+}
+
+message ContainerExecWaitRequest {
   string exec_id = 1;
   float timeout = 2;
-  uint64 last_batch_index = 3;
 }
 
-message ContainerExecPutInputRequest {
+message ContainerExecWaitResponse {
+  optional int32 exit_code = 1;
+  bool completed = 2;
+}
+
+message ContainerFileCloseRequest {
+  string file_descriptor = 1;
+}
+
+message ContainerFileDeleteBytesRequest {
+  string file_descriptor = 1;
+  optional uint32 start_inclusive = 2;
+  optional uint32 end_exclusive = 3;
+}
+
+message ContainerFileFlushRequest {
+  string file_descriptor = 1;
+}
+
+message ContainerFileLsRequest {
+  string path = 1;
+}
+
+message ContainerFileMkdirRequest {
+  string path = 1;
+  bool make_parents = 2;
+}
+
+message ContainerFileOpenRequest {
+  // file descriptor is hydrated when sent from server -> worker
+  optional string file_descriptor = 1;
+  string path = 2;
+  string mode = 3;
+}
+
+message ContainerFileReadLineRequest {
+  string file_descriptor = 1;
+}
+
+message ContainerFileReadRequest {
+  string file_descriptor = 1;
+  optional uint32 n = 2;
+}
+
+message ContainerFileRmRequest {
+  string path = 1;
+  bool recursive = 2;
+}
+
+message ContainerFileSeekRequest {
+  string file_descriptor = 1;
+  int32 offset = 2;
+  SeekWhence whence = 3;
+}
+
+message ContainerFileWatchRequest {
+  string path = 1;
+  bool recursive = 2;
+  optional uint64 timeout_secs = 3;
+}
+
+message ContainerFileWriteReplaceBytesRequest {
+  string file_descriptor = 1;
+  bytes data = 2;
+  optional uint32 start_inclusive = 3;
+  optional uint32 end_exclusive = 4;
+}
+
+message ContainerFileWriteRequest {
+  string file_descriptor = 1;
+  bytes data = 2;
+}
+
+message ContainerFilesystemExecGetOutputRequest {
   string exec_id = 1;
-  RuntimeInputMessage input = 2;
+  float timeout = 2;
 }
 
-message ContainerExecResponse {
+message ContainerFilesystemExecRequest {
+  oneof file_exec_request_oneof {
+    ContainerFileOpenRequest file_open_request = 1;
+    ContainerFileWriteRequest file_write_request = 2;
+    ContainerFileReadRequest file_read_request = 3;
+    ContainerFileFlushRequest file_flush_request = 4;
+    ContainerFileReadLineRequest file_read_line_request = 5;
+    ContainerFileSeekRequest file_seek_request = 6;
+    ContainerFileDeleteBytesRequest file_delete_bytes_request = 7;
+    ContainerFileWriteReplaceBytesRequest file_write_replace_bytes_request = 8;
+    ContainerFileCloseRequest file_close_request = 9;
+    ContainerFileLsRequest file_ls_request = 11;
+    ContainerFileMkdirRequest file_mkdir_request = 12;
+    ContainerFileRmRequest file_rm_request = 13;
+    ContainerFileWatchRequest file_watch_request = 14;
+  }
+  string task_id = 10;
+}
+
+message ContainerFilesystemExecResponse {
   string exec_id = 1;
+  // only set when the request opens a new file, i.e., ContainerFileOpenRequest
+  optional string file_descriptor = 2;
+}
+
+message ContainerHeartbeatRequest {
+  bool canceled_inputs_return_outputs = 4; // Bad client version.
+  bool canceled_inputs_return_outputs_v2 = 5;
+
+  reserved 1, 2, 3;
+}
+
+message ContainerHeartbeatResponse {
+  optional CancelInputEvent cancel_input_event = 1;
+}
+
+message ContainerLogRequest {
+  repeated TaskLogs logs = 3;
+}
+
+message ContainerStopRequest {
+  string task_id = 1 [ (modal.options.audit_target_attr) = true ];
+}
+
+message ContainerStopResponse {
 }
 
 message CustomDomainConfig {
@@ -619,6 +903,12 @@ message CustomDomainInfo {
   string url = 1;
 }
 
+message DNSRecord {
+  DNSRecordType type = 1;
+  string name = 2;
+  string value = 3;
+}
+
 // Chunks of data that can be streamed in and out of tasks.
 message DataChunk {
   DataFormat data_format = 1;
@@ -642,18 +932,25 @@ message DictContainsResponse {
   bool found = 1;
 }
 
-message DictCreateRequest {  // Will be superseded by DictGetOrCreateRequest
-  repeated DictEntry data = 1;
-  string app_id = 2  [ (modal.options.audit_target_attr) = true ];
-  string existing_dict_id = 3;
+message DictContentsRequest {
+  string dict_id = 1;
+  // Setting these to True will populate the corresponding field in the response, otherwise it will be null
+  // This lets us support the keys/values/items SDK API through one RPC without unnecessary data transfer
+  bool keys = 2;
+  bool values = 3;
 }
 
-message DictCreateResponse {  // Will be superseded by DictGetOrCreateResponse
+message DictDeleteRequest {
   string dict_id = 1;
 }
 
+message DictEntry {
+  bytes key = 1;
+  bytes value = 2;
+}
+
 message DictGetOrCreateRequest {
-  string deployment_name = 1;
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
   DeploymentNamespace namespace = 2;
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;
@@ -664,11 +961,6 @@ message DictGetOrCreateResponse {
   string dict_id = 1;
 }
 
-message DictEntry {
-  bytes key = 1;
-  bytes value = 2;
-}
-
 message DictGetRequest {
   string dict_id = 1;
   bytes key = 2;
@@ -691,6 +983,19 @@ message DictLenResponse {
   int32 len = 1;
 }
 
+message DictListRequest {
+  string environment_name = 1;
+}
+
+message DictListResponse {
+  message DictInfo {
+    string name = 1;
+    double created_at = 2;
+  }
+
+  repeated DictInfo dicts = 1;
+}
+
 message DictPopRequest {
   string dict_id = 1;
   bytes key = 2;
@@ -702,17 +1007,27 @@ message DictPopResponse {
 }
 
 message DictUpdateRequest {
-  string dict_id = 1;
+  string dict_id = 1 [ (modal.options.audit_target_attr) = true ];
   repeated DictEntry updates = 2;
 }
 
 message DictUpdateResponse {
 }
 
-message DNSRecord {
-  DNSRecordType type = 1;
-  string name = 2;
-  string value = 3;
+message Domain {
+  string domain_id = 1;
+  string domain_name = 2;
+  double created_at = 3;
+  CertificateStatus certificate_status = 4;
+  repeated DNSRecord dns_records = 5;
+};
+
+message DomainCertificateVerifyRequest {
+  string domain_id = 1;
+}
+
+message DomainCertificateVerifyResponse {
+  Domain domain = 1;
 }
 
 message DomainCreateRequest {
@@ -727,57 +1042,76 @@ message DomainCreateResponse {
 message DomainListRequest {
 }
 
-message Domain {
-  string domain_id = 1;
-  string domain_name = 2;
-  double created_at = 3;
-  CertificateStatus certificate_status = 4;
-  repeated DNSRecord dns_records = 5;
-};
-
 message DomainListResponse {
   repeated Domain domains = 1;
 }
 
-message DomainCertificateVerifyRequest {
-  string domain_id = 1;
+message EnvironmentCreateRequest {
+  string name = 1 [ (modal.options.audit_target_attr) = true ];
 }
 
-message DomainCertificateVerifyResponse {
-  Domain domain = 1;
+message EnvironmentDeleteRequest {
+  string name = 1 [ (modal.options.audit_target_attr) = true ];
 }
-
-message EnvironmentCreateRequest {
-  string name = 1;
+message EnvironmentGetOrCreateRequest {
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  ObjectCreationType object_creation_type = 2;
 }
 
-message EnvironmentDeleteRequest {
-  string name = 1;
+message EnvironmentGetOrCreateResponse {
+  string environment_id = 1;
+  EnvironmentMetadata metadata = 2;
 }
 
 message EnvironmentListItem {
   string name = 1;
   string webhook_suffix = 2;
+  double created_at = 3;
+  bool default = 4;
 }
 
 message EnvironmentListResponse {
   repeated EnvironmentListItem items = 2;
 }
 
+message EnvironmentMetadata{
+  string name = 1;
+  EnvironmentSettings settings = 2;
+}
+
+// Environment-scoped settings, with workspace-level defaults.
+// Note that we use MergeFrom to combine workspace / environment settings,
+// which will *append* any `repeated` fields!
+message EnvironmentSettings {
+  string image_builder_version = 1;
+  string webhook_suffix = 2;
+}
+
 message EnvironmentUpdateRequest {
-  string current_name = 1;
+  string current_name = 1 [ (modal.options.audit_target_attr) = true ];
   google.protobuf.StringValue name = 2;
   google.protobuf.StringValue web_suffix = 3;
 }
 
-message FunctionCallPutDataRequest {
-  string function_call_id = 1;
-  repeated DataChunk data_chunks = 2;
+// A file entry when listing files in a volume or network file system.
+message FileEntry {
+  enum FileType {
+    UNSPECIFIED = 0;
+    FILE = 1;
+    DIRECTORY = 2;
+    SYMLINK = 3;
+  }
+  string path = 1;
+  FileType type = 2;
+  uint64 mtime = 3;
+  uint64 size = 4;
 }
 
-message FunctionCallGetDataRequest {
-  string function_call_id = 1;
-  uint64 last_index = 2;
+message FilesystemRuntimeOutputBatch {
+  repeated bytes output = 1;
+  optional SystemErrorMessage error = 2;
+  uint64 batch_index = 3;
+  bool eof = 4;
 }
 
 message Function {
@@ -815,7 +1149,7 @@ message Function {
 
   uint32 concurrency_limit = 19;
 
-  bool keep_warm = 20;
+  reserved 20; // old fields
 
   uint32 timeout_secs = 21;
 
@@ -834,11 +1168,11 @@ message Function {
   // If set, overrides the runtime used by the function, either "runc" or "gvisor".
   string runtime = 30;
 
-  string stub_name = 31;
+  string app_name = 31;  // Formerly stub_name
 
   repeated VolumeMount volume_mounts = 33;
 
-  uint32 allow_concurrent_inputs = 34;
+  uint32 target_concurrent_inputs = 34;
 
   repeated CustomDomainInfo custom_domain_info = 35;
 
@@ -866,69 +1200,69 @@ message Function {
   repeated S3Mount s3_mounts = 47;
   repeated CloudBucketMount cloud_bucket_mounts = 51;
 
-  bool _experimental_boost = 48;
+  reserved 48; // _experimental_boost
 
   // If set, tasks will be scheduled using the new scheduler, which also knows
   // to look at fine-grained placement constraints.
-  bool _experimental_scheduler = 49;
-  optional SchedulerPlacement _experimental_scheduler_placement = 50;
-}
+  reserved 49; // _experimental_scheduler
+  optional SchedulerPlacement scheduler_placement = 50;
+  reserved 52; // _experimental_scheduler_placement
 
-message SchedulerPlacement {
-  // TODO(irfansharif):
-  // - Fold in cloud, resource needs here too.
-  // - Allow specifying list of regions, zones, cloud, fallback and alternative
-  //   GPU types.
-  optional string _region = 1;
-  optional string _zone = 2;
-  optional string _lifecycle = 3; // "on-demand" or "spot", else ignored
-}
+  bool is_class = 53;  // if "Function" is actually a class grouping multiple methods
 
-message FunctionHandleMetadata {
-  // contains all the info about a function that is needed to trigger the right
-  // behaviour when using a FunctionHandler. Notably excludes things purely
-  // used for *executing* the function in a container entrypoint
+  string use_function_id = 54;  // for class methods use this function id instead for invocations - the *referenced* function should have is_class=True
+  string use_method_name = 55;  // for class methods - this method name needs to be included in the FunctionInput
 
-  // Should be a subset and use IDs/types from `Function` above
-  string function_name = 2;
-  Function.FunctionType function_type = 8;
-  string web_url = 28;
-  bool is_method = 39;
-}
+  ClassParameterInfo class_parameter_info = 56;
 
-message FunctionCreateRequest {
-  Function function = 1;
-  string app_id = 2  [ (modal.options.audit_target_attr) = true ];
-  Schedule schedule = 6;
-  string existing_function_id = 7;
-}
+  reserved 57; // _experimental_resources
+  reserved 58;
+  reserved 59;
+  uint32 batch_max_size = 60; // Maximum number of inputs to fetch at once
+  uint64 batch_linger_ms = 61; // Miliseconds to block before a response is needed
+  bool i6pn_enabled = 62;
+  bool _experimental_concurrent_cancellations = 63;
+  uint32 max_concurrent_inputs = 64;
 
-message FunctionOptions {
-  repeated string secret_ids = 1;
-  repeated string mount_ids = 2; // Currently not supported
-  optional Resources resources = 3;
-  optional FunctionRetryPolicy retry_policy = 4;
-  optional uint32 concurrency_limit = 5;
-  optional uint32 timeout_secs = 6;
-  optional uint32 task_idle_timeout_secs = 7;
-  optional uint32 warm_pool_size = 8;
-  repeated VolumeMount volume_mounts = 9;
-  optional uint32 allow_concurrent_inputs = 10;
-  bool replace_volume_mounts = 11;
-  bool replace_secret_ids = 12;
-}
+  // TODO(irfansharif): Remove, once https://github.com/modal-labs/modal/pull/15645 lands.
+  bool _experimental_task_templates_enabled = 65;  // forces going through the new gpu-fallbacks integration path, even if no fallback options are specified
+  repeated TaskTemplate _experimental_task_templates = 66;  // for fallback options, where the first/most-preferred "template" is derived from fields above
 
-message FunctionPrecreateRequest {
-  string app_id = 1;
-  string function_name = 2  [ (modal.options.audit_target_attr) = true ];
-  string existing_function_id = 3;
-  Function.FunctionType function_type = 4;
-  WebhookConfig webhook_config = 5;
+  // When the function is a "grouped" one, this records the # of tasks we want
+  // to schedule in tandem.
+  uint32 _experimental_group_size = 67;
+
+  // If set, the function will be run in an untrusted environment.
+  bool untrusted = 68;
+
+  uint32 _experimental_buffer_containers = 69;
+
+  // _experimental_proxy_ip -> ProxyInfo
+  // TODO: deprecate.
+  optional string _experimental_proxy_ip = 70;
+
+  bool runtime_perf_record = 71; // For internal debugging use only.
+
+  Schedule schedule = 72;
+
+  bool snapshot_debug = 73; // For internal debugging use only.
+
+  // Mapping of method names to method definitions, only non-empty for class service functions
+  map<string, MethodDefinition> method_definitions = 74;
+  bool method_definitions_set = 75;
+
+  bool _experimental_custom_scaling = 76;
 }
 
-message FunctionPrecreateResponse {
+message FunctionAsyncInvokeRequest {
   string function_id = 1;
-  FunctionHandleMetadata handle_metadata = 2;
+  string parent_input_id = 2;
+  FunctionInput input = 3;
+} 
+
+message FunctionAsyncInvokeResponse {
+  bool retry_with_blob_upload = 1;
+  string function_call_id = 2;
 }
 
 message FunctionBindParamsRequest {
@@ -943,33 +1277,167 @@ message FunctionBindParamsResponse {
   FunctionHandleMetadata handle_metadata = 2;
 }
 
+message FunctionCallCallGraphInfo {
+  string function_call_id = 1;
+  string parent_input_id = 2;
+  string function_name = 3;
+  string module_name = 4;
+}
+
+message FunctionCallCancelRequest {
+  string function_call_id = 1;
+  bool terminate_containers = 2;
+}
+
+message FunctionCallGetDataRequest {
+  string function_call_id = 1;
+  uint64 last_index = 2;
+}
+
+message FunctionCallInfo {
+  string function_call_id = 1;
+  int32 idx = 2;
+  reserved 3, 4, 5; // old fields
+  double created_at = 6; // when the call was created
+  double scheduled_at = 7; // if cron job, when run was scheduled
+  reserved 8, 9, 10, 11;  // old fields
+  InputCategoryInfo pending_inputs = 12;
+  InputCategoryInfo failed_inputs = 13;
+  InputCategoryInfo succeeded_inputs = 14;
+  InputCategoryInfo timeout_inputs = 15;
+  InputCategoryInfo cancelled_inputs = 16;
+  int32 total_inputs = 17;
+}
+
+message FunctionCallListRequest {
+  string function_id = 1;
+}
+
+message FunctionCallListResponse {
+  repeated FunctionCallInfo function_calls = 1;
+}
+
+message FunctionCallPutDataRequest {
+  string function_call_id = 1;
+  repeated DataChunk data_chunks = 2;
+}
+
+message FunctionCreateRequest {
+  Function function = 1;
+  string app_id = 2  [ (modal.options.audit_target_attr) = true ];
+  Schedule schedule = 6 [deprecated=true]; // Deprecated: now passed in the Function definition
+  string existing_function_id = 7;
+  // This flag tells the server to avoid doing updates in FunctionCreate that should now
+  // be done in AppPublish. Provides a smoother migration onto atomic deployments with 0.64,
+  // and can be deprecated once we no longer support ealier versions.
+  bool defer_updates = 8;
+  FunctionData function_data = 9;  // supersedes 'function' field above
+}
+
 message FunctionCreateResponse {
   string function_id = 1;
-  string web_url = 2;  // Deprecated - needed until 0.51 is the minimum version
-  WebUrlInfo web_url_info = 3;  // Deprecated - needed until 0.51 is the minimum version
+  string __deprecated_web_url = 2  [ deprecated = true];  // Used up until 0.62.212
   Function function = 4;
   FunctionHandleMetadata handle_metadata = 5;
 }
 
-message FunctionGetRequest {
-  string app_name = 1;
-  string object_tag = 2;
-  DeploymentNamespace namespace = 3;
-  string environment_name = 4;
+message FunctionData {
+  // Note: FunctionData pulls "up" a subset of fields from Function message that
+  // will get deprecated there and made authoritative here, at the top-level.
+  // All remaining fields will stay within the Function message itself and a
+  // single FunctionData will contain a list of such (ranked) Functions. The
+  // top-level fields capture data not specific to any particular underlying
+  // task (like warm-pool-size, applicable across all tasks), while fields
+  // specific to the task (like the resource request) will exist at the bottom
+  // level.
+
+  string module_name = 1;
+  string function_name = 2;
+
+  Function.FunctionType function_type = 3;
+
+  // Scheduling related fields.
+  uint32 warm_pool_size = 4;
+  uint32 concurrency_limit = 5;
+  uint32 task_idle_timeout_secs = 6;
+  // When the function is a "grouped" one, this records the # of tasks we want
+  // to schedule in tandem.
+  uint32 _experimental_group_size = 19;
+  uint32 _experimental_buffer_containers = 22;
+  bool _experimental_custom_scaling = 23;
+  string worker_id = 7; // for internal debugging use only
+
+  uint32 timeout_secs = 8;
+
+  string web_url = 9;
+  WebUrlInfo web_url_info = 10;
+  WebhookConfig webhook_config = 11;
+  repeated CustomDomainInfo custom_domain_info = 12;
+  // _experimental_proxy_ip -> ProxyInfo
+  // TODO: deprecate.
+  optional string _experimental_proxy_ip = 24;
+  // Mapping of method names to method definitions, only non-empty for class service functions
+  map<string, MethodDefinition> method_definitions = 25;
+  bool method_definitions_set = 26;
+
+  bool is_class = 13;  // if "Function" is actually a class grouping multiple methods - applies across all underlying tasks
+  ClassParameterInfo class_parameter_info = 14;
+
+  bool is_method = 15;
+  string use_function_id = 16; // used for methods
+  string use_method_name = 17; // used for methods
+
+  message RankedFunction {
+    uint32 rank = 1;
+    Function function = 2;
+  }
+  repeated RankedFunction ranked_functions = 18;
+
+  Schedule schedule = 20;
+
+  reserved 21;
+
+  bool untrusted = 27; // If set, the function will be run in an untrusted environment.
+  bool snapshot_debug = 28; // For internal debugging use only.
+  bool runtime_perf_record = 29; // For internal debugging use only.
 }
 
-message FunctionGetResponse {
+message FunctionExtended {
+  uint32 type_identifier = 1;
+  // FunctionExtended is a union type that exists while we migrate between
+  // storage of FunctionData vs. Functions, internally. Once migrated at the
+  // storage level, we can get rid of this union type and replace with access
+  // that expects FunctionData only.
+  oneof function_extended {
+    Function function_singleton = 2;
+    FunctionData function_data = 3;
+  }
+}
+
+
+message FunctionGetCallGraphRequest {
+  // TODO: use input_id once we switch client submit API to return those.
+  string function_call_id = 2;
+}
+
+message FunctionGetCallGraphResponse {
+  repeated InputCallGraphInfo inputs = 1;
+  repeated FunctionCallCallGraphInfo function_calls = 2;
+}
+
+message FunctionGetCurrentStatsRequest {
   string function_id = 1;
-  FunctionHandleMetadata handle_metadata = 2;
 }
 
- 
-message FunctionUpdateSchedulingParamsRequest {
+message FunctionGetDynamicConcurrencyRequest{
   string function_id = 1;
-  uint32 warm_pool_size_override = 2;
+  uint32 target_concurrency = 2;
+  uint32 max_concurrency = 3;
 }
 
-message FunctionUpdateSchedulingParamsResponse {}
+message FunctionGetDynamicConcurrencyResponse {
+  uint32 concurrency = 1;
+}
 
 message FunctionGetInputsItem {
   string input_id = 1;
@@ -977,6 +1445,7 @@ message FunctionGetInputsItem {
   bool kill_switch = 3;
   reserved 4; // previously used
   string function_call_id = 5;
+  FunctionCallInvocationType function_call_invocation_type = 6;
 }
 
 message FunctionGetInputsRequest {
@@ -984,6 +1453,10 @@ message FunctionGetInputsRequest {
   int32 max_values = 3;
   float average_call_time = 5;
   int32 input_concurrency = 6; // Container aims to fetch multiple inputs at the same time
+  reserved 9;
+  reserved 10;
+  uint32 batch_max_size = 11; // Maximum number of inputs to fetch at once
+  uint64 batch_linger_ms = 12; // Miliseconds to block before a response is needed
 }
 
 message FunctionGetInputsResponse {
@@ -995,8 +1468,10 @@ message FunctionGetOutputsItem {
   GenericResult result = 1;
   int32 idx = 2;
   string input_id = 3;
-  int32 gen_index = 4;  // Deprecated, only used in client version <0.57
   DataFormat data_format = 5; // for result.data_oneof
+  string task_id = 6;
+  double input_started_at = 7;
+  double output_created_at = 8;
 }
 
 message FunctionGetOutputsRequest {
@@ -1005,12 +1480,29 @@ message FunctionGetOutputsRequest {
   float timeout = 3;
   string last_entry_id = 6;
   bool clear_on_success = 7; // expires *any* remaining outputs soon after this call, not just the returned ones
+  double requested_at = 8; // Used for waypoints.
+  // The jwts the client expects the server to be processing. This is optional and used for sync inputs only.
+  repeated string input_jwts = 9;
 }
 
 message FunctionGetOutputsResponse {
   repeated int32 idxs = 3;
   repeated FunctionGetOutputsItem outputs = 4;
   string last_entry_id = 5;
+  int32 num_unfinished_inputs = 6;
+}
+
+message FunctionGetRequest {
+  string app_name = 1;
+  string object_tag = 2;
+  DeploymentNamespace namespace = 3;
+  string environment_name = 4;
+}
+
+message FunctionGetResponse {
+  string function_id = 1;
+  FunctionHandleMetadata handle_metadata = 2;
+  repeated Warning server_warnings = 4;
 }
 
 message FunctionGetSerializedRequest {
@@ -1022,6 +1514,24 @@ message FunctionGetSerializedResponse {
   bytes class_serialized = 2;
 }
 
+message FunctionHandleMetadata {
+  // contains all the info about a function that is needed to trigger the right
+  // behaviour when using a FunctionHandler. Notably excludes things purely
+  // used for *executing* the function in a container entrypoint
+
+  // Should be a subset and use IDs/types from `Function` above
+  string function_name = 2;
+  Function.FunctionType function_type = 8;
+  string web_url = 28;
+  bool is_method = 39;
+  string use_function_id = 40; // used for methods
+  string use_method_name = 41; // used for methods
+  string definition_id = 42;
+  ClassParameterInfo class_parameter_info = 43;
+  // Mapping of method names to their metadata, only non-empty for class service functions
+  map<string, FunctionHandleMetadata> method_handle_metadata = 44;
+}
+
 message FunctionInput {
   // serialized (args, kwargs).
   oneof args_oneof {
@@ -1030,6 +1540,7 @@ message FunctionInput {
   }
   bool final_input = 9;
   DataFormat data_format = 10; // For args_oneof.
+  optional string method_name = 11; // specifies which method to call when calling a class/object function
 }
 
 message FunctionMapRequest {
@@ -1038,11 +1549,46 @@ message FunctionMapRequest {
   bool return_exceptions = 3;
   FunctionCallType function_call_type = 4;
   repeated FunctionPutInputsItem pipelined_inputs = 5;
+  FunctionCallInvocationType function_call_invocation_type = 6;
 }
 
 message FunctionMapResponse {
   string function_call_id = 1;
   repeated FunctionPutInputsResponseItem pipelined_inputs = 2;
+  FunctionRetryPolicy retry_policy = 3;
+  string function_call_jwt = 4;
+}
+
+message FunctionOptions {
+  repeated string secret_ids = 1;
+  repeated string mount_ids = 2; // Currently not supported
+  optional Resources resources = 3;
+  optional FunctionRetryPolicy retry_policy = 4;
+  optional uint32 concurrency_limit = 5;
+  optional uint32 timeout_secs = 6;
+  optional uint32 task_idle_timeout_secs = 7;
+  optional uint32 warm_pool_size = 8;
+  repeated VolumeMount volume_mounts = 9;
+  optional uint32 target_concurrent_inputs = 10;
+  bool replace_volume_mounts = 11;
+  bool replace_secret_ids = 12;
+}
+
+message FunctionPrecreateRequest {
+  string app_id = 1;
+  string function_name = 2  [ (modal.options.audit_target_attr) = true ];
+  string existing_function_id = 3;
+  Function.FunctionType function_type = 4;
+  WebhookConfig webhook_config = 5;
+  string use_function_id = 6;  // for class methods - use this function id instead for invocations - the *referenced* function should have is_class=True
+  string use_method_name = 7;  // for class methods - this method name needs to be included in the FunctionInput
+  // Mapping of method names to method definitions, only non-empty for class service functions
+  map<string, MethodDefinition> method_definitions = 8;
+}
+
+message FunctionPrecreateResponse {
+  string function_id = 1;
+  FunctionHandleMetadata handle_metadata = 2;
 }
 
 message FunctionPutInputsItem {
@@ -1056,92 +1602,50 @@ message FunctionPutInputsRequest {
   repeated FunctionPutInputsItem inputs = 4;
 }
 
-message FunctionPutInputsResponseItem {
-  int32 idx = 1;
-  string input_id = 2;
-}
-
 message FunctionPutInputsResponse {
   repeated FunctionPutInputsResponseItem inputs = 1;
 }
 
-message FunctionPutOutputsItem {
-  string input_id = 1;
-  GenericResult result = 2;
-  double input_started_at = 3;
-  double output_created_at = 4;
-  int32 gen_index = 6;  // Deprecated, only used in client version <0.57
-  DataFormat data_format = 7; // for result.data_oneof
-}
-
-message FunctionPutOutputsRequest {
-  repeated FunctionPutOutputsItem outputs = 4;
-}
-
-message FunctionRetryPolicy {
-  float backoff_coefficient = 1;
-  uint32 initial_delay_ms = 2;
-  uint32 max_delay_ms = 3;
-  // NOTE: two-byte field number not used for special reason. copy-paste error. Ref: PR #2542
-  uint32 retries = 18;
-}
-
-message FunctionGetCallGraphRequest {
-  // TODO: use input_id once we switch client submit API to return those.
-  string function_call_id = 2;
-}
-
-
-
-message InputCallGraphInfo {
-  string input_id = 1;
-  GenericResult.GenericStatus status = 2;
-  string function_call_id = 3;
-  string task_id = 4;
-}
-
-message FunctionCallCallGraphInfo {
-  string function_call_id = 1;
-  string parent_input_id = 2;
-  string function_name = 3;
-  string module_name = 4;
-}
-
-message FunctionGetCallGraphResponse {
-  repeated InputCallGraphInfo inputs = 1;
-  repeated FunctionCallCallGraphInfo function_calls = 2;
-}
-
-message FunctionCallCancelRequest {
-  string function_call_id = 1;
-}
-
-message FunctionCallListRequest {
-  string function_id = 1;
+message FunctionPutInputsResponseItem {
+  int32 idx = 1;
+  string input_id = 2;
+  string input_jwt = 3;
 }
 
-message FunctionCallInfo {
-  string function_call_id = 1;
-  int32 idx = 2;
-  reserved 3, 4, 5; // old fields
-  double created_at = 6; // when the call was created
-  double scheduled_at = 7; // if cron job, when run was scheduled
-  reserved 8, 9, 10, 11;  // old fields
-  InputCategoryInfo pending_inputs = 12;
-  InputCategoryInfo failed_inputs = 13;
-  InputCategoryInfo succeeded_inputs = 14;
-  InputCategoryInfo timeout_inputs = 15;
-  InputCategoryInfo cancelled_inputs = 16;
-  int32 total_inputs = 17;
+message FunctionPutOutputsItem {
+  string input_id = 1;
+  GenericResult result = 2;
+  double input_started_at = 3;
+  double output_created_at = 4;
+  DataFormat data_format = 7; // for result.data_oneof
 }
 
-message FunctionCallListResponse {
-  repeated FunctionCallInfo function_calls = 1;
+message FunctionPutOutputsRequest {
+  repeated FunctionPutOutputsItem outputs = 4;
+  double requested_at = 5; // Used for waypoints.
 }
 
+message FunctionRetryInputsItem {
+  string input_jwt = 1;
+  FunctionInput input = 2;
+}
 
-message FunctionGetCurrentStatsRequest {
-  string function_id = 1;
+message FunctionRetryInputsRequest {
+  string function_call_jwt = 1;
+  repeated FunctionRetryInputsItem inputs = 2;
+}
+
+message FunctionRetryInputsResponse {
+  // TODO(ryan): Eventually this will return entry ids, which client
+  // will send back to server to check for lost inputs.
+}
+
+message FunctionRetryPolicy {
+  float backoff_coefficient = 1;
+  uint32 initial_delay_ms = 2;
+  uint32 max_delay_ms = 3;
+  // NOTE: two-byte field number not used for special reason. copy-paste error. Ref: PR #2542
+  uint32 retries = 18;
 }
 
 message FunctionStats {
@@ -1150,6 +1654,19 @@ message FunctionStats {
   uint32 num_total_tasks = 3;
 }
 
+message FunctionUpdateSchedulingParamsRequest {
+  string function_id = 1;
+  uint32 warm_pool_size_override = 2;
+}
+
+message FunctionUpdateSchedulingParamsResponse {}
+
+message GPUConfig {
+  GPUType type = 1;
+  uint32 count = 2;
+  uint32 memory = 3;
+}
+
 message GeneratorDone {  // Sent as the output when a generator finishes running.
   uint64 items_total = 1;
 }
@@ -1165,6 +1682,7 @@ message GenericResult {  // Used for both tasks and function outputs
     // Used when the user's function fails to initialize (ex. S3 mount failed due to invalid credentials).
     // Terminates the function and all remaining inputs.
     GENERIC_STATUS_INIT_FAILURE = 5;
+    GENERIC_STATUS_INTERNAL_FAILURE = 6;
   }
 
   GenericStatus status = 1; // Status of the task or function output.
@@ -1180,28 +1698,9 @@ message GenericResult {  // Used for both tasks and function outputs
     string data_blob_id = 10; // Blob ID for large data.
   }
 
-  enum GeneratorStatus {
-    GENERATOR_STATUS_UNSPECIFIED = 0;
-    GENERATOR_STATUS_INCOMPLETE = 1;
-    GENERATOR_STATUS_COMPLETE = 2;
-  }
-  GeneratorStatus gen_status = 7;  // Deprecated, only used in client version <0.57
-
   string propagation_reason = 13; // (?)
 }
 
-message GPUConfig {
-  GPUType type = 1;
-  uint32 count = 2;
-  uint32 memory = 3;
-}
-
-message BuildFunction {
-  string definition = 1;
-  bytes globals = 2;
-  FunctionInput input = 3;
-}
-
 message Image {
   repeated BaseImage base_images = 5;
   repeated string dockerfile_commands = 6;
@@ -1233,6 +1732,15 @@ message ImageContextFile {
   bytes data = 2;
 }
 
+message ImageFromIdRequest {
+  string image_id = 1;
+}
+
+message ImageFromIdResponse {
+  string image_id = 1;
+  ImageMetadata metadata = 2;
+} 
+
 message ImageGetOrCreateRequest {
   Image image = 2;
   string app_id = 4 [ (modal.options.audit_target_attr) = true ];
@@ -1241,16 +1749,24 @@ message ImageGetOrCreateRequest {
   bool force_build = 7;
   DeploymentNamespace namespace = 8;
   string builder_version = 9;
+  // Only admins can publish global images, but this provides an extra failsafe
+  bool allow_global_deployment = 10;
 }
 
 message ImageGetOrCreateResponse {
+  // image_id is set regardless if the image is built (use ImageJoinStreaming to wait for build)
   string image_id = 1;
+  // result of build - only set if the image has finished building (regardless if success or not)
+  GenericResult result = 2;
+  // image metadata - only set if the image has built successfully
+  ImageMetadata metadata = 3;
 }
 
 message ImageJoinStreamingRequest {
   string image_id = 1;
   float timeout = 2;
   string last_entry_id = 3;
+  bool include_logs_for_finished = 4;
 }
 
 message ImageJoinStreamingResponse {
@@ -1258,6 +1774,18 @@ message ImageJoinStreamingResponse {
   repeated TaskLogs task_logs = 2;
   string entry_id = 3;
   bool eof = 4;
+  ImageMetadata metadata = 5;  // set on success
+}
+
+
+message ImageMetadata {
+  // The output of `python -VV. Not set if missing
+  optional string python_version_info = 1;
+  // Installed python packages, as listed by by `pip list`.
+  // package name -> version. Empty if missing
+  map<string, string> python_packages = 2;
+  // The work directory of the image, defaulting to "/". Not set if missing
+  optional string workdir = 3;
 }
 
 
@@ -1266,6 +1794,18 @@ message ImageRegistryConfig {
   string secret_id = 2;
 }
 
+message InputCallGraphInfo {
+  string input_id = 1;
+  GenericResult.GenericStatus status = 2;
+  string function_call_id = 3;
+  string task_id = 4;
+}
+
+message InputCategoryInfo {
+  int32 total = 1;
+  repeated InputInfo latest = 2;
+}
+
 message InputInfo {
   string input_id = 1;
   int32 idx = 2;
@@ -1276,20 +1816,20 @@ message InputInfo {
   bool task_first_input = 7;
 }
 
-message InputCategoryInfo {
-  int32 total = 1;
-  repeated InputInfo latest = 2;
-}
-
-message MountBuildRequest {
-  string app_id = 2 [ (modal.options.audit_target_attr) = true ];
-  string existing_mount_id = 3;
-  repeated MountFile files = 4;
+message MethodDefinition {
+  string function_name = 1;
+  Function.FunctionType function_type = 2;
+  WebhookConfig webhook_config = 3;
+  string web_url = 4;
+  WebUrlInfo web_url_info = 5;
+  repeated CustomDomainInfo custom_domain_info = 6;
 }
 
-message MountBuildResponse {
-  string mount_id = 1;
-  MountHandleMetadata handle_metadata = 2;
+message MountFile {
+  string filename = 1;
+  string sha256_hex = 3; // SHA-256 checksum of the file.
+  optional uint64 size = 4; // Size of the file in bytes — ignored in MountBuild().
+  optional uint32 mode = 5; // Unix file permission bits `st_mode`.
 }
 
 message MountGetOrCreateRequest {
@@ -1310,13 +1850,6 @@ message MountHandleMetadata {
   string content_checksum_sha256_hex = 1;
 }
 
-message MountFile {
-  string filename = 1;
-  string sha256_hex = 3; // SHA-256 checksum of the file.
-  optional uint64 size = 4; // Size of the file in bytes — ignored in MountBuild().
-  optional uint32 mode = 5; // Unix file permission bits `st_mode`.
-}
-
 message MountPutFileRequest {
   string sha256_hex = 2;
 
@@ -1336,6 +1869,17 @@ message MultiPartUpload {
   string completion_url = 3;
 }
 
+message NetworkAccess {
+  enum NetworkAccessType {
+    UNSPECIFIED = 0;
+    OPEN = 1;
+    BLOCKED = 2;
+    ALLOWLIST = 3;
+  }
+  NetworkAccessType network_access_type = 1;
+  repeated string allowed_cidrs = 2;
+}
+
 message Object {
   string object_id = 1;
   oneof handle_metadata_oneof {
@@ -1350,8 +1894,53 @@ message ObjectDependency {
   string object_id = 1;
 }
 
+message PTYInfo {
+  bool enabled = 1;  // Soon deprecated
+  uint32 winsz_rows = 2;
+  uint32 winsz_cols = 3;
+  string env_term = 4;
+  string env_colorterm = 5;
+  string env_term_program = 6;
+  enum PTYType {
+    PTY_TYPE_UNSPECIFIED = 0;  // Nothing
+    PTY_TYPE_FUNCTION = 1;  // Run function in PTY
+    PTY_TYPE_SHELL = 2;  // Replace function with shell
+  }
+  PTYType pty_type = 7;
+}
+
+message PortSpec {
+  uint32 port = 1;
+  bool unencrypted = 2;
+}
+
+message PortSpecs {
+  repeated PortSpec ports = 1;
+}
+
+message Proxy {
+  string name = 1;
+  double created_at = 2;
+  string environment_name = 3;
+  string proxy_id = 5;
+  repeated ProxyIp proxy_ips = 4;
+}
+
+message ProxyCreateRequest {
+  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string environment_name = 2;
+}
+
+message ProxyCreateResponse {
+  Proxy proxy = 1;
+}
+
+message ProxyDeleteRequest {
+  string proxy_id = 1 [ (modal.options.audit_target_attr) = true ];
+}
+
 message ProxyGetOrCreateRequest {
-  string deployment_name = 1;
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
   DeploymentNamespace namespace = 2;
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;  // must be UNSPECIFIED
@@ -1361,35 +1950,42 @@ message ProxyGetOrCreateResponse {
   string proxy_id = 1;
 }
 
+message ProxyGetRequest {
+  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string environment_name = 2;
+}
+
+message ProxyGetResponse {
+  Proxy proxy = 1;
+}
+
 message ProxyInfo {
   string elastic_ip = 1;
   string proxy_key = 2;
   string remote_addr = 3;
   int32 remote_port = 4;
+  ProxyType proxy_type = 5;
 }
 
-message PTYInfo {
-  bool enabled = 1;  // Soon deprecated
-  uint32 winsz_rows = 2;
-  uint32 winsz_cols = 3;
-  string env_term = 4;
-  string env_colorterm = 5;
-  string env_term_program = 6;
-  enum PTYType {
-    PTY_TYPE_UNSPECIFIED = 0;  // Nothing
-    PTY_TYPE_FUNCTION = 1;  // Run function in PTY
-    PTY_TYPE_SHELL = 2;  // Replace function with shell
-  }
-  PTYType pty_type = 7;
+message ProxyIp {
+  string proxy_ip = 1;
+  ProxyIpStatus status = 2;
+  double created_at = 3;
+  string environment_name = 4;
 }
 
-message QueueCreateRequest {
-  string app_id = 1;
-  string existing_queue_id = 2;
+message ProxyListResponse {
+  repeated Proxy proxies = 1;
 }
 
-message QueueCreateResponse {
+message QueueClearRequest {
   string queue_id = 1;
+  bytes partition_key = 2;
+  bool all_partitions = 3;
+}
+
+message QueueDeleteRequest {
+  string queue_id = 1 [ (modal.options.audit_target_attr) = true ];
 }
 
 message QueueGetOrCreateRequest {
@@ -1418,30 +2014,93 @@ message QueueHeartbeatRequest {
   string queue_id = 1;
 }
 
-message QueuePutRequest {
-  string queue_id = 1;
-  repeated bytes values = 4;
-  bytes partition_key = 5;
+message QueueItem {
+  bytes value = 1;
+  string entry_id = 2;
 }
 
 message QueueLenRequest {
   string queue_id = 1;
   bytes partition_key = 2;
+  bool total = 3;
 }
 
 message QueueLenResponse {
   int32 len = 1;
 }
 
+message QueueListRequest {
+  string environment_name = 1;
+  // Allow client to report a bounded total size to reduce the number of partitions that need to be checked
+  int32 total_size_limit = 2;
+}
+
+message QueueListResponse {
+  message QueueInfo {
+    string name = 1;
+    double created_at = 2;
+    int32 num_partitions = 3;
+    int32 total_size = 4;
+  }
+
+  repeated QueueInfo queues = 1;
+}
+
+message QueueNextItemsRequest {
+  string queue_id = 1;
+  bytes partition_key = 2;
+  string last_entry_id = 3;
+  float item_poll_timeout = 4; // seconds
+}
+
+message QueueNextItemsResponse {
+  repeated QueueItem items = 1;
+}
+
+message QueuePutRequest {
+  string queue_id = 1;
+  repeated bytes values = 4;
+  bytes partition_key = 5;
+  int32 partition_ttl_seconds = 6;
+}
+
+
 message RateLimit {
   int32 limit = 1;
   RateLimitInterval interval = 2;
 }
 
 message Resources {
-  uint32 memory_mb = 2;
-  uint32 milli_cpu = 3;
+  uint32 memory_mb = 2; // MiB
+  uint32 milli_cpu = 3; // milli CPU cores
   GPUConfig gpu_config = 4;
+  uint32 memory_mb_max = 5; // MiB
+  uint32 ephemeral_disk_mb = 6;  // MiB
+  uint32 milli_cpu_max = 7; // milli CPU cores
+}
+
+message RuntimeInputMessage {
+  bytes message = 1;
+  uint64 message_index = 2;
+  bool eof = 3;
+}
+
+message RuntimeOutputBatch {
+  repeated RuntimeOutputMessage items = 1;
+  uint64 batch_index = 2;
+  // if an exit code is given, this is the final message that will be sent.
+  optional int32 exit_code = 3;
+  repeated RuntimeOutputMessage stdout = 4;
+  repeated RuntimeOutputMessage stderr = 5;
+  repeated RuntimeOutputMessage info = 6;
+}
+
+// Used for `modal container exec`, `modal shell`, and Sandboxes
+message RuntimeOutputMessage {
+  // only stdout / stderr is used
+  FileDescriptor file_descriptor = 1;
+  string message = 2;
+  bytes message_bytes = 3;
 }
 
 message S3Mount {
@@ -1476,17 +2135,43 @@ message Sandbox {
   repeated VolumeMount volume_mounts = 13;
 
   PTYInfo pty_info = 15;
+
+  // If set, tasks will be scheduled using the new scheduler, which also knows
+  // to look at fine-grained placement constraints.
+  reserved 16; // _experimental_scheduler
+  optional SchedulerPlacement scheduler_placement = 17;
+  reserved 18;  // _experimental_resources
+
+  string worker_id = 19; // for internal debugging use only
+  oneof open_ports_oneof {
+    PortSpecs open_ports = 20;
+  }
+
+  bool i6pn_enabled = 21;
+
+  // Network access configuration beyond simple allow/block.
+  NetworkAccess network_access = 22;
+
+  optional string proxy_id = 23;
 }
 
 message SandboxCreateRequest {
   string app_id = 1 [ (modal.options.audit_target_attr) = true ];
   Sandbox definition = 2;
+  string environment_name = 3;
 }
 
 message SandboxCreateResponse {
   string sandbox_id = 1;
 }
 
+message SandboxGetLogsRequest {
+  string sandbox_id = 1;
+  FileDescriptor file_descriptor = 2;
+  float timeout = 3;
+  string last_entry_id = 4;
+}
+
 message SandboxGetTaskIdRequest {
   string sandbox_id = 1;
 }
@@ -1495,21 +2180,14 @@ message SandboxGetTaskIdResponse {
   string task_id = 1;
 }
 
-message SandboxGetLogsRequest {
-  string sandbox_id = 1;
-  FileDescriptor file_descriptor = 2;
-  float timeout = 3;
-  string last_entry_id = 4;
-}
-
-message SandboxStdinWriteRequest {
+message SandboxGetTunnelsRequest {
   string sandbox_id = 1;
-  bytes input = 2;
-  uint32 index = 3;
-  bool eof = 4;
+  float timeout = 2;
 }
 
-message SandboxStdinWriteResponse {
+message SandboxGetTunnelsResponse {
+  GenericResult result = 1;
+  repeated TunnelData tunnels = 2;
 }
 
 message SandboxHandleMetadata {
@@ -1518,20 +2196,57 @@ message SandboxHandleMetadata {
 
 message SandboxInfo {
   string id = 1;
-  modal.client.Sandbox definition = 2;
   double created_at = 3;
   TaskInfo task_info = 4;
+
+  reserved 2; // modal.client.Sandbox definition
 }
 
 message SandboxListRequest {
   string app_id = 1;
   double before_timestamp = 2;
+  string environment_name = 3;
+  bool include_finished = 4;
+  repeated SandboxTag tags = 5;
 }
 
 message SandboxListResponse {
   repeated SandboxInfo sandboxes = 1;
 }
 
+message SandboxSnapshotFsRequest {
+  string sandbox_id = 1;
+  float timeout = 2;
+}
+
+message SandboxSnapshotFsResponse {
+  string image_id = 1;
+  GenericResult result = 2;
+  // Metadata may be empty since we may skip it for performance reasons.
+  ImageMetadata image_metadata = 3;
+}
+
+message SandboxStdinWriteRequest {
+  string sandbox_id = 1;
+  bytes input = 2;
+  uint32 index = 3;
+  bool eof = 4;
+}
+
+message SandboxStdinWriteResponse {
+}
+
+message SandboxTag {
+  string tag_name = 1;
+  string tag_value = 2;
+}
+
+message SandboxTagsSetRequest {
+  string environment_name = 1;
+  string sandbox_id = 2;
+  repeated SandboxTag tags = 3;
+}
+
 message SandboxTerminateRequest {
   string sandbox_id = 1;
 }
@@ -1568,6 +2283,21 @@ message Schedule {
   }
 }
 
+message SchedulerPlacement {
+  // TODO(irfansharif):
+  // - Fold in cloud, resource needs here too.
+  // - Allow specifying list of zones, cloud, fallback and alternative
+  //   GPU types.
+
+  repeated string regions = 4;
+  // TODO(irfansharif): Make these two repeated.
+  optional string _zone = 2; // admin-only
+  optional string _lifecycle = 3; // admin-only, "on-demand" or "spot", else ignored
+  repeated string _instance_types = 5; // admin-only
+
+  reserved 1;
+}
+
 message SecretCreateRequest {  // Not used by client anymore
   map<string, string> env_dict = 1;
   string app_id = 2 [ (modal.options.audit_target_attr) = true ];
@@ -1579,13 +2309,18 @@ message SecretCreateResponse {  // Not used by client anymore
   string secret_id = 1;
 }
 
+message SecretDeleteRequest {
+  string secret_id = 1;
+}
+
 message SecretGetOrCreateRequest {
-  string deployment_name = 1;
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
   DeploymentNamespace namespace = 2;
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;  // Not used atm
   map<string, string> env_dict = 5;
   string app_id = 6;  // only used with OBJECT_CREATION_TYPE_ANONYMOUS_OWNED_BY_APP
+  repeated string required_keys = 7;
 }
 
 message SecretGetOrCreateResponse {
@@ -1597,6 +2332,7 @@ message SecretListItem {
   double created_at = 2;
   double last_used_at = 3;
   string environment_name = 4;
+  string secret_id = 5;
 }
 
 message SecretListRequest {
@@ -1608,8 +2344,24 @@ message SecretListResponse {
   string environment_name = 2; // the environment that was listed (useful when relying on "default" logic)
 }
 
+message SharedVolumeDeleteRequest {
+  string shared_volume_id = 1;
+}
+
+message SharedVolumeGetFileRequest {
+  string shared_volume_id = 1;
+  string path = 2;
+}
+
+message SharedVolumeGetFileResponse {
+  oneof data_oneof {
+    bytes data = 1;
+    string data_blob_id = 2;
+  }
+}
+
 message SharedVolumeGetOrCreateRequest {
-  string deployment_name = 1;
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
   DeploymentNamespace namespace = 2;
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;
@@ -1624,13 +2376,13 @@ message SharedVolumeHeartbeatRequest {
   string shared_volume_id = 1;
 }
 
-message SharedVolumeCreateRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
-  CloudProvider cloud_provider = 2;
+message SharedVolumeListFilesRequest {
+  string shared_volume_id = 1;
+  string path = 2;
 }
 
-message SharedVolumeCreateResponse {
-  string shared_volume_id = 1;
+message SharedVolumeListFilesResponse {
+  repeated FileEntry entries = 1;
 }
 
 message SharedVolumeListItem {
@@ -1649,9 +2401,11 @@ message SharedVolumeListResponse {
   string environment_name = 2;
 }
 
-message SharedVolumeListFilesRequest {
-  string shared_volume_id = 1;
-  string path = 2;
+message SharedVolumeMount {
+  string mount_path = 1;
+  string shared_volume_id = 2;
+  CloudProvider cloud_provider = 3;
+  bool allow_cross_region = 4;
 }
 
 message SharedVolumePutFileRequest {
@@ -1669,46 +2423,29 @@ message SharedVolumePutFileResponse {
   bool exists = 1;
 }
 
-message SharedVolumeGetFileRequest {
-  string shared_volume_id = 1;
-  string path = 2;
-}
-
-message SharedVolumeGetFileResponse {
-  oneof data_oneof {
-    bytes data = 1;
-    string data_blob_id = 2;
-  }
-}
-
 message SharedVolumeRemoveFileRequest {
   string shared_volume_id = 1 [ (modal.options.audit_target_attr) = true ];
   string path = 2;
   bool recursive = 3;
 }
 
-message SharedVolumeListFilesEntry {
-  enum FileType {
-    UNSPECIFIED = 0;
-    FILE = 1;
-    DIRECTORY = 2;
-  }
-  string path = 1;
-  FileType type = 2;
+message SystemErrorMessage {
+  SystemErrorCode error_code = 1;
+  string error_message = 2;
 }
 
-message SharedVolumeListFilesResponse {
-  repeated SharedVolumeListFilesEntry entries = 1;
+message TaskClusterHelloRequest {
+  string task_id = 1;
+  string container_ip = 2;
 }
 
-message SharedVolumeMount {
-  string mount_path = 1;
-  string shared_volume_id = 2;
-  CloudProvider cloud_provider = 3;
-  bool allow_cross_region = 4;
+message TaskClusterHelloResponse {
+  string cluster_id = 1;
+  uint32 cluster_rank = 2;
+  // All IP addresses in cluster, ordered by cluster rank
+  repeated string container_ips = 3;
 }
 
-
 message TaskCurrentInputsResponse {
   repeated string input_ids = 1;
 }
@@ -1718,6 +2455,15 @@ message TaskInfo {
   double started_at = 2;
   double finished_at = 3;
   modal.client.GenericResult result = 4;
+  double enqueued_at = 5;
+}
+
+message TaskListRequest {
+  string environment_name = 1;
+}
+
+message TaskListResponse {
+  repeated TaskStats tasks = 1;
 }
 
 message TaskLogs {
@@ -1730,12 +2476,6 @@ message TaskLogs {
   string input_id = 11;
 }
 
-message TaskListRequest {}
-
-message TaskListResponse {
-  repeated TaskStats tasks = 1;
-}
-
 message TaskLogsBatch {
   string task_id = 1;
   repeated TaskLogs items = 2;
@@ -1756,7 +2496,7 @@ message TaskProgress {
 }
 
 message TaskResultRequest {
-  modal.client.GenericResult result = 2;
+  GenericResult result = 2;
 }
 
 message TaskStats {
@@ -1766,6 +2506,16 @@ message TaskStats {
   double started_at = 4;
 }
 
+message TaskTemplate {
+  uint32 rank = 1;
+  Resources resources = 2;
+  uint32 target_concurrent_inputs = 3;
+  uint32 max_concurrent_inputs = 4;
+
+  // TODO(irfansharif): Just move this into a column in the task table instead?
+  // Deprecate all above fields and get rid of this message altogether
+  uint32 index = 5;  // pointer into FunctionData, if using that as the underlying definition type
+}
 
 message TokenFlowCreateRequest {
   string utm_source = 3;
@@ -1793,6 +2543,14 @@ message TokenFlowWaitResponse {
   string workspace_username = 4;
 }
 
+message TunnelData {
+  string host = 1;
+  uint32 port = 2;
+  optional string unencrypted_host = 3;
+  optional uint32 unencrypted_port = 4;
+  uint32 container_port = 5;
+}
+
 message TunnelStartRequest {
   uint32 port = 1;
   bool unencrypted = 2;
@@ -1813,30 +2571,6 @@ message TunnelStopResponse {
   bool exists = 1;
 }
 
-message VolumeGetOrCreateRequest {
-  string deployment_name = 1;
-  DeploymentNamespace namespace = 2;
-  string environment_name = 3;
-  ObjectCreationType object_creation_type = 4;
-  string app_id = 5;  // only used with OBJECT_CREATION_TYPE_ANONYMOUS_OWNED_BY_APP
-}
-
-message VolumeGetOrCreateResponse {
-  string volume_id = 1;
-}
-
-message VolumeHeartbeatRequest {
-  string volume_id = 1;
-}
-
-message VolumeCreateRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
-}
-
-message VolumeCreateResponse {
-  string volume_id = 1;
-}
-
 message VolumeCommitRequest {
   // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
   // a volume mount.
@@ -1847,6 +2581,13 @@ message VolumeCommitResponse {
   bool skip_reload = 1;
 }
 
+message VolumeCopyFilesRequest {
+  string volume_id = 1;
+  repeated string src_paths = 2;
+  string dst_path = 3;
+  bool recursive = 4;
+}
+
 message VolumeDeleteRequest {
   string volume_id = 1;
   string environment_name = 2 [deprecated=true];
@@ -1854,7 +2595,7 @@ message VolumeDeleteRequest {
 
 message VolumeGetFileRequest {
   string volume_id = 1;
-  bytes path = 2;
+  string path = 2;
   uint64 start = 3;
   uint64 len = 4; // 0 is interpreted as 'read to end'
 }
@@ -1869,27 +2610,33 @@ message VolumeGetFileResponse {
   uint64 len = 5; // number of bytes returned
 }
 
-message VolumeListFilesEntry {
-  enum FileType {
-    UNSPECIFIED = 0;
-    FILE = 1;
-    DIRECTORY = 2;
-    SYMLINK = 3;
-  }
-  string path = 1;
-  FileType type = 2;
-  uint64 mtime = 3;
-  uint64 size = 4;
+message VolumeGetOrCreateRequest {
+  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  DeploymentNamespace namespace = 2;
+  string environment_name = 3;
+  ObjectCreationType object_creation_type = 4;
+  string app_id = 5;  // only used with OBJECT_CREATION_TYPE_ANONYMOUS_OWNED_BY_APP
+  VolumeFsVersion version = 6;
+}
+
+message VolumeGetOrCreateResponse {
+  string volume_id = 1;
+  VolumeFsVersion version = 2;
+}
+
+message VolumeHeartbeatRequest {
+  string volume_id = 1;
 }
 
 message VolumeListFilesRequest {
   string volume_id = 1;
   string path = 2;
-  optional int32 max_entries = 3;
+  bool recursive = 4;
+  optional uint32 max_entries = 3;
 }
 
 message VolumeListFilesResponse {
-  repeated VolumeListFilesEntry entries = 1;
+  repeated FileEntry entries = 1;
 }
 
 message VolumeListItem {
@@ -1907,10 +2654,10 @@ message VolumeListResponse {
   string environment_name = 2;
 }
 
-message VolumeReloadRequest {
-  // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
-  // a volume mount.
+message VolumeMount {
   string volume_id = 1;
+  string mount_path = 2;
+  bool allow_background_commits = 3;
 }
 
 message VolumePutFilesRequest {
@@ -1922,23 +2669,37 @@ message VolumePutFilesRequest {
   bool disallow_overwrite_existing_files = 3;
 }
 
+message VolumeReloadRequest {
+  // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
+  // a volume mount.
+  string volume_id = 1;
+}
+
 message VolumeRemoveFileRequest {
   string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
-  bytes path = 2;
+  string path = 2;
   bool recursive = 3;
 }
 
-message VolumeCopyFilesRequest {
-  string volume_id = 1;
-  repeated bytes src_paths = 2;
-  bytes dst_path = 3;
-  bool recursive = 4;
+message VolumeRenameRequest {
+  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 2;
 }
 
-message VolumeMount {
-  string volume_id = 1;
-  string mount_path = 2;
-  bool allow_background_commits = 3;
+message Warning {
+  enum WarningType {
+    WARNING_TYPE_UNSPECIFIED = 0;
+    WARNING_TYPE_CLIENT_DEPRECATION = 1;
+    WARNING_TYPE_RESOURCE_LIMIT = 2;
+  }
+  WarningType type = 1;
+  string message = 2;
+}
+
+message WebUrlInfo {
+  bool truncated = 1;
+  bool has_unique_hash = 2 [deprecated=true];
+  bool label_stolen = 3;
 }
 
 message WebhookConfig {
@@ -1949,53 +2710,34 @@ message WebhookConfig {
   repeated CustomDomainConfig custom_domains = 6;
   uint32 web_server_port = 7;
   float web_server_startup_timeout = 8;
-}
-
-message WebUrlInfo {
-  bool truncated = 1;
-  bool has_unique_hash = 2;
-  bool label_stolen = 3;
+  bool web_endpoint_docs = 9;
+  bool requires_proxy_auth = 10;
 }
 
 message WorkspaceNameLookupResponse {
-  string workspace_name = 1;
+  string workspace_name = 1 [deprecated=true];
   string username = 2;
 }
 
-// Used for `modal container exec`
-message RuntimeOutputMessage {
-  // only stdout / stderr is used
-  FileDescriptor file_descriptor = 1;
-  string message = 2;
-}
-
-message RuntimeOutputBatch {
-  repeated RuntimeOutputMessage items = 1;
-  uint64 batch_index = 2;
-  // if an exit code is given, this is the final message that will be sent.
-  optional int32 exit_code = 3;
-}
-
-message RuntimeInputMessage {
-  bytes message = 1;
-  uint64 message_index = 2;
-}
-
 
 service ModalClient {
   // Apps
-  rpc AppCreate(AppCreateRequest) returns (AppCreateResponse);
   rpc AppClientDisconnect(AppClientDisconnectRequest) returns (google.protobuf.Empty);
+  rpc AppCreate(AppCreateRequest) returns (AppCreateResponse);
+  rpc AppDeploy(AppDeployRequest) returns (AppDeployResponse);
+  rpc AppDeploymentHistory(AppDeploymentHistoryRequest) returns (AppDeploymentHistoryResponse);
+  rpc AppGetByDeploymentName(AppGetByDeploymentNameRequest) returns (AppGetByDeploymentNameResponse);
+  rpc AppGetLayout(AppGetLayoutRequest) returns (AppGetLayoutResponse);
   rpc AppGetLogs(AppGetLogsRequest) returns (stream TaskLogsBatch);
-  rpc AppSetObjects(AppSetObjectsRequest) returns (google.protobuf.Empty);
   rpc AppGetObjects(AppGetObjectsRequest) returns (AppGetObjectsResponse);
+  rpc AppGetOrCreate(AppGetOrCreateRequest) returns (AppGetOrCreateResponse);
+  rpc AppHeartbeat(AppHeartbeatRequest) returns (google.protobuf.Empty);
   rpc AppList(AppListRequest) returns (AppListResponse);
-  rpc AppLookupObject(AppLookupObjectRequest) returns (AppLookupObjectResponse);
-  rpc AppDeploy(AppDeployRequest) returns (AppDeployResponse);
-  rpc AppDeploySingleObject(AppDeploySingleObjectRequest) returns (AppDeploySingleObjectResponse);
-  rpc AppGetByDeploymentName(AppGetByDeploymentNameRequest) returns (AppGetByDeploymentNameResponse);
+  rpc AppLookup(AppLookupRequest) returns (AppLookupResponse);
+  rpc AppPublish(AppPublishRequest) returns (AppPublishResponse);
+  rpc AppRollback(AppRollbackRequest) returns (google.protobuf.Empty);
+  rpc AppSetObjects(AppSetObjectsRequest) returns (google.protobuf.Empty);
   rpc AppStop(AppStopRequest) returns (google.protobuf.Empty);
-  rpc AppHeartbeat(AppHeartbeatRequest) returns (google.protobuf.Empty);
 
   // Blobs
   rpc BlobCreate(BlobCreateRequest) returns (BlobCreateResponse);
@@ -2006,47 +2748,59 @@ service ModalClient {
   rpc ClassGet(ClassGetRequest) returns (ClassGetResponse);
 
   // Clients
-  rpc ClientCreate(ClientCreateRequest) returns (ClientCreateResponse);
   rpc ClientHello(google.protobuf.Empty) returns (ClientHelloResponse);
-  rpc ClientHeartbeat(ClientHeartbeatRequest) returns (google.protobuf.Empty);
 
   // Container
-  rpc ContainerHeartbeat(ContainerHeartbeatRequest) returns (ContainerHeartbeatResponse);
+  rpc ContainerCheckpoint(ContainerCheckpointRequest) returns (google.protobuf.Empty);
   rpc ContainerExec(ContainerExecRequest) returns (ContainerExecResponse);
   rpc ContainerExecGetOutput(ContainerExecGetOutputRequest) returns (stream RuntimeOutputBatch);
   rpc ContainerExecPutInput(ContainerExecPutInputRequest) returns (google.protobuf.Empty);
-
-  // Checkpointing
-  rpc ContainerCheckpoint(ContainerCheckpointRequest) returns (google.protobuf.Empty);
+  rpc ContainerExecWait(ContainerExecWaitRequest) returns (ContainerExecWaitResponse);
+  rpc ContainerFilesystemExec(ContainerFilesystemExecRequest) returns (ContainerFilesystemExecResponse);
+  rpc ContainerFilesystemExecGetOutput(ContainerFilesystemExecGetOutputRequest) returns (stream FilesystemRuntimeOutputBatch);
+  rpc ContainerHeartbeat(ContainerHeartbeatRequest) returns (ContainerHeartbeatResponse);
+  rpc ContainerHello(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc ContainerLog(ContainerLogRequest) returns (google.protobuf.Empty);
+  rpc ContainerStop(ContainerStopRequest) returns (ContainerStopResponse);
 
   // Dicts
   rpc DictClear(DictClearRequest) returns (google.protobuf.Empty);
-  rpc DictCreate(DictCreateRequest) returns (DictCreateResponse);  // Will be superseded by DictGetOrCreate
+  rpc DictContains(DictContainsRequest) returns (DictContainsResponse);
+  rpc DictContents(DictContentsRequest) returns (stream DictEntry);
+  rpc DictDelete(DictDeleteRequest) returns (google.protobuf.Empty);
+  rpc DictGet(DictGetRequest) returns (DictGetResponse);
   rpc DictGetOrCreate(DictGetOrCreateRequest) returns (DictGetOrCreateResponse);
   rpc DictHeartbeat(DictHeartbeatRequest) returns (google.protobuf.Empty);
-  rpc DictUpdate(DictUpdateRequest) returns (DictUpdateResponse);
-  rpc DictGet(DictGetRequest) returns (DictGetResponse);
-  rpc DictPop(DictPopRequest) returns (DictPopResponse);
-  rpc DictContains(DictContainsRequest) returns (DictContainsResponse);
   rpc DictLen(DictLenRequest) returns (DictLenResponse);
+  rpc DictList(DictListRequest) returns (DictListResponse);
+  rpc DictPop(DictPopRequest) returns (DictPopResponse);
+  rpc DictUpdate(DictUpdateRequest) returns (DictUpdateResponse);
 
   // Domains
+  rpc DomainCertificateVerify(DomainCertificateVerifyRequest) returns (DomainCertificateVerifyResponse);
   rpc DomainCreate(DomainCreateRequest) returns (DomainCreateResponse);
   rpc DomainList(DomainListRequest) returns (DomainListResponse);
-  rpc DomainCertificateVerify(DomainCertificateVerifyRequest) returns (DomainCertificateVerifyResponse);
 
   // Environments
   rpc EnvironmentCreate(EnvironmentCreateRequest) returns (google.protobuf.Empty);
-  rpc EnvironmentList(google.protobuf.Empty) returns (EnvironmentListResponse);
   rpc EnvironmentDelete(EnvironmentDeleteRequest) returns (google.protobuf.Empty);
+  rpc EnvironmentGetOrCreate(EnvironmentGetOrCreateRequest) returns (EnvironmentGetOrCreateResponse);
+  rpc EnvironmentList(google.protobuf.Empty) returns (EnvironmentListResponse);
   rpc EnvironmentUpdate(EnvironmentUpdateRequest) returns (EnvironmentListItem);
 
   // Functions
+  rpc FunctionAsyncInvoke(FunctionAsyncInvokeRequest) returns (FunctionAsyncInvokeResponse);
   rpc FunctionBindParams(FunctionBindParamsRequest) returns (FunctionBindParamsResponse);
+  rpc FunctionCallCancel(FunctionCallCancelRequest) returns (google.protobuf.Empty);
+  rpc FunctionCallGetDataIn(FunctionCallGetDataRequest) returns (stream DataChunk);
+  rpc FunctionCallGetDataOut(FunctionCallGetDataRequest) returns (stream DataChunk);
+  rpc FunctionCallList(FunctionCallListRequest) returns (FunctionCallListResponse);
+  rpc FunctionCallPutDataOut(FunctionCallPutDataRequest) returns (google.protobuf.Empty);
   rpc FunctionCreate(FunctionCreateRequest) returns (FunctionCreateResponse);
   rpc FunctionGet(FunctionGetRequest) returns (FunctionGetResponse);
   rpc FunctionGetCallGraph(FunctionGetCallGraphRequest) returns (FunctionGetCallGraphResponse);
   rpc FunctionGetCurrentStats(FunctionGetCurrentStatsRequest) returns (FunctionStats);
+  rpc FunctionGetDynamicConcurrency(FunctionGetDynamicConcurrencyRequest) returns (FunctionGetDynamicConcurrencyResponse);
   rpc FunctionGetInputs(FunctionGetInputsRequest) returns (FunctionGetInputsResponse);  // For containers to request next call
   rpc FunctionGetOutputs(FunctionGetOutputsRequest) returns (FunctionGetOutputsResponse);  // Returns the next result(s) for an entire function call (FunctionMap)
   rpc FunctionGetSerialized(FunctionGetSerializedRequest) returns (FunctionGetSerializedResponse);
@@ -2054,69 +2808,70 @@ service ModalClient {
   rpc FunctionPrecreate(FunctionPrecreateRequest) returns (FunctionPrecreateResponse);
   rpc FunctionPutInputs(FunctionPutInputsRequest) returns (FunctionPutInputsResponse);
   rpc FunctionPutOutputs(FunctionPutOutputsRequest) returns (google.protobuf.Empty);  // For containers to return result
-  rpc FunctionUpdateSchedulingParams(FunctionUpdateSchedulingParamsRequest) returns (FunctionUpdateSchedulingParamsResponse);
-
-  // Function calls
-  rpc FunctionCallCancel(FunctionCallCancelRequest) returns (google.protobuf.Empty);
-  rpc FunctionCallList(FunctionCallListRequest) returns (FunctionCallListResponse);
-  rpc FunctionCallGetDataIn(FunctionCallGetDataRequest) returns (stream DataChunk);
-  rpc FunctionCallGetDataOut(FunctionCallGetDataRequest) returns (stream DataChunk);
-  rpc FunctionCallPutDataOut(FunctionCallPutDataRequest) returns (google.protobuf.Empty);
-
-  // Interactive functions
+  rpc FunctionRetryInputs(FunctionRetryInputsRequest) returns (FunctionRetryInputsResponse);
   rpc FunctionStartPtyShell(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc FunctionUpdateSchedulingParams(FunctionUpdateSchedulingParamsRequest) returns (FunctionUpdateSchedulingParamsResponse);
 
   // Images
+  rpc ImageFromId(ImageFromIdRequest) returns (ImageFromIdResponse);
   rpc ImageGetOrCreate(ImageGetOrCreateRequest) returns (ImageGetOrCreateResponse);
   rpc ImageJoinStreaming(ImageJoinStreamingRequest) returns (stream ImageJoinStreamingResponse);
 
   // Mounts
-  rpc MountPutFile(MountPutFileRequest) returns (MountPutFileResponse);
-  rpc MountBuild(MountBuildRequest) returns (MountBuildResponse);
   rpc MountGetOrCreate(MountGetOrCreateRequest) returns (MountGetOrCreateResponse);
+  rpc MountPutFile(MountPutFileRequest) returns (MountPutFileResponse);
 
   // Proxies
+  rpc ProxyCreate(ProxyCreateRequest) returns (ProxyCreateResponse);
+  rpc ProxyDelete(ProxyDeleteRequest) returns (google.protobuf.Empty);
+  rpc ProxyGet(ProxyGetRequest) returns (ProxyGetResponse);
   rpc ProxyGetOrCreate(ProxyGetOrCreateRequest) returns (ProxyGetOrCreateResponse);
+  rpc ProxyList(google.protobuf.Empty) returns (ProxyListResponse);
 
   // Queues
-  rpc QueueCreate(QueueCreateRequest) returns (QueueCreateResponse);
-  rpc QueueGetOrCreate(QueueGetOrCreateRequest) returns (QueueGetOrCreateResponse);
+  rpc QueueClear(QueueClearRequest) returns (google.protobuf.Empty);
+  rpc QueueDelete(QueueDeleteRequest) returns (google.protobuf.Empty);
   rpc QueueGet(QueueGetRequest) returns (QueueGetResponse);
+  rpc QueueGetOrCreate(QueueGetOrCreateRequest) returns (QueueGetOrCreateResponse);
   rpc QueueHeartbeat(QueueHeartbeatRequest) returns (google.protobuf.Empty);
-  rpc QueuePut(QueuePutRequest) returns (google.protobuf.Empty);
   rpc QueueLen(QueueLenRequest) returns (QueueLenResponse);
+  rpc QueueList(QueueListRequest) returns (QueueListResponse);
+  rpc QueueNextItems(QueueNextItemsRequest) returns (QueueNextItemsResponse);
+  rpc QueuePut(QueuePutRequest) returns (google.protobuf.Empty);
 
   // Sandboxes
   rpc SandboxCreate(SandboxCreateRequest) returns (SandboxCreateResponse);
-  rpc SandboxGetTaskId(SandboxGetTaskIdRequest) returns (SandboxGetTaskIdResponse); // needed for modal container exec
   rpc SandboxGetLogs(SandboxGetLogsRequest) returns (stream TaskLogsBatch);
-  rpc SandboxWait(SandboxWaitRequest) returns (SandboxWaitResponse);
+  rpc SandboxGetTaskId(SandboxGetTaskIdRequest) returns (SandboxGetTaskIdResponse); // needed for modal container exec
+  rpc SandboxGetTunnels(SandboxGetTunnelsRequest) returns (SandboxGetTunnelsResponse);
   rpc SandboxList(SandboxListRequest) returns (SandboxListResponse);
-  rpc SandboxTerminate(SandboxTerminateRequest) returns (SandboxTerminateResponse);
+  rpc SandboxSnapshotFs(SandboxSnapshotFsRequest) returns (SandboxSnapshotFsResponse);
   rpc SandboxStdinWrite(SandboxStdinWriteRequest) returns (SandboxStdinWriteResponse);
+  rpc SandboxTagsSet(SandboxTagsSetRequest) returns (google.protobuf.Empty);
+  rpc SandboxTerminate(SandboxTerminateRequest) returns (SandboxTerminateResponse);
+  rpc SandboxWait(SandboxWaitRequest) returns (SandboxWaitResponse);
 
   // Secrets
-  rpc SecretCreate(SecretCreateRequest) returns (SecretCreateResponse);  // Not used by client anymore
+  rpc SecretDelete(SecretDeleteRequest) returns (google.protobuf.Empty);
   rpc SecretGetOrCreate(SecretGetOrCreateRequest) returns (SecretGetOrCreateResponse);
   rpc SecretList(SecretListRequest) returns (SecretListResponse);
 
   // SharedVolumes
+  rpc SharedVolumeDelete(SharedVolumeDeleteRequest) returns (google.protobuf.Empty);
+  rpc SharedVolumeGetFile(SharedVolumeGetFileRequest) returns (SharedVolumeGetFileResponse);
   rpc SharedVolumeGetOrCreate(SharedVolumeGetOrCreateRequest) returns (SharedVolumeGetOrCreateResponse);
-  rpc SharedVolumeCreate(SharedVolumeCreateRequest) returns (SharedVolumeCreateResponse);
   rpc SharedVolumeHeartbeat(SharedVolumeHeartbeatRequest) returns (google.protobuf.Empty);
   rpc SharedVolumeList(SharedVolumeListRequest) returns (SharedVolumeListResponse);
   rpc SharedVolumeListFiles(SharedVolumeListFilesRequest) returns (SharedVolumeListFilesResponse);
   rpc SharedVolumeListFilesStream(SharedVolumeListFilesRequest) returns (stream SharedVolumeListFilesResponse);
   rpc SharedVolumePutFile(SharedVolumePutFileRequest) returns (SharedVolumePutFileResponse);
-  rpc SharedVolumeGetFile(SharedVolumeGetFileRequest) returns (SharedVolumeGetFileResponse);
   rpc SharedVolumeRemoveFile(SharedVolumeRemoveFileRequest) returns (google.protobuf.Empty);
 
   // Tasks
-  rpc TaskResult(TaskResultRequest) returns (google.protobuf.Empty);
-  rpc TaskList(TaskListRequest) returns (TaskListResponse);
-
-  // Gets the inputs currently assigned to the requesting task, requires task metadata for auth
+  rpc TaskClusterHello(TaskClusterHelloRequest) returns (TaskClusterHelloResponse);
   rpc TaskCurrentInputs(google.protobuf.Empty) returns (TaskCurrentInputsResponse);
+  rpc TaskList(TaskListRequest) returns (TaskListResponse);
+  rpc TaskResult(TaskResultRequest) returns (google.protobuf.Empty);
 
   // Tokens (web auth flow)
   rpc TokenFlowCreate(TokenFlowCreateRequest) returns (TokenFlowCreateResponse);
@@ -2127,18 +2882,18 @@ service ModalClient {
   rpc TunnelStop(TunnelStopRequest) returns (TunnelStopResponse);
 
   // Volumes
-  rpc VolumeGetOrCreate(VolumeGetOrCreateRequest) returns (VolumeGetOrCreateResponse);
-  rpc VolumeCreate(VolumeCreateRequest) returns (VolumeCreateResponse);
-  rpc VolumeHeartbeat(VolumeHeartbeatRequest) returns (google.protobuf.Empty);
   rpc VolumeCommit(VolumeCommitRequest) returns (VolumeCommitResponse);
+  rpc VolumeCopyFiles(VolumeCopyFilesRequest) returns (google.protobuf.Empty);
   rpc VolumeDelete(VolumeDeleteRequest) returns (google.protobuf.Empty);
   rpc VolumeGetFile(VolumeGetFileRequest) returns (VolumeGetFileResponse);
+  rpc VolumeGetOrCreate(VolumeGetOrCreateRequest) returns (VolumeGetOrCreateResponse);
+  rpc VolumeHeartbeat(VolumeHeartbeatRequest) returns (google.protobuf.Empty);
   rpc VolumeList(VolumeListRequest) returns (VolumeListResponse);
   rpc VolumeListFiles(VolumeListFilesRequest) returns (stream VolumeListFilesResponse);
   rpc VolumePutFiles(VolumePutFilesRequest) returns (google.protobuf.Empty);
   rpc VolumeReload(VolumeReloadRequest) returns (google.protobuf.Empty);
   rpc VolumeRemoveFile(VolumeRemoveFileRequest) returns (google.protobuf.Empty);
-  rpc VolumeCopyFiles(VolumeCopyFilesRequest) returns (google.protobuf.Empty);
+  rpc VolumeRename(VolumeRenameRequest) returns (google.protobuf.Empty);
 
   // Workspaces
   rpc WorkspaceNameLookup(google.protobuf.Empty) returns (WorkspaceNameLookupResponse);