diff --git a/pkgs/coverage/pubspec.yaml b/pkgs/coverage/pubspec.yaml
index fe0f0060b..c0f26bfcd 100644
--- a/pkgs/coverage/pubspec.yaml
+++ b/pkgs/coverage/pubspec.yaml
@@ -20,7 +20,7 @@ dev_dependencies:
   benchmark_harness: ^2.2.0
   build_runner: ^2.3.1
   dart_flutter_team_lints: ^3.0.0
-  mockito: ^5.4.1
+  mockito: ^5.4.4
   test: ^1.24.7
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
diff --git a/pkgs/coverage/test/collect_coverage_mock_test.mocks.dart b/pkgs/coverage/test/collect_coverage_mock_test.mocks.dart
index efdb26046..86f596af0 100644
--- a/pkgs/coverage/test/collect_coverage_mock_test.mocks.dart
+++ b/pkgs/coverage/test/collect_coverage_mock_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.2 from annotations
+// Mocks generated by Mockito 5.4.4 from annotations
 // in coverage/test/collect_coverage_mock_test.dart.
 // Do not manually edit this file.
 
@@ -6,12 +6,15 @@
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i4;
 import 'package:vm_service/src/vm_service.dart' as _i2;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 // ignore_for_file: prefer_const_constructors
@@ -39,8 +42,8 @@ class _FakeSuccess_1 extends _i1.SmartFake implements _i2.Success {
         );
 }
 
