diff --git a/lib/oto/agent/agent_runner.dart b/lib/oto/agent/agent_runner.dart
index 61b2f24..d6952e5 100644
--- a/lib/oto/agent/agent_runner.dart
+++ b/lib/oto/agent/agent_runner.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'package:oto/cli/cli.dart';
 import 'package:oto/oto/agent/agent_config.dart';
 import 'package:oto/oto/agent/edge_registration_client.dart';
@@ -18,19 +19,31 @@ class RegistrationException implements Exception {
 class DefaultAgentRunner implements AgentRunner {
   final EdgeRegistrationClient _client;
   final void Function(String)? _onLog;
+  final Future<void> Function()? _waitForShutdown;
 
   DefaultAgentRunner({
     EdgeRegistrationClient? client,
     void Function(String)? onLog,
+    Future<void> Function()? waitForShutdown,
   })  : _client = client ?? EdgeRegistrationClient(),
-        _onLog = onLog;
+        _onLog = onLog,
+        _waitForShutdown = waitForShutdown;
 
   @override
   Future<void> run(AgentConfig config) async {
     _log('Starting registration with OTO Edge at "${config.edge.url}"...');
 
+    final EdgeAgentSession session;
     try {
-      final result = await _client.register(config);
+      session = await _client.openSession(config);
+    } on RegistrationException {
+      rethrow;
+    } catch (e) {
+      throw RegistrationException('Connection failed: $e');
+    }
+
+    try {
+      final result = session.result;
 
       if (!result.accepted) {
         throw RegistrationException(result.rejectReason ??
@@ -42,10 +55,42 @@ class DefaultAgentRunner implements AgentRunner {
       if (result.alias != null) {
         _log('Alias: ${result.alias}');
       }
-    } on RegistrationException {
-      rethrow;
-    } catch (e) {
-      throw RegistrationException('Connection failed: $e');
+
+      _log('Agent connected. Waiting for shutdown signal...');
+      await _awaitShutdown();
+    } finally {
+      await session.close();
+    }
+  }
+
+  /// 등록 성공 후 종료 신호를 기다린다. 테스트는 [waitForShutdown]를 주입해
+  /// hang 없이 연결 유지/정리 흐름을 검증한다.
+  Future<void> _awaitShutdown() async {
+    final waitForShutdown = _waitForShutdown;
+    if (waitForShutdown != null) {
+      await waitForShutdown();
+      return;
+    }
+
+    final completer = Completer<void>();
+    final subscriptions = <StreamSubscription<ProcessSignal>>[];
+    void requestStop() {
+      if (!completer.isCompleted) {
+        completer.complete();
+      }
+    }
+
+    subscriptions
+        .add(ProcessSignal.sigint.watch().listen((_) => requestStop()));
+    subscriptions
+        .add(ProcessSignal.sigterm.watch().listen((_) => requestStop()));
+
+    try {
+      await completer.future;
+    } finally {
+      for (final subscription in subscriptions) {
+        await subscription.cancel();
+      }
     }
   }
 
diff --git a/lib/oto/agent/edge_registration_client.dart b/lib/oto/agent/edge_registration_client.dart
index 58c2ebd..1005bc7 100644
--- a/lib/oto/agent/edge_registration_client.dart
+++ b/lib/oto/agent/edge_registration_client.dart
@@ -103,8 +103,38 @@ class _OtoIopClient extends ProtobufClient {
         });
 }
 
+/// Edge에 등록한 뒤에도 연결을 유지하는 agent session.
+///
+/// registration accepted 이후 최초 heartbeat까지 살아 있어야 하는 OTO agent를
+/// 위해, connection을 닫지 않고 보존한다. session 소유자는 종료 시 [close]를
+/// 호출해 transport를 정리할 책임이 있다.
+abstract class EdgeAgentSession {
+  /// register 요청에 대한 Edge 응답 결과.
+  RegistrationResult get result;
+
+  /// 유지 중인 Edge 연결을 닫는다. 여러 번 호출해도 안전하다.
+  Future<void> close();
+}
+
+class _OtoEdgeAgentSession implements EdgeAgentSession {
+  final _OtoIopClient _client;
+
+  @override
+  final RegistrationResult result;
+
+  _OtoEdgeAgentSession(this._client, this.result);
+
+  @override
+  Future<void> close() => _client.close();
+}
+
 class EdgeRegistrationClient {
-  Future<RegistrationResult> register(AgentConfig config) async {
+  /// Edge에 연결해 register 요청을 보낸 뒤, 연결을 유지한 채 session을 돌려준다.
+  ///
+  /// 반환된 [EdgeAgentSession] 소유자는 종료 시 반드시 [EdgeAgentSession.close]를
+  /// 호출해야 한다. 연결 단계에서 실패하면 내부에서 transport를 닫고 예외를
+  /// 다시 던지므로 leak이 생기지 않는다.
+  Future<EdgeAgentSession> openSession(AgentConfig config) async {
     final endpoint = EdgeEndpoint.parse(config.edge.url);
     final socket = await ProtobufClient.connect(endpoint.host, endpoint.port);
     final client = _OtoIopClient(socket);
@@ -114,9 +144,21 @@ class EdgeRegistrationClient {
         iop.RegisterRequest()..token = config.agent.enrollmentToken,
         timeout: const Duration(seconds: 5),
       );
-      return RegistrationResult.fromResponse(response);
-    } finally {
+      return _OtoEdgeAgentSession(
+          client, RegistrationResult.fromResponse(response));
+    } catch (_) {
       await client.close();
+      rethrow;
+    }
+  }
+
+  /// 연결을 유지하지 않는 one-shot 등록. 결과를 받은 뒤 즉시 연결을 닫는다.
+  Future<RegistrationResult> register(AgentConfig config) async {
+    final session = await openSession(config);
+    try {
+      return session.result;
+    } finally {
+      await session.close();
     }
   }
 }
diff --git a/lib/oto/agent/google/protobuf/struct.pb.dart b/lib/oto/agent/google/protobuf/struct.pb.dart
deleted file mode 100644
index 847ddda..0000000
--- a/lib/oto/agent/google/protobuf/struct.pb.dart
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
-
-import 'struct.pbenum.dart';
-
-export 'struct.pbenum.dart';
-
-///  `Struct` represents a structured data value, consisting of fields
-///  which map to dynamically typed values. In some languages, `Struct`
-///  might be supported by a native representation. For example, in
-///  scripting languages like JS a struct is represented as an
-///  object. The details of that representation are described together
-///  with the proto support for the language.
-///
-///  The JSON representation for `Struct` is JSON object.
-class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
-  factory Struct({
-    $core.Map<$core.String, Value>? fields,
-  }) {
-    final $result = create();
-    if (fields != null) {
-      $result.fields.addAll(fields);
-    }
-    return $result;
-  }
-  Struct._() : super();
-  factory Struct.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Struct.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Struct', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.StructMixin.toProto3JsonHelper, fromProto3Json: $mixin.StructMixin.fromProto3JsonHelper)
-    ..m<$core.String, Value>(1, _omitFieldNames ? '' : 'fields', entryClassName: 'Struct.FieldsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: Value.create, valueDefaultOrMaker: Value.getDefault, packageName: const $pb.PackageName('google.protobuf'))
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Struct clone() => Struct()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Struct copyWith(void Function(Struct) updates) => super.copyWith((message) => updates(message as Struct)) as Struct;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Struct create() => Struct._();
-  Struct createEmptyInstance() => create();
-  static $pb.PbList<Struct> createRepeated() => $pb.PbList<Struct>();
-  @$core.pragma('dart2js:noInline')
-  static Struct getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Struct>(create);
-  static Struct? _defaultInstance;
-
-  /// Unordered map of dynamically typed values.
-  @$pb.TagNumber(1)
-  $core.Map<$core.String, Value> get fields => $_getMap(0);
-}
-
-enum Value_Kind {
-  nullValue, 
-  numberValue, 
-  stringValue, 
-  boolValue, 
-  structValue, 
-  listValue, 
-  notSet
-}
-
-///  `Value` represents a dynamically typed value which can be either
-///  null, a number, a string, a boolean, a recursive struct value, or a
-///  list of values. A producer of value is expected to set one of these
-///  variants. Absence of any variant indicates an error.
-///
-///  The JSON representation for `Value` is JSON value.
-class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
-  factory Value({
-    NullValue? nullValue,
-    $core.double? numberValue,
-    $core.String? stringValue,
-    $core.bool? boolValue,
-    Struct? structValue,
-    ListValue? listValue,
-  }) {
-    final $result = create();
-    if (nullValue != null) {
-      $result.nullValue = nullValue;
-    }
-    if (numberValue != null) {
-      $result.numberValue = numberValue;
-    }
-    if (stringValue != null) {
-      $result.stringValue = stringValue;
-    }
-    if (boolValue != null) {
-      $result.boolValue = boolValue;
-    }
-    if (structValue != null) {
-      $result.structValue = structValue;
-    }
-    if (listValue != null) {
-      $result.listValue = listValue;
-    }
-    return $result;
-  }
-  Value._() : super();
-  factory Value.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Value.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static const $core.Map<$core.int, Value_Kind> _Value_KindByTag = {
-    1 : Value_Kind.nullValue,
-    2 : Value_Kind.numberValue,
-    3 : Value_Kind.stringValue,
-    4 : Value_Kind.boolValue,
-    5 : Value_Kind.structValue,
-    6 : Value_Kind.listValue,
-    0 : Value_Kind.notSet
-  };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Value', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.ValueMixin.toProto3JsonHelper, fromProto3Json: $mixin.ValueMixin.fromProto3JsonHelper)
-    ..oo(0, [1, 2, 3, 4, 5, 6])
-    ..e<NullValue>(1, _omitFieldNames ? '' : 'nullValue', $pb.PbFieldType.OE, defaultOrMaker: NullValue.NULL_VALUE, valueOf: NullValue.valueOf, enumValues: NullValue.values)
-    ..a<$core.double>(2, _omitFieldNames ? '' : 'numberValue', $pb.PbFieldType.OD)
-    ..aOS(3, _omitFieldNames ? '' : 'stringValue')
-    ..aOB(4, _omitFieldNames ? '' : 'boolValue')
-    ..aOM<Struct>(5, _omitFieldNames ? '' : 'structValue', subBuilder: Struct.create)
-    ..aOM<ListValue>(6, _omitFieldNames ? '' : 'listValue', subBuilder: ListValue.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Value clone() => Value()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Value copyWith(void Function(Value) updates) => super.copyWith((message) => updates(message as Value)) as Value;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Value create() => Value._();
-  Value createEmptyInstance() => create();
-  static $pb.PbList<Value> createRepeated() => $pb.PbList<Value>();
-  @$core.pragma('dart2js:noInline')
-  static Value getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Value>(create);
-  static Value? _defaultInstance;
-
-  Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!;
-  void clearKind() => clearField($_whichOneof(0));
-
-  /// Represents a null value.
-  @$pb.TagNumber(1)
-  NullValue get nullValue => $_getN(0);
-  @$pb.TagNumber(1)
-  set nullValue(NullValue v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasNullValue() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearNullValue() => clearField(1);
-
-  /// Represents a double value.
-  @$pb.TagNumber(2)
-  $core.double get numberValue => $_getN(1);
-  @$pb.TagNumber(2)
-  set numberValue($core.double v) { $_setDouble(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasNumberValue() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearNumberValue() => clearField(2);
-
-  /// Represents a string value.
-  @$pb.TagNumber(3)
-  $core.String get stringValue => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set stringValue($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasStringValue() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearStringValue() => clearField(3);
-
-  /// Represents a boolean value.
-  @$pb.TagNumber(4)
-  $core.bool get boolValue => $_getBF(3);
-  @$pb.TagNumber(4)
-  set boolValue($core.bool v) { $_setBool(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasBoolValue() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearBoolValue() => clearField(4);
-
-  /// Represents a structured value.
-  @$pb.TagNumber(5)
-  Struct get structValue => $_getN(4);
-  @$pb.TagNumber(5)
-  set structValue(Struct v) { setField(5, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasStructValue() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearStructValue() => clearField(5);
-  @$pb.TagNumber(5)
-  Struct ensureStructValue() => $_ensure(4);
-
-  /// Represents a repeated `Value`.
-  @$pb.TagNumber(6)
-  ListValue get listValue => $_getN(5);
-  @$pb.TagNumber(6)
-  set listValue(ListValue v) { setField(6, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasListValue() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearListValue() => clearField(6);
-  @$pb.TagNumber(6)
-  ListValue ensureListValue() => $_ensure(5);
-}
-
-///  `ListValue` is a wrapper around a repeated field of values.
-///
-///  The JSON representation for `ListValue` is JSON array.
-class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin {
-  factory ListValue({
-    $core.Iterable<Value>? values,
-  }) {
-    final $result = create();
-    if (values != null) {
-      $result.values.addAll(values);
-    }
-    return $result;
-  }
-  ListValue._() : super();
-  factory ListValue.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ListValue.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListValue', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.ListValueMixin.toProto3JsonHelper, fromProto3Json: $mixin.ListValueMixin.fromProto3JsonHelper)
-    ..pc<Value>(1, _omitFieldNames ? '' : 'values', $pb.PbFieldType.PM, subBuilder: Value.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ListValue clone() => ListValue()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ListValue copyWith(void Function(ListValue) updates) => super.copyWith((message) => updates(message as ListValue)) as ListValue;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ListValue create() => ListValue._();
-  ListValue createEmptyInstance() => create();
-  static $pb.PbList<ListValue> createRepeated() => $pb.PbList<ListValue>();
-  @$core.pragma('dart2js:noInline')
-  static ListValue getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ListValue>(create);
-  static ListValue? _defaultInstance;
-
-  /// Repeated field of dynamically typed values.
-  @$pb.TagNumber(1)
-  $core.List<Value> get values => $_getList(0);
-}
-
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/oto/agent/google/protobuf/struct.pbenum.dart b/lib/oto/agent/google/protobuf/struct.pbenum.dart
deleted file mode 100644
index bf7c571..0000000
--- a/lib/oto/agent/google/protobuf/struct.pbenum.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-///  `NullValue` is a singleton enumeration to represent the null value for the
-///  `Value` type union.
-///
-///  The JSON representation for `NullValue` is JSON `null`.
-class NullValue extends $pb.ProtobufEnum {
-  static const NullValue NULL_VALUE = NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE');
-
-  static const $core.List<NullValue> values = <NullValue> [
-    NULL_VALUE,
-  ];
-
-  static final $core.Map<$core.int, NullValue> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static NullValue? valueOf($core.int value) => _byValue[value];
-
-  const NullValue._($core.int v, $core.String n) : super(v, n);
-}
-
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/lib/oto/agent/google/protobuf/struct.pbjson.dart b/lib/oto/agent/google/protobuf/struct.pbjson.dart
deleted file mode 100644
index ffa25fa..0000000
--- a/lib/oto/agent/google/protobuf/struct.pbjson.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use nullValueDescriptor instead')
-const NullValue$json = {
-  '1': 'NullValue',
-  '2': [
-    {'1': 'NULL_VALUE', '2': 0},
-  ],
-};
-
-/// Descriptor for `NullValue`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List nullValueDescriptor = $convert.base64Decode(
-    'CglOdWxsVmFsdWUSDgoKTlVMTF9WQUxVRRAA');
-
-@$core.Deprecated('Use structDescriptor instead')
-const Struct$json = {
-  '1': 'Struct',
-  '2': [
-    {'1': 'fields', '3': 1, '4': 3, '5': 11, '6': '.google.protobuf.Struct.FieldsEntry', '10': 'fields'},
-  ],
-  '3': [Struct_FieldsEntry$json],
-};
-
-@$core.Deprecated('Use structDescriptor instead')
-const Struct_FieldsEntry$json = {
-  '1': 'FieldsEntry',
-  '2': [
-    {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'value', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Value', '10': 'value'},
-  ],
-  '7': {'7': true},
-};
-
-/// Descriptor for `Struct`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List structDescriptor = $convert.base64Decode(
-    'CgZTdHJ1Y3QSOwoGZmllbGRzGAEgAygLMiMuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdC5GaWVsZH'
-    'NFbnRyeVIGZmllbGRzGlEKC0ZpZWxkc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EiwKBXZhbHVl'
-    'GAIgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgV2YWx1ZToCOAE=');
-
-@$core.Deprecated('Use valueDescriptor instead')
-const Value$json = {
-  '1': 'Value',
-  '2': [
-    {'1': 'null_value', '3': 1, '4': 1, '5': 14, '6': '.google.protobuf.NullValue', '9': 0, '10': 'nullValue'},
-    {'1': 'number_value', '3': 2, '4': 1, '5': 1, '9': 0, '10': 'numberValue'},
-    {'1': 'string_value', '3': 3, '4': 1, '5': 9, '9': 0, '10': 'stringValue'},
-    {'1': 'bool_value', '3': 4, '4': 1, '5': 8, '9': 0, '10': 'boolValue'},
-    {'1': 'struct_value', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '9': 0, '10': 'structValue'},
-    {'1': 'list_value', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.ListValue', '9': 0, '10': 'listValue'},
-  ],
-  '8': [
-    {'1': 'kind'},
-  ],
-};
-
-/// Descriptor for `Value`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List valueDescriptor = $convert.base64Decode(
-    'CgVWYWx1ZRI7CgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZU'
-    'gAUgludWxsVmFsdWUSIwoMbnVtYmVyX3ZhbHVlGAIgASgBSABSC251bWJlclZhbHVlEiMKDHN0'
-    'cmluZ192YWx1ZRgDIAEoCUgAUgtzdHJpbmdWYWx1ZRIfCgpib29sX3ZhbHVlGAQgASgISABSCW'
-    'Jvb2xWYWx1ZRI8CgxzdHJ1Y3RfdmFsdWUYBSABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0'
-    'SABSC3N0cnVjdFZhbHVlEjsKCmxpc3RfdmFsdWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuTG'
-    'lzdFZhbHVlSABSCWxpc3RWYWx1ZUIGCgRraW5k');
-
-@$core.Deprecated('Use listValueDescriptor instead')
-const ListValue$json = {
-  '1': 'ListValue',
-  '2': [
-    {'1': 'values', '3': 1, '4': 3, '5': 11, '6': '.google.protobuf.Value', '10': 'values'},
-  ],
-};
-
-/// Descriptor for `ListValue`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listValueDescriptor = $convert.base64Decode(
-    'CglMaXN0VmFsdWUSLgoGdmFsdWVzGAEgAygLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgZ2YW'
-    'x1ZXM=');
-
diff --git a/lib/oto/agent/google/protobuf/struct.pbserver.dart b/lib/oto/agent/google/protobuf/struct.pbserver.dart
deleted file mode 100644
index b92ae61..0000000
--- a/lib/oto/agent/google/protobuf/struct.pbserver.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'struct.pb.dart';
-
diff --git a/lib/oto/agent/iop/runtime.pb.dart b/lib/oto/agent/iop/runtime.pb.dart
index 68bb874..f513506 100644
--- a/lib/oto/agent/iop/runtime.pb.dart
+++ b/lib/oto/agent/iop/runtime.pb.dart
@@ -1,22 +1,25 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
+import 'package:protobuf/well_known_types/google/protobuf/struct.pb.dart' as $0;
 
-import '../google/protobuf/struct.pb.dart' as $0;
 import 'runtime.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'runtime.pbenum.dart';
 
 /// RunRequest initiates an adapter execution on a node.
@@ -29,183 +32,173 @@ class RunRequest extends $pb.GeneratedMessage {
     $0.Struct? policy,
     $0.Struct? input,
     $core.int? timeoutSec,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $core.String? sessionId,
     RunSessionMode? sessionMode,
     $core.bool? background,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (workspace != null) {
-      $result.workspace = workspace;
-    }
-    if (policy != null) {
-      $result.policy = policy;
-    }
-    if (input != null) {
-      $result.input = input;
-    }
-    if (timeoutSec != null) {
-      $result.timeoutSec = timeoutSec;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (sessionMode != null) {
-      $result.sessionMode = sessionMode;
-    }
-    if (background != null) {
-      $result.background = background;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (workspace != null) result.workspace = workspace;
+    if (policy != null) result.policy = policy;
+    if (input != null) result.input = input;
+    if (timeoutSec != null) result.timeoutSec = timeoutSec;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (sessionId != null) result.sessionId = sessionId;
+    if (sessionMode != null) result.sessionMode = sessionMode;
+    if (background != null) result.background = background;
+    return result;
   }
-  RunRequest._() : super();
-  factory RunRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RunRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RunRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RunRequest._();
+
+  factory RunRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RunRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RunRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'adapter')
     ..aOS(3, _omitFieldNames ? '' : 'target')
     ..aOS(4, _omitFieldNames ? '' : 'workspace')
-    ..aOM<$0.Struct>(5, _omitFieldNames ? '' : 'policy', subBuilder: $0.Struct.create)
-    ..aOM<$0.Struct>(6, _omitFieldNames ? '' : 'input', subBuilder: $0.Struct.create)
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'timeoutSec', $pb.PbFieldType.O3)
-    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'metadata', entryClassName: 'RunRequest.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..aOM<$0.Struct>(5, _omitFieldNames ? '' : 'policy',
+        subBuilder: $0.Struct.create)
+    ..aOM<$0.Struct>(6, _omitFieldNames ? '' : 'input',
+        subBuilder: $0.Struct.create)
+    ..aI(7, _omitFieldNames ? '' : 'timeoutSec')
+    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'RunRequest.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aOS(9, _omitFieldNames ? '' : 'sessionId')
-    ..e<RunSessionMode>(10, _omitFieldNames ? '' : 'sessionMode', $pb.PbFieldType.OE, defaultOrMaker: RunSessionMode.RUN_SESSION_MODE_UNSPECIFIED, valueOf: RunSessionMode.valueOf, enumValues: RunSessionMode.values)
+    ..aE<RunSessionMode>(10, _omitFieldNames ? '' : 'sessionMode',
+        enumValues: RunSessionMode.values)
     ..aOB(11, _omitFieldNames ? '' : 'background')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RunRequest clone() => RunRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RunRequest copyWith(void Function(RunRequest) updates) => super.copyWith((message) => updates(message as RunRequest)) as RunRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunRequest copyWith(void Function(RunRequest) updates) =>
+      super.copyWith((message) => updates(message as RunRequest)) as RunRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RunRequest create() => RunRequest._();
+  @$core.override
   RunRequest createEmptyInstance() => create();
-  static $pb.PbList<RunRequest> createRepeated() => $pb.PbList<RunRequest>();
   @$core.pragma('dart2js:noInline')
-  static RunRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunRequest>(create);
+  static RunRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RunRequest>(create);
   static RunRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get adapter => $_getSZ(1);
   @$pb.TagNumber(2)
-  set adapter($core.String v) { $_setString(1, v); }
+  set adapter($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasAdapter() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAdapter() => clearField(2);
+  void clearAdapter() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get target => $_getSZ(2);
   @$pb.TagNumber(3)
-  set target($core.String v) { $_setString(2, v); }
+  set target($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasTarget() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTarget() => clearField(3);
+  void clearTarget() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get workspace => $_getSZ(3);
   @$pb.TagNumber(4)
-  set workspace($core.String v) { $_setString(3, v); }
+  set workspace($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasWorkspace() => $_has(3);
   @$pb.TagNumber(4)
-  void clearWorkspace() => clearField(4);
+  void clearWorkspace() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $0.Struct get policy => $_getN(4);
   @$pb.TagNumber(5)
-  set policy($0.Struct v) { setField(5, v); }
+  set policy($0.Struct value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasPolicy() => $_has(4);
   @$pb.TagNumber(5)
-  void clearPolicy() => clearField(5);
+  void clearPolicy() => $_clearField(5);
   @$pb.TagNumber(5)
   $0.Struct ensurePolicy() => $_ensure(4);
 
   @$pb.TagNumber(6)
   $0.Struct get input => $_getN(5);
   @$pb.TagNumber(6)
-  set input($0.Struct v) { setField(6, v); }
+  set input($0.Struct value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasInput() => $_has(5);
   @$pb.TagNumber(6)
-  void clearInput() => clearField(6);
+  void clearInput() => $_clearField(6);
   @$pb.TagNumber(6)
   $0.Struct ensureInput() => $_ensure(5);
 
   @$pb.TagNumber(7)
   $core.int get timeoutSec => $_getIZ(6);
   @$pb.TagNumber(7)
-  set timeoutSec($core.int v) { $_setSignedInt32(6, v); }
+  set timeoutSec($core.int value) => $_setSignedInt32(6, value);
   @$pb.TagNumber(7)
   $core.bool hasTimeoutSec() => $_has(6);
   @$pb.TagNumber(7)
-  void clearTimeoutSec() => clearField(7);
+  void clearTimeoutSec() => $_clearField(7);
 
   @$pb.TagNumber(8)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(7);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(7);
 
   @$pb.TagNumber(9)
   $core.String get sessionId => $_getSZ(8);
   @$pb.TagNumber(9)
-  set sessionId($core.String v) { $_setString(8, v); }
+  set sessionId($core.String value) => $_setString(8, value);
   @$pb.TagNumber(9)
   $core.bool hasSessionId() => $_has(8);
   @$pb.TagNumber(9)
-  void clearSessionId() => clearField(9);
+  void clearSessionId() => $_clearField(9);
 
   @$pb.TagNumber(10)
   RunSessionMode get sessionMode => $_getN(9);
   @$pb.TagNumber(10)
-  set sessionMode(RunSessionMode v) { setField(10, v); }
+  set sessionMode(RunSessionMode value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasSessionMode() => $_has(9);
   @$pb.TagNumber(10)
-  void clearSessionMode() => clearField(10);
+  void clearSessionMode() => $_clearField(10);
 
   @$pb.TagNumber(11)
   $core.bool get background => $_getBF(10);
   @$pb.TagNumber(11)
-  set background($core.bool v) { $_setBool(10, v); }
+  set background($core.bool value) => $_setBool(10, value);
   @$pb.TagNumber(11)
   $core.bool hasBackground() => $_has(10);
   @$pb.TagNumber(11)
-  void clearBackground() => clearField(11);
+  void clearBackground() => $_clearField(11);
 }
 
 /// RunEvent is a streaming execution event.
@@ -217,196 +210,181 @@ class RunEvent extends $pb.GeneratedMessage {
     $core.String? message,
     $core.String? error,
     Usage? usage,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $fixnum.Int64? timestamp,
     $core.String? sessionId,
     $core.bool? background,
     $core.String? nodeId,
     $core.String? nodeAlias,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (delta != null) {
-      $result.delta = delta;
-    }
-    if (message != null) {
-      $result.message = message;
-    }
-    if (error != null) {
-      $result.error = error;
-    }
-    if (usage != null) {
-      $result.usage = usage;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (background != null) {
-      $result.background = background;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (nodeAlias != null) {
-      $result.nodeAlias = nodeAlias;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (type != null) result.type = type;
+    if (delta != null) result.delta = delta;
+    if (message != null) result.message = message;
+    if (error != null) result.error = error;
+    if (usage != null) result.usage = usage;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (timestamp != null) result.timestamp = timestamp;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (background != null) result.background = background;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (nodeAlias != null) result.nodeAlias = nodeAlias;
+    return result;
   }
-  RunEvent._() : super();
-  factory RunEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RunEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RunEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RunEvent._();
+
+  factory RunEvent.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RunEvent.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RunEvent',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'type')
     ..aOS(3, _omitFieldNames ? '' : 'delta')
     ..aOS(4, _omitFieldNames ? '' : 'message')
     ..aOS(5, _omitFieldNames ? '' : 'error')
     ..aOM<Usage>(6, _omitFieldNames ? '' : 'usage', subBuilder: Usage.create)
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'RunEvent.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'RunEvent.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aInt64(8, _omitFieldNames ? '' : 'timestamp')
     ..aOS(9, _omitFieldNames ? '' : 'sessionId')
     ..aOB(10, _omitFieldNames ? '' : 'background')
     ..aOS(11, _omitFieldNames ? '' : 'nodeId')
     ..aOS(12, _omitFieldNames ? '' : 'nodeAlias')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RunEvent clone() => RunEvent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RunEvent copyWith(void Function(RunEvent) updates) => super.copyWith((message) => updates(message as RunEvent)) as RunEvent;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunEvent clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunEvent copyWith(void Function(RunEvent) updates) =>
+      super.copyWith((message) => updates(message as RunEvent)) as RunEvent;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RunEvent create() => RunEvent._();
+  @$core.override
   RunEvent createEmptyInstance() => create();
-  static $pb.PbList<RunEvent> createRepeated() => $pb.PbList<RunEvent>();
   @$core.pragma('dart2js:noInline')
-  static RunEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunEvent>(create);
+  static RunEvent getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunEvent>(create);
   static RunEvent? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get type => $_getSZ(1);
   @$pb.TagNumber(2)
-  set type($core.String v) { $_setString(1, v); }
+  set type($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get delta => $_getSZ(2);
   @$pb.TagNumber(3)
-  set delta($core.String v) { $_setString(2, v); }
+  set delta($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasDelta() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDelta() => clearField(3);
+  void clearDelta() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get message => $_getSZ(3);
   @$pb.TagNumber(4)
-  set message($core.String v) { $_setString(3, v); }
+  set message($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasMessage() => $_has(3);
   @$pb.TagNumber(4)
-  void clearMessage() => clearField(4);
+  void clearMessage() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get error => $_getSZ(4);
   @$pb.TagNumber(5)
-  set error($core.String v) { $_setString(4, v); }
+  set error($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasError() => $_has(4);
   @$pb.TagNumber(5)
-  void clearError() => clearField(5);
+  void clearError() => $_clearField(5);
 
   @$pb.TagNumber(6)
   Usage get usage => $_getN(5);
   @$pb.TagNumber(6)
-  set usage(Usage v) { setField(6, v); }
+  set usage(Usage value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasUsage() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUsage() => clearField(6);
+  void clearUsage() => $_clearField(6);
   @$pb.TagNumber(6)
   Usage ensureUsage() => $_ensure(5);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 
   @$pb.TagNumber(8)
   $fixnum.Int64 get timestamp => $_getI64(7);
   @$pb.TagNumber(8)
-  set timestamp($fixnum.Int64 v) { $_setInt64(7, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(7, value);
   @$pb.TagNumber(8)
   $core.bool hasTimestamp() => $_has(7);
   @$pb.TagNumber(8)
-  void clearTimestamp() => clearField(8);
+  void clearTimestamp() => $_clearField(8);
 
   @$pb.TagNumber(9)
   $core.String get sessionId => $_getSZ(8);
   @$pb.TagNumber(9)
-  set sessionId($core.String v) { $_setString(8, v); }
+  set sessionId($core.String value) => $_setString(8, value);
   @$pb.TagNumber(9)
   $core.bool hasSessionId() => $_has(8);
   @$pb.TagNumber(9)
-  void clearSessionId() => clearField(9);
+  void clearSessionId() => $_clearField(9);
 
   @$pb.TagNumber(10)
   $core.bool get background => $_getBF(9);
   @$pb.TagNumber(10)
-  set background($core.bool v) { $_setBool(9, v); }
+  set background($core.bool value) => $_setBool(9, value);
   @$pb.TagNumber(10)
   $core.bool hasBackground() => $_has(9);
   @$pb.TagNumber(10)
-  void clearBackground() => clearField(10);
+  void clearBackground() => $_clearField(10);
 
   @$pb.TagNumber(11)
   $core.String get nodeId => $_getSZ(10);
   @$pb.TagNumber(11)
-  set nodeId($core.String v) { $_setString(10, v); }
+  set nodeId($core.String value) => $_setString(10, value);
   @$pb.TagNumber(11)
   $core.bool hasNodeId() => $_has(10);
   @$pb.TagNumber(11)
-  void clearNodeId() => clearField(11);
+  void clearNodeId() => $_clearField(11);
 
   @$pb.TagNumber(12)
   $core.String get nodeAlias => $_getSZ(11);
   @$pb.TagNumber(12)
-  set nodeAlias($core.String v) { $_setString(11, v); }
+  set nodeAlias($core.String value) => $_setString(11, value);
   @$pb.TagNumber(12)
   $core.bool hasNodeAlias() => $_has(11);
   @$pb.TagNumber(12)
-  void clearNodeAlias() => clearField(12);
+  void clearNodeAlias() => $_clearField(12);
 }
 
 /// EdgeNodeEvent is a general edge-node lifecycle/control event envelope.
@@ -419,138 +397,132 @@ class EdgeNodeEvent extends $pb.GeneratedMessage {
     $core.String? nodeId,
     $core.String? alias,
     $core.String? reason,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $fixnum.Int64? timestamp,
   }) {
-    final $result = create();
-    if (eventId != null) {
-      $result.eventId = eventId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (source != null) {
-      $result.source = source;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (alias != null) {
-      $result.alias = alias;
-    }
-    if (reason != null) {
-      $result.reason = reason;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    return $result;
+    final result = create();
+    if (eventId != null) result.eventId = eventId;
+    if (type != null) result.type = type;
+    if (source != null) result.source = source;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (alias != null) result.alias = alias;
+    if (reason != null) result.reason = reason;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (timestamp != null) result.timestamp = timestamp;
+    return result;
   }
-  EdgeNodeEvent._() : super();
-  factory EdgeNodeEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EdgeNodeEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EdgeNodeEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  EdgeNodeEvent._();
+
+  factory EdgeNodeEvent.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EdgeNodeEvent.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EdgeNodeEvent',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'eventId')
     ..aOS(2, _omitFieldNames ? '' : 'type')
     ..aOS(3, _omitFieldNames ? '' : 'source')
     ..aOS(4, _omitFieldNames ? '' : 'nodeId')
     ..aOS(5, _omitFieldNames ? '' : 'alias')
     ..aOS(6, _omitFieldNames ? '' : 'reason')
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'EdgeNodeEvent.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'EdgeNodeEvent.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aInt64(8, _omitFieldNames ? '' : 'timestamp')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  EdgeNodeEvent clone() => EdgeNodeEvent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  EdgeNodeEvent copyWith(void Function(EdgeNodeEvent) updates) => super.copyWith((message) => updates(message as EdgeNodeEvent)) as EdgeNodeEvent;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EdgeNodeEvent clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EdgeNodeEvent copyWith(void Function(EdgeNodeEvent) updates) =>
+      super.copyWith((message) => updates(message as EdgeNodeEvent))
+          as EdgeNodeEvent;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EdgeNodeEvent create() => EdgeNodeEvent._();
+  @$core.override
   EdgeNodeEvent createEmptyInstance() => create();
-  static $pb.PbList<EdgeNodeEvent> createRepeated() => $pb.PbList<EdgeNodeEvent>();
   @$core.pragma('dart2js:noInline')
-  static EdgeNodeEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EdgeNodeEvent>(create);
+  static EdgeNodeEvent getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EdgeNodeEvent>(create);
   static EdgeNodeEvent? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get eventId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set eventId($core.String v) { $_setString(0, v); }
+  set eventId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasEventId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearEventId() => clearField(1);
+  void clearEventId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get type => $_getSZ(1);
   @$pb.TagNumber(2)
-  set type($core.String v) { $_setString(1, v); }
+  set type($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get source => $_getSZ(2);
   @$pb.TagNumber(3)
-  set source($core.String v) { $_setString(2, v); }
+  set source($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasSource() => $_has(2);
   @$pb.TagNumber(3)
-  void clearSource() => clearField(3);
+  void clearSource() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get nodeId => $_getSZ(3);
   @$pb.TagNumber(4)
-  set nodeId($core.String v) { $_setString(3, v); }
+  set nodeId($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasNodeId() => $_has(3);
   @$pb.TagNumber(4)
-  void clearNodeId() => clearField(4);
+  void clearNodeId() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get alias => $_getSZ(4);
   @$pb.TagNumber(5)
-  set alias($core.String v) { $_setString(4, v); }
+  set alias($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasAlias() => $_has(4);
   @$pb.TagNumber(5)
-  void clearAlias() => clearField(5);
+  void clearAlias() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.String get reason => $_getSZ(5);
   @$pb.TagNumber(6)
-  set reason($core.String v) { $_setString(5, v); }
+  set reason($core.String value) => $_setString(5, value);
   @$pb.TagNumber(6)
   $core.bool hasReason() => $_has(5);
   @$pb.TagNumber(6)
-  void clearReason() => clearField(6);
+  void clearReason() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 
   @$pb.TagNumber(8)
   $fixnum.Int64 get timestamp => $_getI64(7);
   @$pb.TagNumber(8)
-  set timestamp($fixnum.Int64 v) { $_setInt64(7, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(7, value);
   @$pb.TagNumber(8)
   $core.bool hasTimestamp() => $_has(7);
   @$pb.TagNumber(8)
-  void clearTimestamp() => clearField(8);
+  void clearTimestamp() => $_clearField(8);
 }
 
 class Usage extends $pb.GeneratedMessage {
@@ -558,63 +530,64 @@ class Usage extends $pb.GeneratedMessage {
     $core.int? inputTokens,
     $core.int? outputTokens,
   }) {
-    final $result = create();
-    if (inputTokens != null) {
-      $result.inputTokens = inputTokens;
-    }
-    if (outputTokens != null) {
-      $result.outputTokens = outputTokens;
-    }
-    return $result;
+    final result = create();
+    if (inputTokens != null) result.inputTokens = inputTokens;
+    if (outputTokens != null) result.outputTokens = outputTokens;
+    return result;
   }
-  Usage._() : super();
-  factory Usage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Usage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Usage', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'inputTokens', $pb.PbFieldType.O3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'outputTokens', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+  Usage._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Usage clone() => Usage()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Usage copyWith(void Function(Usage) updates) => super.copyWith((message) => updates(message as Usage)) as Usage;
+  factory Usage.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Usage.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Usage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'inputTokens')
+    ..aI(2, _omitFieldNames ? '' : 'outputTokens')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Usage clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Usage copyWith(void Function(Usage) updates) =>
+      super.copyWith((message) => updates(message as Usage)) as Usage;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Usage create() => Usage._();
+  @$core.override
   Usage createEmptyInstance() => create();
-  static $pb.PbList<Usage> createRepeated() => $pb.PbList<Usage>();
   @$core.pragma('dart2js:noInline')
-  static Usage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Usage>(create);
+  static Usage getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Usage>(create);
   static Usage? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get inputTokens => $_getIZ(0);
   @$pb.TagNumber(1)
-  set inputTokens($core.int v) { $_setSignedInt32(0, v); }
+  set inputTokens($core.int value) => $_setSignedInt32(0, value);
   @$pb.TagNumber(1)
   $core.bool hasInputTokens() => $_has(0);
   @$pb.TagNumber(1)
-  void clearInputTokens() => clearField(1);
+  void clearInputTokens() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get outputTokens => $_getIZ(1);
   @$pb.TagNumber(2)
-  set outputTokens($core.int v) { $_setSignedInt32(1, v); }
+  set outputTokens($core.int value) => $_setSignedInt32(1, value);
   @$pb.TagNumber(2)
   $core.bool hasOutputTokens() => $_has(1);
   @$pb.TagNumber(2)
-  void clearOutputTokens() => clearField(2);
+  void clearOutputTokens() => $_clearField(2);
 }
 
 /// Heartbeat is sent by both sides to keep the connection alive.
@@ -622,50 +595,53 @@ class Heartbeat extends $pb.GeneratedMessage {
   factory Heartbeat({
     $fixnum.Int64? timestamp,
   }) {
-    final $result = create();
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    return $result;
+    final result = create();
+    if (timestamp != null) result.timestamp = timestamp;
+    return result;
   }
-  Heartbeat._() : super();
-  factory Heartbeat.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Heartbeat.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Heartbeat', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  Heartbeat._();
+
+  factory Heartbeat.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Heartbeat.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Heartbeat',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'timestamp')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Heartbeat clone() => Heartbeat()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Heartbeat copyWith(void Function(Heartbeat) updates) => super.copyWith((message) => updates(message as Heartbeat)) as Heartbeat;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Heartbeat clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Heartbeat copyWith(void Function(Heartbeat) updates) =>
+      super.copyWith((message) => updates(message as Heartbeat)) as Heartbeat;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Heartbeat create() => Heartbeat._();
+  @$core.override
   Heartbeat createEmptyInstance() => create();
-  static $pb.PbList<Heartbeat> createRepeated() => $pb.PbList<Heartbeat>();
   @$core.pragma('dart2js:noInline')
-  static Heartbeat getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Heartbeat>(create);
+  static Heartbeat getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Heartbeat>(create);
   static Heartbeat? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get timestamp => $_getI64(0);
   @$pb.TagNumber(1)
-  set timestamp($fixnum.Int64 v) { $_setInt64(0, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(0, value);
   @$pb.TagNumber(1)
   $core.bool hasTimestamp() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTimestamp() => clearField(1);
+  void clearTimestamp() => $_clearField(1);
 }
 
 /// CancelRequest asks the node to cancel a running execution.
@@ -677,102 +653,99 @@ class CancelRequest extends $pb.GeneratedMessage {
     $core.String? sessionId,
     CancelAction? action,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (action != null) {
-      $result.action = action;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (action != null) result.action = action;
+    return result;
   }
-  CancelRequest._() : super();
-  factory CancelRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CancelRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CancelRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CancelRequest._();
+
+  factory CancelRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CancelRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CancelRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'adapter')
     ..aOS(3, _omitFieldNames ? '' : 'target')
     ..aOS(4, _omitFieldNames ? '' : 'sessionId')
-    ..e<CancelAction>(5, _omitFieldNames ? '' : 'action', $pb.PbFieldType.OE, defaultOrMaker: CancelAction.CANCEL_ACTION_UNSPECIFIED, valueOf: CancelAction.valueOf, enumValues: CancelAction.values)
-    ..hasRequiredFields = false
-  ;
+    ..aE<CancelAction>(5, _omitFieldNames ? '' : 'action',
+        enumValues: CancelAction.values)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CancelRequest clone() => CancelRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CancelRequest copyWith(void Function(CancelRequest) updates) => super.copyWith((message) => updates(message as CancelRequest)) as CancelRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CancelRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CancelRequest copyWith(void Function(CancelRequest) updates) =>
+      super.copyWith((message) => updates(message as CancelRequest))
+          as CancelRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CancelRequest create() => CancelRequest._();
+  @$core.override
   CancelRequest createEmptyInstance() => create();
-  static $pb.PbList<CancelRequest> createRepeated() => $pb.PbList<CancelRequest>();
   @$core.pragma('dart2js:noInline')
-  static CancelRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CancelRequest>(create);
+  static CancelRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CancelRequest>(create);
   static CancelRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get adapter => $_getSZ(1);
   @$pb.TagNumber(2)
-  set adapter($core.String v) { $_setString(1, v); }
+  set adapter($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasAdapter() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAdapter() => clearField(2);
+  void clearAdapter() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get target => $_getSZ(2);
   @$pb.TagNumber(3)
-  set target($core.String v) { $_setString(2, v); }
+  set target($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasTarget() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTarget() => clearField(3);
+  void clearTarget() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get sessionId => $_getSZ(3);
   @$pb.TagNumber(4)
-  set sessionId($core.String v) { $_setString(3, v); }
+  set sessionId($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasSessionId() => $_has(3);
   @$pb.TagNumber(4)
-  void clearSessionId() => clearField(4);
+  void clearSessionId() => $_clearField(4);
 
   @$pb.TagNumber(5)
   CancelAction get action => $_getN(4);
   @$pb.TagNumber(5)
-  set action(CancelAction v) { setField(5, v); }
+  set action(CancelAction value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasAction() => $_has(4);
   @$pb.TagNumber(5)
-  void clearAction() => clearField(5);
+  void clearAction() => $_clearField(5);
 }
 
 class NodeCommandRequest extends $pb.GeneratedMessage {
@@ -783,124 +756,121 @@ class NodeCommandRequest extends $pb.GeneratedMessage {
     $core.String? target,
     $core.String? sessionId,
     $core.int? timeoutSec,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
   }) {
-    final $result = create();
-    if (requestId != null) {
-      $result.requestId = requestId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (timeoutSec != null) {
-      $result.timeoutSec = timeoutSec;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    return $result;
+    final result = create();
+    if (requestId != null) result.requestId = requestId;
+    if (type != null) result.type = type;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (timeoutSec != null) result.timeoutSec = timeoutSec;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    return result;
   }
-  NodeCommandRequest._() : super();
-  factory NodeCommandRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeCommandRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeCommandRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  NodeCommandRequest._();
+
+  factory NodeCommandRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeCommandRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeCommandRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'requestId')
-    ..e<NodeCommandType>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: NodeCommandType.NODE_COMMAND_TYPE_UNSPECIFIED, valueOf: NodeCommandType.valueOf, enumValues: NodeCommandType.values)
+    ..aE<NodeCommandType>(2, _omitFieldNames ? '' : 'type',
+        enumValues: NodeCommandType.values)
     ..aOS(3, _omitFieldNames ? '' : 'adapter')
     ..aOS(4, _omitFieldNames ? '' : 'target')
     ..aOS(5, _omitFieldNames ? '' : 'sessionId')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'timeoutSec', $pb.PbFieldType.O3)
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'NodeCommandRequest.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..aI(6, _omitFieldNames ? '' : 'timeoutSec')
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'NodeCommandRequest.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeCommandRequest clone() => NodeCommandRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeCommandRequest copyWith(void Function(NodeCommandRequest) updates) => super.copyWith((message) => updates(message as NodeCommandRequest)) as NodeCommandRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandRequest copyWith(void Function(NodeCommandRequest) updates) =>
+      super.copyWith((message) => updates(message as NodeCommandRequest))
+          as NodeCommandRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeCommandRequest create() => NodeCommandRequest._();
+  @$core.override
   NodeCommandRequest createEmptyInstance() => create();
-  static $pb.PbList<NodeCommandRequest> createRepeated() => $pb.PbList<NodeCommandRequest>();
   @$core.pragma('dart2js:noInline')
-  static NodeCommandRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeCommandRequest>(create);
+  static NodeCommandRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeCommandRequest>(create);
   static NodeCommandRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get requestId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set requestId($core.String v) { $_setString(0, v); }
+  set requestId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRequestId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequestId() => clearField(1);
+  void clearRequestId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   NodeCommandType get type => $_getN(1);
   @$pb.TagNumber(2)
-  set type(NodeCommandType v) { setField(2, v); }
+  set type(NodeCommandType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get adapter => $_getSZ(2);
   @$pb.TagNumber(3)
-  set adapter($core.String v) { $_setString(2, v); }
+  set adapter($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAdapter() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAdapter() => clearField(3);
+  void clearAdapter() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get target => $_getSZ(3);
   @$pb.TagNumber(4)
-  set target($core.String v) { $_setString(3, v); }
+  set target($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasTarget() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTarget() => clearField(4);
+  void clearTarget() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get sessionId => $_getSZ(4);
   @$pb.TagNumber(5)
-  set sessionId($core.String v) { $_setString(4, v); }
+  set sessionId($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasSessionId() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSessionId() => clearField(5);
+  void clearSessionId() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.int get timeoutSec => $_getIZ(5);
   @$pb.TagNumber(6)
-  set timeoutSec($core.int v) { $_setSignedInt32(5, v); }
+  set timeoutSec($core.int value) => $_setSignedInt32(5, value);
   @$pb.TagNumber(6)
   $core.bool hasTimeoutSec() => $_has(5);
   @$pb.TagNumber(6)
-  void clearTimeoutSec() => clearField(6);
+  void clearTimeoutSec() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 }
 
 class NodeCommandResponse extends $pb.GeneratedMessage {
@@ -912,142 +882,138 @@ class NodeCommandResponse extends $pb.GeneratedMessage {
     $core.String? sessionId,
     AgentUsageStatus? usageStatus,
     $core.String? error,
-    $core.Map<$core.String, $core.String>? result,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? result,
   }) {
-    final $result = create();
-    if (requestId != null) {
-      $result.requestId = requestId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (usageStatus != null) {
-      $result.usageStatus = usageStatus;
-    }
-    if (error != null) {
-      $result.error = error;
-    }
-    if (result != null) {
-      $result.result.addAll(result);
-    }
-    return $result;
+    final result$ = create();
+    if (requestId != null) result$.requestId = requestId;
+    if (type != null) result$.type = type;
+    if (adapter != null) result$.adapter = adapter;
+    if (target != null) result$.target = target;
+    if (sessionId != null) result$.sessionId = sessionId;
+    if (usageStatus != null) result$.usageStatus = usageStatus;
+    if (error != null) result$.error = error;
+    if (result != null) result$.result.addEntries(result);
+    return result$;
   }
-  NodeCommandResponse._() : super();
-  factory NodeCommandResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeCommandResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeCommandResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  NodeCommandResponse._();
+
+  factory NodeCommandResponse.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeCommandResponse.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeCommandResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'requestId')
-    ..e<NodeCommandType>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: NodeCommandType.NODE_COMMAND_TYPE_UNSPECIFIED, valueOf: NodeCommandType.valueOf, enumValues: NodeCommandType.values)
+    ..aE<NodeCommandType>(2, _omitFieldNames ? '' : 'type',
+        enumValues: NodeCommandType.values)
     ..aOS(3, _omitFieldNames ? '' : 'adapter')
     ..aOS(4, _omitFieldNames ? '' : 'target')
     ..aOS(5, _omitFieldNames ? '' : 'sessionId')
-    ..aOM<AgentUsageStatus>(6, _omitFieldNames ? '' : 'usageStatus', subBuilder: AgentUsageStatus.create)
+    ..aOM<AgentUsageStatus>(6, _omitFieldNames ? '' : 'usageStatus',
+        subBuilder: AgentUsageStatus.create)
     ..aOS(7, _omitFieldNames ? '' : 'error')
-    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'result', entryClassName: 'NodeCommandResponse.ResultEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'result',
+        entryClassName: 'NodeCommandResponse.ResultEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeCommandResponse clone() => NodeCommandResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeCommandResponse copyWith(void Function(NodeCommandResponse) updates) => super.copyWith((message) => updates(message as NodeCommandResponse)) as NodeCommandResponse;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandResponse clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandResponse copyWith(void Function(NodeCommandResponse) updates) =>
+      super.copyWith((message) => updates(message as NodeCommandResponse))
+          as NodeCommandResponse;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeCommandResponse create() => NodeCommandResponse._();
+  @$core.override
   NodeCommandResponse createEmptyInstance() => create();
-  static $pb.PbList<NodeCommandResponse> createRepeated() => $pb.PbList<NodeCommandResponse>();
   @$core.pragma('dart2js:noInline')
-  static NodeCommandResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeCommandResponse>(create);
+  static NodeCommandResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeCommandResponse>(create);
   static NodeCommandResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get requestId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set requestId($core.String v) { $_setString(0, v); }
+  set requestId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRequestId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequestId() => clearField(1);
+  void clearRequestId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   NodeCommandType get type => $_getN(1);
   @$pb.TagNumber(2)
-  set type(NodeCommandType v) { setField(2, v); }
+  set type(NodeCommandType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get adapter => $_getSZ(2);
   @$pb.TagNumber(3)
-  set adapter($core.String v) { $_setString(2, v); }
+  set adapter($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAdapter() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAdapter() => clearField(3);
+  void clearAdapter() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get target => $_getSZ(3);
   @$pb.TagNumber(4)
-  set target($core.String v) { $_setString(3, v); }
+  set target($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasTarget() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTarget() => clearField(4);
+  void clearTarget() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get sessionId => $_getSZ(4);
   @$pb.TagNumber(5)
-  set sessionId($core.String v) { $_setString(4, v); }
+  set sessionId($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasSessionId() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSessionId() => clearField(5);
+  void clearSessionId() => $_clearField(5);
 
   @$pb.TagNumber(6)
   AgentUsageStatus get usageStatus => $_getN(5);
   @$pb.TagNumber(6)
-  set usageStatus(AgentUsageStatus v) { setField(6, v); }
+  set usageStatus(AgentUsageStatus value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasUsageStatus() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUsageStatus() => clearField(6);
+  void clearUsageStatus() => $_clearField(6);
   @$pb.TagNumber(6)
   AgentUsageStatus ensureUsageStatus() => $_ensure(5);
 
   @$pb.TagNumber(7)
   $core.String get error => $_getSZ(6);
   @$pb.TagNumber(7)
-  set error($core.String v) { $_setString(6, v); }
+  set error($core.String value) => $_setString(6, value);
   @$pb.TagNumber(7)
   $core.bool hasError() => $_has(6);
   @$pb.TagNumber(7)
-  void clearError() => clearField(7);
+  void clearError() => $_clearField(7);
 
   /// result carries free-form key/value data for non-usage-status command types
   /// (capabilities, session_list, transport_status). usage_status keeps its
   /// dedicated typed payload.
   @$pb.TagNumber(8)
-  $core.Map<$core.String, $core.String> get result => $_getMap(7);
+  $pb.PbMap<$core.String, $core.String> get result => $_getMap(7);
 }
 
 class AgentUsageStatus extends $pb.GeneratedMessage {
@@ -1057,111 +1023,109 @@ class AgentUsageStatus extends $pb.GeneratedMessage {
     $core.String? dailyResetTime,
     $core.String? weeklyLimit,
     $core.String? weeklyResetTime,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
   }) {
-    final $result = create();
-    if (rawOutput != null) {
-      $result.rawOutput = rawOutput;
-    }
-    if (dailyLimit != null) {
-      $result.dailyLimit = dailyLimit;
-    }
-    if (dailyResetTime != null) {
-      $result.dailyResetTime = dailyResetTime;
-    }
-    if (weeklyLimit != null) {
-      $result.weeklyLimit = weeklyLimit;
-    }
-    if (weeklyResetTime != null) {
-      $result.weeklyResetTime = weeklyResetTime;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    return $result;
+    final result = create();
+    if (rawOutput != null) result.rawOutput = rawOutput;
+    if (dailyLimit != null) result.dailyLimit = dailyLimit;
+    if (dailyResetTime != null) result.dailyResetTime = dailyResetTime;
+    if (weeklyLimit != null) result.weeklyLimit = weeklyLimit;
+    if (weeklyResetTime != null) result.weeklyResetTime = weeklyResetTime;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    return result;
   }
-  AgentUsageStatus._() : super();
-  factory AgentUsageStatus.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory AgentUsageStatus.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AgentUsageStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  AgentUsageStatus._();
+
+  factory AgentUsageStatus.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory AgentUsageStatus.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'AgentUsageStatus',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'rawOutput')
     ..aOS(2, _omitFieldNames ? '' : 'dailyLimit')
     ..aOS(3, _omitFieldNames ? '' : 'dailyResetTime')
     ..aOS(4, _omitFieldNames ? '' : 'weeklyLimit')
     ..aOS(5, _omitFieldNames ? '' : 'weeklyResetTime')
-    ..m<$core.String, $core.String>(6, _omitFieldNames ? '' : 'metadata', entryClassName: 'AgentUsageStatus.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..m<$core.String, $core.String>(6, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'AgentUsageStatus.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  AgentUsageStatus clone() => AgentUsageStatus()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  AgentUsageStatus copyWith(void Function(AgentUsageStatus) updates) => super.copyWith((message) => updates(message as AgentUsageStatus)) as AgentUsageStatus;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AgentUsageStatus clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AgentUsageStatus copyWith(void Function(AgentUsageStatus) updates) =>
+      super.copyWith((message) => updates(message as AgentUsageStatus))
+          as AgentUsageStatus;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static AgentUsageStatus create() => AgentUsageStatus._();
+  @$core.override
   AgentUsageStatus createEmptyInstance() => create();
-  static $pb.PbList<AgentUsageStatus> createRepeated() => $pb.PbList<AgentUsageStatus>();
   @$core.pragma('dart2js:noInline')
-  static AgentUsageStatus getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AgentUsageStatus>(create);
+  static AgentUsageStatus getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<AgentUsageStatus>(create);
   static AgentUsageStatus? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get rawOutput => $_getSZ(0);
   @$pb.TagNumber(1)
-  set rawOutput($core.String v) { $_setString(0, v); }
+  set rawOutput($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRawOutput() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRawOutput() => clearField(1);
+  void clearRawOutput() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get dailyLimit => $_getSZ(1);
   @$pb.TagNumber(2)
-  set dailyLimit($core.String v) { $_setString(1, v); }
+  set dailyLimit($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasDailyLimit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDailyLimit() => clearField(2);
+  void clearDailyLimit() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get dailyResetTime => $_getSZ(2);
   @$pb.TagNumber(3)
-  set dailyResetTime($core.String v) { $_setString(2, v); }
+  set dailyResetTime($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasDailyResetTime() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDailyResetTime() => clearField(3);
+  void clearDailyResetTime() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get weeklyLimit => $_getSZ(3);
   @$pb.TagNumber(4)
-  set weeklyLimit($core.String v) { $_setString(3, v); }
+  set weeklyLimit($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasWeeklyLimit() => $_has(3);
   @$pb.TagNumber(4)
-  void clearWeeklyLimit() => clearField(4);
+  void clearWeeklyLimit() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get weeklyResetTime => $_getSZ(4);
   @$pb.TagNumber(5)
-  set weeklyResetTime($core.String v) { $_setString(4, v); }
+  set weeklyResetTime($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasWeeklyResetTime() => $_has(4);
   @$pb.TagNumber(5)
-  void clearWeeklyResetTime() => clearField(5);
+  void clearWeeklyResetTime() => $_clearField(5);
 
   @$pb.TagNumber(6)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(5);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(5);
 }
 
 /// Error is returned when a request fails at the transport layer.
@@ -1170,63 +1134,64 @@ class Error extends $pb.GeneratedMessage {
     $core.String? code,
     $core.String? message,
   }) {
-    final $result = create();
-    if (code != null) {
-      $result.code = code;
-    }
-    if (message != null) {
-      $result.message = message;
-    }
-    return $result;
+    final result = create();
+    if (code != null) result.code = code;
+    if (message != null) result.message = message;
+    return result;
   }
-  Error._() : super();
-  factory Error.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Error.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Error', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  Error._();
+
+  factory Error.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Error.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Error',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'code')
     ..aOS(2, _omitFieldNames ? '' : 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Error clone() => Error()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Error copyWith(void Function(Error) updates) => super.copyWith((message) => updates(message as Error)) as Error;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Error clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Error copyWith(void Function(Error) updates) =>
+      super.copyWith((message) => updates(message as Error)) as Error;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Error create() => Error._();
+  @$core.override
   Error createEmptyInstance() => create();
-  static $pb.PbList<Error> createRepeated() => $pb.PbList<Error>();
   @$core.pragma('dart2js:noInline')
-  static Error getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Error>(create);
+  static Error getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Error>(create);
   static Error? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get code => $_getSZ(0);
   @$pb.TagNumber(1)
-  set code($core.String v) { $_setString(0, v); }
+  set code($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCode() => clearField(1);
+  void clearCode() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get message => $_getSZ(1);
   @$pb.TagNumber(2)
-  set message($core.String v) { $_setString(1, v); }
+  set message($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 }
 
 /// RegisterRequest is sent by node to edge immediately on connect.
@@ -1234,50 +1199,54 @@ class RegisterRequest extends $pb.GeneratedMessage {
   factory RegisterRequest({
     $core.String? token,
   }) {
-    final $result = create();
-    if (token != null) {
-      $result.token = token;
-    }
-    return $result;
+    final result = create();
+    if (token != null) result.token = token;
+    return result;
   }
-  RegisterRequest._() : super();
-  factory RegisterRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RegisterRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RegisterRequest._();
+
+  factory RegisterRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RegisterRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RegisterRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'token')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RegisterRequest clone() => RegisterRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RegisterRequest copyWith(void Function(RegisterRequest) updates) => super.copyWith((message) => updates(message as RegisterRequest)) as RegisterRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterRequest copyWith(void Function(RegisterRequest) updates) =>
+      super.copyWith((message) => updates(message as RegisterRequest))
+          as RegisterRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RegisterRequest create() => RegisterRequest._();
+  @$core.override
   RegisterRequest createEmptyInstance() => create();
-  static $pb.PbList<RegisterRequest> createRepeated() => $pb.PbList<RegisterRequest>();
   @$core.pragma('dart2js:noInline')
-  static RegisterRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RegisterRequest>(create);
+  static RegisterRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RegisterRequest>(create);
   static RegisterRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get token => $_getSZ(0);
   @$pb.TagNumber(1)
-  set token($core.String v) { $_setString(0, v); }
+  set token($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasToken() => $_has(0);
   @$pb.TagNumber(1)
-  void clearToken() => clearField(1);
+  void clearToken() => $_clearField(1);
 }
 
 /// RegisterResponse is sent by edge to node in response to RegisterRequest.
@@ -1289,102 +1258,99 @@ class RegisterResponse extends $pb.GeneratedMessage {
     $core.String? reason,
     NodeConfigPayload? config,
   }) {
-    final $result = create();
-    if (accepted != null) {
-      $result.accepted = accepted;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (alias != null) {
-      $result.alias = alias;
-    }
-    if (reason != null) {
-      $result.reason = reason;
-    }
-    if (config != null) {
-      $result.config = config;
-    }
-    return $result;
+    final result = create();
+    if (accepted != null) result.accepted = accepted;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (alias != null) result.alias = alias;
+    if (reason != null) result.reason = reason;
+    if (config != null) result.config = config;
+    return result;
   }
-  RegisterResponse._() : super();
-  factory RegisterResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RegisterResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RegisterResponse._();
+
+  factory RegisterResponse.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RegisterResponse.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RegisterResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOB(1, _omitFieldNames ? '' : 'accepted')
     ..aOS(2, _omitFieldNames ? '' : 'nodeId')
     ..aOS(3, _omitFieldNames ? '' : 'alias')
     ..aOS(4, _omitFieldNames ? '' : 'reason')
-    ..aOM<NodeConfigPayload>(5, _omitFieldNames ? '' : 'config', subBuilder: NodeConfigPayload.create)
-    ..hasRequiredFields = false
-  ;
+    ..aOM<NodeConfigPayload>(5, _omitFieldNames ? '' : 'config',
+        subBuilder: NodeConfigPayload.create)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RegisterResponse clone() => RegisterResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RegisterResponse copyWith(void Function(RegisterResponse) updates) => super.copyWith((message) => updates(message as RegisterResponse)) as RegisterResponse;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterResponse clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterResponse copyWith(void Function(RegisterResponse) updates) =>
+      super.copyWith((message) => updates(message as RegisterResponse))
+          as RegisterResponse;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RegisterResponse create() => RegisterResponse._();
+  @$core.override
   RegisterResponse createEmptyInstance() => create();
-  static $pb.PbList<RegisterResponse> createRepeated() => $pb.PbList<RegisterResponse>();
   @$core.pragma('dart2js:noInline')
-  static RegisterResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RegisterResponse>(create);
+  static RegisterResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RegisterResponse>(create);
   static RegisterResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.bool get accepted => $_getBF(0);
   @$pb.TagNumber(1)
-  set accepted($core.bool v) { $_setBool(0, v); }
+  set accepted($core.bool value) => $_setBool(0, value);
   @$pb.TagNumber(1)
   $core.bool hasAccepted() => $_has(0);
   @$pb.TagNumber(1)
-  void clearAccepted() => clearField(1);
+  void clearAccepted() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get nodeId => $_getSZ(1);
   @$pb.TagNumber(2)
-  set nodeId($core.String v) { $_setString(1, v); }
+  set nodeId($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasNodeId() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNodeId() => clearField(2);
+  void clearNodeId() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get alias => $_getSZ(2);
   @$pb.TagNumber(3)
-  set alias($core.String v) { $_setString(2, v); }
+  set alias($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAlias() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAlias() => clearField(3);
+  void clearAlias() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get reason => $_getSZ(3);
   @$pb.TagNumber(4)
-  set reason($core.String v) { $_setString(3, v); }
+  set reason($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasReason() => $_has(3);
   @$pb.TagNumber(4)
-  void clearReason() => clearField(4);
+  void clearReason() => $_clearField(4);
 
   @$pb.TagNumber(5)
   NodeConfigPayload get config => $_getN(4);
   @$pb.TagNumber(5)
-  set config(NodeConfigPayload v) { setField(5, v); }
+  set config(NodeConfigPayload value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasConfig() => $_has(4);
   @$pb.TagNumber(5)
-  void clearConfig() => clearField(5);
+  void clearConfig() => $_clearField(5);
   @$pb.TagNumber(5)
   NodeConfigPayload ensureConfig() => $_ensure(4);
 }
@@ -1395,67 +1361,66 @@ class NodeConfigPayload extends $pb.GeneratedMessage {
     $core.Iterable<AdapterConfig>? adapters,
     NodeRuntimeConfig? runtime,
   }) {
-    final $result = create();
-    if (adapters != null) {
-      $result.adapters.addAll(adapters);
-    }
-    if (runtime != null) {
-      $result.runtime = runtime;
-    }
-    return $result;
+    final result = create();
+    if (adapters != null) result.adapters.addAll(adapters);
+    if (runtime != null) result.runtime = runtime;
+    return result;
   }
-  NodeConfigPayload._() : super();
-  factory NodeConfigPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeConfigPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeConfigPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..pc<AdapterConfig>(1, _omitFieldNames ? '' : 'adapters', $pb.PbFieldType.PM, subBuilder: AdapterConfig.create)
-    ..aOM<NodeRuntimeConfig>(2, _omitFieldNames ? '' : 'runtime', subBuilder: NodeRuntimeConfig.create)
-    ..hasRequiredFields = false
-  ;
+  NodeConfigPayload._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeConfigPayload clone() => NodeConfigPayload()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeConfigPayload copyWith(void Function(NodeConfigPayload) updates) => super.copyWith((message) => updates(message as NodeConfigPayload)) as NodeConfigPayload;
+  factory NodeConfigPayload.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeConfigPayload.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeConfigPayload',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..pPM<AdapterConfig>(1, _omitFieldNames ? '' : 'adapters',
+        subBuilder: AdapterConfig.create)
+    ..aOM<NodeRuntimeConfig>(2, _omitFieldNames ? '' : 'runtime',
+        subBuilder: NodeRuntimeConfig.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeConfigPayload clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeConfigPayload copyWith(void Function(NodeConfigPayload) updates) =>
+      super.copyWith((message) => updates(message as NodeConfigPayload))
+          as NodeConfigPayload;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeConfigPayload create() => NodeConfigPayload._();
+  @$core.override
   NodeConfigPayload createEmptyInstance() => create();
-  static $pb.PbList<NodeConfigPayload> createRepeated() => $pb.PbList<NodeConfigPayload>();
   @$core.pragma('dart2js:noInline')
-  static NodeConfigPayload getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeConfigPayload>(create);
+  static NodeConfigPayload getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeConfigPayload>(create);
   static NodeConfigPayload? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<AdapterConfig> get adapters => $_getList(0);
+  $pb.PbList<AdapterConfig> get adapters => $_getList(0);
 
   @$pb.TagNumber(2)
   NodeRuntimeConfig get runtime => $_getN(1);
   @$pb.TagNumber(2)
-  set runtime(NodeRuntimeConfig v) { setField(2, v); }
+  set runtime(NodeRuntimeConfig value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasRuntime() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRuntime() => clearField(2);
+  void clearRuntime() => $_clearField(2);
   @$pb.TagNumber(2)
   NodeRuntimeConfig ensureRuntime() => $_ensure(1);
 }
 
-enum AdapterConfig_Config {
-  cli, 
-  ollama, 
-  vllm, 
-  notSet
-}
+enum AdapterConfig_Config { cli, ollama, vllm, notSet }
 
 /// AdapterConfig describes one adapter to enable on the node.
 class AdapterConfig extends $pb.GeneratedMessage {
@@ -1467,177 +1432,193 @@ class AdapterConfig extends $pb.GeneratedMessage {
     OllamaAdapterConfig? ollama,
     VllmAdapterConfig? vllm,
   }) {
-    final $result = create();
-    if (type != null) {
-      $result.type = type;
-    }
-    if (enabled != null) {
-      $result.enabled = enabled;
-    }
-    if (settings != null) {
-      $result.settings = settings;
-    }
-    if (cli != null) {
-      $result.cli = cli;
-    }
-    if (ollama != null) {
-      $result.ollama = ollama;
-    }
-    if (vllm != null) {
-      $result.vllm = vllm;
-    }
-    return $result;
+    final result = create();
+    if (type != null) result.type = type;
+    if (enabled != null) result.enabled = enabled;
+    if (settings != null) result.settings = settings;
+    if (cli != null) result.cli = cli;
+    if (ollama != null) result.ollama = ollama;
+    if (vllm != null) result.vllm = vllm;
+    return result;
   }
-  AdapterConfig._() : super();
-  factory AdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory AdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static const $core.Map<$core.int, AdapterConfig_Config> _AdapterConfig_ConfigByTag = {
-    4 : AdapterConfig_Config.cli,
-    5 : AdapterConfig_Config.ollama,
-    6 : AdapterConfig_Config.vllm,
-    0 : AdapterConfig_Config.notSet
+  AdapterConfig._();
+
+  factory AdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory AdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static const $core.Map<$core.int, AdapterConfig_Config>
+      _AdapterConfig_ConfigByTag = {
+    4: AdapterConfig_Config.cli,
+    5: AdapterConfig_Config.ollama,
+    6: AdapterConfig_Config.vllm,
+    0: AdapterConfig_Config.notSet
   };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'AdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..oo(0, [4, 5, 6])
     ..aOS(1, _omitFieldNames ? '' : 'type')
     ..aOB(2, _omitFieldNames ? '' : 'enabled')
-    ..aOM<$0.Struct>(3, _omitFieldNames ? '' : 'settings', subBuilder: $0.Struct.create)
-    ..aOM<CLIAdapterConfig>(4, _omitFieldNames ? '' : 'cli', subBuilder: CLIAdapterConfig.create)
-    ..aOM<OllamaAdapterConfig>(5, _omitFieldNames ? '' : 'ollama', subBuilder: OllamaAdapterConfig.create)
-    ..aOM<VllmAdapterConfig>(6, _omitFieldNames ? '' : 'vllm', subBuilder: VllmAdapterConfig.create)
-    ..hasRequiredFields = false
-  ;
+    ..aOM<$0.Struct>(3, _omitFieldNames ? '' : 'settings',
+        subBuilder: $0.Struct.create)
+    ..aOM<CLIAdapterConfig>(4, _omitFieldNames ? '' : 'cli',
+        subBuilder: CLIAdapterConfig.create)
+    ..aOM<OllamaAdapterConfig>(5, _omitFieldNames ? '' : 'ollama',
+        subBuilder: OllamaAdapterConfig.create)
+    ..aOM<VllmAdapterConfig>(6, _omitFieldNames ? '' : 'vllm',
+        subBuilder: VllmAdapterConfig.create)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  AdapterConfig clone() => AdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  AdapterConfig copyWith(void Function(AdapterConfig) updates) => super.copyWith((message) => updates(message as AdapterConfig)) as AdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AdapterConfig copyWith(void Function(AdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as AdapterConfig))
+          as AdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static AdapterConfig create() => AdapterConfig._();
+  @$core.override
   AdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<AdapterConfig> createRepeated() => $pb.PbList<AdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static AdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AdapterConfig>(create);
+  static AdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<AdapterConfig>(create);
   static AdapterConfig? _defaultInstance;
 
-  AdapterConfig_Config whichConfig() => _AdapterConfig_ConfigByTag[$_whichOneof(0)]!;
-  void clearConfig() => clearField($_whichOneof(0));
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  AdapterConfig_Config whichConfig() =>
+      _AdapterConfig_ConfigByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  void clearConfig() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
   $core.String get type => $_getSZ(0);
   @$pb.TagNumber(1)
-  set type($core.String v) { $_setString(0, v); }
+  set type($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.bool get enabled => $_getBF(1);
   @$pb.TagNumber(2)
-  set enabled($core.bool v) { $_setBool(1, v); }
+  set enabled($core.bool value) => $_setBool(1, value);
   @$pb.TagNumber(2)
   $core.bool hasEnabled() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEnabled() => clearField(2);
+  void clearEnabled() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $0.Struct get settings => $_getN(2);
   @$pb.TagNumber(3)
-  set settings($0.Struct v) { setField(3, v); }
+  set settings($0.Struct value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasSettings() => $_has(2);
   @$pb.TagNumber(3)
-  void clearSettings() => clearField(3);
+  void clearSettings() => $_clearField(3);
   @$pb.TagNumber(3)
   $0.Struct ensureSettings() => $_ensure(2);
 
   @$pb.TagNumber(4)
   CLIAdapterConfig get cli => $_getN(3);
   @$pb.TagNumber(4)
-  set cli(CLIAdapterConfig v) { setField(4, v); }
+  set cli(CLIAdapterConfig value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasCli() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCli() => clearField(4);
+  void clearCli() => $_clearField(4);
   @$pb.TagNumber(4)
   CLIAdapterConfig ensureCli() => $_ensure(3);
 
   @$pb.TagNumber(5)
   OllamaAdapterConfig get ollama => $_getN(4);
   @$pb.TagNumber(5)
-  set ollama(OllamaAdapterConfig v) { setField(5, v); }
+  set ollama(OllamaAdapterConfig value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasOllama() => $_has(4);
   @$pb.TagNumber(5)
-  void clearOllama() => clearField(5);
+  void clearOllama() => $_clearField(5);
   @$pb.TagNumber(5)
   OllamaAdapterConfig ensureOllama() => $_ensure(4);
 
   @$pb.TagNumber(6)
   VllmAdapterConfig get vllm => $_getN(5);
   @$pb.TagNumber(6)
-  set vllm(VllmAdapterConfig v) { setField(6, v); }
+  set vllm(VllmAdapterConfig value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasVllm() => $_has(5);
   @$pb.TagNumber(6)
-  void clearVllm() => clearField(6);
+  void clearVllm() => $_clearField(6);
   @$pb.TagNumber(6)
   VllmAdapterConfig ensureVllm() => $_ensure(5);
 }
 
 class CLIAdapterConfig extends $pb.GeneratedMessage {
   factory CLIAdapterConfig({
-    $core.Map<$core.String, CLIProfileConfig>? profiles,
+    $core.Iterable<$core.MapEntry<$core.String, CLIProfileConfig>>? profiles,
   }) {
-    final $result = create();
-    if (profiles != null) {
-      $result.profiles.addAll(profiles);
-    }
-    return $result;
+    final result = create();
+    if (profiles != null) result.profiles.addEntries(profiles);
+    return result;
   }
-  CLIAdapterConfig._() : super();
-  factory CLIAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLIAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLIAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..m<$core.String, CLIProfileConfig>(1, _omitFieldNames ? '' : 'profiles', entryClassName: 'CLIAdapterConfig.ProfilesEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: CLIProfileConfig.create, valueDefaultOrMaker: CLIProfileConfig.getDefault, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+  CLIAdapterConfig._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLIAdapterConfig clone() => CLIAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLIAdapterConfig copyWith(void Function(CLIAdapterConfig) updates) => super.copyWith((message) => updates(message as CLIAdapterConfig)) as CLIAdapterConfig;
+  factory CLIAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLIAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLIAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..m<$core.String, CLIProfileConfig>(1, _omitFieldNames ? '' : 'profiles',
+        entryClassName: 'CLIAdapterConfig.ProfilesEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OM,
+        valueCreator: CLIProfileConfig.create,
+        valueDefaultOrMaker: CLIProfileConfig.getDefault,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIAdapterConfig copyWith(void Function(CLIAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as CLIAdapterConfig))
+          as CLIAdapterConfig;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLIAdapterConfig create() => CLIAdapterConfig._();
+  @$core.override
   CLIAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<CLIAdapterConfig> createRepeated() => $pb.PbList<CLIAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static CLIAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLIAdapterConfig>(create);
+  static CLIAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLIAdapterConfig>(create);
   static CLIAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.Map<$core.String, CLIProfileConfig> get profiles => $_getMap(0);
+  $pb.PbMap<$core.String, CLIProfileConfig> get profiles => $_getMap(0);
 }
 
 class CLIProfileConfig extends $pb.GeneratedMessage {
@@ -1654,164 +1635,151 @@ class CLIProfileConfig extends $pb.GeneratedMessage {
     $core.String? mode,
     $core.Iterable<$core.String>? resumeArgs,
   }) {
-    final $result = create();
-    if (command != null) {
-      $result.command = command;
-    }
-    if (args != null) {
-      $result.args.addAll(args);
-    }
-    if (env != null) {
-      $result.env.addAll(env);
-    }
-    if (persistent != null) {
-      $result.persistent = persistent;
-    }
-    if (terminal != null) {
-      $result.terminal = terminal;
-    }
-    if (responseIdleTimeoutMs != null) {
-      $result.responseIdleTimeoutMs = responseIdleTimeoutMs;
-    }
-    if (startupIdleTimeoutMs != null) {
-      $result.startupIdleTimeoutMs = startupIdleTimeoutMs;
-    }
-    if (outputFormat != null) {
-      $result.outputFormat = outputFormat;
-    }
-    if (completionMarker != null) {
-      $result.completionMarker = completionMarker;
-    }
-    if (mode != null) {
-      $result.mode = mode;
-    }
-    if (resumeArgs != null) {
-      $result.resumeArgs.addAll(resumeArgs);
-    }
-    return $result;
+    final result = create();
+    if (command != null) result.command = command;
+    if (args != null) result.args.addAll(args);
+    if (env != null) result.env.addAll(env);
+    if (persistent != null) result.persistent = persistent;
+    if (terminal != null) result.terminal = terminal;
+    if (responseIdleTimeoutMs != null)
+      result.responseIdleTimeoutMs = responseIdleTimeoutMs;
+    if (startupIdleTimeoutMs != null)
+      result.startupIdleTimeoutMs = startupIdleTimeoutMs;
+    if (outputFormat != null) result.outputFormat = outputFormat;
+    if (completionMarker != null) result.completionMarker = completionMarker;
+    if (mode != null) result.mode = mode;
+    if (resumeArgs != null) result.resumeArgs.addAll(resumeArgs);
+    return result;
   }
-  CLIProfileConfig._() : super();
-  factory CLIProfileConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLIProfileConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLIProfileConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CLIProfileConfig._();
+
+  factory CLIProfileConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLIProfileConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLIProfileConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'command')
     ..pPS(2, _omitFieldNames ? '' : 'args')
     ..pPS(3, _omitFieldNames ? '' : 'env')
     ..aOB(4, _omitFieldNames ? '' : 'persistent')
     ..aOB(5, _omitFieldNames ? '' : 'terminal')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'responseIdleTimeoutMs', $pb.PbFieldType.O3)
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'startupIdleTimeoutMs', $pb.PbFieldType.O3)
+    ..aI(6, _omitFieldNames ? '' : 'responseIdleTimeoutMs')
+    ..aI(7, _omitFieldNames ? '' : 'startupIdleTimeoutMs')
     ..aOS(8, _omitFieldNames ? '' : 'outputFormat')
-    ..aOM<CLICompletionMarker>(9, _omitFieldNames ? '' : 'completionMarker', subBuilder: CLICompletionMarker.create)
+    ..aOM<CLICompletionMarker>(9, _omitFieldNames ? '' : 'completionMarker',
+        subBuilder: CLICompletionMarker.create)
     ..aOS(10, _omitFieldNames ? '' : 'mode')
     ..pPS(11, _omitFieldNames ? '' : 'resumeArgs')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLIProfileConfig clone() => CLIProfileConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLIProfileConfig copyWith(void Function(CLIProfileConfig) updates) => super.copyWith((message) => updates(message as CLIProfileConfig)) as CLIProfileConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIProfileConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIProfileConfig copyWith(void Function(CLIProfileConfig) updates) =>
+      super.copyWith((message) => updates(message as CLIProfileConfig))
+          as CLIProfileConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLIProfileConfig create() => CLIProfileConfig._();
+  @$core.override
   CLIProfileConfig createEmptyInstance() => create();
-  static $pb.PbList<CLIProfileConfig> createRepeated() => $pb.PbList<CLIProfileConfig>();
   @$core.pragma('dart2js:noInline')
-  static CLIProfileConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLIProfileConfig>(create);
+  static CLIProfileConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLIProfileConfig>(create);
   static CLIProfileConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get command => $_getSZ(0);
   @$pb.TagNumber(1)
-  set command($core.String v) { $_setString(0, v); }
+  set command($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasCommand() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCommand() => clearField(1);
+  void clearCommand() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<$core.String> get args => $_getList(1);
+  $pb.PbList<$core.String> get args => $_getList(1);
 
   @$pb.TagNumber(3)
-  $core.List<$core.String> get env => $_getList(2);
+  $pb.PbList<$core.String> get env => $_getList(2);
 
   @$pb.TagNumber(4)
   $core.bool get persistent => $_getBF(3);
   @$pb.TagNumber(4)
-  set persistent($core.bool v) { $_setBool(3, v); }
+  set persistent($core.bool value) => $_setBool(3, value);
   @$pb.TagNumber(4)
   $core.bool hasPersistent() => $_has(3);
   @$pb.TagNumber(4)
-  void clearPersistent() => clearField(4);
+  void clearPersistent() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.bool get terminal => $_getBF(4);
   @$pb.TagNumber(5)
-  set terminal($core.bool v) { $_setBool(4, v); }
+  set terminal($core.bool value) => $_setBool(4, value);
   @$pb.TagNumber(5)
   $core.bool hasTerminal() => $_has(4);
   @$pb.TagNumber(5)
-  void clearTerminal() => clearField(5);
+  void clearTerminal() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.int get responseIdleTimeoutMs => $_getIZ(5);
   @$pb.TagNumber(6)
-  set responseIdleTimeoutMs($core.int v) { $_setSignedInt32(5, v); }
+  set responseIdleTimeoutMs($core.int value) => $_setSignedInt32(5, value);
   @$pb.TagNumber(6)
   $core.bool hasResponseIdleTimeoutMs() => $_has(5);
   @$pb.TagNumber(6)
-  void clearResponseIdleTimeoutMs() => clearField(6);
+  void clearResponseIdleTimeoutMs() => $_clearField(6);
 
   @$pb.TagNumber(7)
   $core.int get startupIdleTimeoutMs => $_getIZ(6);
   @$pb.TagNumber(7)
-  set startupIdleTimeoutMs($core.int v) { $_setSignedInt32(6, v); }
+  set startupIdleTimeoutMs($core.int value) => $_setSignedInt32(6, value);
   @$pb.TagNumber(7)
   $core.bool hasStartupIdleTimeoutMs() => $_has(6);
   @$pb.TagNumber(7)
-  void clearStartupIdleTimeoutMs() => clearField(7);
+  void clearStartupIdleTimeoutMs() => $_clearField(7);
 
   @$pb.TagNumber(8)
   $core.String get outputFormat => $_getSZ(7);
   @$pb.TagNumber(8)
-  set outputFormat($core.String v) { $_setString(7, v); }
+  set outputFormat($core.String value) => $_setString(7, value);
   @$pb.TagNumber(8)
   $core.bool hasOutputFormat() => $_has(7);
   @$pb.TagNumber(8)
-  void clearOutputFormat() => clearField(8);
+  void clearOutputFormat() => $_clearField(8);
 
   @$pb.TagNumber(9)
   CLICompletionMarker get completionMarker => $_getN(8);
   @$pb.TagNumber(9)
-  set completionMarker(CLICompletionMarker v) { setField(9, v); }
+  set completionMarker(CLICompletionMarker value) => $_setField(9, value);
   @$pb.TagNumber(9)
   $core.bool hasCompletionMarker() => $_has(8);
   @$pb.TagNumber(9)
-  void clearCompletionMarker() => clearField(9);
+  void clearCompletionMarker() => $_clearField(9);
   @$pb.TagNumber(9)
   CLICompletionMarker ensureCompletionMarker() => $_ensure(8);
 
   @$pb.TagNumber(10)
   $core.String get mode => $_getSZ(9);
   @$pb.TagNumber(10)
-  set mode($core.String v) { $_setString(9, v); }
+  set mode($core.String value) => $_setString(9, value);
   @$pb.TagNumber(10)
   $core.bool hasMode() => $_has(9);
   @$pb.TagNumber(10)
-  void clearMode() => clearField(10);
+  void clearMode() => $_clearField(10);
 
   @$pb.TagNumber(11)
-  $core.List<$core.String> get resumeArgs => $_getList(10);
+  $pb.PbList<$core.String> get resumeArgs => $_getList(10);
 }
 
 class CLICompletionMarker extends $pb.GeneratedMessage {
@@ -1819,63 +1787,65 @@ class CLICompletionMarker extends $pb.GeneratedMessage {
     $core.String? line,
     $core.String? regex,
   }) {
-    final $result = create();
-    if (line != null) {
-      $result.line = line;
-    }
-    if (regex != null) {
-      $result.regex = regex;
-    }
-    return $result;
+    final result = create();
+    if (line != null) result.line = line;
+    if (regex != null) result.regex = regex;
+    return result;
   }
-  CLICompletionMarker._() : super();
-  factory CLICompletionMarker.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLICompletionMarker.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLICompletionMarker', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CLICompletionMarker._();
+
+  factory CLICompletionMarker.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLICompletionMarker.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLICompletionMarker',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'line')
     ..aOS(2, _omitFieldNames ? '' : 'regex')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLICompletionMarker clone() => CLICompletionMarker()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLICompletionMarker copyWith(void Function(CLICompletionMarker) updates) => super.copyWith((message) => updates(message as CLICompletionMarker)) as CLICompletionMarker;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLICompletionMarker clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLICompletionMarker copyWith(void Function(CLICompletionMarker) updates) =>
+      super.copyWith((message) => updates(message as CLICompletionMarker))
+          as CLICompletionMarker;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLICompletionMarker create() => CLICompletionMarker._();
+  @$core.override
   CLICompletionMarker createEmptyInstance() => create();
-  static $pb.PbList<CLICompletionMarker> createRepeated() => $pb.PbList<CLICompletionMarker>();
   @$core.pragma('dart2js:noInline')
-  static CLICompletionMarker getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLICompletionMarker>(create);
+  static CLICompletionMarker getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLICompletionMarker>(create);
   static CLICompletionMarker? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get line => $_getSZ(0);
   @$pb.TagNumber(1)
-  set line($core.String v) { $_setString(0, v); }
+  set line($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasLine() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLine() => clearField(1);
+  void clearLine() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get regex => $_getSZ(1);
   @$pb.TagNumber(2)
-  set regex($core.String v) { $_setString(1, v); }
+  set regex($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasRegex() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRegex() => clearField(2);
+  void clearRegex() => $_clearField(2);
 }
 
 class OllamaAdapterConfig extends $pb.GeneratedMessage {
@@ -1883,113 +1853,119 @@ class OllamaAdapterConfig extends $pb.GeneratedMessage {
     $core.String? baseUrl,
     $core.int? contextSize,
   }) {
-    final $result = create();
-    if (baseUrl != null) {
-      $result.baseUrl = baseUrl;
-    }
-    if (contextSize != null) {
-      $result.contextSize = contextSize;
-    }
-    return $result;
+    final result = create();
+    if (baseUrl != null) result.baseUrl = baseUrl;
+    if (contextSize != null) result.contextSize = contextSize;
+    return result;
   }
-  OllamaAdapterConfig._() : super();
-  factory OllamaAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory OllamaAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OllamaAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  OllamaAdapterConfig._();
+
+  factory OllamaAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory OllamaAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'OllamaAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'baseUrl')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'contextSize', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..aI(2, _omitFieldNames ? '' : 'contextSize')
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  OllamaAdapterConfig clone() => OllamaAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  OllamaAdapterConfig copyWith(void Function(OllamaAdapterConfig) updates) => super.copyWith((message) => updates(message as OllamaAdapterConfig)) as OllamaAdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  OllamaAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  OllamaAdapterConfig copyWith(void Function(OllamaAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as OllamaAdapterConfig))
+          as OllamaAdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static OllamaAdapterConfig create() => OllamaAdapterConfig._();
+  @$core.override
   OllamaAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<OllamaAdapterConfig> createRepeated() => $pb.PbList<OllamaAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static OllamaAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OllamaAdapterConfig>(create);
+  static OllamaAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<OllamaAdapterConfig>(create);
   static OllamaAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get baseUrl => $_getSZ(0);
   @$pb.TagNumber(1)
-  set baseUrl($core.String v) { $_setString(0, v); }
+  set baseUrl($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasBaseUrl() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBaseUrl() => clearField(1);
+  void clearBaseUrl() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get contextSize => $_getIZ(1);
   @$pb.TagNumber(2)
-  set contextSize($core.int v) { $_setSignedInt32(1, v); }
+  set contextSize($core.int value) => $_setSignedInt32(1, value);
   @$pb.TagNumber(2)
   $core.bool hasContextSize() => $_has(1);
   @$pb.TagNumber(2)
-  void clearContextSize() => clearField(2);
+  void clearContextSize() => $_clearField(2);
 }
 
 class VllmAdapterConfig extends $pb.GeneratedMessage {
   factory VllmAdapterConfig({
     $core.String? endpoint,
   }) {
-    final $result = create();
-    if (endpoint != null) {
-      $result.endpoint = endpoint;
-    }
-    return $result;
+    final result = create();
+    if (endpoint != null) result.endpoint = endpoint;
+    return result;
   }
-  VllmAdapterConfig._() : super();
-  factory VllmAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory VllmAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'VllmAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  VllmAdapterConfig._();
+
+  factory VllmAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory VllmAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VllmAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'endpoint')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  VllmAdapterConfig clone() => VllmAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  VllmAdapterConfig copyWith(void Function(VllmAdapterConfig) updates) => super.copyWith((message) => updates(message as VllmAdapterConfig)) as VllmAdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  VllmAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  VllmAdapterConfig copyWith(void Function(VllmAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as VllmAdapterConfig))
+          as VllmAdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static VllmAdapterConfig create() => VllmAdapterConfig._();
+  @$core.override
   VllmAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<VllmAdapterConfig> createRepeated() => $pb.PbList<VllmAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static VllmAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<VllmAdapterConfig>(create);
+  static VllmAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<VllmAdapterConfig>(create);
   static VllmAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get endpoint => $_getSZ(0);
   @$pb.TagNumber(1)
-  set endpoint($core.String v) { $_setString(0, v); }
+  set endpoint($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasEndpoint() => $_has(0);
   @$pb.TagNumber(1)
-  void clearEndpoint() => clearField(1);
+  void clearEndpoint() => $_clearField(1);
 }
 
 /// NodeRuntimeConfig is the runtime tuning pushed to the node.
@@ -1998,65 +1974,68 @@ class NodeRuntimeConfig extends $pb.GeneratedMessage {
     $core.int? concurrency,
     $core.String? workspaceRoot,
   }) {
-    final $result = create();
-    if (concurrency != null) {
-      $result.concurrency = concurrency;
-    }
-    if (workspaceRoot != null) {
-      $result.workspaceRoot = workspaceRoot;
-    }
-    return $result;
+    final result = create();
+    if (concurrency != null) result.concurrency = concurrency;
+    if (workspaceRoot != null) result.workspaceRoot = workspaceRoot;
+    return result;
   }
-  NodeRuntimeConfig._() : super();
-  factory NodeRuntimeConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeRuntimeConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeRuntimeConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'concurrency', $pb.PbFieldType.O3)
+  NodeRuntimeConfig._();
+
+  factory NodeRuntimeConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeRuntimeConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeRuntimeConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'concurrency')
     ..aOS(2, _omitFieldNames ? '' : 'workspaceRoot')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeRuntimeConfig clone() => NodeRuntimeConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeRuntimeConfig copyWith(void Function(NodeRuntimeConfig) updates) => super.copyWith((message) => updates(message as NodeRuntimeConfig)) as NodeRuntimeConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeRuntimeConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeRuntimeConfig copyWith(void Function(NodeRuntimeConfig) updates) =>
+      super.copyWith((message) => updates(message as NodeRuntimeConfig))
+          as NodeRuntimeConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeRuntimeConfig create() => NodeRuntimeConfig._();
+  @$core.override
   NodeRuntimeConfig createEmptyInstance() => create();
-  static $pb.PbList<NodeRuntimeConfig> createRepeated() => $pb.PbList<NodeRuntimeConfig>();
   @$core.pragma('dart2js:noInline')
-  static NodeRuntimeConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeRuntimeConfig>(create);
+  static NodeRuntimeConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeRuntimeConfig>(create);
   static NodeRuntimeConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get concurrency => $_getIZ(0);
   @$pb.TagNumber(1)
-  set concurrency($core.int v) { $_setSignedInt32(0, v); }
+  set concurrency($core.int value) => $_setSignedInt32(0, value);
   @$pb.TagNumber(1)
   $core.bool hasConcurrency() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConcurrency() => clearField(1);
+  void clearConcurrency() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get workspaceRoot => $_getSZ(1);
   @$pb.TagNumber(2)
-  set workspaceRoot($core.String v) { $_setString(1, v); }
+  set workspaceRoot($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasWorkspaceRoot() => $_has(1);
   @$pb.TagNumber(2)
-  void clearWorkspaceRoot() => clearField(2);
+  void clearWorkspaceRoot() => $_clearField(2);
 }
 
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/oto/agent/iop/runtime.pbenum.dart b/lib/oto/agent/iop/runtime.pbenum.dart
index cd0e002..18dc147 100644
--- a/lib/oto/agent/iop/runtime.pbenum.dart
+++ b/lib/oto/agent/iop/runtime.pbenum.dart
@@ -1,72 +1,100 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class RunSessionMode extends $pb.ProtobufEnum {
-  static const RunSessionMode RUN_SESSION_MODE_UNSPECIFIED = RunSessionMode._(0, _omitEnumNames ? '' : 'RUN_SESSION_MODE_UNSPECIFIED');
-  static const RunSessionMode RUN_SESSION_MODE_CREATE_IF_MISSING = RunSessionMode._(1, _omitEnumNames ? '' : 'RUN_SESSION_MODE_CREATE_IF_MISSING');
-  static const RunSessionMode RUN_SESSION_MODE_REQUIRE_EXISTING = RunSessionMode._(2, _omitEnumNames ? '' : 'RUN_SESSION_MODE_REQUIRE_EXISTING');
+  static const RunSessionMode RUN_SESSION_MODE_UNSPECIFIED =
+      RunSessionMode._(0, _omitEnumNames ? '' : 'RUN_SESSION_MODE_UNSPECIFIED');
+  static const RunSessionMode RUN_SESSION_MODE_CREATE_IF_MISSING =
+      RunSessionMode._(
+          1, _omitEnumNames ? '' : 'RUN_SESSION_MODE_CREATE_IF_MISSING');
+  static const RunSessionMode RUN_SESSION_MODE_REQUIRE_EXISTING =
+      RunSessionMode._(
+          2, _omitEnumNames ? '' : 'RUN_SESSION_MODE_REQUIRE_EXISTING');
 
-  static const $core.List<RunSessionMode> values = <RunSessionMode> [
+  static const $core.List<RunSessionMode> values = <RunSessionMode>[
     RUN_SESSION_MODE_UNSPECIFIED,
     RUN_SESSION_MODE_CREATE_IF_MISSING,
     RUN_SESSION_MODE_REQUIRE_EXISTING,
   ];
 
-  static final $core.Map<$core.int, RunSessionMode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static RunSessionMode? valueOf($core.int value) => _byValue[value];
+  static final $core.List<RunSessionMode?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static RunSessionMode? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const RunSessionMode._($core.int v, $core.String n) : super(v, n);
+  const RunSessionMode._(super.value, super.name);
 }
 
 class CancelAction extends $pb.ProtobufEnum {
-  static const CancelAction CANCEL_ACTION_UNSPECIFIED = CancelAction._(0, _omitEnumNames ? '' : 'CANCEL_ACTION_UNSPECIFIED');
-  static const CancelAction CANCEL_ACTION_CANCEL_RUN = CancelAction._(1, _omitEnumNames ? '' : 'CANCEL_ACTION_CANCEL_RUN');
-  static const CancelAction CANCEL_ACTION_TERMINATE_SESSION = CancelAction._(2, _omitEnumNames ? '' : 'CANCEL_ACTION_TERMINATE_SESSION');
+  static const CancelAction CANCEL_ACTION_UNSPECIFIED =
+      CancelAction._(0, _omitEnumNames ? '' : 'CANCEL_ACTION_UNSPECIFIED');
+  static const CancelAction CANCEL_ACTION_CANCEL_RUN =
+      CancelAction._(1, _omitEnumNames ? '' : 'CANCEL_ACTION_CANCEL_RUN');
+  static const CancelAction CANCEL_ACTION_TERMINATE_SESSION = CancelAction._(
+      2, _omitEnumNames ? '' : 'CANCEL_ACTION_TERMINATE_SESSION');
 
-  static const $core.List<CancelAction> values = <CancelAction> [
+  static const $core.List<CancelAction> values = <CancelAction>[
     CANCEL_ACTION_UNSPECIFIED,
     CANCEL_ACTION_CANCEL_RUN,
     CANCEL_ACTION_TERMINATE_SESSION,
   ];
 
-  static final $core.Map<$core.int, CancelAction> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static CancelAction? valueOf($core.int value) => _byValue[value];
+  static final $core.List<CancelAction?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static CancelAction? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const CancelAction._($core.int v, $core.String n) : super(v, n);
+  const CancelAction._(super.value, super.name);
 }
 
 class NodeCommandType extends $pb.ProtobufEnum {
-  static const NodeCommandType NODE_COMMAND_TYPE_UNSPECIFIED = NodeCommandType._(0, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_UNSPECIFIED');
-  static const NodeCommandType NODE_COMMAND_TYPE_USAGE_STATUS = NodeCommandType._(1, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_USAGE_STATUS');
-  static const NodeCommandType NODE_COMMAND_TYPE_CAPABILITIES = NodeCommandType._(2, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_CAPABILITIES');
-  static const NodeCommandType NODE_COMMAND_TYPE_SESSION_LIST = NodeCommandType._(3, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_SESSION_LIST');
-  static const NodeCommandType NODE_COMMAND_TYPE_TRANSPORT_STATUS = NodeCommandType._(4, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_TRANSPORT_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_UNSPECIFIED =
+      NodeCommandType._(
+          0, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_UNSPECIFIED');
+  static const NodeCommandType NODE_COMMAND_TYPE_USAGE_STATUS =
+      NodeCommandType._(
+          1, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_USAGE_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_CAPABILITIES =
+      NodeCommandType._(
+          2, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_CAPABILITIES');
+  static const NodeCommandType NODE_COMMAND_TYPE_SESSION_LIST =
+      NodeCommandType._(
+          3, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_SESSION_LIST');
+  static const NodeCommandType NODE_COMMAND_TYPE_TRANSPORT_STATUS =
+      NodeCommandType._(
+          4, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_TRANSPORT_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_OLLAMA_API = NodeCommandType._(
+      5, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_OLLAMA_API');
 
-  static const $core.List<NodeCommandType> values = <NodeCommandType> [
+  static const $core.List<NodeCommandType> values = <NodeCommandType>[
     NODE_COMMAND_TYPE_UNSPECIFIED,
     NODE_COMMAND_TYPE_USAGE_STATUS,
     NODE_COMMAND_TYPE_CAPABILITIES,
     NODE_COMMAND_TYPE_SESSION_LIST,
     NODE_COMMAND_TYPE_TRANSPORT_STATUS,
+    NODE_COMMAND_TYPE_OLLAMA_API,
   ];
 
-  static final $core.Map<$core.int, NodeCommandType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static NodeCommandType? valueOf($core.int value) => _byValue[value];
+  static final $core.List<NodeCommandType?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 5);
+  static NodeCommandType? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const NodeCommandType._($core.int v, $core.String n) : super(v, n);
+  const NodeCommandType._(super.value, super.name);
 }
 
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+const $core.bool _omitEnumNames =
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/lib/oto/agent/iop/runtime.pbjson.dart b/lib/oto/agent/iop/runtime.pbjson.dart
index 9b70113..cc91302 100644
--- a/lib/oto/agent/iop/runtime.pbjson.dart
+++ b/lib/oto/agent/iop/runtime.pbjson.dart
@@ -1,13 +1,15 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -54,6 +56,7 @@ const NodeCommandType$json = {
     {'1': 'NODE_COMMAND_TYPE_CAPABILITIES', '2': 2},
     {'1': 'NODE_COMMAND_TYPE_SESSION_LIST', '2': 3},
     {'1': 'NODE_COMMAND_TYPE_TRANSPORT_STATUS', '2': 4},
+    {'1': 'NODE_COMMAND_TYPE_OLLAMA_API', '2': 5},
   ],
 };
 
@@ -62,7 +65,8 @@ final $typed_data.Uint8List nodeCommandTypeDescriptor = $convert.base64Decode(
     'Cg9Ob2RlQ29tbWFuZFR5cGUSIQodTk9ERV9DT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIiCh'
     '5OT0RFX0NPTU1BTkRfVFlQRV9VU0FHRV9TVEFUVVMQARIiCh5OT0RFX0NPTU1BTkRfVFlQRV9D'
     'QVBBQklMSVRJRVMQAhIiCh5OT0RFX0NPTU1BTkRfVFlQRV9TRVNTSU9OX0xJU1QQAxImCiJOT0'
-    'RFX0NPTU1BTkRfVFlQRV9UUkFOU1BPUlRfU1RBVFVTEAQ=');
+    'RFX0NPTU1BTkRfVFlQRV9UUkFOU1BPUlRfU1RBVFVTEAQSIAocTk9ERV9DT01NQU5EX1RZUEVf'
+    'T0xMQU1BX0FQSRAF');
 
 @$core.Deprecated('Use runRequestDescriptor instead')
 const RunRequest$json = {
@@ -72,12 +76,40 @@ const RunRequest$json = {
     {'1': 'adapter', '3': 2, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 3, '4': 1, '5': 9, '10': 'target'},
     {'1': 'workspace', '3': 4, '4': 1, '5': 9, '10': 'workspace'},
-    {'1': 'policy', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'policy'},
-    {'1': 'input', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'input'},
+    {
+      '1': 'policy',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'policy'
+    },
+    {
+      '1': 'input',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'input'
+    },
     {'1': 'timeout_sec', '3': 7, '4': 1, '5': 5, '10': 'timeoutSec'},
-    {'1': 'metadata', '3': 8, '4': 3, '5': 11, '6': '.iop.RunRequest.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 8,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.RunRequest.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'session_id', '3': 9, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'session_mode', '3': 10, '4': 1, '5': 14, '6': '.iop.RunSessionMode', '10': 'sessionMode'},
+    {
+      '1': 'session_mode',
+      '3': 10,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.RunSessionMode',
+      '10': 'sessionMode'
+    },
     {'1': 'background', '3': 11, '4': 1, '5': 8, '10': 'background'},
   ],
   '3': [RunRequest_MetadataEntry$json],
@@ -115,7 +147,14 @@ const RunEvent$json = {
     {'1': 'message', '3': 4, '4': 1, '5': 9, '10': 'message'},
     {'1': 'error', '3': 5, '4': 1, '5': 9, '10': 'error'},
     {'1': 'usage', '3': 6, '4': 1, '5': 11, '6': '.iop.Usage', '10': 'usage'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.RunEvent.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.RunEvent.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'timestamp', '3': 8, '4': 1, '5': 3, '10': 'timestamp'},
     {'1': 'session_id', '3': 9, '4': 1, '5': 9, '10': 'sessionId'},
     {'1': 'background', '3': 10, '4': 1, '5': 8, '10': 'background'},
@@ -156,7 +195,14 @@ const EdgeNodeEvent$json = {
     {'1': 'node_id', '3': 4, '4': 1, '5': 9, '10': 'nodeId'},
     {'1': 'alias', '3': 5, '4': 1, '5': 9, '10': 'alias'},
     {'1': 'reason', '3': 6, '4': 1, '5': 9, '10': 'reason'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.EdgeNodeEvent.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.EdgeNodeEvent.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'timestamp', '3': 8, '4': 1, '5': 3, '10': 'timestamp'},
   ],
   '3': [EdgeNodeEvent_MetadataEntry$json],
@@ -204,8 +250,8 @@ const Heartbeat$json = {
 };
 
 /// Descriptor for `Heartbeat`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List heartbeatDescriptor = $convert.base64Decode(
-    'CglIZWFydGJlYXQSHAoJdGltZXN0YW1wGAEgASgDUgl0aW1lc3RhbXA=');
+final $typed_data.Uint8List heartbeatDescriptor = $convert
+    .base64Decode('CglIZWFydGJlYXQSHAoJdGltZXN0YW1wGAEgASgDUgl0aW1lc3RhbXA=');
 
 @$core.Deprecated('Use cancelRequestDescriptor instead')
 const CancelRequest$json = {
@@ -215,7 +261,14 @@ const CancelRequest$json = {
     {'1': 'adapter', '3': 2, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 3, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 4, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'action', '3': 5, '4': 1, '5': 14, '6': '.iop.CancelAction', '10': 'action'},
+    {
+      '1': 'action',
+      '3': 5,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.CancelAction',
+      '10': 'action'
+    },
   ],
 };
 
@@ -230,12 +283,26 @@ const NodeCommandRequest$json = {
   '1': 'NodeCommandRequest',
   '2': [
     {'1': 'request_id', '3': 1, '4': 1, '5': 9, '10': 'requestId'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.iop.NodeCommandType', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.NodeCommandType',
+      '10': 'type'
+    },
     {'1': 'adapter', '3': 3, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 4, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 5, '4': 1, '5': 9, '10': 'sessionId'},
     {'1': 'timeout_sec', '3': 6, '4': 1, '5': 5, '10': 'timeoutSec'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.NodeCommandRequest.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.NodeCommandRequest.MetadataEntry',
+      '10': 'metadata'
+    },
   ],
   '3': [NodeCommandRequest_MetadataEntry$json],
 };
@@ -265,13 +332,34 @@ const NodeCommandResponse$json = {
   '1': 'NodeCommandResponse',
   '2': [
     {'1': 'request_id', '3': 1, '4': 1, '5': 9, '10': 'requestId'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.iop.NodeCommandType', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.NodeCommandType',
+      '10': 'type'
+    },
     {'1': 'adapter', '3': 3, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 4, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 5, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'usage_status', '3': 6, '4': 1, '5': 11, '6': '.iop.AgentUsageStatus', '10': 'usageStatus'},
+    {
+      '1': 'usage_status',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.AgentUsageStatus',
+      '10': 'usageStatus'
+    },
     {'1': 'error', '3': 7, '4': 1, '5': 9, '10': 'error'},
-    {'1': 'result', '3': 8, '4': 3, '5': 11, '6': '.iop.NodeCommandResponse.ResultEntry', '10': 'result'},
+    {
+      '1': 'result',
+      '3': 8,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.NodeCommandResponse.ResultEntry',
+      '10': 'result'
+    },
   ],
   '3': [NodeCommandResponse_ResultEntry$json],
 };
@@ -305,7 +393,14 @@ const AgentUsageStatus$json = {
     {'1': 'daily_reset_time', '3': 3, '4': 1, '5': 9, '10': 'dailyResetTime'},
     {'1': 'weekly_limit', '3': 4, '4': 1, '5': 9, '10': 'weeklyLimit'},
     {'1': 'weekly_reset_time', '3': 5, '4': 1, '5': 9, '10': 'weeklyResetTime'},
-    {'1': 'metadata', '3': 6, '4': 3, '5': 11, '6': '.iop.AgentUsageStatus.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 6,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.AgentUsageStatus.MetadataEntry',
+      '10': 'metadata'
+    },
   ],
   '3': [AgentUsageStatus_MetadataEntry$json],
 };
@@ -351,8 +446,8 @@ const RegisterRequest$json = {
 };
 
 /// Descriptor for `RegisterRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List registerRequestDescriptor = $convert.base64Decode(
-    'Cg9SZWdpc3RlclJlcXVlc3QSFAoFdG9rZW4YASABKAlSBXRva2Vu');
+final $typed_data.Uint8List registerRequestDescriptor = $convert
+    .base64Decode('Cg9SZWdpc3RlclJlcXVlc3QSFAoFdG9rZW4YASABKAlSBXRva2Vu');
 
 @$core.Deprecated('Use registerResponseDescriptor instead')
 const RegisterResponse$json = {
@@ -362,7 +457,14 @@ const RegisterResponse$json = {
     {'1': 'node_id', '3': 2, '4': 1, '5': 9, '10': 'nodeId'},
     {'1': 'alias', '3': 3, '4': 1, '5': 9, '10': 'alias'},
     {'1': 'reason', '3': 4, '4': 1, '5': 9, '10': 'reason'},
-    {'1': 'config', '3': 5, '4': 1, '5': 11, '6': '.iop.NodeConfigPayload', '10': 'config'},
+    {
+      '1': 'config',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.NodeConfigPayload',
+      '10': 'config'
+    },
   ],
 };
 
@@ -376,8 +478,22 @@ final $typed_data.Uint8List registerResponseDescriptor = $convert.base64Decode(
 const NodeConfigPayload$json = {
   '1': 'NodeConfigPayload',
   '2': [
-    {'1': 'adapters', '3': 1, '4': 3, '5': 11, '6': '.iop.AdapterConfig', '10': 'adapters'},
-    {'1': 'runtime', '3': 2, '4': 1, '5': 11, '6': '.iop.NodeRuntimeConfig', '10': 'runtime'},
+    {
+      '1': 'adapters',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.AdapterConfig',
+      '10': 'adapters'
+    },
+    {
+      '1': 'runtime',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.NodeRuntimeConfig',
+      '10': 'runtime'
+    },
   ],
 };
 
@@ -393,10 +509,41 @@ const AdapterConfig$json = {
   '2': [
     {'1': 'type', '3': 1, '4': 1, '5': 9, '10': 'type'},
     {'1': 'enabled', '3': 2, '4': 1, '5': 8, '10': 'enabled'},
-    {'1': 'settings', '3': 3, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'settings'},
-    {'1': 'cli', '3': 4, '4': 1, '5': 11, '6': '.iop.CLIAdapterConfig', '9': 0, '10': 'cli'},
-    {'1': 'ollama', '3': 5, '4': 1, '5': 11, '6': '.iop.OllamaAdapterConfig', '9': 0, '10': 'ollama'},
-    {'1': 'vllm', '3': 6, '4': 1, '5': 11, '6': '.iop.VllmAdapterConfig', '9': 0, '10': 'vllm'},
+    {
+      '1': 'settings',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'settings'
+    },
+    {
+      '1': 'cli',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLIAdapterConfig',
+      '9': 0,
+      '10': 'cli'
+    },
+    {
+      '1': 'ollama',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.OllamaAdapterConfig',
+      '9': 0,
+      '10': 'ollama'
+    },
+    {
+      '1': 'vllm',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.VllmAdapterConfig',
+      '9': 0,
+      '10': 'vllm'
+    },
   ],
   '8': [
     {'1': 'config'},
@@ -415,7 +562,14 @@ final $typed_data.Uint8List adapterConfigDescriptor = $convert.base64Decode(
 const CLIAdapterConfig$json = {
   '1': 'CLIAdapterConfig',
   '2': [
-    {'1': 'profiles', '3': 1, '4': 3, '5': 11, '6': '.iop.CLIAdapterConfig.ProfilesEntry', '10': 'profiles'},
+    {
+      '1': 'profiles',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.CLIAdapterConfig.ProfilesEntry',
+      '10': 'profiles'
+    },
   ],
   '3': [CLIAdapterConfig_ProfilesEntry$json],
 };
@@ -425,7 +579,14 @@ const CLIAdapterConfig_ProfilesEntry$json = {
   '1': 'ProfilesEntry',
   '2': [
     {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'value', '3': 2, '4': 1, '5': 11, '6': '.iop.CLIProfileConfig', '10': 'value'},
+    {
+      '1': 'value',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLIProfileConfig',
+      '10': 'value'
+    },
   ],
   '7': {'7': true},
 };
@@ -446,10 +607,29 @@ const CLIProfileConfig$json = {
     {'1': 'env', '3': 3, '4': 3, '5': 9, '10': 'env'},
     {'1': 'persistent', '3': 4, '4': 1, '5': 8, '10': 'persistent'},
     {'1': 'terminal', '3': 5, '4': 1, '5': 8, '10': 'terminal'},
-    {'1': 'response_idle_timeout_ms', '3': 6, '4': 1, '5': 5, '10': 'responseIdleTimeoutMs'},
-    {'1': 'startup_idle_timeout_ms', '3': 7, '4': 1, '5': 5, '10': 'startupIdleTimeoutMs'},
+    {
+      '1': 'response_idle_timeout_ms',
+      '3': 6,
+      '4': 1,
+      '5': 5,
+      '10': 'responseIdleTimeoutMs'
+    },
+    {
+      '1': 'startup_idle_timeout_ms',
+      '3': 7,
+      '4': 1,
+      '5': 5,
+      '10': 'startupIdleTimeoutMs'
+    },
     {'1': 'output_format', '3': 8, '4': 1, '5': 9, '10': 'outputFormat'},
-    {'1': 'completion_marker', '3': 9, '4': 1, '5': 11, '6': '.iop.CLICompletionMarker', '10': 'completionMarker'},
+    {
+      '1': 'completion_marker',
+      '3': 9,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLICompletionMarker',
+      '10': 'completionMarker'
+    },
     {'1': 'mode', '3': 10, '4': 1, '5': 9, '10': 'mode'},
     {'1': 'resume_args', '3': 11, '4': 3, '5': 9, '10': 'resumeArgs'},
   ],
@@ -519,4 +699,3 @@ const NodeRuntimeConfig$json = {
 final $typed_data.Uint8List nodeRuntimeConfigDescriptor = $convert.base64Decode(
     'ChFOb2RlUnVudGltZUNvbmZpZxIgCgtjb25jdXJyZW5jeRgBIAEoBVILY29uY3VycmVuY3kSJQ'
     'oOd29ya3NwYWNlX3Jvb3QYAiABKAlSDXdvcmtzcGFjZVJvb3Q=');
-
diff --git a/lib/oto/agent/iop/runtime.pbserver.dart b/lib/oto/agent/iop/runtime.pbserver.dart
deleted file mode 100644
index a8fe277..0000000
--- a/lib/oto/agent/iop/runtime.pbserver.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'runtime.pb.dart';
-
diff --git a/pubspec.yaml b/pubspec.yaml
index f587080..9baea42 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: none
 repository: https://git.toki-labs.com/toki/oto.git
 
 environment:
-  sdk: '>=3.2.3 <4.0.0'
+  sdk: '>=3.8.0 <4.0.0'
 
 # Add regular dependencies here.
 dependencies:
@@ -27,7 +27,7 @@ dependencies:
       url: https://git.toki-labs.com/toki/dart-app-core.git
       ref: master
   fixnum: ^1.1.1
-  protobuf: ^3.1.0
+  protobuf: ^6.0.0
 
 dev_dependencies:
   lints: ^6.0.0
diff --git a/test/oto_agent_registration_test.dart b/test/oto_agent_registration_test.dart
index d4ef88a..8bb77e7 100644
--- a/test/oto_agent_registration_test.dart
+++ b/test/oto_agent_registration_test.dart
@@ -1,16 +1,34 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:oto/oto/agent/agent_config.dart';
 import 'package:oto/oto/agent/agent_runner.dart';
 import 'package:oto/oto/agent/edge_registration_client.dart';
 
+class FakeEdgeAgentSession implements EdgeAgentSession {
+  @override
+  final RegistrationResult result;
+  bool closed = false;
+
+  FakeEdgeAgentSession(this.result);
+
+  @override
+  Future<void> close() async {
+    closed = true;
+  }
+}
+
 class FakeEdgeRegistrationClient extends EdgeRegistrationClient {
   final RegistrationResult Function(AgentConfig config) _onRegister;
+  FakeEdgeAgentSession? lastSession;
 
   FakeEdgeRegistrationClient(this._onRegister);
 
   @override
-  Future<RegistrationResult> register(AgentConfig config) async {
-    return _onRegister(config);
+  Future<EdgeAgentSession> openSession(AgentConfig config) async {
+    final session = FakeEdgeAgentSession(_onRegister(config));
+    lastSession = session;
+    return session;
   }
 }
 
@@ -54,6 +72,22 @@ runtime:
     });
   });
 
+  group('EdgeRegistrationClient.register one-shot', () {
+    test('register returns session result and closes the session', () async {
+      final fakeClient = FakeEdgeRegistrationClient((config) {
+        return RegistrationResult.accepted(
+            'node-123', 'alias-123', {'concurrency': 1});
+      });
+
+      final result = await fakeClient.register(validConfig);
+
+      expect(result.accepted, isTrue);
+      expect(result.nodeId, 'node-123');
+      expect(fakeClient.lastSession, isNotNull);
+      expect(fakeClient.lastSession!.closed, isTrue);
+    });
+  });
+
   group('AgentRunner', () {
     test('AgentRunner maps config token to register request', () async {
       AgentConfig? capturedConfig;
@@ -63,24 +97,59 @@ runtime:
             'node-123', 'alias-123', {'concurrency': 1});
       });
 
-      final runner = DefaultAgentRunner(client: fakeClient, onLog: (msg) {});
+      final runner = DefaultAgentRunner(
+        client: fakeClient,
+        onLog: (msg) {},
+        waitForShutdown: () async {},
+      );
       await runner.run(validConfig);
 
       expect(capturedConfig, isNotNull);
       expect(capturedConfig!.agent.enrollmentToken, 'token-456');
     });
 
-    test('AgentRunner reports rejected registration', () async {
+    test('AgentRunner keeps session open until shutdown then closes', () async {
+      final fakeClient = FakeEdgeRegistrationClient((config) {
+        return RegistrationResult.accepted(
+            'node-123', 'alias-123', {'concurrency': 1});
+      });
+
+      final shutdown = Completer<void>();
+      final runner = DefaultAgentRunner(
+        client: fakeClient,
+        onLog: (msg) {},
+        waitForShutdown: () => shutdown.future,
+      );
+
+      final runFuture = runner.run(validConfig);
+      // 종료 신호 전에는 session이 살아 있어야 한다.
+      await Future<void>.delayed(Duration.zero);
+      expect(fakeClient.lastSession, isNotNull);
+      expect(fakeClient.lastSession!.closed, isFalse);
+
+      shutdown.complete();
+      await runFuture;
+      expect(fakeClient.lastSession!.closed, isTrue);
+    });
+
+    test('AgentRunner reports rejected registration and closes session',
+        () async {
       final fakeClient = FakeEdgeRegistrationClient((config) {
         return RegistrationResult.rejected('Invalid token');
       });
 
-      final runner = DefaultAgentRunner(client: fakeClient, onLog: (msg) {});
-      expect(
+      final runner = DefaultAgentRunner(
+        client: fakeClient,
+        onLog: (msg) {},
+        waitForShutdown: () async {},
+      );
+      await expectLater(
         () => runner.run(validConfig),
         throwsA(isA<RegistrationException>()
             .having((e) => e.message, 'message', 'Invalid token')),
       );
+      expect(fakeClient.lastSession, isNotNull);
+      expect(fakeClient.lastSession!.closed, isTrue);
     });
   });
 }
diff --git a/test/oto_iop_connection_smoke_test.dart b/test/oto_iop_connection_smoke_test.dart
index 3922fa9..c6f8f9b 100644
--- a/test/oto_iop_connection_smoke_test.dart
+++ b/test/oto_iop_connection_smoke_test.dart
@@ -10,81 +10,140 @@ const _token = 'oto-smoke-token';
 const _nodeId = 'oto-smoke-node';
 const _nodeAlias = 'oto-smoke';
 
+/// iop repo root used to run the Edge under test.
+///
+/// Defaults to the same-host sibling `../iop` checkout, but `IOP_REPO_ROOT`
+/// can override it so this smoke runs against any iop checkout (for example
+/// the `iop2oto` workspace clone).
+String _iopRepoRoot() {
+  final override = Platform.environment['IOP_REPO_ROOT'];
+  if (override != null && override.trim().isNotEmpty) {
+    return override;
+  }
+  return '../iop';
+}
+
 void main() {
-  test('OTO Dart proto-socket client registers with iop Edge', () async {
-    final edgePort = await _freePort();
-    final metricsPort = await _freePort();
-    final workDir = await Directory.systemTemp.createTemp('oto-iop-smoke-');
-    final config = File('${workDir.path}/edge.yaml');
-    await config
-        .writeAsString(_edgeConfig(edgePort, metricsPort, workDir.path));
+  test(
+    'OTO Dart proto-socket client registers with iop Edge and goes online',
+    () async {
+      final iopRepoRoot = _iopRepoRoot();
+      final edgePort = await _freePort();
+      final metricsPort = await _freePort();
+      final bootstrapPort = await _freePort();
+      final workDir = await Directory.systemTemp.createTemp('oto-iop-smoke-');
+      // Reuse a stable build cache across runs so the Edge `go run` stays warm
+      // and a fresh checkout still completes its first cold build in time.
+      final goCache = '${Directory.systemTemp.path}/oto-iop-smoke-gocache';
+      // The Edge writes its application (zap) logs to this file, not stderr, so
+      // the smoke tails it for the node.online lifecycle marker.
+      final edgeLog = File('${workDir.path}/edge.log');
+      final config = File('${workDir.path}/edge.yaml');
+      await config.writeAsString(_edgeConfig(
+        edgePort: edgePort,
+        metricsPort: metricsPort,
+        bootstrapPort: bootstrapPort,
+        logPath: edgeLog.path,
+        root: workDir.path,
+      ));
 
-    final edge = await Process.start(
-      'go',
-      [
-        'run',
-        './apps/edge/cmd/edge',
-        'serve',
-        '--config',
-        config.path,
-      ],
-      workingDirectory: '../iop',
-      environment: {
-        'GOCACHE': '${workDir.path}/gocache',
-      },
-    );
-
-    final output = StringBuffer();
-    final stdoutSub = edge.stdout
-        .transform(systemEncoding.decoder)
-        .listen(output.write, onError: output.write);
-    final stderrSub = edge.stderr
-        .transform(systemEncoding.decoder)
-        .listen(output.write, onError: output.write);
-
-    try {
-      await _waitForPort(_host, edgePort, edge, output);
-
-      final agentConfig = AgentConfig(
-        agent: const AgentIdentityConfig(
-          id: _nodeId,
-          alias: _nodeAlias,
-          enrollmentToken: _token,
-        ),
-        edge: EdgeConnectionConfig(
-          url: '$_host:$edgePort',
-        ),
-        runtime: AgentRuntimeConfig(
-          installDir: '${workDir.path}/install',
-          workspaceRoot: '${workDir.path}/workspace',
-          logDir: '${workDir.path}/log',
-        ),
-      );
-
-      final client = EdgeRegistrationClient();
-      final result = await client.register(agentConfig);
-
-      expect(result.accepted, isTrue);
-      expect(result.nodeId, _nodeId);
-      expect(result.alias, _nodeAlias);
-      expect(result.runtimeConfig, isNotNull);
-      expect(result.runtimeConfig!['concurrency'], 1);
-      expect(
-          result.runtimeConfig!['workspaceRoot'], '${workDir.path}/workspace');
-    } finally {
-      edge.kill(ProcessSignal.sigterm);
-      await edge.exitCode.timeout(
-        const Duration(seconds: 5),
-        onTimeout: () {
-          edge.kill(ProcessSignal.sigkill);
-          return edge.exitCode;
+      final edge = await Process.start(
+        'go',
+        [
+          'run',
+          './apps/edge/cmd/edge',
+          'serve',
+          '--config',
+          config.path,
+        ],
+        workingDirectory: iopRepoRoot,
+        environment: {
+          'GOCACHE': goCache,
         },
       );
-      await stdoutSub.cancel();
-      await stderrSub.cancel();
-      await workDir.delete(recursive: true);
-    }
-  }, timeout: const Timeout(Duration(seconds: 45)));
+
+      final output = StringBuffer();
+      final stdoutSub = edge.stdout
+          .transform(systemEncoding.decoder)
+          .listen(output.write, onError: output.write);
+      final stderrSub = edge.stderr
+          .transform(systemEncoding.decoder)
+          .listen(output.write, onError: output.write);
+
+      // ignore: avoid_print
+      print('[oto-smoke] iop repo root: $iopRepoRoot');
+
+      EdgeAgentSession? session;
+      try {
+        await _waitForPort(_host, edgePort, edge, output);
+
+        final agentConfig = AgentConfig(
+          agent: const AgentIdentityConfig(
+            id: _nodeId,
+            alias: _nodeAlias,
+            enrollmentToken: _token,
+          ),
+          edge: EdgeConnectionConfig(
+            url: '$_host:$edgePort',
+          ),
+          runtime: AgentRuntimeConfig(
+            installDir: '${workDir.path}/install',
+            workspaceRoot: '${workDir.path}/workspace',
+            logDir: '${workDir.path}/log',
+          ),
+        );
+
+        // openSession keeps the connection alive after registration so the
+        // proto-socket heartbeat reaches the Edge and flips the node online.
+        session = await EdgeRegistrationClient().openSession(agentConfig);
+        final result = session.result;
+
+        expect(result.accepted, isTrue);
+        expect(result.nodeId, _nodeId);
+        expect(result.alias, _nodeAlias);
+        expect(result.runtimeConfig, isNotNull);
+        expect(result.runtimeConfig!['concurrency'], 1);
+        expect(
+          result.runtimeConfig!['workspaceRoot'],
+          '${workDir.path}/workspace',
+        );
+
+        // ignore: avoid_print
+        print('[oto-smoke] registration accepted '
+            'node=${result.nodeId} alias=${result.alias}');
+
+        // After accepted, wait for the Edge to record the first heartbeat and
+        // transition the oto-agent node to online (node.online event). The
+        // first heartbeat arrives on the proto-socket heartbeat interval
+        // (~30s), so allow margin beyond it. The Edge emits this through its
+        // application log file.
+        final onlineLine = await _waitForLogMarker(
+          'node.online',
+          edgeLog,
+          edge,
+          output,
+          const Duration(seconds: 60),
+        );
+
+        // ignore: avoid_print
+        print('[oto-smoke] online evidence: ${onlineLine.trim()}');
+      } finally {
+        await session?.close();
+        edge.kill(ProcessSignal.sigterm);
+        await edge.exitCode.timeout(
+          const Duration(seconds: 5),
+          onTimeout: () {
+            edge.kill(ProcessSignal.sigkill);
+            return edge.exitCode;
+          },
+        );
+        await stdoutSub.cancel();
+        await stderrSub.cancel();
+        await workDir.delete(recursive: true);
+      }
+    },
+    timeout: const Timeout(Duration(seconds: 180)),
+  );
 }
 
 Future<int> _freePort() async {
@@ -100,7 +159,8 @@ Future<void> _waitForPort(
   Process process,
   StringBuffer output,
 ) async {
-  final deadline = DateTime.now().add(const Duration(seconds: 20));
+  // Generous deadline so a cold `go run` build of the Edge still finishes.
+  final deadline = DateTime.now().add(const Duration(seconds: 120));
   while (DateTime.now().isBefore(deadline)) {
     final exit = await _tryExitCode(process);
     if (exit != null) {
@@ -121,6 +181,42 @@ Future<void> _waitForPort(
   fail('timed out waiting for iop Edge on $host:$port:\n$output');
 }
 
+/// Polls the Edge [logFile] until [marker] appears and returns the matching
+/// log line. The captured process [output] (Fx/stderr) is only used for error
+/// context. Fails if the Edge exits early or the [timeout] elapses.
+Future<String> _waitForLogMarker(
+  String marker,
+  File logFile,
+  Process process,
+  StringBuffer output,
+  Duration timeout,
+) async {
+  final deadline = DateTime.now().add(timeout);
+  while (DateTime.now().isBefore(deadline)) {
+    if (logFile.existsSync()) {
+      final text = logFile.readAsStringSync();
+      final idx = text.indexOf(marker);
+      if (idx >= 0) {
+        final lineStart = text.lastIndexOf('\n', idx) + 1;
+        var lineEnd = text.indexOf('\n', idx);
+        if (lineEnd < 0) {
+          lineEnd = text.length;
+        }
+        return text.substring(lineStart, lineEnd);
+      }
+    }
+    final exit = await _tryExitCode(process);
+    if (exit != null) {
+      fail('iop Edge exited before "$marker" (code $exit):\n$output');
+    }
+    await Future<void>.delayed(const Duration(milliseconds: 100));
+  }
+  final logTail =
+      logFile.existsSync() ? logFile.readAsStringSync() : '(no log)';
+  fail('timed out waiting for "$marker" in Edge log:\n'
+      'edge log:\n$logTail\nedge stderr:\n$output');
+}
+
 Future<int?> _tryExitCode(Process process) {
   return process.exitCode
       .timeout(
@@ -130,7 +226,13 @@ Future<int?> _tryExitCode(Process process) {
       .then((code) => code == -1 ? null : code);
 }
 
-String _edgeConfig(int edgePort, int metricsPort, String root) {
+String _edgeConfig({
+  required int edgePort,
+  required int metricsPort,
+  required int bootstrapPort,
+  required String logPath,
+  required String root,
+}) {
   return '''
 edge:
   id: "oto-smoke-edge"
@@ -143,12 +245,16 @@ tls:
   enabled: false
 
 logging:
-  level: "error"
+  level: "debug"
   pretty: false
+  path: "$logPath"
 
 metrics:
   port: $metricsPort
 
+bootstrap:
+  listen: "$_host:$bootstrapPort"
+
 openai:
   enabled: false
 
@@ -166,6 +272,7 @@ nodes:
   - id: "$_nodeId"
     alias: "$_nodeAlias"
     token: "$_token"
+    agent_kind: "oto-agent"
     adapters:
       cli:
         enabled: false
diff --git a/test/support/google/protobuf/struct.pb.dart b/test/support/google/protobuf/struct.pb.dart
deleted file mode 100644
index 847ddda..0000000
--- a/test/support/google/protobuf/struct.pb.dart
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
-
-import 'struct.pbenum.dart';
-
-export 'struct.pbenum.dart';
-
-///  `Struct` represents a structured data value, consisting of fields
-///  which map to dynamically typed values. In some languages, `Struct`
-///  might be supported by a native representation. For example, in
-///  scripting languages like JS a struct is represented as an
-///  object. The details of that representation are described together
-///  with the proto support for the language.
-///
-///  The JSON representation for `Struct` is JSON object.
-class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
-  factory Struct({
-    $core.Map<$core.String, Value>? fields,
-  }) {
-    final $result = create();
-    if (fields != null) {
-      $result.fields.addAll(fields);
-    }
-    return $result;
-  }
-  Struct._() : super();
-  factory Struct.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Struct.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Struct', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.StructMixin.toProto3JsonHelper, fromProto3Json: $mixin.StructMixin.fromProto3JsonHelper)
-    ..m<$core.String, Value>(1, _omitFieldNames ? '' : 'fields', entryClassName: 'Struct.FieldsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: Value.create, valueDefaultOrMaker: Value.getDefault, packageName: const $pb.PackageName('google.protobuf'))
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Struct clone() => Struct()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Struct copyWith(void Function(Struct) updates) => super.copyWith((message) => updates(message as Struct)) as Struct;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Struct create() => Struct._();
-  Struct createEmptyInstance() => create();
-  static $pb.PbList<Struct> createRepeated() => $pb.PbList<Struct>();
-  @$core.pragma('dart2js:noInline')
-  static Struct getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Struct>(create);
-  static Struct? _defaultInstance;
-
-  /// Unordered map of dynamically typed values.
-  @$pb.TagNumber(1)
-  $core.Map<$core.String, Value> get fields => $_getMap(0);
-}
-
-enum Value_Kind {
-  nullValue, 
-  numberValue, 
-  stringValue, 
-  boolValue, 
-  structValue, 
-  listValue, 
-  notSet
-}
-
-///  `Value` represents a dynamically typed value which can be either
-///  null, a number, a string, a boolean, a recursive struct value, or a
-///  list of values. A producer of value is expected to set one of these
-///  variants. Absence of any variant indicates an error.
-///
-///  The JSON representation for `Value` is JSON value.
-class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
-  factory Value({
-    NullValue? nullValue,
-    $core.double? numberValue,
-    $core.String? stringValue,
-    $core.bool? boolValue,
-    Struct? structValue,
-    ListValue? listValue,
-  }) {
-    final $result = create();
-    if (nullValue != null) {
-      $result.nullValue = nullValue;
-    }
-    if (numberValue != null) {
-      $result.numberValue = numberValue;
-    }
-    if (stringValue != null) {
-      $result.stringValue = stringValue;
-    }
-    if (boolValue != null) {
-      $result.boolValue = boolValue;
-    }
-    if (structValue != null) {
-      $result.structValue = structValue;
-    }
-    if (listValue != null) {
-      $result.listValue = listValue;
-    }
-    return $result;
-  }
-  Value._() : super();
-  factory Value.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Value.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static const $core.Map<$core.int, Value_Kind> _Value_KindByTag = {
-    1 : Value_Kind.nullValue,
-    2 : Value_Kind.numberValue,
-    3 : Value_Kind.stringValue,
-    4 : Value_Kind.boolValue,
-    5 : Value_Kind.structValue,
-    6 : Value_Kind.listValue,
-    0 : Value_Kind.notSet
-  };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Value', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.ValueMixin.toProto3JsonHelper, fromProto3Json: $mixin.ValueMixin.fromProto3JsonHelper)
-    ..oo(0, [1, 2, 3, 4, 5, 6])
-    ..e<NullValue>(1, _omitFieldNames ? '' : 'nullValue', $pb.PbFieldType.OE, defaultOrMaker: NullValue.NULL_VALUE, valueOf: NullValue.valueOf, enumValues: NullValue.values)
-    ..a<$core.double>(2, _omitFieldNames ? '' : 'numberValue', $pb.PbFieldType.OD)
-    ..aOS(3, _omitFieldNames ? '' : 'stringValue')
-    ..aOB(4, _omitFieldNames ? '' : 'boolValue')
-    ..aOM<Struct>(5, _omitFieldNames ? '' : 'structValue', subBuilder: Struct.create)
-    ..aOM<ListValue>(6, _omitFieldNames ? '' : 'listValue', subBuilder: ListValue.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Value clone() => Value()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Value copyWith(void Function(Value) updates) => super.copyWith((message) => updates(message as Value)) as Value;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Value create() => Value._();
-  Value createEmptyInstance() => create();
-  static $pb.PbList<Value> createRepeated() => $pb.PbList<Value>();
-  @$core.pragma('dart2js:noInline')
-  static Value getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Value>(create);
-  static Value? _defaultInstance;
-
-  Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!;
-  void clearKind() => clearField($_whichOneof(0));
-
-  /// Represents a null value.
-  @$pb.TagNumber(1)
-  NullValue get nullValue => $_getN(0);
-  @$pb.TagNumber(1)
-  set nullValue(NullValue v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasNullValue() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearNullValue() => clearField(1);
-
-  /// Represents a double value.
-  @$pb.TagNumber(2)
-  $core.double get numberValue => $_getN(1);
-  @$pb.TagNumber(2)
-  set numberValue($core.double v) { $_setDouble(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasNumberValue() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearNumberValue() => clearField(2);
-
-  /// Represents a string value.
-  @$pb.TagNumber(3)
-  $core.String get stringValue => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set stringValue($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasStringValue() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearStringValue() => clearField(3);
-
-  /// Represents a boolean value.
-  @$pb.TagNumber(4)
-  $core.bool get boolValue => $_getBF(3);
-  @$pb.TagNumber(4)
-  set boolValue($core.bool v) { $_setBool(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasBoolValue() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearBoolValue() => clearField(4);
-
-  /// Represents a structured value.
-  @$pb.TagNumber(5)
-  Struct get structValue => $_getN(4);
-  @$pb.TagNumber(5)
-  set structValue(Struct v) { setField(5, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasStructValue() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearStructValue() => clearField(5);
-  @$pb.TagNumber(5)
-  Struct ensureStructValue() => $_ensure(4);
-
-  /// Represents a repeated `Value`.
-  @$pb.TagNumber(6)
-  ListValue get listValue => $_getN(5);
-  @$pb.TagNumber(6)
-  set listValue(ListValue v) { setField(6, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasListValue() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearListValue() => clearField(6);
-  @$pb.TagNumber(6)
-  ListValue ensureListValue() => $_ensure(5);
-}
-
-///  `ListValue` is a wrapper around a repeated field of values.
-///
-///  The JSON representation for `ListValue` is JSON array.
-class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin {
-  factory ListValue({
-    $core.Iterable<Value>? values,
-  }) {
-    final $result = create();
-    if (values != null) {
-      $result.values.addAll(values);
-    }
-    return $result;
-  }
-  ListValue._() : super();
-  factory ListValue.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ListValue.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListValue', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.ListValueMixin.toProto3JsonHelper, fromProto3Json: $mixin.ListValueMixin.fromProto3JsonHelper)
-    ..pc<Value>(1, _omitFieldNames ? '' : 'values', $pb.PbFieldType.PM, subBuilder: Value.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ListValue clone() => ListValue()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ListValue copyWith(void Function(ListValue) updates) => super.copyWith((message) => updates(message as ListValue)) as ListValue;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ListValue create() => ListValue._();
-  ListValue createEmptyInstance() => create();
-  static $pb.PbList<ListValue> createRepeated() => $pb.PbList<ListValue>();
-  @$core.pragma('dart2js:noInline')
-  static ListValue getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ListValue>(create);
-  static ListValue? _defaultInstance;
-
-  /// Repeated field of dynamically typed values.
-  @$pb.TagNumber(1)
-  $core.List<Value> get values => $_getList(0);
-}
-
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/test/support/google/protobuf/struct.pbenum.dart b/test/support/google/protobuf/struct.pbenum.dart
deleted file mode 100644
index bf7c571..0000000
--- a/test/support/google/protobuf/struct.pbenum.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-///  `NullValue` is a singleton enumeration to represent the null value for the
-///  `Value` type union.
-///
-///  The JSON representation for `NullValue` is JSON `null`.
-class NullValue extends $pb.ProtobufEnum {
-  static const NullValue NULL_VALUE = NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE');
-
-  static const $core.List<NullValue> values = <NullValue> [
-    NULL_VALUE,
-  ];
-
-  static final $core.Map<$core.int, NullValue> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static NullValue? valueOf($core.int value) => _byValue[value];
-
-  const NullValue._($core.int v, $core.String n) : super(v, n);
-}
-
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/test/support/google/protobuf/struct.pbjson.dart b/test/support/google/protobuf/struct.pbjson.dart
deleted file mode 100644
index ffa25fa..0000000
--- a/test/support/google/protobuf/struct.pbjson.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use nullValueDescriptor instead')
-const NullValue$json = {
-  '1': 'NullValue',
-  '2': [
-    {'1': 'NULL_VALUE', '2': 0},
-  ],
-};
-
-/// Descriptor for `NullValue`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List nullValueDescriptor = $convert.base64Decode(
-    'CglOdWxsVmFsdWUSDgoKTlVMTF9WQUxVRRAA');
-
-@$core.Deprecated('Use structDescriptor instead')
-const Struct$json = {
-  '1': 'Struct',
-  '2': [
-    {'1': 'fields', '3': 1, '4': 3, '5': 11, '6': '.google.protobuf.Struct.FieldsEntry', '10': 'fields'},
-  ],
-  '3': [Struct_FieldsEntry$json],
-};
-
-@$core.Deprecated('Use structDescriptor instead')
-const Struct_FieldsEntry$json = {
-  '1': 'FieldsEntry',
-  '2': [
-    {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'value', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Value', '10': 'value'},
-  ],
-  '7': {'7': true},
-};
-
-/// Descriptor for `Struct`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List structDescriptor = $convert.base64Decode(
-    'CgZTdHJ1Y3QSOwoGZmllbGRzGAEgAygLMiMuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdC5GaWVsZH'
-    'NFbnRyeVIGZmllbGRzGlEKC0ZpZWxkc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EiwKBXZhbHVl'
-    'GAIgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgV2YWx1ZToCOAE=');
-
-@$core.Deprecated('Use valueDescriptor instead')
-const Value$json = {
-  '1': 'Value',
-  '2': [
-    {'1': 'null_value', '3': 1, '4': 1, '5': 14, '6': '.google.protobuf.NullValue', '9': 0, '10': 'nullValue'},
-    {'1': 'number_value', '3': 2, '4': 1, '5': 1, '9': 0, '10': 'numberValue'},
-    {'1': 'string_value', '3': 3, '4': 1, '5': 9, '9': 0, '10': 'stringValue'},
-    {'1': 'bool_value', '3': 4, '4': 1, '5': 8, '9': 0, '10': 'boolValue'},
-    {'1': 'struct_value', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '9': 0, '10': 'structValue'},
-    {'1': 'list_value', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.ListValue', '9': 0, '10': 'listValue'},
-  ],
-  '8': [
-    {'1': 'kind'},
-  ],
-};
-
-/// Descriptor for `Value`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List valueDescriptor = $convert.base64Decode(
-    'CgVWYWx1ZRI7CgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZU'
-    'gAUgludWxsVmFsdWUSIwoMbnVtYmVyX3ZhbHVlGAIgASgBSABSC251bWJlclZhbHVlEiMKDHN0'
-    'cmluZ192YWx1ZRgDIAEoCUgAUgtzdHJpbmdWYWx1ZRIfCgpib29sX3ZhbHVlGAQgASgISABSCW'
-    'Jvb2xWYWx1ZRI8CgxzdHJ1Y3RfdmFsdWUYBSABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0'
-    'SABSC3N0cnVjdFZhbHVlEjsKCmxpc3RfdmFsdWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuTG'
-    'lzdFZhbHVlSABSCWxpc3RWYWx1ZUIGCgRraW5k');
-
-@$core.Deprecated('Use listValueDescriptor instead')
-const ListValue$json = {
-  '1': 'ListValue',
-  '2': [
-    {'1': 'values', '3': 1, '4': 3, '5': 11, '6': '.google.protobuf.Value', '10': 'values'},
-  ],
-};
-
-/// Descriptor for `ListValue`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listValueDescriptor = $convert.base64Decode(
-    'CglMaXN0VmFsdWUSLgoGdmFsdWVzGAEgAygLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgZ2YW'
-    'x1ZXM=');
-
diff --git a/test/support/google/protobuf/struct.pbserver.dart b/test/support/google/protobuf/struct.pbserver.dart
deleted file mode 100644
index b92ae61..0000000
--- a/test/support/google/protobuf/struct.pbserver.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: google/protobuf/struct.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'struct.pb.dart';
-
diff --git a/test/support/iop/runtime.pb.dart b/test/support/iop/runtime.pb.dart
index 68bb874..f513506 100644
--- a/test/support/iop/runtime.pb.dart
+++ b/test/support/iop/runtime.pb.dart
@@ -1,22 +1,25 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
+import 'package:protobuf/well_known_types/google/protobuf/struct.pb.dart' as $0;
 
-import '../google/protobuf/struct.pb.dart' as $0;
 import 'runtime.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'runtime.pbenum.dart';
 
 /// RunRequest initiates an adapter execution on a node.
@@ -29,183 +32,173 @@ class RunRequest extends $pb.GeneratedMessage {
     $0.Struct? policy,
     $0.Struct? input,
     $core.int? timeoutSec,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $core.String? sessionId,
     RunSessionMode? sessionMode,
     $core.bool? background,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (workspace != null) {
-      $result.workspace = workspace;
-    }
-    if (policy != null) {
-      $result.policy = policy;
-    }
-    if (input != null) {
-      $result.input = input;
-    }
-    if (timeoutSec != null) {
-      $result.timeoutSec = timeoutSec;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (sessionMode != null) {
-      $result.sessionMode = sessionMode;
-    }
-    if (background != null) {
-      $result.background = background;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (workspace != null) result.workspace = workspace;
+    if (policy != null) result.policy = policy;
+    if (input != null) result.input = input;
+    if (timeoutSec != null) result.timeoutSec = timeoutSec;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (sessionId != null) result.sessionId = sessionId;
+    if (sessionMode != null) result.sessionMode = sessionMode;
+    if (background != null) result.background = background;
+    return result;
   }
-  RunRequest._() : super();
-  factory RunRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RunRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RunRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RunRequest._();
+
+  factory RunRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RunRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RunRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'adapter')
     ..aOS(3, _omitFieldNames ? '' : 'target')
     ..aOS(4, _omitFieldNames ? '' : 'workspace')
-    ..aOM<$0.Struct>(5, _omitFieldNames ? '' : 'policy', subBuilder: $0.Struct.create)
-    ..aOM<$0.Struct>(6, _omitFieldNames ? '' : 'input', subBuilder: $0.Struct.create)
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'timeoutSec', $pb.PbFieldType.O3)
-    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'metadata', entryClassName: 'RunRequest.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..aOM<$0.Struct>(5, _omitFieldNames ? '' : 'policy',
+        subBuilder: $0.Struct.create)
+    ..aOM<$0.Struct>(6, _omitFieldNames ? '' : 'input',
+        subBuilder: $0.Struct.create)
+    ..aI(7, _omitFieldNames ? '' : 'timeoutSec')
+    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'RunRequest.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aOS(9, _omitFieldNames ? '' : 'sessionId')
-    ..e<RunSessionMode>(10, _omitFieldNames ? '' : 'sessionMode', $pb.PbFieldType.OE, defaultOrMaker: RunSessionMode.RUN_SESSION_MODE_UNSPECIFIED, valueOf: RunSessionMode.valueOf, enumValues: RunSessionMode.values)
+    ..aE<RunSessionMode>(10, _omitFieldNames ? '' : 'sessionMode',
+        enumValues: RunSessionMode.values)
     ..aOB(11, _omitFieldNames ? '' : 'background')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RunRequest clone() => RunRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RunRequest copyWith(void Function(RunRequest) updates) => super.copyWith((message) => updates(message as RunRequest)) as RunRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunRequest copyWith(void Function(RunRequest) updates) =>
+      super.copyWith((message) => updates(message as RunRequest)) as RunRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RunRequest create() => RunRequest._();
+  @$core.override
   RunRequest createEmptyInstance() => create();
-  static $pb.PbList<RunRequest> createRepeated() => $pb.PbList<RunRequest>();
   @$core.pragma('dart2js:noInline')
-  static RunRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunRequest>(create);
+  static RunRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RunRequest>(create);
   static RunRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get adapter => $_getSZ(1);
   @$pb.TagNumber(2)
-  set adapter($core.String v) { $_setString(1, v); }
+  set adapter($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasAdapter() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAdapter() => clearField(2);
+  void clearAdapter() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get target => $_getSZ(2);
   @$pb.TagNumber(3)
-  set target($core.String v) { $_setString(2, v); }
+  set target($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasTarget() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTarget() => clearField(3);
+  void clearTarget() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get workspace => $_getSZ(3);
   @$pb.TagNumber(4)
-  set workspace($core.String v) { $_setString(3, v); }
+  set workspace($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasWorkspace() => $_has(3);
   @$pb.TagNumber(4)
-  void clearWorkspace() => clearField(4);
+  void clearWorkspace() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $0.Struct get policy => $_getN(4);
   @$pb.TagNumber(5)
-  set policy($0.Struct v) { setField(5, v); }
+  set policy($0.Struct value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasPolicy() => $_has(4);
   @$pb.TagNumber(5)
-  void clearPolicy() => clearField(5);
+  void clearPolicy() => $_clearField(5);
   @$pb.TagNumber(5)
   $0.Struct ensurePolicy() => $_ensure(4);
 
   @$pb.TagNumber(6)
   $0.Struct get input => $_getN(5);
   @$pb.TagNumber(6)
-  set input($0.Struct v) { setField(6, v); }
+  set input($0.Struct value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasInput() => $_has(5);
   @$pb.TagNumber(6)
-  void clearInput() => clearField(6);
+  void clearInput() => $_clearField(6);
   @$pb.TagNumber(6)
   $0.Struct ensureInput() => $_ensure(5);
 
   @$pb.TagNumber(7)
   $core.int get timeoutSec => $_getIZ(6);
   @$pb.TagNumber(7)
-  set timeoutSec($core.int v) { $_setSignedInt32(6, v); }
+  set timeoutSec($core.int value) => $_setSignedInt32(6, value);
   @$pb.TagNumber(7)
   $core.bool hasTimeoutSec() => $_has(6);
   @$pb.TagNumber(7)
-  void clearTimeoutSec() => clearField(7);
+  void clearTimeoutSec() => $_clearField(7);
 
   @$pb.TagNumber(8)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(7);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(7);
 
   @$pb.TagNumber(9)
   $core.String get sessionId => $_getSZ(8);
   @$pb.TagNumber(9)
-  set sessionId($core.String v) { $_setString(8, v); }
+  set sessionId($core.String value) => $_setString(8, value);
   @$pb.TagNumber(9)
   $core.bool hasSessionId() => $_has(8);
   @$pb.TagNumber(9)
-  void clearSessionId() => clearField(9);
+  void clearSessionId() => $_clearField(9);
 
   @$pb.TagNumber(10)
   RunSessionMode get sessionMode => $_getN(9);
   @$pb.TagNumber(10)
-  set sessionMode(RunSessionMode v) { setField(10, v); }
+  set sessionMode(RunSessionMode value) => $_setField(10, value);
   @$pb.TagNumber(10)
   $core.bool hasSessionMode() => $_has(9);
   @$pb.TagNumber(10)
-  void clearSessionMode() => clearField(10);
+  void clearSessionMode() => $_clearField(10);
 
   @$pb.TagNumber(11)
   $core.bool get background => $_getBF(10);
   @$pb.TagNumber(11)
-  set background($core.bool v) { $_setBool(10, v); }
+  set background($core.bool value) => $_setBool(10, value);
   @$pb.TagNumber(11)
   $core.bool hasBackground() => $_has(10);
   @$pb.TagNumber(11)
-  void clearBackground() => clearField(11);
+  void clearBackground() => $_clearField(11);
 }
 
 /// RunEvent is a streaming execution event.
@@ -217,196 +210,181 @@ class RunEvent extends $pb.GeneratedMessage {
     $core.String? message,
     $core.String? error,
     Usage? usage,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $fixnum.Int64? timestamp,
     $core.String? sessionId,
     $core.bool? background,
     $core.String? nodeId,
     $core.String? nodeAlias,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (delta != null) {
-      $result.delta = delta;
-    }
-    if (message != null) {
-      $result.message = message;
-    }
-    if (error != null) {
-      $result.error = error;
-    }
-    if (usage != null) {
-      $result.usage = usage;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (background != null) {
-      $result.background = background;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (nodeAlias != null) {
-      $result.nodeAlias = nodeAlias;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (type != null) result.type = type;
+    if (delta != null) result.delta = delta;
+    if (message != null) result.message = message;
+    if (error != null) result.error = error;
+    if (usage != null) result.usage = usage;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (timestamp != null) result.timestamp = timestamp;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (background != null) result.background = background;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (nodeAlias != null) result.nodeAlias = nodeAlias;
+    return result;
   }
-  RunEvent._() : super();
-  factory RunEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RunEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RunEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RunEvent._();
+
+  factory RunEvent.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RunEvent.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RunEvent',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'type')
     ..aOS(3, _omitFieldNames ? '' : 'delta')
     ..aOS(4, _omitFieldNames ? '' : 'message')
     ..aOS(5, _omitFieldNames ? '' : 'error')
     ..aOM<Usage>(6, _omitFieldNames ? '' : 'usage', subBuilder: Usage.create)
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'RunEvent.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'RunEvent.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aInt64(8, _omitFieldNames ? '' : 'timestamp')
     ..aOS(9, _omitFieldNames ? '' : 'sessionId')
     ..aOB(10, _omitFieldNames ? '' : 'background')
     ..aOS(11, _omitFieldNames ? '' : 'nodeId')
     ..aOS(12, _omitFieldNames ? '' : 'nodeAlias')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RunEvent clone() => RunEvent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RunEvent copyWith(void Function(RunEvent) updates) => super.copyWith((message) => updates(message as RunEvent)) as RunEvent;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunEvent clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RunEvent copyWith(void Function(RunEvent) updates) =>
+      super.copyWith((message) => updates(message as RunEvent)) as RunEvent;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RunEvent create() => RunEvent._();
+  @$core.override
   RunEvent createEmptyInstance() => create();
-  static $pb.PbList<RunEvent> createRepeated() => $pb.PbList<RunEvent>();
   @$core.pragma('dart2js:noInline')
-  static RunEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunEvent>(create);
+  static RunEvent getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RunEvent>(create);
   static RunEvent? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get type => $_getSZ(1);
   @$pb.TagNumber(2)
-  set type($core.String v) { $_setString(1, v); }
+  set type($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get delta => $_getSZ(2);
   @$pb.TagNumber(3)
-  set delta($core.String v) { $_setString(2, v); }
+  set delta($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasDelta() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDelta() => clearField(3);
+  void clearDelta() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get message => $_getSZ(3);
   @$pb.TagNumber(4)
-  set message($core.String v) { $_setString(3, v); }
+  set message($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasMessage() => $_has(3);
   @$pb.TagNumber(4)
-  void clearMessage() => clearField(4);
+  void clearMessage() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get error => $_getSZ(4);
   @$pb.TagNumber(5)
-  set error($core.String v) { $_setString(4, v); }
+  set error($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasError() => $_has(4);
   @$pb.TagNumber(5)
-  void clearError() => clearField(5);
+  void clearError() => $_clearField(5);
 
   @$pb.TagNumber(6)
   Usage get usage => $_getN(5);
   @$pb.TagNumber(6)
-  set usage(Usage v) { setField(6, v); }
+  set usage(Usage value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasUsage() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUsage() => clearField(6);
+  void clearUsage() => $_clearField(6);
   @$pb.TagNumber(6)
   Usage ensureUsage() => $_ensure(5);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 
   @$pb.TagNumber(8)
   $fixnum.Int64 get timestamp => $_getI64(7);
   @$pb.TagNumber(8)
-  set timestamp($fixnum.Int64 v) { $_setInt64(7, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(7, value);
   @$pb.TagNumber(8)
   $core.bool hasTimestamp() => $_has(7);
   @$pb.TagNumber(8)
-  void clearTimestamp() => clearField(8);
+  void clearTimestamp() => $_clearField(8);
 
   @$pb.TagNumber(9)
   $core.String get sessionId => $_getSZ(8);
   @$pb.TagNumber(9)
-  set sessionId($core.String v) { $_setString(8, v); }
+  set sessionId($core.String value) => $_setString(8, value);
   @$pb.TagNumber(9)
   $core.bool hasSessionId() => $_has(8);
   @$pb.TagNumber(9)
-  void clearSessionId() => clearField(9);
+  void clearSessionId() => $_clearField(9);
 
   @$pb.TagNumber(10)
   $core.bool get background => $_getBF(9);
   @$pb.TagNumber(10)
-  set background($core.bool v) { $_setBool(9, v); }
+  set background($core.bool value) => $_setBool(9, value);
   @$pb.TagNumber(10)
   $core.bool hasBackground() => $_has(9);
   @$pb.TagNumber(10)
-  void clearBackground() => clearField(10);
+  void clearBackground() => $_clearField(10);
 
   @$pb.TagNumber(11)
   $core.String get nodeId => $_getSZ(10);
   @$pb.TagNumber(11)
-  set nodeId($core.String v) { $_setString(10, v); }
+  set nodeId($core.String value) => $_setString(10, value);
   @$pb.TagNumber(11)
   $core.bool hasNodeId() => $_has(10);
   @$pb.TagNumber(11)
-  void clearNodeId() => clearField(11);
+  void clearNodeId() => $_clearField(11);
 
   @$pb.TagNumber(12)
   $core.String get nodeAlias => $_getSZ(11);
   @$pb.TagNumber(12)
-  set nodeAlias($core.String v) { $_setString(11, v); }
+  set nodeAlias($core.String value) => $_setString(11, value);
   @$pb.TagNumber(12)
   $core.bool hasNodeAlias() => $_has(11);
   @$pb.TagNumber(12)
-  void clearNodeAlias() => clearField(12);
+  void clearNodeAlias() => $_clearField(12);
 }
 
 /// EdgeNodeEvent is a general edge-node lifecycle/control event envelope.
@@ -419,138 +397,132 @@ class EdgeNodeEvent extends $pb.GeneratedMessage {
     $core.String? nodeId,
     $core.String? alias,
     $core.String? reason,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
     $fixnum.Int64? timestamp,
   }) {
-    final $result = create();
-    if (eventId != null) {
-      $result.eventId = eventId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (source != null) {
-      $result.source = source;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (alias != null) {
-      $result.alias = alias;
-    }
-    if (reason != null) {
-      $result.reason = reason;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    return $result;
+    final result = create();
+    if (eventId != null) result.eventId = eventId;
+    if (type != null) result.type = type;
+    if (source != null) result.source = source;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (alias != null) result.alias = alias;
+    if (reason != null) result.reason = reason;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    if (timestamp != null) result.timestamp = timestamp;
+    return result;
   }
-  EdgeNodeEvent._() : super();
-  factory EdgeNodeEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EdgeNodeEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EdgeNodeEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  EdgeNodeEvent._();
+
+  factory EdgeNodeEvent.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EdgeNodeEvent.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EdgeNodeEvent',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'eventId')
     ..aOS(2, _omitFieldNames ? '' : 'type')
     ..aOS(3, _omitFieldNames ? '' : 'source')
     ..aOS(4, _omitFieldNames ? '' : 'nodeId')
     ..aOS(5, _omitFieldNames ? '' : 'alias')
     ..aOS(6, _omitFieldNames ? '' : 'reason')
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'EdgeNodeEvent.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'EdgeNodeEvent.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
     ..aInt64(8, _omitFieldNames ? '' : 'timestamp')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  EdgeNodeEvent clone() => EdgeNodeEvent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  EdgeNodeEvent copyWith(void Function(EdgeNodeEvent) updates) => super.copyWith((message) => updates(message as EdgeNodeEvent)) as EdgeNodeEvent;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EdgeNodeEvent clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EdgeNodeEvent copyWith(void Function(EdgeNodeEvent) updates) =>
+      super.copyWith((message) => updates(message as EdgeNodeEvent))
+          as EdgeNodeEvent;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EdgeNodeEvent create() => EdgeNodeEvent._();
+  @$core.override
   EdgeNodeEvent createEmptyInstance() => create();
-  static $pb.PbList<EdgeNodeEvent> createRepeated() => $pb.PbList<EdgeNodeEvent>();
   @$core.pragma('dart2js:noInline')
-  static EdgeNodeEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EdgeNodeEvent>(create);
+  static EdgeNodeEvent getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EdgeNodeEvent>(create);
   static EdgeNodeEvent? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get eventId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set eventId($core.String v) { $_setString(0, v); }
+  set eventId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasEventId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearEventId() => clearField(1);
+  void clearEventId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get type => $_getSZ(1);
   @$pb.TagNumber(2)
-  set type($core.String v) { $_setString(1, v); }
+  set type($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get source => $_getSZ(2);
   @$pb.TagNumber(3)
-  set source($core.String v) { $_setString(2, v); }
+  set source($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasSource() => $_has(2);
   @$pb.TagNumber(3)
-  void clearSource() => clearField(3);
+  void clearSource() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get nodeId => $_getSZ(3);
   @$pb.TagNumber(4)
-  set nodeId($core.String v) { $_setString(3, v); }
+  set nodeId($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasNodeId() => $_has(3);
   @$pb.TagNumber(4)
-  void clearNodeId() => clearField(4);
+  void clearNodeId() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get alias => $_getSZ(4);
   @$pb.TagNumber(5)
-  set alias($core.String v) { $_setString(4, v); }
+  set alias($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasAlias() => $_has(4);
   @$pb.TagNumber(5)
-  void clearAlias() => clearField(5);
+  void clearAlias() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.String get reason => $_getSZ(5);
   @$pb.TagNumber(6)
-  set reason($core.String v) { $_setString(5, v); }
+  set reason($core.String value) => $_setString(5, value);
   @$pb.TagNumber(6)
   $core.bool hasReason() => $_has(5);
   @$pb.TagNumber(6)
-  void clearReason() => clearField(6);
+  void clearReason() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 
   @$pb.TagNumber(8)
   $fixnum.Int64 get timestamp => $_getI64(7);
   @$pb.TagNumber(8)
-  set timestamp($fixnum.Int64 v) { $_setInt64(7, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(7, value);
   @$pb.TagNumber(8)
   $core.bool hasTimestamp() => $_has(7);
   @$pb.TagNumber(8)
-  void clearTimestamp() => clearField(8);
+  void clearTimestamp() => $_clearField(8);
 }
 
 class Usage extends $pb.GeneratedMessage {
@@ -558,63 +530,64 @@ class Usage extends $pb.GeneratedMessage {
     $core.int? inputTokens,
     $core.int? outputTokens,
   }) {
-    final $result = create();
-    if (inputTokens != null) {
-      $result.inputTokens = inputTokens;
-    }
-    if (outputTokens != null) {
-      $result.outputTokens = outputTokens;
-    }
-    return $result;
+    final result = create();
+    if (inputTokens != null) result.inputTokens = inputTokens;
+    if (outputTokens != null) result.outputTokens = outputTokens;
+    return result;
   }
-  Usage._() : super();
-  factory Usage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Usage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Usage', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'inputTokens', $pb.PbFieldType.O3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'outputTokens', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+  Usage._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Usage clone() => Usage()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Usage copyWith(void Function(Usage) updates) => super.copyWith((message) => updates(message as Usage)) as Usage;
+  factory Usage.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Usage.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Usage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'inputTokens')
+    ..aI(2, _omitFieldNames ? '' : 'outputTokens')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Usage clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Usage copyWith(void Function(Usage) updates) =>
+      super.copyWith((message) => updates(message as Usage)) as Usage;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Usage create() => Usage._();
+  @$core.override
   Usage createEmptyInstance() => create();
-  static $pb.PbList<Usage> createRepeated() => $pb.PbList<Usage>();
   @$core.pragma('dart2js:noInline')
-  static Usage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Usage>(create);
+  static Usage getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Usage>(create);
   static Usage? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get inputTokens => $_getIZ(0);
   @$pb.TagNumber(1)
-  set inputTokens($core.int v) { $_setSignedInt32(0, v); }
+  set inputTokens($core.int value) => $_setSignedInt32(0, value);
   @$pb.TagNumber(1)
   $core.bool hasInputTokens() => $_has(0);
   @$pb.TagNumber(1)
-  void clearInputTokens() => clearField(1);
+  void clearInputTokens() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get outputTokens => $_getIZ(1);
   @$pb.TagNumber(2)
-  set outputTokens($core.int v) { $_setSignedInt32(1, v); }
+  set outputTokens($core.int value) => $_setSignedInt32(1, value);
   @$pb.TagNumber(2)
   $core.bool hasOutputTokens() => $_has(1);
   @$pb.TagNumber(2)
-  void clearOutputTokens() => clearField(2);
+  void clearOutputTokens() => $_clearField(2);
 }
 
 /// Heartbeat is sent by both sides to keep the connection alive.
@@ -622,50 +595,53 @@ class Heartbeat extends $pb.GeneratedMessage {
   factory Heartbeat({
     $fixnum.Int64? timestamp,
   }) {
-    final $result = create();
-    if (timestamp != null) {
-      $result.timestamp = timestamp;
-    }
-    return $result;
+    final result = create();
+    if (timestamp != null) result.timestamp = timestamp;
+    return result;
   }
-  Heartbeat._() : super();
-  factory Heartbeat.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Heartbeat.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Heartbeat', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  Heartbeat._();
+
+  factory Heartbeat.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Heartbeat.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Heartbeat',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'timestamp')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Heartbeat clone() => Heartbeat()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Heartbeat copyWith(void Function(Heartbeat) updates) => super.copyWith((message) => updates(message as Heartbeat)) as Heartbeat;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Heartbeat clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Heartbeat copyWith(void Function(Heartbeat) updates) =>
+      super.copyWith((message) => updates(message as Heartbeat)) as Heartbeat;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Heartbeat create() => Heartbeat._();
+  @$core.override
   Heartbeat createEmptyInstance() => create();
-  static $pb.PbList<Heartbeat> createRepeated() => $pb.PbList<Heartbeat>();
   @$core.pragma('dart2js:noInline')
-  static Heartbeat getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Heartbeat>(create);
+  static Heartbeat getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Heartbeat>(create);
   static Heartbeat? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get timestamp => $_getI64(0);
   @$pb.TagNumber(1)
-  set timestamp($fixnum.Int64 v) { $_setInt64(0, v); }
+  set timestamp($fixnum.Int64 value) => $_setInt64(0, value);
   @$pb.TagNumber(1)
   $core.bool hasTimestamp() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTimestamp() => clearField(1);
+  void clearTimestamp() => $_clearField(1);
 }
 
 /// CancelRequest asks the node to cancel a running execution.
@@ -677,102 +653,99 @@ class CancelRequest extends $pb.GeneratedMessage {
     $core.String? sessionId,
     CancelAction? action,
   }) {
-    final $result = create();
-    if (runId != null) {
-      $result.runId = runId;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (action != null) {
-      $result.action = action;
-    }
-    return $result;
+    final result = create();
+    if (runId != null) result.runId = runId;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (action != null) result.action = action;
+    return result;
   }
-  CancelRequest._() : super();
-  factory CancelRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CancelRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CancelRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CancelRequest._();
+
+  factory CancelRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CancelRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CancelRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'runId')
     ..aOS(2, _omitFieldNames ? '' : 'adapter')
     ..aOS(3, _omitFieldNames ? '' : 'target')
     ..aOS(4, _omitFieldNames ? '' : 'sessionId')
-    ..e<CancelAction>(5, _omitFieldNames ? '' : 'action', $pb.PbFieldType.OE, defaultOrMaker: CancelAction.CANCEL_ACTION_UNSPECIFIED, valueOf: CancelAction.valueOf, enumValues: CancelAction.values)
-    ..hasRequiredFields = false
-  ;
+    ..aE<CancelAction>(5, _omitFieldNames ? '' : 'action',
+        enumValues: CancelAction.values)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CancelRequest clone() => CancelRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CancelRequest copyWith(void Function(CancelRequest) updates) => super.copyWith((message) => updates(message as CancelRequest)) as CancelRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CancelRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CancelRequest copyWith(void Function(CancelRequest) updates) =>
+      super.copyWith((message) => updates(message as CancelRequest))
+          as CancelRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CancelRequest create() => CancelRequest._();
+  @$core.override
   CancelRequest createEmptyInstance() => create();
-  static $pb.PbList<CancelRequest> createRepeated() => $pb.PbList<CancelRequest>();
   @$core.pragma('dart2js:noInline')
-  static CancelRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CancelRequest>(create);
+  static CancelRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CancelRequest>(create);
   static CancelRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get runId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set runId($core.String v) { $_setString(0, v); }
+  set runId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRunId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRunId() => clearField(1);
+  void clearRunId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get adapter => $_getSZ(1);
   @$pb.TagNumber(2)
-  set adapter($core.String v) { $_setString(1, v); }
+  set adapter($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasAdapter() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAdapter() => clearField(2);
+  void clearAdapter() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get target => $_getSZ(2);
   @$pb.TagNumber(3)
-  set target($core.String v) { $_setString(2, v); }
+  set target($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasTarget() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTarget() => clearField(3);
+  void clearTarget() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get sessionId => $_getSZ(3);
   @$pb.TagNumber(4)
-  set sessionId($core.String v) { $_setString(3, v); }
+  set sessionId($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasSessionId() => $_has(3);
   @$pb.TagNumber(4)
-  void clearSessionId() => clearField(4);
+  void clearSessionId() => $_clearField(4);
 
   @$pb.TagNumber(5)
   CancelAction get action => $_getN(4);
   @$pb.TagNumber(5)
-  set action(CancelAction v) { setField(5, v); }
+  set action(CancelAction value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasAction() => $_has(4);
   @$pb.TagNumber(5)
-  void clearAction() => clearField(5);
+  void clearAction() => $_clearField(5);
 }
 
 class NodeCommandRequest extends $pb.GeneratedMessage {
@@ -783,124 +756,121 @@ class NodeCommandRequest extends $pb.GeneratedMessage {
     $core.String? target,
     $core.String? sessionId,
     $core.int? timeoutSec,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
   }) {
-    final $result = create();
-    if (requestId != null) {
-      $result.requestId = requestId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (timeoutSec != null) {
-      $result.timeoutSec = timeoutSec;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    return $result;
+    final result = create();
+    if (requestId != null) result.requestId = requestId;
+    if (type != null) result.type = type;
+    if (adapter != null) result.adapter = adapter;
+    if (target != null) result.target = target;
+    if (sessionId != null) result.sessionId = sessionId;
+    if (timeoutSec != null) result.timeoutSec = timeoutSec;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    return result;
   }
-  NodeCommandRequest._() : super();
-  factory NodeCommandRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeCommandRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeCommandRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  NodeCommandRequest._();
+
+  factory NodeCommandRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeCommandRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeCommandRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'requestId')
-    ..e<NodeCommandType>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: NodeCommandType.NODE_COMMAND_TYPE_UNSPECIFIED, valueOf: NodeCommandType.valueOf, enumValues: NodeCommandType.values)
+    ..aE<NodeCommandType>(2, _omitFieldNames ? '' : 'type',
+        enumValues: NodeCommandType.values)
     ..aOS(3, _omitFieldNames ? '' : 'adapter')
     ..aOS(4, _omitFieldNames ? '' : 'target')
     ..aOS(5, _omitFieldNames ? '' : 'sessionId')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'timeoutSec', $pb.PbFieldType.O3)
-    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata', entryClassName: 'NodeCommandRequest.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..aI(6, _omitFieldNames ? '' : 'timeoutSec')
+    ..m<$core.String, $core.String>(7, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'NodeCommandRequest.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeCommandRequest clone() => NodeCommandRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeCommandRequest copyWith(void Function(NodeCommandRequest) updates) => super.copyWith((message) => updates(message as NodeCommandRequest)) as NodeCommandRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandRequest copyWith(void Function(NodeCommandRequest) updates) =>
+      super.copyWith((message) => updates(message as NodeCommandRequest))
+          as NodeCommandRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeCommandRequest create() => NodeCommandRequest._();
+  @$core.override
   NodeCommandRequest createEmptyInstance() => create();
-  static $pb.PbList<NodeCommandRequest> createRepeated() => $pb.PbList<NodeCommandRequest>();
   @$core.pragma('dart2js:noInline')
-  static NodeCommandRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeCommandRequest>(create);
+  static NodeCommandRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeCommandRequest>(create);
   static NodeCommandRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get requestId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set requestId($core.String v) { $_setString(0, v); }
+  set requestId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRequestId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequestId() => clearField(1);
+  void clearRequestId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   NodeCommandType get type => $_getN(1);
   @$pb.TagNumber(2)
-  set type(NodeCommandType v) { setField(2, v); }
+  set type(NodeCommandType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get adapter => $_getSZ(2);
   @$pb.TagNumber(3)
-  set adapter($core.String v) { $_setString(2, v); }
+  set adapter($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAdapter() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAdapter() => clearField(3);
+  void clearAdapter() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get target => $_getSZ(3);
   @$pb.TagNumber(4)
-  set target($core.String v) { $_setString(3, v); }
+  set target($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasTarget() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTarget() => clearField(4);
+  void clearTarget() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get sessionId => $_getSZ(4);
   @$pb.TagNumber(5)
-  set sessionId($core.String v) { $_setString(4, v); }
+  set sessionId($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasSessionId() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSessionId() => clearField(5);
+  void clearSessionId() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.int get timeoutSec => $_getIZ(5);
   @$pb.TagNumber(6)
-  set timeoutSec($core.int v) { $_setSignedInt32(5, v); }
+  set timeoutSec($core.int value) => $_setSignedInt32(5, value);
   @$pb.TagNumber(6)
   $core.bool hasTimeoutSec() => $_has(5);
   @$pb.TagNumber(6)
-  void clearTimeoutSec() => clearField(6);
+  void clearTimeoutSec() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(6);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(6);
 }
 
 class NodeCommandResponse extends $pb.GeneratedMessage {
@@ -912,142 +882,138 @@ class NodeCommandResponse extends $pb.GeneratedMessage {
     $core.String? sessionId,
     AgentUsageStatus? usageStatus,
     $core.String? error,
-    $core.Map<$core.String, $core.String>? result,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? result,
   }) {
-    final $result = create();
-    if (requestId != null) {
-      $result.requestId = requestId;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (adapter != null) {
-      $result.adapter = adapter;
-    }
-    if (target != null) {
-      $result.target = target;
-    }
-    if (sessionId != null) {
-      $result.sessionId = sessionId;
-    }
-    if (usageStatus != null) {
-      $result.usageStatus = usageStatus;
-    }
-    if (error != null) {
-      $result.error = error;
-    }
-    if (result != null) {
-      $result.result.addAll(result);
-    }
-    return $result;
+    final result$ = create();
+    if (requestId != null) result$.requestId = requestId;
+    if (type != null) result$.type = type;
+    if (adapter != null) result$.adapter = adapter;
+    if (target != null) result$.target = target;
+    if (sessionId != null) result$.sessionId = sessionId;
+    if (usageStatus != null) result$.usageStatus = usageStatus;
+    if (error != null) result$.error = error;
+    if (result != null) result$.result.addEntries(result);
+    return result$;
   }
-  NodeCommandResponse._() : super();
-  factory NodeCommandResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeCommandResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeCommandResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  NodeCommandResponse._();
+
+  factory NodeCommandResponse.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeCommandResponse.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeCommandResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'requestId')
-    ..e<NodeCommandType>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: NodeCommandType.NODE_COMMAND_TYPE_UNSPECIFIED, valueOf: NodeCommandType.valueOf, enumValues: NodeCommandType.values)
+    ..aE<NodeCommandType>(2, _omitFieldNames ? '' : 'type',
+        enumValues: NodeCommandType.values)
     ..aOS(3, _omitFieldNames ? '' : 'adapter')
     ..aOS(4, _omitFieldNames ? '' : 'target')
     ..aOS(5, _omitFieldNames ? '' : 'sessionId')
-    ..aOM<AgentUsageStatus>(6, _omitFieldNames ? '' : 'usageStatus', subBuilder: AgentUsageStatus.create)
+    ..aOM<AgentUsageStatus>(6, _omitFieldNames ? '' : 'usageStatus',
+        subBuilder: AgentUsageStatus.create)
     ..aOS(7, _omitFieldNames ? '' : 'error')
-    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'result', entryClassName: 'NodeCommandResponse.ResultEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..m<$core.String, $core.String>(8, _omitFieldNames ? '' : 'result',
+        entryClassName: 'NodeCommandResponse.ResultEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeCommandResponse clone() => NodeCommandResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeCommandResponse copyWith(void Function(NodeCommandResponse) updates) => super.copyWith((message) => updates(message as NodeCommandResponse)) as NodeCommandResponse;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandResponse clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeCommandResponse copyWith(void Function(NodeCommandResponse) updates) =>
+      super.copyWith((message) => updates(message as NodeCommandResponse))
+          as NodeCommandResponse;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeCommandResponse create() => NodeCommandResponse._();
+  @$core.override
   NodeCommandResponse createEmptyInstance() => create();
-  static $pb.PbList<NodeCommandResponse> createRepeated() => $pb.PbList<NodeCommandResponse>();
   @$core.pragma('dart2js:noInline')
-  static NodeCommandResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeCommandResponse>(create);
+  static NodeCommandResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeCommandResponse>(create);
   static NodeCommandResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get requestId => $_getSZ(0);
   @$pb.TagNumber(1)
-  set requestId($core.String v) { $_setString(0, v); }
+  set requestId($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRequestId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequestId() => clearField(1);
+  void clearRequestId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   NodeCommandType get type => $_getN(1);
   @$pb.TagNumber(2)
-  set type(NodeCommandType v) { setField(2, v); }
+  set type(NodeCommandType value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get adapter => $_getSZ(2);
   @$pb.TagNumber(3)
-  set adapter($core.String v) { $_setString(2, v); }
+  set adapter($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAdapter() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAdapter() => clearField(3);
+  void clearAdapter() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get target => $_getSZ(3);
   @$pb.TagNumber(4)
-  set target($core.String v) { $_setString(3, v); }
+  set target($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasTarget() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTarget() => clearField(4);
+  void clearTarget() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get sessionId => $_getSZ(4);
   @$pb.TagNumber(5)
-  set sessionId($core.String v) { $_setString(4, v); }
+  set sessionId($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasSessionId() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSessionId() => clearField(5);
+  void clearSessionId() => $_clearField(5);
 
   @$pb.TagNumber(6)
   AgentUsageStatus get usageStatus => $_getN(5);
   @$pb.TagNumber(6)
-  set usageStatus(AgentUsageStatus v) { setField(6, v); }
+  set usageStatus(AgentUsageStatus value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasUsageStatus() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUsageStatus() => clearField(6);
+  void clearUsageStatus() => $_clearField(6);
   @$pb.TagNumber(6)
   AgentUsageStatus ensureUsageStatus() => $_ensure(5);
 
   @$pb.TagNumber(7)
   $core.String get error => $_getSZ(6);
   @$pb.TagNumber(7)
-  set error($core.String v) { $_setString(6, v); }
+  set error($core.String value) => $_setString(6, value);
   @$pb.TagNumber(7)
   $core.bool hasError() => $_has(6);
   @$pb.TagNumber(7)
-  void clearError() => clearField(7);
+  void clearError() => $_clearField(7);
 
   /// result carries free-form key/value data for non-usage-status command types
   /// (capabilities, session_list, transport_status). usage_status keeps its
   /// dedicated typed payload.
   @$pb.TagNumber(8)
-  $core.Map<$core.String, $core.String> get result => $_getMap(7);
+  $pb.PbMap<$core.String, $core.String> get result => $_getMap(7);
 }
 
 class AgentUsageStatus extends $pb.GeneratedMessage {
@@ -1057,111 +1023,109 @@ class AgentUsageStatus extends $pb.GeneratedMessage {
     $core.String? dailyResetTime,
     $core.String? weeklyLimit,
     $core.String? weeklyResetTime,
-    $core.Map<$core.String, $core.String>? metadata,
+    $core.Iterable<$core.MapEntry<$core.String, $core.String>>? metadata,
   }) {
-    final $result = create();
-    if (rawOutput != null) {
-      $result.rawOutput = rawOutput;
-    }
-    if (dailyLimit != null) {
-      $result.dailyLimit = dailyLimit;
-    }
-    if (dailyResetTime != null) {
-      $result.dailyResetTime = dailyResetTime;
-    }
-    if (weeklyLimit != null) {
-      $result.weeklyLimit = weeklyLimit;
-    }
-    if (weeklyResetTime != null) {
-      $result.weeklyResetTime = weeklyResetTime;
-    }
-    if (metadata != null) {
-      $result.metadata.addAll(metadata);
-    }
-    return $result;
+    final result = create();
+    if (rawOutput != null) result.rawOutput = rawOutput;
+    if (dailyLimit != null) result.dailyLimit = dailyLimit;
+    if (dailyResetTime != null) result.dailyResetTime = dailyResetTime;
+    if (weeklyLimit != null) result.weeklyLimit = weeklyLimit;
+    if (weeklyResetTime != null) result.weeklyResetTime = weeklyResetTime;
+    if (metadata != null) result.metadata.addEntries(metadata);
+    return result;
   }
-  AgentUsageStatus._() : super();
-  factory AgentUsageStatus.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory AgentUsageStatus.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AgentUsageStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  AgentUsageStatus._();
+
+  factory AgentUsageStatus.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory AgentUsageStatus.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'AgentUsageStatus',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'rawOutput')
     ..aOS(2, _omitFieldNames ? '' : 'dailyLimit')
     ..aOS(3, _omitFieldNames ? '' : 'dailyResetTime')
     ..aOS(4, _omitFieldNames ? '' : 'weeklyLimit')
     ..aOS(5, _omitFieldNames ? '' : 'weeklyResetTime')
-    ..m<$core.String, $core.String>(6, _omitFieldNames ? '' : 'metadata', entryClassName: 'AgentUsageStatus.MetadataEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+    ..m<$core.String, $core.String>(6, _omitFieldNames ? '' : 'metadata',
+        entryClassName: 'AgentUsageStatus.MetadataEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  AgentUsageStatus clone() => AgentUsageStatus()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  AgentUsageStatus copyWith(void Function(AgentUsageStatus) updates) => super.copyWith((message) => updates(message as AgentUsageStatus)) as AgentUsageStatus;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AgentUsageStatus clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AgentUsageStatus copyWith(void Function(AgentUsageStatus) updates) =>
+      super.copyWith((message) => updates(message as AgentUsageStatus))
+          as AgentUsageStatus;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static AgentUsageStatus create() => AgentUsageStatus._();
+  @$core.override
   AgentUsageStatus createEmptyInstance() => create();
-  static $pb.PbList<AgentUsageStatus> createRepeated() => $pb.PbList<AgentUsageStatus>();
   @$core.pragma('dart2js:noInline')
-  static AgentUsageStatus getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AgentUsageStatus>(create);
+  static AgentUsageStatus getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<AgentUsageStatus>(create);
   static AgentUsageStatus? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get rawOutput => $_getSZ(0);
   @$pb.TagNumber(1)
-  set rawOutput($core.String v) { $_setString(0, v); }
+  set rawOutput($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasRawOutput() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRawOutput() => clearField(1);
+  void clearRawOutput() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get dailyLimit => $_getSZ(1);
   @$pb.TagNumber(2)
-  set dailyLimit($core.String v) { $_setString(1, v); }
+  set dailyLimit($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasDailyLimit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDailyLimit() => clearField(2);
+  void clearDailyLimit() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get dailyResetTime => $_getSZ(2);
   @$pb.TagNumber(3)
-  set dailyResetTime($core.String v) { $_setString(2, v); }
+  set dailyResetTime($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasDailyResetTime() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDailyResetTime() => clearField(3);
+  void clearDailyResetTime() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get weeklyLimit => $_getSZ(3);
   @$pb.TagNumber(4)
-  set weeklyLimit($core.String v) { $_setString(3, v); }
+  set weeklyLimit($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasWeeklyLimit() => $_has(3);
   @$pb.TagNumber(4)
-  void clearWeeklyLimit() => clearField(4);
+  void clearWeeklyLimit() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get weeklyResetTime => $_getSZ(4);
   @$pb.TagNumber(5)
-  set weeklyResetTime($core.String v) { $_setString(4, v); }
+  set weeklyResetTime($core.String value) => $_setString(4, value);
   @$pb.TagNumber(5)
   $core.bool hasWeeklyResetTime() => $_has(4);
   @$pb.TagNumber(5)
-  void clearWeeklyResetTime() => clearField(5);
+  void clearWeeklyResetTime() => $_clearField(5);
 
   @$pb.TagNumber(6)
-  $core.Map<$core.String, $core.String> get metadata => $_getMap(5);
+  $pb.PbMap<$core.String, $core.String> get metadata => $_getMap(5);
 }
 
 /// Error is returned when a request fails at the transport layer.
@@ -1170,63 +1134,64 @@ class Error extends $pb.GeneratedMessage {
     $core.String? code,
     $core.String? message,
   }) {
-    final $result = create();
-    if (code != null) {
-      $result.code = code;
-    }
-    if (message != null) {
-      $result.message = message;
-    }
-    return $result;
+    final result = create();
+    if (code != null) result.code = code;
+    if (message != null) result.message = message;
+    return result;
   }
-  Error._() : super();
-  factory Error.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Error.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Error', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  Error._();
+
+  factory Error.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory Error.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Error',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'code')
     ..aOS(2, _omitFieldNames ? '' : 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Error clone() => Error()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Error copyWith(void Function(Error) updates) => super.copyWith((message) => updates(message as Error)) as Error;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Error clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  Error copyWith(void Function(Error) updates) =>
+      super.copyWith((message) => updates(message as Error)) as Error;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static Error create() => Error._();
+  @$core.override
   Error createEmptyInstance() => create();
-  static $pb.PbList<Error> createRepeated() => $pb.PbList<Error>();
   @$core.pragma('dart2js:noInline')
-  static Error getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Error>(create);
+  static Error getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Error>(create);
   static Error? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get code => $_getSZ(0);
   @$pb.TagNumber(1)
-  set code($core.String v) { $_setString(0, v); }
+  set code($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCode() => clearField(1);
+  void clearCode() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get message => $_getSZ(1);
   @$pb.TagNumber(2)
-  set message($core.String v) { $_setString(1, v); }
+  set message($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 }
 
 /// RegisterRequest is sent by node to edge immediately on connect.
@@ -1234,50 +1199,54 @@ class RegisterRequest extends $pb.GeneratedMessage {
   factory RegisterRequest({
     $core.String? token,
   }) {
-    final $result = create();
-    if (token != null) {
-      $result.token = token;
-    }
-    return $result;
+    final result = create();
+    if (token != null) result.token = token;
+    return result;
   }
-  RegisterRequest._() : super();
-  factory RegisterRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RegisterRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RegisterRequest._();
+
+  factory RegisterRequest.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RegisterRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RegisterRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'token')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RegisterRequest clone() => RegisterRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RegisterRequest copyWith(void Function(RegisterRequest) updates) => super.copyWith((message) => updates(message as RegisterRequest)) as RegisterRequest;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterRequest copyWith(void Function(RegisterRequest) updates) =>
+      super.copyWith((message) => updates(message as RegisterRequest))
+          as RegisterRequest;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RegisterRequest create() => RegisterRequest._();
+  @$core.override
   RegisterRequest createEmptyInstance() => create();
-  static $pb.PbList<RegisterRequest> createRepeated() => $pb.PbList<RegisterRequest>();
   @$core.pragma('dart2js:noInline')
-  static RegisterRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RegisterRequest>(create);
+  static RegisterRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RegisterRequest>(create);
   static RegisterRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get token => $_getSZ(0);
   @$pb.TagNumber(1)
-  set token($core.String v) { $_setString(0, v); }
+  set token($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasToken() => $_has(0);
   @$pb.TagNumber(1)
-  void clearToken() => clearField(1);
+  void clearToken() => $_clearField(1);
 }
 
 /// RegisterResponse is sent by edge to node in response to RegisterRequest.
@@ -1289,102 +1258,99 @@ class RegisterResponse extends $pb.GeneratedMessage {
     $core.String? reason,
     NodeConfigPayload? config,
   }) {
-    final $result = create();
-    if (accepted != null) {
-      $result.accepted = accepted;
-    }
-    if (nodeId != null) {
-      $result.nodeId = nodeId;
-    }
-    if (alias != null) {
-      $result.alias = alias;
-    }
-    if (reason != null) {
-      $result.reason = reason;
-    }
-    if (config != null) {
-      $result.config = config;
-    }
-    return $result;
+    final result = create();
+    if (accepted != null) result.accepted = accepted;
+    if (nodeId != null) result.nodeId = nodeId;
+    if (alias != null) result.alias = alias;
+    if (reason != null) result.reason = reason;
+    if (config != null) result.config = config;
+    return result;
   }
-  RegisterResponse._() : super();
-  factory RegisterResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RegisterResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  RegisterResponse._();
+
+  factory RegisterResponse.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory RegisterResponse.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'RegisterResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOB(1, _omitFieldNames ? '' : 'accepted')
     ..aOS(2, _omitFieldNames ? '' : 'nodeId')
     ..aOS(3, _omitFieldNames ? '' : 'alias')
     ..aOS(4, _omitFieldNames ? '' : 'reason')
-    ..aOM<NodeConfigPayload>(5, _omitFieldNames ? '' : 'config', subBuilder: NodeConfigPayload.create)
-    ..hasRequiredFields = false
-  ;
+    ..aOM<NodeConfigPayload>(5, _omitFieldNames ? '' : 'config',
+        subBuilder: NodeConfigPayload.create)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RegisterResponse clone() => RegisterResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RegisterResponse copyWith(void Function(RegisterResponse) updates) => super.copyWith((message) => updates(message as RegisterResponse)) as RegisterResponse;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterResponse clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  RegisterResponse copyWith(void Function(RegisterResponse) updates) =>
+      super.copyWith((message) => updates(message as RegisterResponse))
+          as RegisterResponse;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static RegisterResponse create() => RegisterResponse._();
+  @$core.override
   RegisterResponse createEmptyInstance() => create();
-  static $pb.PbList<RegisterResponse> createRepeated() => $pb.PbList<RegisterResponse>();
   @$core.pragma('dart2js:noInline')
-  static RegisterResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RegisterResponse>(create);
+  static RegisterResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RegisterResponse>(create);
   static RegisterResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.bool get accepted => $_getBF(0);
   @$pb.TagNumber(1)
-  set accepted($core.bool v) { $_setBool(0, v); }
+  set accepted($core.bool value) => $_setBool(0, value);
   @$pb.TagNumber(1)
   $core.bool hasAccepted() => $_has(0);
   @$pb.TagNumber(1)
-  void clearAccepted() => clearField(1);
+  void clearAccepted() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get nodeId => $_getSZ(1);
   @$pb.TagNumber(2)
-  set nodeId($core.String v) { $_setString(1, v); }
+  set nodeId($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasNodeId() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNodeId() => clearField(2);
+  void clearNodeId() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get alias => $_getSZ(2);
   @$pb.TagNumber(3)
-  set alias($core.String v) { $_setString(2, v); }
+  set alias($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAlias() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAlias() => clearField(3);
+  void clearAlias() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get reason => $_getSZ(3);
   @$pb.TagNumber(4)
-  set reason($core.String v) { $_setString(3, v); }
+  set reason($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasReason() => $_has(3);
   @$pb.TagNumber(4)
-  void clearReason() => clearField(4);
+  void clearReason() => $_clearField(4);
 
   @$pb.TagNumber(5)
   NodeConfigPayload get config => $_getN(4);
   @$pb.TagNumber(5)
-  set config(NodeConfigPayload v) { setField(5, v); }
+  set config(NodeConfigPayload value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasConfig() => $_has(4);
   @$pb.TagNumber(5)
-  void clearConfig() => clearField(5);
+  void clearConfig() => $_clearField(5);
   @$pb.TagNumber(5)
   NodeConfigPayload ensureConfig() => $_ensure(4);
 }
@@ -1395,67 +1361,66 @@ class NodeConfigPayload extends $pb.GeneratedMessage {
     $core.Iterable<AdapterConfig>? adapters,
     NodeRuntimeConfig? runtime,
   }) {
-    final $result = create();
-    if (adapters != null) {
-      $result.adapters.addAll(adapters);
-    }
-    if (runtime != null) {
-      $result.runtime = runtime;
-    }
-    return $result;
+    final result = create();
+    if (adapters != null) result.adapters.addAll(adapters);
+    if (runtime != null) result.runtime = runtime;
+    return result;
   }
-  NodeConfigPayload._() : super();
-  factory NodeConfigPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeConfigPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeConfigPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..pc<AdapterConfig>(1, _omitFieldNames ? '' : 'adapters', $pb.PbFieldType.PM, subBuilder: AdapterConfig.create)
-    ..aOM<NodeRuntimeConfig>(2, _omitFieldNames ? '' : 'runtime', subBuilder: NodeRuntimeConfig.create)
-    ..hasRequiredFields = false
-  ;
+  NodeConfigPayload._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeConfigPayload clone() => NodeConfigPayload()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeConfigPayload copyWith(void Function(NodeConfigPayload) updates) => super.copyWith((message) => updates(message as NodeConfigPayload)) as NodeConfigPayload;
+  factory NodeConfigPayload.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeConfigPayload.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeConfigPayload',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..pPM<AdapterConfig>(1, _omitFieldNames ? '' : 'adapters',
+        subBuilder: AdapterConfig.create)
+    ..aOM<NodeRuntimeConfig>(2, _omitFieldNames ? '' : 'runtime',
+        subBuilder: NodeRuntimeConfig.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeConfigPayload clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeConfigPayload copyWith(void Function(NodeConfigPayload) updates) =>
+      super.copyWith((message) => updates(message as NodeConfigPayload))
+          as NodeConfigPayload;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeConfigPayload create() => NodeConfigPayload._();
+  @$core.override
   NodeConfigPayload createEmptyInstance() => create();
-  static $pb.PbList<NodeConfigPayload> createRepeated() => $pb.PbList<NodeConfigPayload>();
   @$core.pragma('dart2js:noInline')
-  static NodeConfigPayload getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeConfigPayload>(create);
+  static NodeConfigPayload getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeConfigPayload>(create);
   static NodeConfigPayload? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<AdapterConfig> get adapters => $_getList(0);
+  $pb.PbList<AdapterConfig> get adapters => $_getList(0);
 
   @$pb.TagNumber(2)
   NodeRuntimeConfig get runtime => $_getN(1);
   @$pb.TagNumber(2)
-  set runtime(NodeRuntimeConfig v) { setField(2, v); }
+  set runtime(NodeRuntimeConfig value) => $_setField(2, value);
   @$pb.TagNumber(2)
   $core.bool hasRuntime() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRuntime() => clearField(2);
+  void clearRuntime() => $_clearField(2);
   @$pb.TagNumber(2)
   NodeRuntimeConfig ensureRuntime() => $_ensure(1);
 }
 
-enum AdapterConfig_Config {
-  cli, 
-  ollama, 
-  vllm, 
-  notSet
-}
+enum AdapterConfig_Config { cli, ollama, vllm, notSet }
 
 /// AdapterConfig describes one adapter to enable on the node.
 class AdapterConfig extends $pb.GeneratedMessage {
@@ -1467,177 +1432,193 @@ class AdapterConfig extends $pb.GeneratedMessage {
     OllamaAdapterConfig? ollama,
     VllmAdapterConfig? vllm,
   }) {
-    final $result = create();
-    if (type != null) {
-      $result.type = type;
-    }
-    if (enabled != null) {
-      $result.enabled = enabled;
-    }
-    if (settings != null) {
-      $result.settings = settings;
-    }
-    if (cli != null) {
-      $result.cli = cli;
-    }
-    if (ollama != null) {
-      $result.ollama = ollama;
-    }
-    if (vllm != null) {
-      $result.vllm = vllm;
-    }
-    return $result;
+    final result = create();
+    if (type != null) result.type = type;
+    if (enabled != null) result.enabled = enabled;
+    if (settings != null) result.settings = settings;
+    if (cli != null) result.cli = cli;
+    if (ollama != null) result.ollama = ollama;
+    if (vllm != null) result.vllm = vllm;
+    return result;
   }
-  AdapterConfig._() : super();
-  factory AdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory AdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static const $core.Map<$core.int, AdapterConfig_Config> _AdapterConfig_ConfigByTag = {
-    4 : AdapterConfig_Config.cli,
-    5 : AdapterConfig_Config.ollama,
-    6 : AdapterConfig_Config.vllm,
-    0 : AdapterConfig_Config.notSet
+  AdapterConfig._();
+
+  factory AdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory AdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static const $core.Map<$core.int, AdapterConfig_Config>
+      _AdapterConfig_ConfigByTag = {
+    4: AdapterConfig_Config.cli,
+    5: AdapterConfig_Config.ollama,
+    6: AdapterConfig_Config.vllm,
+    0: AdapterConfig_Config.notSet
   };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'AdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..oo(0, [4, 5, 6])
     ..aOS(1, _omitFieldNames ? '' : 'type')
     ..aOB(2, _omitFieldNames ? '' : 'enabled')
-    ..aOM<$0.Struct>(3, _omitFieldNames ? '' : 'settings', subBuilder: $0.Struct.create)
-    ..aOM<CLIAdapterConfig>(4, _omitFieldNames ? '' : 'cli', subBuilder: CLIAdapterConfig.create)
-    ..aOM<OllamaAdapterConfig>(5, _omitFieldNames ? '' : 'ollama', subBuilder: OllamaAdapterConfig.create)
-    ..aOM<VllmAdapterConfig>(6, _omitFieldNames ? '' : 'vllm', subBuilder: VllmAdapterConfig.create)
-    ..hasRequiredFields = false
-  ;
+    ..aOM<$0.Struct>(3, _omitFieldNames ? '' : 'settings',
+        subBuilder: $0.Struct.create)
+    ..aOM<CLIAdapterConfig>(4, _omitFieldNames ? '' : 'cli',
+        subBuilder: CLIAdapterConfig.create)
+    ..aOM<OllamaAdapterConfig>(5, _omitFieldNames ? '' : 'ollama',
+        subBuilder: OllamaAdapterConfig.create)
+    ..aOM<VllmAdapterConfig>(6, _omitFieldNames ? '' : 'vllm',
+        subBuilder: VllmAdapterConfig.create)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  AdapterConfig clone() => AdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  AdapterConfig copyWith(void Function(AdapterConfig) updates) => super.copyWith((message) => updates(message as AdapterConfig)) as AdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  AdapterConfig copyWith(void Function(AdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as AdapterConfig))
+          as AdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static AdapterConfig create() => AdapterConfig._();
+  @$core.override
   AdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<AdapterConfig> createRepeated() => $pb.PbList<AdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static AdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AdapterConfig>(create);
+  static AdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<AdapterConfig>(create);
   static AdapterConfig? _defaultInstance;
 
-  AdapterConfig_Config whichConfig() => _AdapterConfig_ConfigByTag[$_whichOneof(0)]!;
-  void clearConfig() => clearField($_whichOneof(0));
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  AdapterConfig_Config whichConfig() =>
+      _AdapterConfig_ConfigByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  void clearConfig() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
   $core.String get type => $_getSZ(0);
   @$pb.TagNumber(1)
-  set type($core.String v) { $_setString(0, v); }
+  set type($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.bool get enabled => $_getBF(1);
   @$pb.TagNumber(2)
-  set enabled($core.bool v) { $_setBool(1, v); }
+  set enabled($core.bool value) => $_setBool(1, value);
   @$pb.TagNumber(2)
   $core.bool hasEnabled() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEnabled() => clearField(2);
+  void clearEnabled() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $0.Struct get settings => $_getN(2);
   @$pb.TagNumber(3)
-  set settings($0.Struct v) { setField(3, v); }
+  set settings($0.Struct value) => $_setField(3, value);
   @$pb.TagNumber(3)
   $core.bool hasSettings() => $_has(2);
   @$pb.TagNumber(3)
-  void clearSettings() => clearField(3);
+  void clearSettings() => $_clearField(3);
   @$pb.TagNumber(3)
   $0.Struct ensureSettings() => $_ensure(2);
 
   @$pb.TagNumber(4)
   CLIAdapterConfig get cli => $_getN(3);
   @$pb.TagNumber(4)
-  set cli(CLIAdapterConfig v) { setField(4, v); }
+  set cli(CLIAdapterConfig value) => $_setField(4, value);
   @$pb.TagNumber(4)
   $core.bool hasCli() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCli() => clearField(4);
+  void clearCli() => $_clearField(4);
   @$pb.TagNumber(4)
   CLIAdapterConfig ensureCli() => $_ensure(3);
 
   @$pb.TagNumber(5)
   OllamaAdapterConfig get ollama => $_getN(4);
   @$pb.TagNumber(5)
-  set ollama(OllamaAdapterConfig v) { setField(5, v); }
+  set ollama(OllamaAdapterConfig value) => $_setField(5, value);
   @$pb.TagNumber(5)
   $core.bool hasOllama() => $_has(4);
   @$pb.TagNumber(5)
-  void clearOllama() => clearField(5);
+  void clearOllama() => $_clearField(5);
   @$pb.TagNumber(5)
   OllamaAdapterConfig ensureOllama() => $_ensure(4);
 
   @$pb.TagNumber(6)
   VllmAdapterConfig get vllm => $_getN(5);
   @$pb.TagNumber(6)
-  set vllm(VllmAdapterConfig v) { setField(6, v); }
+  set vllm(VllmAdapterConfig value) => $_setField(6, value);
   @$pb.TagNumber(6)
   $core.bool hasVllm() => $_has(5);
   @$pb.TagNumber(6)
-  void clearVllm() => clearField(6);
+  void clearVllm() => $_clearField(6);
   @$pb.TagNumber(6)
   VllmAdapterConfig ensureVllm() => $_ensure(5);
 }
 
 class CLIAdapterConfig extends $pb.GeneratedMessage {
   factory CLIAdapterConfig({
-    $core.Map<$core.String, CLIProfileConfig>? profiles,
+    $core.Iterable<$core.MapEntry<$core.String, CLIProfileConfig>>? profiles,
   }) {
-    final $result = create();
-    if (profiles != null) {
-      $result.profiles.addAll(profiles);
-    }
-    return $result;
+    final result = create();
+    if (profiles != null) result.profiles.addEntries(profiles);
+    return result;
   }
-  CLIAdapterConfig._() : super();
-  factory CLIAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLIAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLIAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..m<$core.String, CLIProfileConfig>(1, _omitFieldNames ? '' : 'profiles', entryClassName: 'CLIAdapterConfig.ProfilesEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: CLIProfileConfig.create, valueDefaultOrMaker: CLIProfileConfig.getDefault, packageName: const $pb.PackageName('iop'))
-    ..hasRequiredFields = false
-  ;
+  CLIAdapterConfig._();
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLIAdapterConfig clone() => CLIAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLIAdapterConfig copyWith(void Function(CLIAdapterConfig) updates) => super.copyWith((message) => updates(message as CLIAdapterConfig)) as CLIAdapterConfig;
+  factory CLIAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLIAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLIAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..m<$core.String, CLIProfileConfig>(1, _omitFieldNames ? '' : 'profiles',
+        entryClassName: 'CLIAdapterConfig.ProfilesEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OM,
+        valueCreator: CLIProfileConfig.create,
+        valueDefaultOrMaker: CLIProfileConfig.getDefault,
+        packageName: const $pb.PackageName('iop'))
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIAdapterConfig copyWith(void Function(CLIAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as CLIAdapterConfig))
+          as CLIAdapterConfig;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLIAdapterConfig create() => CLIAdapterConfig._();
+  @$core.override
   CLIAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<CLIAdapterConfig> createRepeated() => $pb.PbList<CLIAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static CLIAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLIAdapterConfig>(create);
+  static CLIAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLIAdapterConfig>(create);
   static CLIAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.Map<$core.String, CLIProfileConfig> get profiles => $_getMap(0);
+  $pb.PbMap<$core.String, CLIProfileConfig> get profiles => $_getMap(0);
 }
 
 class CLIProfileConfig extends $pb.GeneratedMessage {
@@ -1654,164 +1635,151 @@ class CLIProfileConfig extends $pb.GeneratedMessage {
     $core.String? mode,
     $core.Iterable<$core.String>? resumeArgs,
   }) {
-    final $result = create();
-    if (command != null) {
-      $result.command = command;
-    }
-    if (args != null) {
-      $result.args.addAll(args);
-    }
-    if (env != null) {
-      $result.env.addAll(env);
-    }
-    if (persistent != null) {
-      $result.persistent = persistent;
-    }
-    if (terminal != null) {
-      $result.terminal = terminal;
-    }
-    if (responseIdleTimeoutMs != null) {
-      $result.responseIdleTimeoutMs = responseIdleTimeoutMs;
-    }
-    if (startupIdleTimeoutMs != null) {
-      $result.startupIdleTimeoutMs = startupIdleTimeoutMs;
-    }
-    if (outputFormat != null) {
-      $result.outputFormat = outputFormat;
-    }
-    if (completionMarker != null) {
-      $result.completionMarker = completionMarker;
-    }
-    if (mode != null) {
-      $result.mode = mode;
-    }
-    if (resumeArgs != null) {
-      $result.resumeArgs.addAll(resumeArgs);
-    }
-    return $result;
+    final result = create();
+    if (command != null) result.command = command;
+    if (args != null) result.args.addAll(args);
+    if (env != null) result.env.addAll(env);
+    if (persistent != null) result.persistent = persistent;
+    if (terminal != null) result.terminal = terminal;
+    if (responseIdleTimeoutMs != null)
+      result.responseIdleTimeoutMs = responseIdleTimeoutMs;
+    if (startupIdleTimeoutMs != null)
+      result.startupIdleTimeoutMs = startupIdleTimeoutMs;
+    if (outputFormat != null) result.outputFormat = outputFormat;
+    if (completionMarker != null) result.completionMarker = completionMarker;
+    if (mode != null) result.mode = mode;
+    if (resumeArgs != null) result.resumeArgs.addAll(resumeArgs);
+    return result;
   }
-  CLIProfileConfig._() : super();
-  factory CLIProfileConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLIProfileConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLIProfileConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CLIProfileConfig._();
+
+  factory CLIProfileConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLIProfileConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLIProfileConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'command')
     ..pPS(2, _omitFieldNames ? '' : 'args')
     ..pPS(3, _omitFieldNames ? '' : 'env')
     ..aOB(4, _omitFieldNames ? '' : 'persistent')
     ..aOB(5, _omitFieldNames ? '' : 'terminal')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'responseIdleTimeoutMs', $pb.PbFieldType.O3)
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'startupIdleTimeoutMs', $pb.PbFieldType.O3)
+    ..aI(6, _omitFieldNames ? '' : 'responseIdleTimeoutMs')
+    ..aI(7, _omitFieldNames ? '' : 'startupIdleTimeoutMs')
     ..aOS(8, _omitFieldNames ? '' : 'outputFormat')
-    ..aOM<CLICompletionMarker>(9, _omitFieldNames ? '' : 'completionMarker', subBuilder: CLICompletionMarker.create)
+    ..aOM<CLICompletionMarker>(9, _omitFieldNames ? '' : 'completionMarker',
+        subBuilder: CLICompletionMarker.create)
     ..aOS(10, _omitFieldNames ? '' : 'mode')
     ..pPS(11, _omitFieldNames ? '' : 'resumeArgs')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLIProfileConfig clone() => CLIProfileConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLIProfileConfig copyWith(void Function(CLIProfileConfig) updates) => super.copyWith((message) => updates(message as CLIProfileConfig)) as CLIProfileConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIProfileConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLIProfileConfig copyWith(void Function(CLIProfileConfig) updates) =>
+      super.copyWith((message) => updates(message as CLIProfileConfig))
+          as CLIProfileConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLIProfileConfig create() => CLIProfileConfig._();
+  @$core.override
   CLIProfileConfig createEmptyInstance() => create();
-  static $pb.PbList<CLIProfileConfig> createRepeated() => $pb.PbList<CLIProfileConfig>();
   @$core.pragma('dart2js:noInline')
-  static CLIProfileConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLIProfileConfig>(create);
+  static CLIProfileConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLIProfileConfig>(create);
   static CLIProfileConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get command => $_getSZ(0);
   @$pb.TagNumber(1)
-  set command($core.String v) { $_setString(0, v); }
+  set command($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasCommand() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCommand() => clearField(1);
+  void clearCommand() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<$core.String> get args => $_getList(1);
+  $pb.PbList<$core.String> get args => $_getList(1);
 
   @$pb.TagNumber(3)
-  $core.List<$core.String> get env => $_getList(2);
+  $pb.PbList<$core.String> get env => $_getList(2);
 
   @$pb.TagNumber(4)
   $core.bool get persistent => $_getBF(3);
   @$pb.TagNumber(4)
-  set persistent($core.bool v) { $_setBool(3, v); }
+  set persistent($core.bool value) => $_setBool(3, value);
   @$pb.TagNumber(4)
   $core.bool hasPersistent() => $_has(3);
   @$pb.TagNumber(4)
-  void clearPersistent() => clearField(4);
+  void clearPersistent() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.bool get terminal => $_getBF(4);
   @$pb.TagNumber(5)
-  set terminal($core.bool v) { $_setBool(4, v); }
+  set terminal($core.bool value) => $_setBool(4, value);
   @$pb.TagNumber(5)
   $core.bool hasTerminal() => $_has(4);
   @$pb.TagNumber(5)
-  void clearTerminal() => clearField(5);
+  void clearTerminal() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.int get responseIdleTimeoutMs => $_getIZ(5);
   @$pb.TagNumber(6)
-  set responseIdleTimeoutMs($core.int v) { $_setSignedInt32(5, v); }
+  set responseIdleTimeoutMs($core.int value) => $_setSignedInt32(5, value);
   @$pb.TagNumber(6)
   $core.bool hasResponseIdleTimeoutMs() => $_has(5);
   @$pb.TagNumber(6)
-  void clearResponseIdleTimeoutMs() => clearField(6);
+  void clearResponseIdleTimeoutMs() => $_clearField(6);
 
   @$pb.TagNumber(7)
   $core.int get startupIdleTimeoutMs => $_getIZ(6);
   @$pb.TagNumber(7)
-  set startupIdleTimeoutMs($core.int v) { $_setSignedInt32(6, v); }
+  set startupIdleTimeoutMs($core.int value) => $_setSignedInt32(6, value);
   @$pb.TagNumber(7)
   $core.bool hasStartupIdleTimeoutMs() => $_has(6);
   @$pb.TagNumber(7)
-  void clearStartupIdleTimeoutMs() => clearField(7);
+  void clearStartupIdleTimeoutMs() => $_clearField(7);
 
   @$pb.TagNumber(8)
   $core.String get outputFormat => $_getSZ(7);
   @$pb.TagNumber(8)
-  set outputFormat($core.String v) { $_setString(7, v); }
+  set outputFormat($core.String value) => $_setString(7, value);
   @$pb.TagNumber(8)
   $core.bool hasOutputFormat() => $_has(7);
   @$pb.TagNumber(8)
-  void clearOutputFormat() => clearField(8);
+  void clearOutputFormat() => $_clearField(8);
 
   @$pb.TagNumber(9)
   CLICompletionMarker get completionMarker => $_getN(8);
   @$pb.TagNumber(9)
-  set completionMarker(CLICompletionMarker v) { setField(9, v); }
+  set completionMarker(CLICompletionMarker value) => $_setField(9, value);
   @$pb.TagNumber(9)
   $core.bool hasCompletionMarker() => $_has(8);
   @$pb.TagNumber(9)
-  void clearCompletionMarker() => clearField(9);
+  void clearCompletionMarker() => $_clearField(9);
   @$pb.TagNumber(9)
   CLICompletionMarker ensureCompletionMarker() => $_ensure(8);
 
   @$pb.TagNumber(10)
   $core.String get mode => $_getSZ(9);
   @$pb.TagNumber(10)
-  set mode($core.String v) { $_setString(9, v); }
+  set mode($core.String value) => $_setString(9, value);
   @$pb.TagNumber(10)
   $core.bool hasMode() => $_has(9);
   @$pb.TagNumber(10)
-  void clearMode() => clearField(10);
+  void clearMode() => $_clearField(10);
 
   @$pb.TagNumber(11)
-  $core.List<$core.String> get resumeArgs => $_getList(10);
+  $pb.PbList<$core.String> get resumeArgs => $_getList(10);
 }
 
 class CLICompletionMarker extends $pb.GeneratedMessage {
@@ -1819,63 +1787,65 @@ class CLICompletionMarker extends $pb.GeneratedMessage {
     $core.String? line,
     $core.String? regex,
   }) {
-    final $result = create();
-    if (line != null) {
-      $result.line = line;
-    }
-    if (regex != null) {
-      $result.regex = regex;
-    }
-    return $result;
+    final result = create();
+    if (line != null) result.line = line;
+    if (regex != null) result.regex = regex;
+    return result;
   }
-  CLICompletionMarker._() : super();
-  factory CLICompletionMarker.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory CLICompletionMarker.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CLICompletionMarker', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  CLICompletionMarker._();
+
+  factory CLICompletionMarker.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory CLICompletionMarker.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CLICompletionMarker',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'line')
     ..aOS(2, _omitFieldNames ? '' : 'regex')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  CLICompletionMarker clone() => CLICompletionMarker()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  CLICompletionMarker copyWith(void Function(CLICompletionMarker) updates) => super.copyWith((message) => updates(message as CLICompletionMarker)) as CLICompletionMarker;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLICompletionMarker clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  CLICompletionMarker copyWith(void Function(CLICompletionMarker) updates) =>
+      super.copyWith((message) => updates(message as CLICompletionMarker))
+          as CLICompletionMarker;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static CLICompletionMarker create() => CLICompletionMarker._();
+  @$core.override
   CLICompletionMarker createEmptyInstance() => create();
-  static $pb.PbList<CLICompletionMarker> createRepeated() => $pb.PbList<CLICompletionMarker>();
   @$core.pragma('dart2js:noInline')
-  static CLICompletionMarker getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<CLICompletionMarker>(create);
+  static CLICompletionMarker getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<CLICompletionMarker>(create);
   static CLICompletionMarker? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get line => $_getSZ(0);
   @$pb.TagNumber(1)
-  set line($core.String v) { $_setString(0, v); }
+  set line($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasLine() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLine() => clearField(1);
+  void clearLine() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get regex => $_getSZ(1);
   @$pb.TagNumber(2)
-  set regex($core.String v) { $_setString(1, v); }
+  set regex($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasRegex() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRegex() => clearField(2);
+  void clearRegex() => $_clearField(2);
 }
 
 class OllamaAdapterConfig extends $pb.GeneratedMessage {
@@ -1883,113 +1853,119 @@ class OllamaAdapterConfig extends $pb.GeneratedMessage {
     $core.String? baseUrl,
     $core.int? contextSize,
   }) {
-    final $result = create();
-    if (baseUrl != null) {
-      $result.baseUrl = baseUrl;
-    }
-    if (contextSize != null) {
-      $result.contextSize = contextSize;
-    }
-    return $result;
+    final result = create();
+    if (baseUrl != null) result.baseUrl = baseUrl;
+    if (contextSize != null) result.contextSize = contextSize;
+    return result;
   }
-  OllamaAdapterConfig._() : super();
-  factory OllamaAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory OllamaAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OllamaAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  OllamaAdapterConfig._();
+
+  factory OllamaAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory OllamaAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'OllamaAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'baseUrl')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'contextSize', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..aI(2, _omitFieldNames ? '' : 'contextSize')
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  OllamaAdapterConfig clone() => OllamaAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  OllamaAdapterConfig copyWith(void Function(OllamaAdapterConfig) updates) => super.copyWith((message) => updates(message as OllamaAdapterConfig)) as OllamaAdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  OllamaAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  OllamaAdapterConfig copyWith(void Function(OllamaAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as OllamaAdapterConfig))
+          as OllamaAdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static OllamaAdapterConfig create() => OllamaAdapterConfig._();
+  @$core.override
   OllamaAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<OllamaAdapterConfig> createRepeated() => $pb.PbList<OllamaAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static OllamaAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OllamaAdapterConfig>(create);
+  static OllamaAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<OllamaAdapterConfig>(create);
   static OllamaAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get baseUrl => $_getSZ(0);
   @$pb.TagNumber(1)
-  set baseUrl($core.String v) { $_setString(0, v); }
+  set baseUrl($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasBaseUrl() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBaseUrl() => clearField(1);
+  void clearBaseUrl() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get contextSize => $_getIZ(1);
   @$pb.TagNumber(2)
-  set contextSize($core.int v) { $_setSignedInt32(1, v); }
+  set contextSize($core.int value) => $_setSignedInt32(1, value);
   @$pb.TagNumber(2)
   $core.bool hasContextSize() => $_has(1);
   @$pb.TagNumber(2)
-  void clearContextSize() => clearField(2);
+  void clearContextSize() => $_clearField(2);
 }
 
 class VllmAdapterConfig extends $pb.GeneratedMessage {
   factory VllmAdapterConfig({
     $core.String? endpoint,
   }) {
-    final $result = create();
-    if (endpoint != null) {
-      $result.endpoint = endpoint;
-    }
-    return $result;
+    final result = create();
+    if (endpoint != null) result.endpoint = endpoint;
+    return result;
   }
-  VllmAdapterConfig._() : super();
-  factory VllmAdapterConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory VllmAdapterConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'VllmAdapterConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
+  VllmAdapterConfig._();
+
+  factory VllmAdapterConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory VllmAdapterConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VllmAdapterConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'endpoint')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  VllmAdapterConfig clone() => VllmAdapterConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  VllmAdapterConfig copyWith(void Function(VllmAdapterConfig) updates) => super.copyWith((message) => updates(message as VllmAdapterConfig)) as VllmAdapterConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  VllmAdapterConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  VllmAdapterConfig copyWith(void Function(VllmAdapterConfig) updates) =>
+      super.copyWith((message) => updates(message as VllmAdapterConfig))
+          as VllmAdapterConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static VllmAdapterConfig create() => VllmAdapterConfig._();
+  @$core.override
   VllmAdapterConfig createEmptyInstance() => create();
-  static $pb.PbList<VllmAdapterConfig> createRepeated() => $pb.PbList<VllmAdapterConfig>();
   @$core.pragma('dart2js:noInline')
-  static VllmAdapterConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<VllmAdapterConfig>(create);
+  static VllmAdapterConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<VllmAdapterConfig>(create);
   static VllmAdapterConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get endpoint => $_getSZ(0);
   @$pb.TagNumber(1)
-  set endpoint($core.String v) { $_setString(0, v); }
+  set endpoint($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasEndpoint() => $_has(0);
   @$pb.TagNumber(1)
-  void clearEndpoint() => clearField(1);
+  void clearEndpoint() => $_clearField(1);
 }
 
 /// NodeRuntimeConfig is the runtime tuning pushed to the node.
@@ -1998,65 +1974,68 @@ class NodeRuntimeConfig extends $pb.GeneratedMessage {
     $core.int? concurrency,
     $core.String? workspaceRoot,
   }) {
-    final $result = create();
-    if (concurrency != null) {
-      $result.concurrency = concurrency;
-    }
-    if (workspaceRoot != null) {
-      $result.workspaceRoot = workspaceRoot;
-    }
-    return $result;
+    final result = create();
+    if (concurrency != null) result.concurrency = concurrency;
+    if (workspaceRoot != null) result.workspaceRoot = workspaceRoot;
+    return result;
   }
-  NodeRuntimeConfig._() : super();
-  factory NodeRuntimeConfig.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory NodeRuntimeConfig.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'NodeRuntimeConfig', package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'concurrency', $pb.PbFieldType.O3)
+  NodeRuntimeConfig._();
+
+  factory NodeRuntimeConfig.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory NodeRuntimeConfig.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'NodeRuntimeConfig',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'iop'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'concurrency')
     ..aOS(2, _omitFieldNames ? '' : 'workspaceRoot')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  NodeRuntimeConfig clone() => NodeRuntimeConfig()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  NodeRuntimeConfig copyWith(void Function(NodeRuntimeConfig) updates) => super.copyWith((message) => updates(message as NodeRuntimeConfig)) as NodeRuntimeConfig;
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeRuntimeConfig clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  NodeRuntimeConfig copyWith(void Function(NodeRuntimeConfig) updates) =>
+      super.copyWith((message) => updates(message as NodeRuntimeConfig))
+          as NodeRuntimeConfig;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static NodeRuntimeConfig create() => NodeRuntimeConfig._();
+  @$core.override
   NodeRuntimeConfig createEmptyInstance() => create();
-  static $pb.PbList<NodeRuntimeConfig> createRepeated() => $pb.PbList<NodeRuntimeConfig>();
   @$core.pragma('dart2js:noInline')
-  static NodeRuntimeConfig getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<NodeRuntimeConfig>(create);
+  static NodeRuntimeConfig getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<NodeRuntimeConfig>(create);
   static NodeRuntimeConfig? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get concurrency => $_getIZ(0);
   @$pb.TagNumber(1)
-  set concurrency($core.int v) { $_setSignedInt32(0, v); }
+  set concurrency($core.int value) => $_setSignedInt32(0, value);
   @$pb.TagNumber(1)
   $core.bool hasConcurrency() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConcurrency() => clearField(1);
+  void clearConcurrency() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get workspaceRoot => $_getSZ(1);
   @$pb.TagNumber(2)
-  set workspaceRoot($core.String v) { $_setString(1, v); }
+  set workspaceRoot($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasWorkspaceRoot() => $_has(1);
   @$pb.TagNumber(2)
-  void clearWorkspaceRoot() => clearField(2);
+  void clearWorkspaceRoot() => $_clearField(2);
 }
 
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/test/support/iop/runtime.pbenum.dart b/test/support/iop/runtime.pbenum.dart
index cd0e002..18dc147 100644
--- a/test/support/iop/runtime.pbenum.dart
+++ b/test/support/iop/runtime.pbenum.dart
@@ -1,72 +1,100 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class RunSessionMode extends $pb.ProtobufEnum {
-  static const RunSessionMode RUN_SESSION_MODE_UNSPECIFIED = RunSessionMode._(0, _omitEnumNames ? '' : 'RUN_SESSION_MODE_UNSPECIFIED');
-  static const RunSessionMode RUN_SESSION_MODE_CREATE_IF_MISSING = RunSessionMode._(1, _omitEnumNames ? '' : 'RUN_SESSION_MODE_CREATE_IF_MISSING');
-  static const RunSessionMode RUN_SESSION_MODE_REQUIRE_EXISTING = RunSessionMode._(2, _omitEnumNames ? '' : 'RUN_SESSION_MODE_REQUIRE_EXISTING');
+  static const RunSessionMode RUN_SESSION_MODE_UNSPECIFIED =
+      RunSessionMode._(0, _omitEnumNames ? '' : 'RUN_SESSION_MODE_UNSPECIFIED');
+  static const RunSessionMode RUN_SESSION_MODE_CREATE_IF_MISSING =
+      RunSessionMode._(
+          1, _omitEnumNames ? '' : 'RUN_SESSION_MODE_CREATE_IF_MISSING');
+  static const RunSessionMode RUN_SESSION_MODE_REQUIRE_EXISTING =
+      RunSessionMode._(
+          2, _omitEnumNames ? '' : 'RUN_SESSION_MODE_REQUIRE_EXISTING');
 
-  static const $core.List<RunSessionMode> values = <RunSessionMode> [
+  static const $core.List<RunSessionMode> values = <RunSessionMode>[
     RUN_SESSION_MODE_UNSPECIFIED,
     RUN_SESSION_MODE_CREATE_IF_MISSING,
     RUN_SESSION_MODE_REQUIRE_EXISTING,
   ];
 
-  static final $core.Map<$core.int, RunSessionMode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static RunSessionMode? valueOf($core.int value) => _byValue[value];
+  static final $core.List<RunSessionMode?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static RunSessionMode? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const RunSessionMode._($core.int v, $core.String n) : super(v, n);
+  const RunSessionMode._(super.value, super.name);
 }
 
 class CancelAction extends $pb.ProtobufEnum {
-  static const CancelAction CANCEL_ACTION_UNSPECIFIED = CancelAction._(0, _omitEnumNames ? '' : 'CANCEL_ACTION_UNSPECIFIED');
-  static const CancelAction CANCEL_ACTION_CANCEL_RUN = CancelAction._(1, _omitEnumNames ? '' : 'CANCEL_ACTION_CANCEL_RUN');
-  static const CancelAction CANCEL_ACTION_TERMINATE_SESSION = CancelAction._(2, _omitEnumNames ? '' : 'CANCEL_ACTION_TERMINATE_SESSION');
+  static const CancelAction CANCEL_ACTION_UNSPECIFIED =
+      CancelAction._(0, _omitEnumNames ? '' : 'CANCEL_ACTION_UNSPECIFIED');
+  static const CancelAction CANCEL_ACTION_CANCEL_RUN =
+      CancelAction._(1, _omitEnumNames ? '' : 'CANCEL_ACTION_CANCEL_RUN');
+  static const CancelAction CANCEL_ACTION_TERMINATE_SESSION = CancelAction._(
+      2, _omitEnumNames ? '' : 'CANCEL_ACTION_TERMINATE_SESSION');
 
-  static const $core.List<CancelAction> values = <CancelAction> [
+  static const $core.List<CancelAction> values = <CancelAction>[
     CANCEL_ACTION_UNSPECIFIED,
     CANCEL_ACTION_CANCEL_RUN,
     CANCEL_ACTION_TERMINATE_SESSION,
   ];
 
-  static final $core.Map<$core.int, CancelAction> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static CancelAction? valueOf($core.int value) => _byValue[value];
+  static final $core.List<CancelAction?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static CancelAction? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const CancelAction._($core.int v, $core.String n) : super(v, n);
+  const CancelAction._(super.value, super.name);
 }
 
 class NodeCommandType extends $pb.ProtobufEnum {
-  static const NodeCommandType NODE_COMMAND_TYPE_UNSPECIFIED = NodeCommandType._(0, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_UNSPECIFIED');
-  static const NodeCommandType NODE_COMMAND_TYPE_USAGE_STATUS = NodeCommandType._(1, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_USAGE_STATUS');
-  static const NodeCommandType NODE_COMMAND_TYPE_CAPABILITIES = NodeCommandType._(2, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_CAPABILITIES');
-  static const NodeCommandType NODE_COMMAND_TYPE_SESSION_LIST = NodeCommandType._(3, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_SESSION_LIST');
-  static const NodeCommandType NODE_COMMAND_TYPE_TRANSPORT_STATUS = NodeCommandType._(4, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_TRANSPORT_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_UNSPECIFIED =
+      NodeCommandType._(
+          0, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_UNSPECIFIED');
+  static const NodeCommandType NODE_COMMAND_TYPE_USAGE_STATUS =
+      NodeCommandType._(
+          1, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_USAGE_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_CAPABILITIES =
+      NodeCommandType._(
+          2, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_CAPABILITIES');
+  static const NodeCommandType NODE_COMMAND_TYPE_SESSION_LIST =
+      NodeCommandType._(
+          3, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_SESSION_LIST');
+  static const NodeCommandType NODE_COMMAND_TYPE_TRANSPORT_STATUS =
+      NodeCommandType._(
+          4, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_TRANSPORT_STATUS');
+  static const NodeCommandType NODE_COMMAND_TYPE_OLLAMA_API = NodeCommandType._(
+      5, _omitEnumNames ? '' : 'NODE_COMMAND_TYPE_OLLAMA_API');
 
-  static const $core.List<NodeCommandType> values = <NodeCommandType> [
+  static const $core.List<NodeCommandType> values = <NodeCommandType>[
     NODE_COMMAND_TYPE_UNSPECIFIED,
     NODE_COMMAND_TYPE_USAGE_STATUS,
     NODE_COMMAND_TYPE_CAPABILITIES,
     NODE_COMMAND_TYPE_SESSION_LIST,
     NODE_COMMAND_TYPE_TRANSPORT_STATUS,
+    NODE_COMMAND_TYPE_OLLAMA_API,
   ];
 
-  static final $core.Map<$core.int, NodeCommandType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static NodeCommandType? valueOf($core.int value) => _byValue[value];
+  static final $core.List<NodeCommandType?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 5);
+  static NodeCommandType? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const NodeCommandType._($core.int v, $core.String n) : super(v, n);
+  const NodeCommandType._(super.value, super.name);
 }
 
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+const $core.bool _omitEnumNames =
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/test/support/iop/runtime.pbjson.dart b/test/support/iop/runtime.pbjson.dart
index 9b70113..cc91302 100644
--- a/test/support/iop/runtime.pbjson.dart
+++ b/test/support/iop/runtime.pbjson.dart
@@ -1,13 +1,15 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
+// Generated from iop/runtime.proto.
+
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -54,6 +56,7 @@ const NodeCommandType$json = {
     {'1': 'NODE_COMMAND_TYPE_CAPABILITIES', '2': 2},
     {'1': 'NODE_COMMAND_TYPE_SESSION_LIST', '2': 3},
     {'1': 'NODE_COMMAND_TYPE_TRANSPORT_STATUS', '2': 4},
+    {'1': 'NODE_COMMAND_TYPE_OLLAMA_API', '2': 5},
   ],
 };
 
@@ -62,7 +65,8 @@ final $typed_data.Uint8List nodeCommandTypeDescriptor = $convert.base64Decode(
     'Cg9Ob2RlQ29tbWFuZFR5cGUSIQodTk9ERV9DT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIiCh'
     '5OT0RFX0NPTU1BTkRfVFlQRV9VU0FHRV9TVEFUVVMQARIiCh5OT0RFX0NPTU1BTkRfVFlQRV9D'
     'QVBBQklMSVRJRVMQAhIiCh5OT0RFX0NPTU1BTkRfVFlQRV9TRVNTSU9OX0xJU1QQAxImCiJOT0'
-    'RFX0NPTU1BTkRfVFlQRV9UUkFOU1BPUlRfU1RBVFVTEAQ=');
+    'RFX0NPTU1BTkRfVFlQRV9UUkFOU1BPUlRfU1RBVFVTEAQSIAocTk9ERV9DT01NQU5EX1RZUEVf'
+    'T0xMQU1BX0FQSRAF');
 
 @$core.Deprecated('Use runRequestDescriptor instead')
 const RunRequest$json = {
@@ -72,12 +76,40 @@ const RunRequest$json = {
     {'1': 'adapter', '3': 2, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 3, '4': 1, '5': 9, '10': 'target'},
     {'1': 'workspace', '3': 4, '4': 1, '5': 9, '10': 'workspace'},
-    {'1': 'policy', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'policy'},
-    {'1': 'input', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'input'},
+    {
+      '1': 'policy',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'policy'
+    },
+    {
+      '1': 'input',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'input'
+    },
     {'1': 'timeout_sec', '3': 7, '4': 1, '5': 5, '10': 'timeoutSec'},
-    {'1': 'metadata', '3': 8, '4': 3, '5': 11, '6': '.iop.RunRequest.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 8,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.RunRequest.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'session_id', '3': 9, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'session_mode', '3': 10, '4': 1, '5': 14, '6': '.iop.RunSessionMode', '10': 'sessionMode'},
+    {
+      '1': 'session_mode',
+      '3': 10,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.RunSessionMode',
+      '10': 'sessionMode'
+    },
     {'1': 'background', '3': 11, '4': 1, '5': 8, '10': 'background'},
   ],
   '3': [RunRequest_MetadataEntry$json],
@@ -115,7 +147,14 @@ const RunEvent$json = {
     {'1': 'message', '3': 4, '4': 1, '5': 9, '10': 'message'},
     {'1': 'error', '3': 5, '4': 1, '5': 9, '10': 'error'},
     {'1': 'usage', '3': 6, '4': 1, '5': 11, '6': '.iop.Usage', '10': 'usage'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.RunEvent.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.RunEvent.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'timestamp', '3': 8, '4': 1, '5': 3, '10': 'timestamp'},
     {'1': 'session_id', '3': 9, '4': 1, '5': 9, '10': 'sessionId'},
     {'1': 'background', '3': 10, '4': 1, '5': 8, '10': 'background'},
@@ -156,7 +195,14 @@ const EdgeNodeEvent$json = {
     {'1': 'node_id', '3': 4, '4': 1, '5': 9, '10': 'nodeId'},
     {'1': 'alias', '3': 5, '4': 1, '5': 9, '10': 'alias'},
     {'1': 'reason', '3': 6, '4': 1, '5': 9, '10': 'reason'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.EdgeNodeEvent.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.EdgeNodeEvent.MetadataEntry',
+      '10': 'metadata'
+    },
     {'1': 'timestamp', '3': 8, '4': 1, '5': 3, '10': 'timestamp'},
   ],
   '3': [EdgeNodeEvent_MetadataEntry$json],
@@ -204,8 +250,8 @@ const Heartbeat$json = {
 };
 
 /// Descriptor for `Heartbeat`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List heartbeatDescriptor = $convert.base64Decode(
-    'CglIZWFydGJlYXQSHAoJdGltZXN0YW1wGAEgASgDUgl0aW1lc3RhbXA=');
+final $typed_data.Uint8List heartbeatDescriptor = $convert
+    .base64Decode('CglIZWFydGJlYXQSHAoJdGltZXN0YW1wGAEgASgDUgl0aW1lc3RhbXA=');
 
 @$core.Deprecated('Use cancelRequestDescriptor instead')
 const CancelRequest$json = {
@@ -215,7 +261,14 @@ const CancelRequest$json = {
     {'1': 'adapter', '3': 2, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 3, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 4, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'action', '3': 5, '4': 1, '5': 14, '6': '.iop.CancelAction', '10': 'action'},
+    {
+      '1': 'action',
+      '3': 5,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.CancelAction',
+      '10': 'action'
+    },
   ],
 };
 
@@ -230,12 +283,26 @@ const NodeCommandRequest$json = {
   '1': 'NodeCommandRequest',
   '2': [
     {'1': 'request_id', '3': 1, '4': 1, '5': 9, '10': 'requestId'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.iop.NodeCommandType', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.NodeCommandType',
+      '10': 'type'
+    },
     {'1': 'adapter', '3': 3, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 4, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 5, '4': 1, '5': 9, '10': 'sessionId'},
     {'1': 'timeout_sec', '3': 6, '4': 1, '5': 5, '10': 'timeoutSec'},
-    {'1': 'metadata', '3': 7, '4': 3, '5': 11, '6': '.iop.NodeCommandRequest.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 7,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.NodeCommandRequest.MetadataEntry',
+      '10': 'metadata'
+    },
   ],
   '3': [NodeCommandRequest_MetadataEntry$json],
 };
@@ -265,13 +332,34 @@ const NodeCommandResponse$json = {
   '1': 'NodeCommandResponse',
   '2': [
     {'1': 'request_id', '3': 1, '4': 1, '5': 9, '10': 'requestId'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.iop.NodeCommandType', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.iop.NodeCommandType',
+      '10': 'type'
+    },
     {'1': 'adapter', '3': 3, '4': 1, '5': 9, '10': 'adapter'},
     {'1': 'target', '3': 4, '4': 1, '5': 9, '10': 'target'},
     {'1': 'session_id', '3': 5, '4': 1, '5': 9, '10': 'sessionId'},
-    {'1': 'usage_status', '3': 6, '4': 1, '5': 11, '6': '.iop.AgentUsageStatus', '10': 'usageStatus'},
+    {
+      '1': 'usage_status',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.AgentUsageStatus',
+      '10': 'usageStatus'
+    },
     {'1': 'error', '3': 7, '4': 1, '5': 9, '10': 'error'},
-    {'1': 'result', '3': 8, '4': 3, '5': 11, '6': '.iop.NodeCommandResponse.ResultEntry', '10': 'result'},
+    {
+      '1': 'result',
+      '3': 8,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.NodeCommandResponse.ResultEntry',
+      '10': 'result'
+    },
   ],
   '3': [NodeCommandResponse_ResultEntry$json],
 };
@@ -305,7 +393,14 @@ const AgentUsageStatus$json = {
     {'1': 'daily_reset_time', '3': 3, '4': 1, '5': 9, '10': 'dailyResetTime'},
     {'1': 'weekly_limit', '3': 4, '4': 1, '5': 9, '10': 'weeklyLimit'},
     {'1': 'weekly_reset_time', '3': 5, '4': 1, '5': 9, '10': 'weeklyResetTime'},
-    {'1': 'metadata', '3': 6, '4': 3, '5': 11, '6': '.iop.AgentUsageStatus.MetadataEntry', '10': 'metadata'},
+    {
+      '1': 'metadata',
+      '3': 6,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.AgentUsageStatus.MetadataEntry',
+      '10': 'metadata'
+    },
   ],
   '3': [AgentUsageStatus_MetadataEntry$json],
 };
@@ -351,8 +446,8 @@ const RegisterRequest$json = {
 };
 
 /// Descriptor for `RegisterRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List registerRequestDescriptor = $convert.base64Decode(
-    'Cg9SZWdpc3RlclJlcXVlc3QSFAoFdG9rZW4YASABKAlSBXRva2Vu');
+final $typed_data.Uint8List registerRequestDescriptor = $convert
+    .base64Decode('Cg9SZWdpc3RlclJlcXVlc3QSFAoFdG9rZW4YASABKAlSBXRva2Vu');
 
 @$core.Deprecated('Use registerResponseDescriptor instead')
 const RegisterResponse$json = {
@@ -362,7 +457,14 @@ const RegisterResponse$json = {
     {'1': 'node_id', '3': 2, '4': 1, '5': 9, '10': 'nodeId'},
     {'1': 'alias', '3': 3, '4': 1, '5': 9, '10': 'alias'},
     {'1': 'reason', '3': 4, '4': 1, '5': 9, '10': 'reason'},
-    {'1': 'config', '3': 5, '4': 1, '5': 11, '6': '.iop.NodeConfigPayload', '10': 'config'},
+    {
+      '1': 'config',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.NodeConfigPayload',
+      '10': 'config'
+    },
   ],
 };
 
@@ -376,8 +478,22 @@ final $typed_data.Uint8List registerResponseDescriptor = $convert.base64Decode(
 const NodeConfigPayload$json = {
   '1': 'NodeConfigPayload',
   '2': [
-    {'1': 'adapters', '3': 1, '4': 3, '5': 11, '6': '.iop.AdapterConfig', '10': 'adapters'},
-    {'1': 'runtime', '3': 2, '4': 1, '5': 11, '6': '.iop.NodeRuntimeConfig', '10': 'runtime'},
+    {
+      '1': 'adapters',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.AdapterConfig',
+      '10': 'adapters'
+    },
+    {
+      '1': 'runtime',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.NodeRuntimeConfig',
+      '10': 'runtime'
+    },
   ],
 };
 
@@ -393,10 +509,41 @@ const AdapterConfig$json = {
   '2': [
     {'1': 'type', '3': 1, '4': 1, '5': 9, '10': 'type'},
     {'1': 'enabled', '3': 2, '4': 1, '5': 8, '10': 'enabled'},
-    {'1': 'settings', '3': 3, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'settings'},
-    {'1': 'cli', '3': 4, '4': 1, '5': 11, '6': '.iop.CLIAdapterConfig', '9': 0, '10': 'cli'},
-    {'1': 'ollama', '3': 5, '4': 1, '5': 11, '6': '.iop.OllamaAdapterConfig', '9': 0, '10': 'ollama'},
-    {'1': 'vllm', '3': 6, '4': 1, '5': 11, '6': '.iop.VllmAdapterConfig', '9': 0, '10': 'vllm'},
+    {
+      '1': 'settings',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Struct',
+      '10': 'settings'
+    },
+    {
+      '1': 'cli',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLIAdapterConfig',
+      '9': 0,
+      '10': 'cli'
+    },
+    {
+      '1': 'ollama',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.OllamaAdapterConfig',
+      '9': 0,
+      '10': 'ollama'
+    },
+    {
+      '1': 'vllm',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.VllmAdapterConfig',
+      '9': 0,
+      '10': 'vllm'
+    },
   ],
   '8': [
     {'1': 'config'},
@@ -415,7 +562,14 @@ final $typed_data.Uint8List adapterConfigDescriptor = $convert.base64Decode(
 const CLIAdapterConfig$json = {
   '1': 'CLIAdapterConfig',
   '2': [
-    {'1': 'profiles', '3': 1, '4': 3, '5': 11, '6': '.iop.CLIAdapterConfig.ProfilesEntry', '10': 'profiles'},
+    {
+      '1': 'profiles',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.iop.CLIAdapterConfig.ProfilesEntry',
+      '10': 'profiles'
+    },
   ],
   '3': [CLIAdapterConfig_ProfilesEntry$json],
 };
@@ -425,7 +579,14 @@ const CLIAdapterConfig_ProfilesEntry$json = {
   '1': 'ProfilesEntry',
   '2': [
     {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'value', '3': 2, '4': 1, '5': 11, '6': '.iop.CLIProfileConfig', '10': 'value'},
+    {
+      '1': 'value',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLIProfileConfig',
+      '10': 'value'
+    },
   ],
   '7': {'7': true},
 };
@@ -446,10 +607,29 @@ const CLIProfileConfig$json = {
     {'1': 'env', '3': 3, '4': 3, '5': 9, '10': 'env'},
     {'1': 'persistent', '3': 4, '4': 1, '5': 8, '10': 'persistent'},
     {'1': 'terminal', '3': 5, '4': 1, '5': 8, '10': 'terminal'},
-    {'1': 'response_idle_timeout_ms', '3': 6, '4': 1, '5': 5, '10': 'responseIdleTimeoutMs'},
-    {'1': 'startup_idle_timeout_ms', '3': 7, '4': 1, '5': 5, '10': 'startupIdleTimeoutMs'},
+    {
+      '1': 'response_idle_timeout_ms',
+      '3': 6,
+      '4': 1,
+      '5': 5,
+      '10': 'responseIdleTimeoutMs'
+    },
+    {
+      '1': 'startup_idle_timeout_ms',
+      '3': 7,
+      '4': 1,
+      '5': 5,
+      '10': 'startupIdleTimeoutMs'
+    },
     {'1': 'output_format', '3': 8, '4': 1, '5': 9, '10': 'outputFormat'},
-    {'1': 'completion_marker', '3': 9, '4': 1, '5': 11, '6': '.iop.CLICompletionMarker', '10': 'completionMarker'},
+    {
+      '1': 'completion_marker',
+      '3': 9,
+      '4': 1,
+      '5': 11,
+      '6': '.iop.CLICompletionMarker',
+      '10': 'completionMarker'
+    },
     {'1': 'mode', '3': 10, '4': 1, '5': 9, '10': 'mode'},
     {'1': 'resume_args', '3': 11, '4': 3, '5': 9, '10': 'resumeArgs'},
   ],
@@ -519,4 +699,3 @@ const NodeRuntimeConfig$json = {
 final $typed_data.Uint8List nodeRuntimeConfigDescriptor = $convert.base64Decode(
     'ChFOb2RlUnVudGltZUNvbmZpZxIgCgtjb25jdXJyZW5jeRgBIAEoBVILY29uY3VycmVuY3kSJQ'
     'oOd29ya3NwYWNlX3Jvb3QYAiABKAlSDXdvcmtzcGFjZVJvb3Q=');
-
diff --git a/test/support/iop/runtime.pbserver.dart b/test/support/iop/runtime.pbserver.dart
deleted file mode 100644
index a8fe277..0000000
--- a/test/support/iop/runtime.pbserver.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: iop/runtime.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'runtime.pb.dart';
-