diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index df56439924..0b4c7604b8 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "3356202fbe210e70d1f9dc508af889a6",
+  "checksum": "804c98b9fd10b23b01308934165c0419",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -119,7 +119,7 @@
       "overrides": [],
       "dependencies": [
         "revery@github:revery-ui/revery#d2e614a@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
         "@onivim/reason-native-crash-utils@1.0.1@d41d8cd9",
         "@glennsl/timber@1.2.0@d41d8cd9"
@@ -453,13 +453,13 @@
       "dependencies": [ "graceful-fs@4.2.4@d41d8cd9" ],
       "devDependencies": []
     },
-    "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9": {
-      "id": "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+    "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9": {
+      "id": "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
       "name": "isolinear",
-      "version": "github:revery-ui/isolinear#8cad3b0",
+      "version": "github:revery-ui/isolinear#53fc4eb",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/isolinear#8cad3b0" ]
+        "source": [ "github:revery-ui/isolinear#53fc4eb" ]
       },
       "overrides": [],
       "dependencies": [
@@ -943,7 +943,7 @@
         "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
         "ocaml@4.10.0@d41d8cd9", "libvim@8.10869.59@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "esy-tree-sitter@1.4.1@d41d8cd9",
         "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9",
         "esy-sdl2@2.0.10008@d41d8cd9",
@@ -1209,7 +1209,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1238,7 +1238,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1267,7 +1267,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1351,20 +1351,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "bench.esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "bench.esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
@@ -1524,7 +1524,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -1611,7 +1611,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -1662,7 +1662,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -2998,7 +2998,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/lwt@opam:4.5.0@542100aa", "@opam/fmt@opam:0.8.8@01c3a23c",
@@ -3190,7 +3190,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
@@ -3236,7 +3236,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -3698,7 +3698,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -4006,7 +4006,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
diff --git a/bench.esy.lock/opam/topkg.1.0.2/opam b/bench.esy.lock/opam/topkg.1.0.3/opam
similarity index 97%
rename from bench.esy.lock/opam/topkg.1.0.2/opam
rename to bench.esy.lock/opam/topkg.1.0.3/opam
index 292792ebdf..6e073a114b 100644
--- a/bench.esy.lock/opam/topkg.1.0.2/opam
+++ b/bench.esy.lock/opam/topkg.1.0.3/opam
@@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
 }
diff --git a/esy.lock/index.json b/esy.lock/index.json
index b1bd659562..765b11f110 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "3356202fbe210e70d1f9dc508af889a6",
+  "checksum": "804c98b9fd10b23b01308934165c0419",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -119,7 +119,7 @@
       "overrides": [],
       "dependencies": [
         "revery@github:revery-ui/revery#d2e614a@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
         "@onivim/reason-native-crash-utils@1.0.1@d41d8cd9",
         "@glennsl/timber@1.2.0@d41d8cd9"
@@ -453,13 +453,13 @@
       "dependencies": [ "graceful-fs@4.2.4@d41d8cd9" ],
       "devDependencies": []
     },