-class _FakeResponse_2 extends _i1.SmartFake implements _i2.Response {
-  _FakeResponse_2(
+class _FakeIdZone_2 extends _i1.SmartFake implements _i2.IdZone {
+  _FakeIdZone_2(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -49,9 +52,19 @@ class _FakeResponse_2 extends _i1.SmartFake implements _i2.Response {
         );
 }
 
-class _FakeAllocationProfile_3 extends _i1.SmartFake
+class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response {
+  _FakeResponse_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeAllocationProfile_4 extends _i1.SmartFake
     implements _i2.AllocationProfile {
-  _FakeAllocationProfile_3(
+  _FakeAllocationProfile_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -60,8 +73,8 @@ class _FakeAllocationProfile_3 extends _i1.SmartFake
         );
 }
 
-class _FakeCpuSamples_4 extends _i1.SmartFake implements _i2.CpuSamples {
-  _FakeCpuSamples_4(
+class _FakeCpuSamples_5 extends _i1.SmartFake implements _i2.CpuSamples {
+  _FakeCpuSamples_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -70,8 +83,8 @@ class _FakeCpuSamples_4 extends _i1.SmartFake implements _i2.CpuSamples {
         );
 }
 
-class _FakeClassList_5 extends _i1.SmartFake implements _i2.ClassList {
-  _FakeClassList_5(
+class _FakeClassList_6 extends _i1.SmartFake implements _i2.ClassList {
+  _FakeClassList_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -80,8 +93,8 @@ class _FakeClassList_5 extends _i1.SmartFake implements _i2.ClassList {
         );
 }
 
-class _FakeFlagList_6 extends _i1.SmartFake implements _i2.FlagList {
-  _FakeFlagList_6(
+class _FakeFlagList_7 extends _i1.SmartFake implements _i2.FlagList {
+  _FakeFlagList_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -90,9 +103,9 @@ class _FakeFlagList_6 extends _i1.SmartFake implements _i2.FlagList {
         );
 }
 
-class _FakeInboundReferences_7 extends _i1.SmartFake
+class _FakeInboundReferences_8 extends _i1.SmartFake
     implements _i2.InboundReferences {
-  _FakeInboundReferences_7(
+  _FakeInboundReferences_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -101,8 +114,8 @@ class _FakeInboundReferences_7 extends _i1.SmartFake
         );
 }
 
-class _FakeInstanceSet_8 extends _i1.SmartFake implements _i2.InstanceSet {
-  _FakeInstanceSet_8(
+class _FakeInstanceSet_9 extends _i1.SmartFake implements _i2.InstanceSet {
+  _FakeInstanceSet_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -111,8 +124,8 @@ class _FakeInstanceSet_8 extends _i1.SmartFake implements _i2.InstanceSet {
         );
 }
 
-class _FakeInstanceRef_9 extends _i1.SmartFake implements _i2.InstanceRef {
-  _FakeInstanceRef_9(
+class _FakeInstanceRef_10 extends _i1.SmartFake implements _i2.InstanceRef {
+  _FakeInstanceRef_10(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -121,8 +134,8 @@ class _FakeInstanceRef_9 extends _i1.SmartFake implements _i2.InstanceRef {
         );
 }
 
-class _FakeIsolate_10 extends _i1.SmartFake implements _i2.Isolate {
-  _FakeIsolate_10(
+class _FakeIsolate_11 extends _i1.SmartFake implements _i2.Isolate {
+  _FakeIsolate_11(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -131,8 +144,8 @@ class _FakeIsolate_10 extends _i1.SmartFake implements _i2.Isolate {
         );
 }
 
-class _FakeIsolateGroup_11 extends _i1.SmartFake implements _i2.IsolateGroup {
-  _FakeIsolateGroup_11(
+class _FakeIsolateGroup_12 extends _i1.SmartFake implements _i2.IsolateGroup {
+  _FakeIsolateGroup_12(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -141,8 +154,8 @@ class _FakeIsolateGroup_11 extends _i1.SmartFake implements _i2.IsolateGroup {
         );
 }
 
-class _FakeEvent_12 extends _i1.SmartFake implements _i2.Event {
-  _FakeEvent_12(
+class _FakeEvent_13 extends _i1.SmartFake implements _i2.Event {
+  _FakeEvent_13(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -151,8 +164,8 @@ class _FakeEvent_12 extends _i1.SmartFake implements _i2.Event {
         );
 }
 
-class _FakeMemoryUsage_13 extends _i1.SmartFake implements _i2.MemoryUsage {
-  _FakeMemoryUsage_13(
+class _FakeMemoryUsage_14 extends _i1.SmartFake implements _i2.MemoryUsage {
+  _FakeMemoryUsage_14(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -161,8 +174,8 @@ class _FakeMemoryUsage_13 extends _i1.SmartFake implements _i2.MemoryUsage {
         );
 }
 
-class _FakeScriptList_14 extends _i1.SmartFake implements _i2.ScriptList {
-  _FakeScriptList_14(
+class _FakeScriptList_15 extends _i1.SmartFake implements _i2.ScriptList {
+  _FakeScriptList_15(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -171,8 +184,8 @@ class _FakeScriptList_14 extends _i1.SmartFake implements _i2.ScriptList {
         );
 }
 
-class _FakeObj_15 extends _i1.SmartFake implements _i2.Obj {
-  _FakeObj_15(
+class _FakeObj_16 extends _i1.SmartFake implements _i2.Obj {
+  _FakeObj_16(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -181,9 +194,9 @@ class _FakeObj_15 extends _i1.SmartFake implements _i2.Obj {
         );
 }
 
-class _FakePerfettoCpuSamples_16 extends _i1.SmartFake
+class _FakePerfettoCpuSamples_17 extends _i1.SmartFake
     implements _i2.PerfettoCpuSamples {
-  _FakePerfettoCpuSamples_16(
+  _FakePerfettoCpuSamples_17(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -192,9 +205,9 @@ class _FakePerfettoCpuSamples_16 extends _i1.SmartFake
         );
 }
 
-class _FakePerfettoTimeline_17 extends _i1.SmartFake
+class _FakePerfettoTimeline_18 extends _i1.SmartFake
     implements _i2.PerfettoTimeline {
-  _FakePerfettoTimeline_17(
+  _FakePerfettoTimeline_18(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -203,8 +216,8 @@ class _FakePerfettoTimeline_17 extends _i1.SmartFake
         );
 }
 
-class _FakePortList_18 extends _i1.SmartFake implements _i2.PortList {
-  _FakePortList_18(
+class _FakePortList_19 extends _i1.SmartFake implements _i2.PortList {
+  _FakePortList_19(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -213,8 +226,8 @@ class _FakePortList_18 extends _i1.SmartFake implements _i2.PortList {
         );
 }
 
-class _FakeRetainingPath_19 extends _i1.SmartFake implements _i2.RetainingPath {
-  _FakeRetainingPath_19(
+class _FakeRetainingPath_20 extends _i1.SmartFake implements _i2.RetainingPath {
+  _FakeRetainingPath_20(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -223,9 +236,9 @@ class _FakeRetainingPath_19 extends _i1.SmartFake implements _i2.RetainingPath {
         );
 }
 
-class _FakeProcessMemoryUsage_20 extends _i1.SmartFake
+class _FakeProcessMemoryUsage_21 extends _i1.SmartFake
     implements _i2.ProcessMemoryUsage {
-  _FakeProcessMemoryUsage_20(
+  _FakeProcessMemoryUsage_21(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -234,8 +247,8 @@ class _FakeProcessMemoryUsage_20 extends _i1.SmartFake
         );
 }
 
-class _FakeStack_21 extends _i1.SmartFake implements _i2.Stack {
-  _FakeStack_21(
+class _FakeStack_22 extends _i1.SmartFake implements _i2.Stack {
+  _FakeStack_22(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -244,8 +257,8 @@ class _FakeStack_21 extends _i1.SmartFake implements _i2.Stack {
         );
 }
 
-class _FakeProtocolList_22 extends _i1.SmartFake implements _i2.ProtocolList {
-  _FakeProtocolList_22(
+class _FakeProtocolList_23 extends _i1.SmartFake implements _i2.ProtocolList {
+  _FakeProtocolList_23(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -254,8 +267,8 @@ class _FakeProtocolList_22 extends _i1.SmartFake implements _i2.ProtocolList {
         );
 }
 
-class _FakeSourceReport_23 extends _i1.SmartFake implements _i2.SourceReport {
-  _FakeSourceReport_23(
+class _FakeSourceReport_24 extends _i1.SmartFake implements _i2.SourceReport {
+  _FakeSourceReport_24(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -264,8 +277,8 @@ class _FakeSourceReport_23 extends _i1.SmartFake implements _i2.SourceReport {
         );
 }
 
-class _FakeVersion_24 extends _i1.SmartFake implements _i2.Version {
-  _FakeVersion_24(
+class _FakeVersion_25 extends _i1.SmartFake implements _i2.Version {
+  _FakeVersion_25(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -274,8 +287,8 @@ class _FakeVersion_24 extends _i1.SmartFake implements _i2.Version {
         );
 }
 
-class _FakeVM_25 extends _i1.SmartFake implements _i2.VM {
-  _FakeVM_25(
+class _FakeVM_26 extends _i1.SmartFake implements _i2.VM {
+  _FakeVM_26(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -284,8 +297,8 @@ class _FakeVM_25 extends _i1.SmartFake implements _i2.VM {
         );
 }
 
-class _FakeTimeline_26 extends _i1.SmartFake implements _i2.Timeline {
-  _FakeTimeline_26(
+class _FakeTimeline_27 extends _i1.SmartFake implements _i2.Timeline {
+  _FakeTimeline_27(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -294,8 +307,8 @@ class _FakeTimeline_26 extends _i1.SmartFake implements _i2.Timeline {
         );
 }
 
-class _FakeTimelineFlags_27 extends _i1.SmartFake implements _i2.TimelineFlags {
-  _FakeTimelineFlags_27(
+class _FakeTimelineFlags_28 extends _i1.SmartFake implements _i2.TimelineFlags {
+  _FakeTimelineFlags_28(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -304,8 +317,8 @@ class _FakeTimelineFlags_27 extends _i1.SmartFake implements _i2.TimelineFlags {
         );
 }
 
-class _FakeTimestamp_28 extends _i1.SmartFake implements _i2.Timestamp {
-  _FakeTimestamp_28(
+class _FakeTimestamp_29 extends _i1.SmartFake implements _i2.Timestamp {
+  _FakeTimestamp_29(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -314,8 +327,8 @@ class _FakeTimestamp_28 extends _i1.SmartFake implements _i2.Timestamp {
         );
 }
 
-class _FakeUriList_29 extends _i1.SmartFake implements _i2.UriList {
-  _FakeUriList_29(
+class _FakeUriList_30 extends _i1.SmartFake implements _i2.UriList {
+  _FakeUriList_30(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -324,8 +337,18 @@ class _FakeUriList_29 extends _i1.SmartFake implements _i2.UriList {
         );
 }
 
-class _FakeReloadReport_30 extends _i1.SmartFake implements _i2.ReloadReport {
-  _FakeReloadReport_30(
+class _FakeReloadReport_31 extends _i1.SmartFake implements _i2.ReloadReport {
+  _FakeReloadReport_31(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeFuture_32<T1> extends _i1.SmartFake implements _i3.Future<T1> {
+  _FakeFuture_32(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -342,6 +365,24 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     _i1.throwOnMissingStub(this);
   }
 
+  @override
+  _i3.Stream<String> get onSend => (super.noSuchMethod(
+        Invocation.getter(#onSend),
+        returnValue: _i3.Stream<String>.empty(),
+      ) as _i3.Stream<String>);
+
+  @override
+  _i3.Stream<String> get onReceive => (super.noSuchMethod(
+        Invocation.getter(#onReceive),
+        returnValue: _i3.Stream<String>.empty(),
+      ) as _i3.Stream<String>);
+
+  @override
+  _i3.Future<void> get onDone => (super.noSuchMethod(
+        Invocation.getter(#onDone),
+        returnValue: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
+
   @override
   _i3.Stream<_i2.Event> get onVMEvent => (super.noSuchMethod(
         Invocation.getter(#onVMEvent),
@@ -414,24 +455,6 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
         returnValue: _i3.Stream<_i2.Event>.empty(),
       ) as _i3.Stream<_i2.Event>);
 
-  @override
-  _i3.Stream<String> get onSend => (super.noSuchMethod(
-        Invocation.getter(#onSend),
-        returnValue: _i3.Stream<String>.empty(),
-      ) as _i3.Stream<String>);
-
-  @override
-  _i3.Stream<String> get onReceive => (super.noSuchMethod(
-        Invocation.getter(#onReceive),
-        returnValue: _i3.Stream<String>.empty(),
-      ) as _i3.Stream<String>);
-
-  @override
-  _i3.Future<dynamic> get onDone => (super.noSuchMethod(
-        Invocation.getter(#onDone),
-        returnValue: _i3.Future<dynamic>.value(),
-      ) as _i3.Future<dynamic>);
-
   @override
   _i3.Stream<_i2.Event> onEvent(String? streamId) => (super.noSuchMethod(
         Invocation.method(
@@ -559,6 +582,87 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
         )),
       ) as _i3.Future<_i2.Success>);
 
+  @override
+  _i3.Future<_i2.IdZone> createIdZone(
+    String? isolateId,
+    String? backingBufferKind,
+    String? idAssignmentPolicy, {
+    int? capacity,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #createIdZone,
+          [
+            isolateId,
+            backingBufferKind,
+            idAssignmentPolicy,
+          ],
+          {#capacity: capacity},
+        ),
+        returnValue: _i3.Future<_i2.IdZone>.value(_FakeIdZone_2(
+          this,
+          Invocation.method(
+            #createIdZone,
+            [
+              isolateId,
+              backingBufferKind,
+              idAssignmentPolicy,
+            ],
+            {#capacity: capacity},
+          ),
+        )),
+      ) as _i3.Future<_i2.IdZone>);
+
+  @override
+  _i3.Future<_i2.Success> deleteIdZone(
+    String? isolateId,
+    String? idZoneId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteIdZone,
+          [
+            isolateId,
+            idZoneId,
+          ],
+        ),
+        returnValue: _i3.Future<_i2.Success>.value(_FakeSuccess_1(
+          this,
+          Invocation.method(
+            #deleteIdZone,
+            [
+              isolateId,
+              idZoneId,
+            ],
+          ),
+        )),
+      ) as _i3.Future<_i2.Success>);
+
+  @override
+  _i3.Future<_i2.Success> invalidateIdZone(
+    String? isolateId,
+    String? idZoneId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #invalidateIdZone,
+          [
+            isolateId,
+            idZoneId,
+          ],
+        ),
+        returnValue: _i3.Future<_i2.Success>.value(_FakeSuccess_1(
+          this,
+          Invocation.method(
+            #invalidateIdZone,
+            [
+              isolateId,
+              idZoneId,
+            ],
+          ),
+        )),
+      ) as _i3.Future<_i2.Success>);
+
   @override
   _i3.Future<_i2.Response> invoke(
     String? isolateId,
@@ -566,6 +670,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     String? selector,
     List<String>? argumentIds, {
     bool? disableBreakpoints,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -576,9 +681,12 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             selector,
             argumentIds,
           ],
-          {#disableBreakpoints: disableBreakpoints},
+          {
+            #disableBreakpoints: disableBreakpoints,
+            #idZoneId: idZoneId,
+          },
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #invoke,
@@ -588,7 +696,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
               selector,
               argumentIds,
             ],
-            {#disableBreakpoints: disableBreakpoints},
+            {
+              #disableBreakpoints: disableBreakpoints,
+              #idZoneId: idZoneId,
+            },
           ),
         )),
       ) as _i3.Future<_i2.Response>);
@@ -600,6 +711,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     String? expression, {
     Map<String, String>? scope,
     bool? disableBreakpoints,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -612,9 +724,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           {
             #scope: scope,
             #disableBreakpoints: disableBreakpoints,
+            #idZoneId: idZoneId,
           },
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #evaluate,
@@ -626,6 +739,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             {
               #scope: scope,
               #disableBreakpoints: disableBreakpoints,
+              #idZoneId: idZoneId,
             },
           ),
         )),
@@ -638,6 +752,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     String? expression, {
     Map<String, String>? scope,
     bool? disableBreakpoints,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -650,9 +765,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           {
             #scope: scope,
             #disableBreakpoints: disableBreakpoints,
+            #idZoneId: idZoneId,
           },
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #evaluateInFrame,
@@ -664,6 +780,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             {
               #scope: scope,
               #disableBreakpoints: disableBreakpoints,
+              #idZoneId: idZoneId,
             },
           ),
         )),
@@ -685,7 +802,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           },
         ),
         returnValue:
-            _i3.Future<_i2.AllocationProfile>.value(_FakeAllocationProfile_3(
+            _i3.Future<_i2.AllocationProfile>.value(_FakeAllocationProfile_4(
           this,
           Invocation.method(
             #getAllocationProfile,
@@ -715,7 +832,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #classId: classId,
           },
         ),
-        returnValue: _i3.Future<_i2.CpuSamples>.value(_FakeCpuSamples_4(
+        returnValue: _i3.Future<_i2.CpuSamples>.value(_FakeCpuSamples_5(
           this,
           Invocation.method(
             #getAllocationTraces,
@@ -736,7 +853,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getClassList,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.ClassList>.value(_FakeClassList_5(
+        returnValue: _i3.Future<_i2.ClassList>.value(_FakeClassList_6(
           this,
           Invocation.method(
             #getClassList,
@@ -760,7 +877,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             timeExtentMicros,
           ],
         ),
-        returnValue: _i3.Future<_i2.CpuSamples>.value(_FakeCpuSamples_4(
+        returnValue: _i3.Future<_i2.CpuSamples>.value(_FakeCpuSamples_5(
           this,
           Invocation.method(
             #getCpuSamples,
@@ -779,7 +896,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getFlagList,
           [],
         ),
-        returnValue: _i3.Future<_i2.FlagList>.value(_FakeFlagList_6(
+        returnValue: _i3.Future<_i2.FlagList>.value(_FakeFlagList_7(
           this,
           Invocation.method(
             #getFlagList,
@@ -792,8 +909,9 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
   _i3.Future<_i2.InboundReferences> getInboundReferences(
     String? isolateId,
     String? targetId,
-    int? limit,
-  ) =>
+    int? limit, {
+    String? idZoneId,
+  }) =>
       (super.noSuchMethod(
         Invocation.method(
           #getInboundReferences,
@@ -802,9 +920,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             targetId,
             limit,
           ],
+          {#idZoneId: idZoneId},
         ),
         returnValue:
-            _i3.Future<_i2.InboundReferences>.value(_FakeInboundReferences_7(
+            _i3.Future<_i2.InboundReferences>.value(_FakeInboundReferences_8(
           this,
           Invocation.method(
             #getInboundReferences,
@@ -813,6 +932,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
               targetId,
               limit,
             ],
+            {#idZoneId: idZoneId},
           ),
         )),
       ) as _i3.Future<_i2.InboundReferences>);
@@ -824,6 +944,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     int? limit, {
     bool? includeSubclasses,
     bool? includeImplementers,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -836,9 +957,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           {
             #includeSubclasses: includeSubclasses,
             #includeImplementers: includeImplementers,
+            #idZoneId: idZoneId,
           },
         ),
-        returnValue: _i3.Future<_i2.InstanceSet>.value(_FakeInstanceSet_8(
+        returnValue: _i3.Future<_i2.InstanceSet>.value(_FakeInstanceSet_9(
           this,
           Invocation.method(
             #getInstances,
@@ -850,6 +972,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             {
               #includeSubclasses: includeSubclasses,
               #includeImplementers: includeImplementers,
+              #idZoneId: idZoneId,
             },
           ),
         )),
@@ -861,6 +984,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     String? objectId, {
     bool? includeSubclasses,
     bool? includeImplementers,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -872,9 +996,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           {
             #includeSubclasses: includeSubclasses,
             #includeImplementers: includeImplementers,
+            #idZoneId: idZoneId,
           },
         ),
-        returnValue: _i3.Future<_i2.InstanceRef>.value(_FakeInstanceRef_9(
+        returnValue: _i3.Future<_i2.InstanceRef>.value(_FakeInstanceRef_10(
           this,
           Invocation.method(
             #getInstancesAsList,
@@ -885,6 +1010,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             {
               #includeSubclasses: includeSubclasses,
               #includeImplementers: includeImplementers,
+              #idZoneId: idZoneId,
             },
           ),
         )),
@@ -896,7 +1022,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getIsolate,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.Isolate>.value(_FakeIsolate_10(
+        returnValue: _i3.Future<_i2.Isolate>.value(_FakeIsolate_11(
           this,
           Invocation.method(
             #getIsolate,
@@ -912,7 +1038,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getIsolateGroup,
           [isolateGroupId],
         ),
-        returnValue: _i3.Future<_i2.IsolateGroup>.value(_FakeIsolateGroup_11(
+        returnValue: _i3.Future<_i2.IsolateGroup>.value(_FakeIsolateGroup_12(
           this,
           Invocation.method(
             #getIsolateGroup,
@@ -928,7 +1054,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getIsolatePauseEvent,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.Event>.value(_FakeEvent_12(
+        returnValue: _i3.Future<_i2.Event>.value(_FakeEvent_13(
           this,
           Invocation.method(
             #getIsolatePauseEvent,
@@ -944,7 +1070,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getMemoryUsage,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.MemoryUsage>.value(_FakeMemoryUsage_13(
+        returnValue: _i3.Future<_i2.MemoryUsage>.value(_FakeMemoryUsage_14(
           this,
           Invocation.method(
             #getMemoryUsage,
@@ -961,7 +1087,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getIsolateGroupMemoryUsage,
           [isolateGroupId],
         ),
-        returnValue: _i3.Future<_i2.MemoryUsage>.value(_FakeMemoryUsage_13(
+        returnValue: _i3.Future<_i2.MemoryUsage>.value(_FakeMemoryUsage_14(
           this,
           Invocation.method(
             #getIsolateGroupMemoryUsage,
@@ -977,7 +1103,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getScripts,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.ScriptList>.value(_FakeScriptList_14(
+        returnValue: _i3.Future<_i2.ScriptList>.value(_FakeScriptList_15(
           this,
           Invocation.method(
             #getScripts,
@@ -992,6 +1118,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
     String? objectId, {
     int? offset,
     int? count,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1003,9 +1130,10 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           {
             #offset: offset,
             #count: count,
+            #idZoneId: idZoneId,
           },
         ),
-        returnValue: _i3.Future<_i2.Obj>.value(_FakeObj_15(
+        returnValue: _i3.Future<_i2.Obj>.value(_FakeObj_16(
           this,
           Invocation.method(
             #getObject,
@@ -1016,6 +1144,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             {
               #offset: offset,
               #count: count,
+              #idZoneId: idZoneId,
             },
           ),
         )),
@@ -1037,7 +1166,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           },
         ),
         returnValue:
-            _i3.Future<_i2.PerfettoCpuSamples>.value(_FakePerfettoCpuSamples_16(
+            _i3.Future<_i2.PerfettoCpuSamples>.value(_FakePerfettoCpuSamples_17(
           this,
           Invocation.method(
             #getPerfettoCpuSamples,
@@ -1065,7 +1194,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           },
         ),
         returnValue:
-            _i3.Future<_i2.PerfettoTimeline>.value(_FakePerfettoTimeline_17(
+            _i3.Future<_i2.PerfettoTimeline>.value(_FakePerfettoTimeline_18(
           this,
           Invocation.method(
             #getPerfettoVMTimeline,
@@ -1084,7 +1213,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getPorts,
           [isolateId],
         ),
-        returnValue: _i3.Future<_i2.PortList>.value(_FakePortList_18(
+        returnValue: _i3.Future<_i2.PortList>.value(_FakePortList_19(
           this,
           Invocation.method(
             #getPorts,
@@ -1097,8 +1226,9 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
   _i3.Future<_i2.RetainingPath> getRetainingPath(
     String? isolateId,
     String? targetId,
-    int? limit,
-  ) =>
+    int? limit, {
+    String? idZoneId,
+  }) =>
       (super.noSuchMethod(
         Invocation.method(
           #getRetainingPath,
@@ -1107,8 +1237,9 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             targetId,
             limit,
           ],
+          {#idZoneId: idZoneId},
         ),
-        returnValue: _i3.Future<_i2.RetainingPath>.value(_FakeRetainingPath_19(
+        returnValue: _i3.Future<_i2.RetainingPath>.value(_FakeRetainingPath_20(
           this,
           Invocation.method(
             #getRetainingPath,
@@ -1117,6 +1248,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
               targetId,
               limit,
             ],
+            {#idZoneId: idZoneId},
           ),
         )),
       ) as _i3.Future<_i2.RetainingPath>);
@@ -1129,7 +1261,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           [],
         ),
         returnValue:
-            _i3.Future<_i2.ProcessMemoryUsage>.value(_FakeProcessMemoryUsage_20(
+            _i3.Future<_i2.ProcessMemoryUsage>.value(_FakeProcessMemoryUsage_21(
           this,
           Invocation.method(
             #getProcessMemoryUsage,
@@ -1142,19 +1274,26 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
   _i3.Future<_i2.Stack> getStack(
     String? isolateId, {
     int? limit,
+    String? idZoneId,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
           #getStack,
           [isolateId],
-          {#limit: limit},
+          {
+            #limit: limit,
+            #idZoneId: idZoneId,
+          },
         ),
-        returnValue: _i3.Future<_i2.Stack>.value(_FakeStack_21(
+        returnValue: _i3.Future<_i2.Stack>.value(_FakeStack_22(
           this,
           Invocation.method(
             #getStack,
             [isolateId],
-            {#limit: limit},
+            {
+              #limit: limit,
+              #idZoneId: idZoneId,
+            },
           ),
         )),
       ) as _i3.Future<_i2.Stack>);
@@ -1165,7 +1304,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getSupportedProtocols,
           [],
         ),
-        returnValue: _i3.Future<_i2.ProtocolList>.value(_FakeProtocolList_22(
+        returnValue: _i3.Future<_i2.ProtocolList>.value(_FakeProtocolList_23(
           this,
           Invocation.method(
             #getSupportedProtocols,
@@ -1203,7 +1342,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #librariesAlreadyCompiled: librariesAlreadyCompiled,
           },
         ),
-        returnValue: _i3.Future<_i2.SourceReport>.value(_FakeSourceReport_23(
+        returnValue: _i3.Future<_i2.SourceReport>.value(_FakeSourceReport_24(
           this,
           Invocation.method(
             #getSourceReport,
@@ -1230,7 +1369,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getVersion,
           [],
         ),
-        returnValue: _i3.Future<_i2.Version>.value(_FakeVersion_24(
+        returnValue: _i3.Future<_i2.Version>.value(_FakeVersion_25(
           this,
           Invocation.method(
             #getVersion,
@@ -1245,7 +1384,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getVM,
           [],
         ),
-        returnValue: _i3.Future<_i2.VM>.value(_FakeVM_25(
+        returnValue: _i3.Future<_i2.VM>.value(_FakeVM_26(
           this,
           Invocation.method(
             #getVM,
@@ -1268,7 +1407,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #timeExtentMicros: timeExtentMicros,
           },
         ),
-        returnValue: _i3.Future<_i2.Timeline>.value(_FakeTimeline_26(
+        returnValue: _i3.Future<_i2.Timeline>.value(_FakeTimeline_27(
           this,
           Invocation.method(
             #getVMTimeline,
@@ -1287,7 +1426,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getVMTimelineFlags,
           [],
         ),
-        returnValue: _i3.Future<_i2.TimelineFlags>.value(_FakeTimelineFlags_27(
+        returnValue: _i3.Future<_i2.TimelineFlags>.value(_FakeTimelineFlags_28(
           this,
           Invocation.method(
             #getVMTimelineFlags,
@@ -1302,7 +1441,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           #getVMTimelineMicros,
           [],
         ),
-        returnValue: _i3.Future<_i2.Timestamp>.value(_FakeTimestamp_28(
+        returnValue: _i3.Future<_i2.Timestamp>.value(_FakeTimestamp_29(
           this,
           Invocation.method(
             #getVMTimelineMicros,
@@ -1356,7 +1495,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
           ],
           {#local: local},
         ),
-        returnValue: _i3.Future<_i2.UriList>.value(_FakeUriList_29(
+        returnValue: _i3.Future<_i2.UriList>.value(_FakeUriList_30(
           this,
           Invocation.method(
             #lookupResolvedPackageUris,
@@ -1382,7 +1521,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             uris,
           ],
         ),
-        returnValue: _i3.Future<_i2.UriList>.value(_FakeUriList_29(
+        returnValue: _i3.Future<_i2.UriList>.value(_FakeUriList_30(
           this,
           Invocation.method(
             #lookupPackageUris,
@@ -1438,7 +1577,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #packagesUri: packagesUri,
           },
         ),
-        returnValue: _i3.Future<_i2.ReloadReport>.value(_FakeReloadReport_30(
+        returnValue: _i3.Future<_i2.ReloadReport>.value(_FakeReloadReport_31(
           this,
           Invocation.method(
             #reloadSources,
@@ -1616,7 +1755,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             value,
           ],
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #setFlag,
@@ -1801,7 +1940,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #args: args,
           },
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #callMethod,
@@ -1829,7 +1968,7 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
             #args: args,
           },
         ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_2(
+        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_3(
           this,
           Invocation.method(
             #callServiceExtension,
@@ -1852,6 +1991,44 @@ class MockVmService extends _i1.Mock implements _i2.VmService {
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
 
+  @override
+  _i3.Future<T> wrapFuture<T>(
+    String? name,
+    _i3.Future<T>? future,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #wrapFuture,
+          [
+            name,
+            future,
+          ],
+        ),
+        returnValue: _i4.ifNotNull(
+              _i4.dummyValueOrNull<T>(
+                this,
+                Invocation.method(
+                  #wrapFuture,
+                  [
+                    name,
+                    future,
+                  ],
+                ),
+              ),
+              (T v) => _i3.Future<T>.value(v),
+            ) ??
+            _FakeFuture_32<T>(
+              this,
+              Invocation.method(
+                #wrapFuture,
+                [
+                  name,
+                  future,
+                ],
+              ),
+            ),
+      ) as _i3.Future<T>);
+
   @override
   void registerServiceCallback(
     String? service,