Merge remote-tracking branch 'origin/codex/effect-lint-cloud-mcp-worker-transport' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit 85ff2a72 parents a8c4b45 15b056b1 file · +23 −15Browse files

Unified · Split

apps/cloud/src/services/mcp-worker-transport.ts+23−15

 import { WorkerTransport, type WorkerTransportOptions } from "agents/mcp";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { Data, Effect } from "effect";
+import { Data, Effect, Exit } from "effect";
 export class McpWorkerTransportError extends Data.TaggedError("McpWorkerTransportError")<{
   readonly cause: unknown;
   const contentType = request.headers.get("content-type") ?? "";
   if (!contentType.includes("application/json")) return [];
-  try {
+  const parsed = await Effect.runPromiseExit(
-    const parsed = (await request.clone().json()) as unknown;
+    Effect.tryPromise(() => request.clone().json()),
-    const messages = Array.isArray(parsed) ? parsed : [parsed];
+  );
-    return messages.flatMap((message) => {
+  if (Exit.isFailure(parsed)) {
-      if (!message || typeof message !== "object") return [];
-      const rpc = message as JsonRpcLike;
-      if (typeof rpc.method !== "string") return [];
-      const key = jsonRpcRequestIdKey(rpc.id);
-      return key ? [key] : [];
-    });
-  } catch {
     return [];
   }
+  const messages = Array.isArray(parsed.value) ? parsed.value : [parsed.value];
+  return messages.flatMap((message) => {
+    if (!message || typeof message !== "object") return [];
+    const rpc = message as JsonRpcLike;
+    if (typeof rpc.method !== "string") return [];
+    const key = jsonRpcRequestIdKey(rpc.id);
+    return key ? [key] : [];
+  });
 };
 // Hard ceiling on how long a same-id JSON-RPC request will wait for an
       this.inFlight.set(id, current);
     }
+    // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: promise queue must release in-flight ids after callback completion
     try {
       if (previous.length > 0) {
-        const settled = Promise.all(previous.map((p) => p.catch(() => undefined)));
+        const settled = Promise.all(
+          previous.map((p) => Effect.runPromise(Effect.ignore(Effect.tryPromise(() => p)))),
+        );
         const timeout = new Promise<"timeout">((resolve) =>
           setTimeout(() => resolve("timeout"), this.previousTimeoutMs),
         );
           return result.response;
         }),
       close: () =>
-        Effect.promise(() => transport.close().catch(() => undefined)).pipe(
+        Effect.ignore(
+          Effect.tryPromise({
+            try: () => transport.close(),
+            catch: (cause) => new McpWorkerTransportError({ cause }),
+          }),
+        ).pipe(
           Effect.withSpan("mcp.worker_transport.close"),
-          Effect.orDie,
         ),
     } satisfies McpWorkerTransport;
   }).pipe(Effect.withSpan("mcp.worker_transport.make"));