@cofy-x/axern-sdk 0.6.2 → 0.7.0

package/dist/proto/axern/control/common/v1/common.proto

@@ -4,21 +4,18 @@ package axern.control.common.v1;
 
 option go_package = "github.com/cofy-x/axern/sdk/go/gen/axern/control/common/v1;commonv1";
 
-import "google/protobuf/timestamp.proto";
 import "axern/control/capability/v1/capability.proto";
-import "axern/control/storage/v1/storage_types.proto";
 
 message ResourceQuantity {
   int64 cpu_milli = 1;
   // Total sandbox memory budget. requests.memory_bytes is the placement,
-  // reservation, and namespace-quota commitment. limits.memory_bytes is the
+  // node-capacity charge and namespace-quota commitment. limits.memory_bytes is the
   // host cgroup v2 hard boundary and includes runtime processes, guest
   // accounting, kernel memory, shmem, and charged file/page cache.
   int64 memory_bytes = 2;
   // Sandbox-lifetime node-local disposable storage managed by Axern. The
   // current accounting scope is the runtime writable root overlay and its
-  // metadata/copy-up/whiteouts; persistent volumes and immutable image data
-  // are excluded.
+  // metadata/copy-up/whiteouts; immutable image data is excluded.
   int64 ephemeral_storage_bytes = 3;
 }
 
@@ -27,19 +24,6 @@ message ResourceSpec {
   ResourceQuantity limits = 2;
 }
 