-    "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9": {
-      "id": "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+    "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9": {
+      "id": "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
       "name": "isolinear",
-      "version": "github:revery-ui/isolinear#8cad3b0",
+      "version": "github:revery-ui/isolinear#53fc4eb",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/isolinear#8cad3b0" ]
+        "source": [ "github:revery-ui/isolinear#53fc4eb" ]
       },
       "overrides": [],
       "dependencies": [
@@ -942,7 +942,7 @@
         "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
         "ocaml@4.10.0@d41d8cd9", "libvim@8.10869.59@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "esy-tree-sitter@1.4.1@d41d8cd9",
         "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9",
         "esy-sdl2@2.0.10008@d41d8cd9",
@@ -1208,7 +1208,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1237,7 +1237,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1266,7 +1266,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1350,20 +1350,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
@@ -1523,7 +1523,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -1610,7 +1610,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -1661,7 +1661,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -2997,7 +2997,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/lwt@opam:4.5.0@542100aa", "@opam/fmt@opam:0.8.8@01c3a23c",
@@ -3189,7 +3189,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
@@ -3235,7 +3235,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -3697,7 +3697,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -4005,7 +4005,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
diff --git a/esy.lock/opam/topkg.1.0.2/opam b/esy.lock/opam/topkg.1.0.3/opam
similarity index 97%
rename from esy.lock/opam/topkg.1.0.2/opam
rename to esy.lock/opam/topkg.1.0.3/opam
index 292792ebdf..6e073a114b 100644
--- a/esy.lock/opam/topkg.1.0.2/opam
+++ b/esy.lock/opam/topkg.1.0.3/opam
@@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
 }
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index ec32049863..fab584f0a0 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "3356202fbe210e70d1f9dc508af889a6",
+  "checksum": "804c98b9fd10b23b01308934165c0419",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -119,7 +119,7 @@
       "overrides": [],
       "dependencies": [
         "revery@github:revery-ui/revery#d2e614a@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
         "@onivim/reason-native-crash-utils@1.0.1@d41d8cd9",
         "@glennsl/timber@1.2.0@d41d8cd9"
@@ -453,13 +453,13 @@
       "dependencies": [ "graceful-fs@4.2.4@d41d8cd9" ],
       "devDependencies": []
     },
-    "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9": {
-      "id": "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+    "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9": {
+      "id": "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
       "name": "isolinear",
-      "version": "github:revery-ui/isolinear#8cad3b0",
+      "version": "github:revery-ui/isolinear#53fc4eb",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/isolinear#8cad3b0" ]
+        "source": [ "github:revery-ui/isolinear#53fc4eb" ]
       },
       "overrides": [],
       "dependencies": [
@@ -942,7 +942,7 @@
         "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
         "ocaml@4.10.0@d41d8cd9", "libvim@8.10869.59@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "esy-tree-sitter@1.4.1@d41d8cd9",
         "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9",
         "esy-sdl2@2.0.10008@d41d8cd9",
@@ -1208,7 +1208,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1237,7 +1237,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1266,7 +1266,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1350,20 +1350,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "integrationtest.esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "integrationtest.esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
@@ -1523,7 +1523,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -1610,7 +1610,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -1661,7 +1661,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -2998,7 +2998,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/lwt@opam:4.5.0@542100aa", "@opam/fmt@opam:0.8.8@01c3a23c",
@@ -3190,7 +3190,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
@@ -3236,7 +3236,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -3698,7 +3698,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -4006,7 +4006,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
diff --git a/integrationtest.esy.lock/opam/topkg.1.0.2/opam b/integrationtest.esy.lock/opam/topkg.1.0.3/opam
similarity index 97%
rename from integrationtest.esy.lock/opam/topkg.1.0.2/opam
rename to integrationtest.esy.lock/opam/topkg.1.0.3/opam
index 292792ebdf..6e073a114b 100644
--- a/integrationtest.esy.lock/opam/topkg.1.0.2/opam
+++ b/integrationtest.esy.lock/opam/topkg.1.0.3/opam
@@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
 }
diff --git a/package.json b/package.json
index 5540420d0d..9e0c9b9556 100644
--- a/package.json
+++ b/package.json
@@ -260,7 +260,7 @@
     "esy-skia": "revery-ui/esy-skia#a3785f9",
     "rench": "bryphe/rench#a976fe5",
     "reasonFuzz": "CrossR/reasonFuzz#1ad6f5d",
-    "isolinear": "revery-ui/isolinear#8cad3b0",
+    "isolinear": "revery-ui/isolinear#53fc4eb",
     "revery-terminal": "revery-ui/revery-terminal#37e19a3",
     "@opam/fs": "bryphe/reason-native:fs.opam#fd0225c",
     "@opam/fp": "bryphe/reason-native:fp.opam#fd0225c",
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index 388254db49..8080012e4f 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "3356202fbe210e70d1f9dc508af889a6",
+  "checksum": "804c98b9fd10b23b01308934165c0419",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -119,7 +119,7 @@
       "overrides": [],
       "dependencies": [
         "revery@github:revery-ui/revery#d2e614a@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
         "@onivim/reason-native-crash-utils@1.0.1@d41d8cd9",
         "@glennsl/timber@1.2.0@d41d8cd9"
@@ -453,13 +453,13 @@
       "dependencies": [ "graceful-fs@4.2.4@d41d8cd9" ],
       "devDependencies": []
     },
