diff --git a/packages/core/src/mcp/index.ts b/packages/core/src/mcp/index.ts index d9e5532640b..4d548c49a8f 100644 --- a/packages/core/src/mcp/index.ts +++ b/packages/core/src/mcp/index.ts @@ -181,6 +181,9 @@ export const layer = (options?: Options) => const credentials = yield* Credential.Service const root = yield* Effect.scope const fork = yield* FiberSet.makeRuntime() + // Server scopes close in parallel on shutdown, so one slow server's stop grace does not delay + // the rest past a service restart's kill deadline and leave them orphaned. + const servers = yield* Scope.fork(root, "parallel") const entries = new Map() const attached = new Map() @@ -451,7 +454,7 @@ export const layer = (options?: Options) => // disabled/failed status for the duration of the connection attempt. entry.status = { status: "pending" } yield* bus.publish(McpEvent.StatusChanged, { server: name }) - const scope = yield* Scope.fork(root) + const scope = yield* Scope.fork(servers) entry.scope = scope const authProvider = yield* connectProvider(entry) const { McpClient } = yield* Effect.promise(() => import("./client.js"))