-enum PortProtocol {
-  PORT_PROTOCOL_UNSPECIFIED = 0;
-  PORT_PROTOCOL_TCP = 1;
-  PORT_PROTOCOL_UDP = 2;
-}
-
-message PortSpec {
-  string name = 1;
-  PortProtocol protocol = 2;
-  int32 container_port = 3;
-  int32 host_port = 4;
-}
-
 enum NetworkMode {
   NETWORK_MODE_UNSPECIFIED = 0;
   NETWORK_MODE_DEFAULT = 1;
@@ -113,71 +97,38 @@ message SecretFile {
   bool optional = 5;
 }
 
-message ServiceVolumeMount {
-  string name = 1;
-  string target = 2;
-  bool readonly = 3;
-  repeated string options = 4;
-  axern.control.storage.v1.VolumeReclaimPolicy reclaim_policy = 5;
-}
-
 message ImageMount {
   string image = 1;
   string target = 2;
   bool readonly = 3;
 }
 
-message WorkspaceImageVariant {
-  string format = 1;
-  string image = 2;
-}
-
-message WorkspaceImageSource {
-  repeated WorkspaceImageVariant variants = 1;
-  string source_path = 2;
-  string target = 3;
-}
-
-// WorkspacePreparationFacts records the node-observed preparation result for
-// one allocation's immutable TaskSet workspace. These facts describe the
-// variant that was actually selected by the node, not the variant preference
-// declared by the client.
-message WorkspacePreparationFacts {
-  string payload_format = 1;
-  string payload_digest = 2;
-  bool cache_hit = 3;
-  int64 image_resolve_ms = 4;
-  int64 image_pull_ms = 5;
-  int64 cow_prepare_ms = 6;
-}
-
 message ExecutionConfig {
   repeated string argv = 1;
   map<string, string> env = 2;
   string cwd = 3;
   ResourceSpec resources = 4;
-  repeated PortSpec ports = 5;
-  NetworkSpec network = 6;
-  repeated axern.control.capability.v1.ExtensionCapabilityRequirement extension_capability_requirements = 7;
-  PlacementConstraints placement = 8;
-  repeated SecretEnvVar secret_env = 9;
-  repeated SecretFile secret_files = 10;
-  repeated ServiceVolumeMount volume_mounts = 11;
-  string runtime_class = 12;
-  repeated ImageMount image_mounts = 13;
-  WorkspaceImageSource workspace_image = 14;
-}
-
-enum AllocationStatus {
-  ALLOCATION_STATUS_UNSPECIFIED = 0;
-  ALLOCATION_STATUS_RESERVED = 1;
-  ALLOCATION_STATUS_BOUND = 2;
-  ALLOCATION_STATUS_STARTING = 3;
-  ALLOCATION_STATUS_RUNNING = 4;
-  ALLOCATION_STATUS_EXITED = 5;
-  ALLOCATION_STATUS_FAILED = 6;
-  ALLOCATION_STATUS_RELEASING = 7;
-  ALLOCATION_STATUS_RELEASED = 8;
+  NetworkSpec network = 5;
+  repeated axern.control.capability.v1.ExtensionCapabilityRequirement extension_capability_requirements = 6;
+  PlacementConstraints placement = 7;
+  repeated SecretEnvVar secret_env = 8;
+  repeated SecretFile secret_files = 9;
+  repeated ImageMount image_mounts = 10;
+}
+
+// AllocationLifecycleState tracks only placement and infrastructure cleanup.
+// Workload outcome, exit status, diagnostics, and user-visible status belong to
+// the owning Run.
+enum AllocationLifecycleState {
+  ALLOCATION_LIFECYCLE_STATE_UNSPECIFIED = 0;
+  ALLOCATION_LIFECYCLE_STATE_BOUND = 1;
+  ALLOCATION_LIFECYCLE_STATE_STARTING = 2;
+  ALLOCATION_LIFECYCLE_STATE_ACTIVE = 3;
+  // STOPPED is a node observation. Controld transitions it atomically to
+  // RELEASING when it commits the owning Run result and cleanup work.
+  ALLOCATION_LIFECYCLE_STATE_STOPPED = 4;
+  ALLOCATION_LIFECYCLE_STATE_RELEASING = 5;
+  ALLOCATION_LIFECYCLE_STATE_RELEASED = 6;
 }
 
 enum WorkloadDiagnosticCode {
@@ -188,34 +139,10 @@ enum WorkloadDiagnosticCode {
   WORKLOAD_DIAGNOSTIC_CODE_NODE_SELECTION_ERROR = 4;
   WORKLOAD_DIAGNOSTIC_CODE_RUNTIME_START_ERROR = 5;
   WORKLOAD_DIAGNOSTIC_CODE_PROCESS_EXITED = 6;
-  WORKLOAD_DIAGNOSTIC_CODE_LIVENESS_PROBE_FAILED = 7;
-  WORKLOAD_DIAGNOSTIC_CODE_ADMISSION_BLOCKED = 8;
-  WORKLOAD_DIAGNOSTIC_CODE_STORAGE_TOPOLOGY_UNSATISFIED = 9;
-  WORKLOAD_DIAGNOSTIC_CODE_STORAGE_RESERVE_ERROR = 10;
-  WORKLOAD_DIAGNOSTIC_CODE_VOLUME_PUBLISH_ERROR = 11;
-  WORKLOAD_DIAGNOSTIC_CODE_VOLUME_RELEASE_ERROR = 12;
-  WORKLOAD_DIAGNOSTIC_CODE_VOLUME_SPEC_CONFLICT = 13;
-  WORKLOAD_DIAGNOSTIC_CODE_CAPABILITY_ENFORCEMENT_LOST = 14;
-  WORKLOAD_DIAGNOSTIC_CODE_MEMORY_LIMIT_EXCEEDED = 15;
-}
-
-enum LeaseType {
-  LEASE_TYPE_UNSPECIFIED = 0;
-  LEASE_TYPE_RUN = 1;
-  LEASE_TYPE_SERVICE = 2;
-  LEASE_TYPE_INVOKE = 3;
-}
-
-message ExecutionLease {
-  string lease_id = 1;
-  string allocation_id = 2;
-  string node_id = 3;
-  int64 attempt = 4;
-  LeaseType lease_type = 5;
-  string plaintext_token = 6;
-  int64 revision = 7;
-  google.protobuf.Timestamp expires_at = 8;
-  bool revoked = 9;
-  string node_target = 10;
-  string validation_token_hash = 11;
+  WORKLOAD_DIAGNOSTIC_CODE_ADMISSION_BLOCKED = 7;
+  WORKLOAD_DIAGNOSTIC_CODE_CAPABILITY_ENFORCEMENT_LOST = 8;
+  WORKLOAD_DIAGNOSTIC_CODE_MEMORY_LIMIT_EXCEEDED = 9;
+  WORKLOAD_DIAGNOSTIC_CODE_EXECUTION_LEASE_EXPIRED = 10;
+  WORKLOAD_DIAGNOSTIC_CODE_OPERATOR_FORCE_TERMINATED = 11;
+  WORKLOAD_DIAGNOSTIC_CODE_OPERATOR_FORCE_CLEANUP = 12;
 }

package/dist/proto/axern/control/environment/v1/environment.proto

@@ -4,14 +4,45 @@ package axern.control.environment.v1;
 
 option go_package = "github.com/cofy-x/axern/sdk/go/gen/axern/control/environment/v1;environmentv1";
 
-import "axern/control/catalog/v1/catalog.proto";
 import "google/protobuf/timestamp.proto";
 
+message EnvironmentMount {
+  string type = 1;
+  string source = 2;
+  string target = 3;
+  repeated string options = 4;
+}
+
+message OciImageDescriptor {
+  string digest = 1;
+  string media_type = 2;
+  int64 size_bytes = 3;
+  map<string, string> annotations = 4;
+}
+
+message OciBaselinePolicy {
+  repeated string capabilities = 1;
+  uint64 no_file_limit = 2;
+}
+
+message OciExecutionProfile {
+  OciBaselinePolicy baseline = 1;
+}
+
+message ResolvedEnvironmentSpec {
+  bool rootfs_readonly = 1;
+  repeated string image_default_argv = 2;
+  string default_cwd = 3;
+  map<string, string> default_env = 4;
+  repeated EnvironmentMount mounts = 5;
+  OciImageDescriptor image_descriptor = 6;
+  OciExecutionProfile execution_profile = 7;
+}
+
 message EnvironmentImageSource {
   string ref = 1;
-  string digest = 2;
-  bool rootfs_readonly = 3;
-  string registry_credential_id = 4;
+  bool rootfs_readonly = 2;
+  string registry_credential_id = 3;
 }
 
 message EnvironmentSpec {
@@ -21,35 +52,20 @@ message EnvironmentSpec {
   EnvironmentImageSource image = 4;
 }
 
-enum EnvironmentStatus {
-  ENVIRONMENT_STATUS_UNSPECIFIED = 0;
-  ENVIRONMENT_STATUS_PENDING = 1;
-  ENVIRONMENT_STATUS_READY = 2;
-  ENVIRONMENT_STATUS_FAILED = 3;
-  ENVIRONMENT_STATUS_DELETING = 4;
-  ENVIRONMENT_STATUS_DELETED = 5;
-}
-
 message Environment {
   string id = 1;
   string namespace = 2;
-  EnvironmentStatus status = 3;
-  EnvironmentSpec spec = 4;
-  string spec_hash = 5;
-  axern.control.catalog.v1.RuntimeTemplate resolved_template = 6;
-  map<string, string> labels = 7;
-  int64 version = 8;
-  google.protobuf.Timestamp created_at = 9;
-  google.protobuf.Timestamp updated_at = 10;
-  string message = 11;
+  EnvironmentSpec spec = 3;
+  ResolvedEnvironmentSpec resolved_spec = 4;
+  map<string, string> labels = 5;
+  google.protobuf.Timestamp created_at = 6;
 }
 
 message ListFilter {
   string namespace = 1;
-  repeated EnvironmentStatus statuses = 2;
-  map<string, string> labels = 3;
-  string cursor = 4;
-  int32 page_size = 5;
+  map<string, string> labels = 2;
+  string cursor = 3;
+  int32 page_size = 4;
 }
 
 message CreateEnvironmentRequest {

package/dist/proto/axern/control/gateway/v1/gateway.proto

@@ -4,47 +4,14 @@ package axern.control.gateway.v1;
 
 option go_package = "github.com/cofy-x/axern/sdk/go/gen/axern/control/gateway/v1;gatewayv1";
 
-import "axern/control/common/v1/common.proto";
-import "axern/control/service/v1/service_types.proto";
-
-message ResolveServiceRouteRequest {
-  string namespace = 1;
-  string service_id = 2;
-  string port_ref = 3;
-  int64 ttl_seconds = 4;
-}
-
-message ServiceRoutePort {
-  string name = 1;
-  axern.control.common.v1.PortProtocol protocol = 2;
-  int32 container_port = 3;
-}
-
-message ServiceRouteEndpoint {
-  string allocation_id = 1;
-  string node_id = 2;
-  string node_target = 3;
-  int64 attempt = 4;
-  int32 container_port = 5;
-  axern.control.common.v1.PortProtocol protocol = 6;
-  bool ready = 7;
-  axern.control.common.v1.ExecutionLease lease = 8;
-}
-
-message ResolveServiceRouteResponse {
-  string service_id = 1;
-  string namespace = 2;
-  axern.control.service.v1.ServiceStatus service_status = 3;
-  ServiceRoutePort port = 4;
-  repeated ServiceRouteEndpoint endpoints = 5;
-}
-
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
 message ResolveAllocationTerminalRequest {
   string allocation_id = 1;
   int64 ttl_seconds = 2;
-  string client_certificate_fingerprint = 3;
-  string rollout_execution_lease = 4;
-  AllocationAccessPurpose purpose = 5;
+  string credential_fingerprint = 3;
+  AllocationAccessPurpose purpose = 4;
+  string credential_kind = 5;
 }
 
 enum AllocationAccessPurpose {
@@ -55,12 +22,18 @@ enum AllocationAccessPurpose {
 
 message ResolveAllocationTerminalResponse {
   string allocation_id = 1;
-  string owner_type = 2;
-  string owner_id = 3;
-  string node_id = 4;
-  string node_target = 5;
-  int64 attempt = 6;
-  axern.control.common.v1.ExecutionLease lease = 7;
+  string run_id = 2;
+  string node_id = 3;
+  string node_target = 4;
+  AllocationAccessGrant access_grant = 5;
+}
+
+message AllocationAccessGrant {
+  string grant_id = 1;
+  string allocation_id = 2;
+  string node_id = 3;
+  string plaintext_token = 4;
+  google.protobuf.Timestamp expires_at = 5;
 }
 
 message ResolveTunnelRelayTargetRequest {
@@ -71,22 +44,8 @@ message ResolveTunnelRelayTargetResponse {
   string node_edge_target = 1;
 }
 
-message ResolveServiceReplicaTargetsRequest {
-  string service_id = 1;
-}
-
-message ServiceReplicaTarget {
-  string allocation_id = 1;
-  string node_id = 2;
-}
-
-message ResolveServiceReplicaTargetsResponse {
-  repeated ServiceReplicaTarget replicas = 1;
-}
-
 service GatewayControl {
-  rpc ResolveServiceRoute(ResolveServiceRouteRequest) returns (ResolveServiceRouteResponse) {}
+  rpc AuthorizeAllocationAccess(ResolveAllocationTerminalRequest) returns (google.protobuf.Empty) {}
   rpc ResolveAllocationTerminal(ResolveAllocationTerminalRequest) returns (ResolveAllocationTerminalResponse) {}
   rpc ResolveTunnelRelayTarget(ResolveTunnelRelayTargetRequest) returns (ResolveTunnelRelayTargetResponse) {}
-  rpc ResolveServiceReplicaTargets(ResolveServiceReplicaTargetsRequest) returns (ResolveServiceReplicaTargetsResponse) {}
 }

package/dist/proto/axern/control/identity/v1/identity.proto

@@ -17,7 +17,7 @@ message CredentialIdentity {
   string credential_id = 1;
   string label = 2;
   string fingerprint = 3;
-  google.protobuf.Timestamp certificate_not_after = 4;
+  google.protobuf.Timestamp expires_at = 4;
 }
 
 message EffectiveRole {

package/dist/proto/axern/control/namespace/v1/namespace.proto

@@ -8,9 +8,8 @@ import "google/protobuf/timestamp.proto";
 
 message Namespace {
   string namespace = 1;
-  int64 version = 2;
-  google.protobuf.Timestamp created_at = 3;
-  google.protobuf.Timestamp updated_at = 4;
+  google.protobuf.Timestamp created_at = 2;
+  google.protobuf.Timestamp deleted_at = 3;
 }
 
 message CreateNamespaceRequest {

package/dist/proto/axern/control/quota/v1/quota.proto

@@ -11,16 +11,15 @@ message NamespaceQuota {
   string namespace = 1;
   google.protobuf.Int64Value cpu_milli_limit = 2;
   google.protobuf.Int64Value memory_bytes_limit = 3;
-  int64 reserved_cpu_milli = 4;
-  int64 reserved_memory_bytes = 5;
+  int64 used_cpu_milli = 4;
+  int64 used_memory_bytes = 5;
   google.protobuf.Int64Value available_cpu_milli = 6;
   google.protobuf.Int64Value available_memory_bytes = 7;
-  int64 version = 8;
-  google.protobuf.Timestamp created_at = 9;
-  google.protobuf.Timestamp updated_at = 10;
-  google.protobuf.Int64Value ephemeral_storage_bytes_limit = 11;
-  int64 reserved_ephemeral_storage_bytes = 12;
-  google.protobuf.Int64Value available_ephemeral_storage_bytes = 13;
+  google.protobuf.Timestamp created_at = 8;
+  google.protobuf.Timestamp updated_at = 9;
+  google.protobuf.Int64Value ephemeral_storage_bytes_limit = 10;
+  int64 used_ephemeral_storage_bytes = 11;
+  google.protobuf.Int64Value available_ephemeral_storage_bytes = 12;
 }
 
 enum NamespaceQuotaEventType {
@@ -28,12 +27,6 @@ enum NamespaceQuotaEventType {
   NAMESPACE_QUOTA_EVENT_TYPE_ADMISSION_REJECTED = 1;
 }
 
-enum NamespaceQuotaEventWorkloadType {
-  NAMESPACE_QUOTA_EVENT_WORKLOAD_TYPE_UNSPECIFIED = 0;
-  NAMESPACE_QUOTA_EVENT_WORKLOAD_TYPE_RUN = 1;
-  NAMESPACE_QUOTA_EVENT_WORKLOAD_TYPE_SERVICE = 2;
-}
-
 enum NamespaceQuotaEventReason {
   NAMESPACE_QUOTA_EVENT_REASON_UNSPECIFIED = 0;
   NAMESPACE_QUOTA_EVENT_REASON_INSUFFICIENT_CPU = 1;
@@ -46,24 +39,21 @@ message NamespaceQuotaEvent {
   string id = 1;
   string namespace = 2;
   NamespaceQuotaEventType type = 3;
-  NamespaceQuotaEventWorkloadType workload_type = 4;
-  string workload_id = 5;
-  string environment_id = 6;
-  NamespaceQuotaEventReason reason = 7;
-  int64 requested_cpu_milli = 8;
-  int64 reserved_cpu_milli = 9;
-  google.protobuf.Int64Value cpu_milli_limit = 10;
-  google.protobuf.Int64Value available_cpu_milli = 11;
-  int64 requested_memory_bytes = 12;
-  int64 reserved_memory_bytes = 13;
-  google.protobuf.Int64Value memory_bytes_limit = 14;
-  google.protobuf.Int64Value available_memory_bytes = 15;
-  string message = 16;
-  google.protobuf.Timestamp created_at = 17;
-  int64 requested_ephemeral_storage_bytes = 18;
-  int64 reserved_ephemeral_storage_bytes = 19;
-  google.protobuf.Int64Value ephemeral_storage_bytes_limit = 20;
-  google.protobuf.Int64Value available_ephemeral_storage_bytes = 21;
+  string environment_id = 4;
+  NamespaceQuotaEventReason reason = 5;
+  int64 requested_cpu_milli = 6;
+  int64 used_cpu_milli = 7;
+  google.protobuf.Int64Value cpu_milli_limit = 8;
+  google.protobuf.Int64Value available_cpu_milli = 9;
+  int64 requested_memory_bytes = 10;
+  int64 used_memory_bytes = 11;
+  google.protobuf.Int64Value memory_bytes_limit = 12;
+  google.protobuf.Int64Value available_memory_bytes = 13;
+  google.protobuf.Timestamp created_at = 14;
+  int64 requested_ephemeral_storage_bytes = 15;
+  int64 used_ephemeral_storage_bytes = 16;
+  google.protobuf.Int64Value ephemeral_storage_bytes_limit = 17;
+  google.protobuf.Int64Value available_ephemeral_storage_bytes = 18;
 }
 
 message GetNamespaceQuotaRequest {

package/dist/proto/axern/control/run/v1/run.proto

@@ -6,17 +6,17 @@ option go_package = "github.com/cofy-x/axern/sdk/go/gen/axern/control/run/v1;run
 
 import "axern/control/common/v1/common.proto";
 import "axern/control/capability/v1/capability.proto";
+import "axern/control/environment/v1/environment.proto";
 import "google/protobuf/timestamp.proto";
 
 enum RunStatus {
   RUN_STATUS_UNSPECIFIED = 0;
-  RUN_STATUS_QUEUED = 1;
-  RUN_STATUS_PLACED = 2;
-  RUN_STATUS_STARTING = 3;
-  RUN_STATUS_RUNNING = 4;
-  RUN_STATUS_SUCCEEDED = 5;
-  RUN_STATUS_FAILED = 6;
-  RUN_STATUS_CANCELLED = 7;
+  RUN_STATUS_PLACED = 1;
+  RUN_STATUS_STARTING = 2;
+  RUN_STATUS_RUNNING = 3;
+  RUN_STATUS_SUCCEEDED = 4;
+  RUN_STATUS_FAILED = 5;
+  RUN_STATUS_CANCELLED = 6;
 }
 
 message Run {
@@ -24,21 +24,25 @@ message Run {
   string namespace = 2;
   string environment_id = 3;
   string allocation_id = 4;
-  int64 attempt = 5;
-  RunStatus status = 6;
-  axern.control.common.v1.ExecutionConfig config = 7;
-  map<string, string> labels = 8;
-  int64 version = 9;
-  google.protobuf.Timestamp created_at = 10;
-  google.protobuf.Timestamp updated_at = 11;
-  int32 exit_code = 12;
-  bool exit_code_known = 13;
-  string message = 14;
-  axern.control.common.v1.WorkloadDiagnosticCode diagnostic_code = 15;
-	// Full, monotonically revised allocation capability condition projection.
-	// It is independent from run lifecycle status and message.
-	axern.control.capability.v1.CapabilityConditionSet capability_conditions = 16;
-  reserved 17 to 18;
+  RunStatus status = 5;
+  axern.control.common.v1.ExecutionConfig config = 6;
+  map<string, string> labels = 7;
+  int64 version = 8;
+  google.protobuf.Timestamp created_at = 9;
+  google.protobuf.Timestamp updated_at = 10;
+  optional int32 exit_code = 11;
+  string message = 12;
+  axern.control.common.v1.WorkloadDiagnosticCode diagnostic_code = 13;
+  // Latest allocation capability condition projection. It is independent
+  // from Run lifecycle status and message.
+  axern.control.capability.v1.CapabilityConditionSet capability_conditions = 14;
+  string node_id = 15;
+  // Immutable Environment input frozen atomically with Run admission. The
+  // source record may be deleted after this Run is created.
+  axern.control.environment.v1.EnvironmentSpec environment_spec = 16;
+  axern.control.environment.v1.ResolvedEnvironmentSpec resolved_environment_spec = 17;
+  // Node-local stdout/stderr availability deadline; node loss may make bytes unavailable earlier.
+  google.protobuf.Timestamp output_expires_at = 18;
 }
 
 message RunListFilter {

package/dist/proto/axern/control/secret/v1/secret.proto

@@ -18,9 +18,7 @@ message Secret {
   SecretType type = 3;
   repeated string data_keys = 4;
   map<string, string> labels = 5;
-  int64 version = 6;
-  google.protobuf.Timestamp created_at = 7;
-  google.protobuf.Timestamp updated_at = 8;
+  google.protobuf.Timestamp created_at = 6;
 }
 
 message SecretListFilter {

package/dist/proto/axern/control/tunnel/v1/tunnel.proto

@@ -67,27 +67,21 @@ message TunnelSession {
   string session_id = 1;
   string allocation_id = 2;
   string node_id = 3;
-  string node_target = 4;
-  int64 attempt = 5;
-  int32 remote_port = 6;
-  string local_target = 7;
-  string edge_target = 8;
-  TunnelSessionStatus status = 9;
-  string reason = 10;
-  string bound_addr = 11;
-  bool revoked = 12;
-  google.protobuf.Timestamp created_at = 13;
-  google.protobuf.Timestamp updated_at = 14;
-  google.protobuf.Timestamp expires_at = 15;
-  string node_edge_target = 16;
-  string relay_id = 17;
-  string client_edge_target = 18;
-  google.protobuf.Timestamp ready_at = 19;
-  google.protobuf.Timestamp last_peer_event_at = 20;
-  int64 bytes_in = 21;
-  int64 bytes_out = 22;
-  string namespace = 23;
-  string creator_principal_id = 24;
+  int32 remote_port = 4;
+  string client_edge_target = 5;
+  TunnelSessionStatus status = 6;
+  string reason = 7;
+  string bound_addr = 8;
+  google.protobuf.Timestamp created_at = 9;
+  google.protobuf.Timestamp updated_at = 10;
+  google.protobuf.Timestamp expires_at = 11;
+  string relay_id = 12;
+  google.protobuf.Timestamp ready_at = 13;
+  google.protobuf.Timestamp last_peer_event_at = 14;
+  int64 bytes_in = 15;
+  int64 bytes_out = 16;
+  string namespace = 17;
+  string creator_principal_id = 18;
 }
 
 message TunnelSessionEvent {
@@ -108,10 +102,9 @@ message TunnelSessionEvent {
 message CreateTunnelSessionRequest {
   string allocation_id = 1;
   optional int32 remote_port = 2;
-  string local_target = 3;
-  google.protobuf.Duration ttl = 4;
-  bool wait_ready = 5;
-  google.protobuf.Duration ready_timeout = 6;
+  google.protobuf.Duration ttl = 3;
+  bool wait_ready = 4;
+  google.protobuf.Duration ready_timeout = 5;
 }
 
 message CreateTunnelSessionResponse {