-    "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9": {
-      "id": "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+    "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9": {
+      "id": "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
       "name": "isolinear",
-      "version": "github:revery-ui/isolinear#8cad3b0",
+      "version": "github:revery-ui/isolinear#53fc4eb",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/isolinear#8cad3b0" ]
+        "source": [ "github:revery-ui/isolinear#53fc4eb" ]
       },
       "overrides": [],
       "dependencies": [
@@ -942,7 +942,7 @@
         "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
         "ocaml@4.10.0@d41d8cd9", "libvim@8.10869.59@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "esy-tree-sitter@1.4.1@d41d8cd9",
         "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9",
         "esy-sdl2@2.0.10008@d41d8cd9",
@@ -1208,7 +1208,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1237,7 +1237,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1266,7 +1266,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1350,20 +1350,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "release.esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "release.esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
@@ -1523,7 +1523,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -1610,7 +1610,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -1661,7 +1661,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -2997,7 +2997,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/lwt@opam:4.5.0@542100aa", "@opam/fmt@opam:0.8.8@01c3a23c",
@@ -3189,7 +3189,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
@@ -3235,7 +3235,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -3697,7 +3697,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -4005,7 +4005,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
diff --git a/release.esy.lock/opam/topkg.1.0.2/opam b/release.esy.lock/opam/topkg.1.0.3/opam
similarity index 97%
rename from release.esy.lock/opam/topkg.1.0.2/opam
rename to release.esy.lock/opam/topkg.1.0.3/opam
index 292792ebdf..6e073a114b 100644
--- a/release.esy.lock/opam/topkg.1.0.2/opam
+++ b/release.esy.lock/opam/topkg.1.0.3/opam
@@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
 }
diff --git a/src/Feature/Extensions/Model.re b/src/Feature/Extensions/Model.re
index d43a80c732..fc19b571a9 100644
--- a/src/Feature/Extensions/Model.re
+++ b/src/Feature/Extensions/Model.re
@@ -583,7 +583,6 @@ let update = (~extHostClient, msg, model) => {
         | Some(focus) => (focus, Nothing)
         }
 
-      // TODO
       | PreviousTab
       | NextTab => (focusedWindow, Nothing)
       };
diff --git a/src/Service/Exthost/Service_Exthost.re b/src/Service/Exthost/Service_Exthost.re
index 7b95523cb7..d9d43ff3a7 100644
--- a/src/Service/Exthost/Service_Exthost.re
+++ b/src/Service/Exthost/Service_Exthost.re
@@ -269,24 +269,6 @@ module Internal = {
     };
 };
 
-// This is a temporary helper to avoid dispatching after a subscription is disposed
-// Really, this needs to be baked into isolinear - we should not ignore dispatches that
-// occur in the context of a disposed description. However - at this point in this release,
-// it's risky, so we'll scope it to just some of the new subscriptions.
-module Latch = {
-  type state =
-    | Open
-    | Closed;
-
-  type t = ref(state);
-
-  let create = () => ref(Open);
-
-  let isOpen = latch => latch^ == Open;
-
-  let close = latch => latch := Closed;
-};
-
 // SUBSCRIPTIONS
 
 module Sub = {
@@ -592,7 +574,7 @@ module Sub = {
       type nonrec msg = list(Exthost.DefinitionLink.t);
       type nonrec params = bufferPositionParams;
 
-      type state = {latch: Latch.t};
+      type state = unit;
 
       let name = "Service_Exthost.DefinitionSubscription";
       let id = ({handle, buffer, position, _}: bufferPositionParams) =>
@@ -612,27 +594,17 @@ module Sub = {
             params.client,
           );
 
-        let latch = Latch.create();
+        Lwt.on_success(promise, definitionLinks => dispatch(definitionLinks));
 
-        Lwt.on_success(promise, definitionLinks =>
-          if (Latch.isOpen(latch)) {
-            dispatch(definitionLinks);
-          }
-        );
+        Lwt.on_failure(promise, _ => dispatch([]));
 
-        Lwt.on_failure(promise, _ =>
-          if (Latch.isOpen(latch)) {
-            dispatch([]);
-          }
-        );
-
-        {latch: latch};
+        ();
       };
 
       let update = (~params as _, ~state, ~dispatch as _) => state;
 
-      let dispose = (~params as _, ~state) => {
-        Latch.close(state.latch);
+      let dispose = (~params as _, ~state as _) => {
+        ();
       };
     });
 
