ensure metrics is interruptible

package.json

@@ -135,15 +135,15 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",
-    "@effect/experimental": "^0.9.10",
+    "@effect/experimental": "^0.9.11",
     "@effect/language-service": "^0.1.0",
     "@types/mocha": "^10.0.6",
     "@types/node": "~20.11.17",
     "@types/vscode": "^1.84.0",
     "@types/ws": "^8.5.10",
     "@vscode/test-electron": "^2.3.9",
     "@vscode/vsce": "^2.23.0",
-    "effect": "2.3.5",
+    "effect": "2.3.6",
     "glob": "^10.3.10",
     "mocha": "^10.3.0",
     "prettier": "^3.2.5",

src/Clients.ts

@@ -20,8 +20,10 @@ import {
   registerCommand,
 } from "./VsCode"
 import * as FiberMap from "effect/FiberMap"
+import * as Equal from "effect/Equal"
+import * as Hash from "effect/Hash"
 
-export interface Client {
+export interface Client extends Equal.Equal {
   readonly id: number
   readonly spans: Queue.Dequeue<Domain.Span>
   readonly metrics: Queue.Dequeue<Domain.MetricsSnapshot>
@@ -105,6 +107,12 @@ const runServer = Effect.gen(function* (_) {
         spans,
         metrics,
         requestMetrics: serverClient.request({ _tag: "MetricsRequest" }),
+        [Equal.symbol](that: Client) {
+          return id === that.id
+        },
+        [Hash.symbol]() {
+          return Hash.number(id)
+        },
       }
       yield* _(
         Effect.acquireRelease(
@@ -116,7 +124,7 @@ const runServer = Effect.gen(function* (_) {
         Effect.acquireRelease(
           SubscriptionRef.update(
             activeClient,
-            Option.orElse(() => Option.some(client)),
+            Option.orElseSome(() => client),
           ),
           () =>
             SubscriptionRef.update(

src/MetricsProvider.ts

@@ -67,12 +67,16 @@ export const MetricsProviderLive = treeDataProvider<TreeNode>("effect-metrics")(
 
       yield* _(
         clients.activeClient.changes,
+        Stream.changes,
         Stream.tap(_ => (Option.isSome(_) ? reset : Effect.unit)),
         Stream.runForEach(_ =>
           Option.match(_, {
             onNone: () => Effect.unit,
             onSome: client =>
-              ScopedRef.set(currentClient, handleClient(client)),
+              ScopedRef.set(
+                currentClient,
+                Effect.interruptible(handleClient(client)),
+              ),
           }),
         ),
         Effect.forkScoped,