@@ -647,7 +619,7 @@ module Sub = {
       type nonrec msg = list(Exthost.DocumentHighlight.t);
       type nonrec params = bufferPositionParams;
 
-      type state = {latch: Latch.t};
+      type state = unit;
 
       let name = "Service_Exthost.DocumentHighlightsSubscription";
       let id = ({handle, buffer, position, _}) =>
@@ -667,27 +639,19 @@ module Sub = {
             params.client,
           );
 
-        let latch = Latch.create();
-
         Lwt.on_success(promise, documentHighlights =>
-          if (Latch.isOpen(latch)) {
-            dispatch(documentHighlights);
-          }
+          dispatch(documentHighlights)
         );
 
-        Lwt.on_failure(promise, _ =>
-          if (Latch.isOpen(latch)) {
-            dispatch([]);
-          }
-        );
+        Lwt.on_failure(promise, _ => dispatch([]));
 
-        {latch: latch};
+        ();
       };
 
       let update = (~params as _, ~state, ~dispatch as _) => state;
 
-      let dispose = (~params as _, ~state) => {
-        Latch.close(state.latch);
+      let dispose = (~params as _, ~state as _) => {
+        ();
       };
     });
 
@@ -710,7 +674,7 @@ module Sub = {
       type nonrec msg = result(Exthost.SuggestResult.t, string);
       type nonrec params = completionParams;
 
-      type state = {latch: Latch.t};
+      type state = unit;
 
       let name = "Service_Exthost.CompletionSubscription";
       let id = ({handle, buffer, position, _}: params) =>
@@ -731,27 +695,21 @@ module Sub = {
             params.client,
           );
 
-        let latch = Latch.create();
-
         Lwt.on_success(promise, suggestResult =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Ok(suggestResult));
-          }
+          dispatch(Ok(suggestResult))
         );
 
         Lwt.on_failure(promise, exn =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Error(Printexc.to_string(exn)));
-          }
+          dispatch(Error(Printexc.to_string(exn)))
         );
 
-        {latch: latch};
+        ();
       };
 
       let update = (~params as _, ~state, ~dispatch as _) => state;
 
-      let dispose = (~params as _, ~state) => {
-        Latch.close(state.latch);
+      let dispose = (~params as _, ~state as _) => {
+        ();
       };
     });
   let completionItems =
@@ -774,7 +732,7 @@ module Sub = {
       type nonrec msg = result(Exthost.SuggestItem.t, string);
       type nonrec params = completionItemParams;
 
-      type state = {latch: Latch.t};
+      type state = unit;
 
       let name = "Service_Exthost.CompletionItemSubscription";
       let id = ({handle, chainedCacheId, _}: params) =>
@@ -788,27 +746,19 @@ module Sub = {
             params.client,
           );
 
-        let latch = Latch.create();
-
-        Lwt.on_success(promise, suggestItem =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Ok(suggestItem));
-          }
-        );
+        Lwt.on_success(promise, suggestItem => dispatch(Ok(suggestItem)));
 
         Lwt.on_failure(promise, exn =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Error(Printexc.to_string(exn)));
-          }
+          dispatch(Error(Printexc.to_string(exn)))
         );
 
-        {latch: latch};
+        ();
       };
 
       let update = (~params as _, ~state, ~dispatch as _) => state;
 
-      let dispose = (~params as _, ~state) => {
-        Latch.close(state.latch);
+      let dispose = (~params as _, ~state as _) => {
+        ();
       };
     });
   let completionItem = (~handle, ~chainedCacheId, ~toMsg, client) => {
diff --git a/src/Service/OS/Service_OS.re b/src/Service/OS/Service_OS.re
index c8de295ba2..82df968448 100644
--- a/src/Service/OS/Service_OS.re
+++ b/src/Service/OS/Service_OS.re
@@ -266,24 +266,6 @@ module Effect = {
 // SUBSCRIPTIONS
 
 module Sub = {
-  // This is a temporary helper to avoid dispatching after a subscription is disposed
-  // Really, this needs to be baked into isolinear - we should not ignore dispatches that
-  // occur in the context of a disposed description. However - at this point in this release,
-  // it's risky, so we'll scope it to just some of the new subscriptions.
-  module Latch = {
-    type state =
-      | Open
-      | Closed;
-
-    type t = ref(state);
-
-    let create = () => ref(Open);
-
-    let isOpen = latch => latch^ == Open;
-
-    let close = latch => latch := Closed;
-  };
-
   type dirParams = {
     id: string,
     cwd: string,
@@ -294,7 +276,7 @@ module Sub = {
 
       type nonrec params = dirParams;
 
-      type state = Latch.t;
+      type state = unit;
 
       let name = "Service_OS.Sub.dir";
       let id = ({id, cwd}) => id ++ cwd;
@@ -302,29 +284,21 @@ module Sub = {
       let init = (~params, ~dispatch) => {
         let promise = Api.readdir(params.cwd);
 
-        let latch = Latch.create();
-
-        Lwt.on_success(promise, dirItems =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Ok(dirItems));
-          }
-        );
+        Lwt.on_success(promise, dirItems => dispatch(Ok(dirItems)));
 
         Lwt.on_failure(promise, exn =>
-          if (Latch.isOpen(latch)) {
-            dispatch(Error(Printexc.to_string(exn)));
-          }
+          dispatch(Error(Printexc.to_string(exn)))
         );
 
-        latch;
+        ();
       };
 
       let update = (~params as _, ~state, ~dispatch as _) => {
         state;
       };
 
-      let dispose = (~params as _, ~state) => {
-        Latch.close(state);
+      let dispose = (~params as _, ~state as _) => {
+        ();
       };
     });
   let dir = (~uniqueId, ~toMsg, path) => {
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index d7bc8ec01b..3ea4279267 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "3d5d661b3b6b2c335973a06de15c607e",
+  "checksum": "e2542ee9abb3fe1d47bb49fd58967c23",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -119,7 +119,7 @@
       "overrides": [],
       "dependencies": [
         "revery@github:revery-ui/revery#d2e614a@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
         "@onivim/reason-native-crash-utils@1.0.1@d41d8cd9",
         "@glennsl/timber@1.2.0@d41d8cd9"
@@ -453,13 +453,13 @@
       "dependencies": [ "graceful-fs@4.2.4@d41d8cd9" ],
       "devDependencies": []
     },
-    "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9": {
-      "id": "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+    "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9": {
+      "id": "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
       "name": "isolinear",
-      "version": "github:revery-ui/isolinear#8cad3b0",
+      "version": "github:revery-ui/isolinear#53fc4eb",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/isolinear#8cad3b0" ]
+        "source": [ "github:revery-ui/isolinear#53fc4eb" ]
       },
       "overrides": [],
       "dependencies": [
@@ -942,7 +942,7 @@
         "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
         "ocaml@4.10.0@d41d8cd9", "libvim@8.10869.59@d41d8cd9",
-        "isolinear@github:revery-ui/isolinear#8cad3b0@d41d8cd9",
+        "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "esy-tree-sitter@1.4.1@d41d8cd9",
         "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9",
         "esy-sdl2@2.0.10008@d41d8cd9",
@@ -1209,7 +1209,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1238,7 +1238,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1267,7 +1267,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
@@ -1351,20 +1351,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "test.esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "test.esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
@@ -1524,7 +1524,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -1611,7 +1611,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -1662,7 +1662,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -2998,7 +2998,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/lwt@opam:4.5.0@542100aa", "@opam/fmt@opam:0.8.8@01c3a23c",
@@ -3190,7 +3190,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
@@ -3236,7 +3236,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -3698,7 +3698,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -4006,7 +4006,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
diff --git a/test.esy.lock/opam/topkg.1.0.2/opam b/test.esy.lock/opam/topkg.1.0.2/opam
deleted file mode 100644
index 292792ebdf..0000000000
--- a/test.esy.lock/opam/topkg.1.0.2/opam
+++ /dev/null
@@ -1,48 +0,0 @@
-opam-version: "2.0"
-maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
-homepage: "http://erratique.ch/software/topkg"
-doc: "http://erratique.ch/software/topkg/doc"
-license: "ISC"
-dev-repo: "git+http://erratique.ch/repos/topkg.git"
-bug-reports: "https://github.com/dbuenzli/topkg/issues"
-tags: ["packaging" "ocamlbuild" "org:erratique"]
-depends: [
-  "ocaml" {>= "4.03.0"}
-  "ocamlfind" {build & >= "1.6.1"}
-  "ocamlbuild" ]
-build: [[
-  "ocaml" "pkg/pkg.ml" "build"
-          "--pkg-name" name
-          "--dev-pkg" "%{pinned}%" ]]
-synopsis: """The transitory OCaml software packager"""
-description: """\
-
-Topkg is a packager for distributing OCaml software. It provides an
-API to describe the files a package installs in a given build
-configuration and to specify information about the package's
-distribution, creation and publication procedures.
-
-The optional topkg-care package provides the `topkg` command line tool
-which helps with various aspects of a package's life cycle: creating
-and linting a distribution, releasing it on the WWW, publish its
-documentation, add it to the OCaml opam repository, etc.
-
-Topkg is distributed under the ISC license and has **no**
-dependencies. This is what your packages will need as a *build*
-dependency.
-
-Topkg-care is distributed under the ISC license it depends on
-[fmt][fmt], [logs][logs], [bos][bos], [cmdliner][cmdliner],
-[webbrowser][webbrowser] and `opam-format`.
-
-[fmt]: http://erratique.ch/software/fmt
-[logs]: http://erratique.ch/software/logs
-[bos]: http://erratique.ch/software/bos
-[cmdliner]: http://erratique.ch/software/cmdliner
-[webbrowser]: http://erratique.ch/software/webbrowser
-"""
-url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
-}
diff --git a/test.esy.lock/opam/topkg.1.0.3/opam b/test.esy.lock/opam/topkg.1.0.3/opam
new file mode 100644
index 0000000000..6e073a114b
--- /dev/null
+++ b/test.esy.lock/opam/topkg.1.0.3/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
+homepage: "http://erratique.ch/software/topkg"
+doc: "http://erratique.ch/software/topkg/doc"
+license: "ISC"
+dev-repo: "git+http://erratique.ch/repos/topkg.git"
+bug-reports: "https://github.com/dbuenzli/topkg/issues"
+tags: ["packaging" "ocamlbuild" "org:erratique"]
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "ocamlfind" {build & >= "1.6.1"}
+  "ocamlbuild" ]
+build: [[
+  "ocaml" "pkg/pkg.ml" "build"
+          "--pkg-name" name
+          "--dev-pkg" "%{pinned}%" ]]
+synopsis: """The transitory OCaml software packager"""
+description: """\
+
+Topkg is a packager for distributing OCaml software. It provides an
+API to describe the files a package installs in a given build
+configuration and to specify information about the package's
+distribution, creation and publication procedures.
+
+The optional topkg-care package provides the `topkg` command line tool
+which helps with various aspects of a package's life cycle: creating
+and linting a distribution, releasing it on the WWW, publish its
+documentation, add it to the OCaml opam repository, etc.
+
+Topkg is distributed under the ISC license and has **no**
+dependencies. This is what your packages will need as a *build*
+dependency.
+
+Topkg-care is distributed under the ISC license it depends on
+[fmt][fmt], [logs][logs], [bos][bos], [cmdliner][cmdliner],
+[webbrowser][webbrowser] and `opam-format`.
+
+[fmt]: http://erratique.ch/software/fmt
+[logs]: http://erratique.ch/software/logs
+[bos]: http://erratique.ch/software/bos
+[cmdliner]: http://erratique.ch/software/cmdliner
+[webbrowser]: http://erratique.ch/software/webbrowser
+"""
+url {
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
+}