@opencode/core 0.0.0-dev-19967 → 0.0.0-dev-19969

package/dist/chunks/{aisdk-native-61jzsvxp.js → instance-cmev2171.js}

@@ -1,31 +1,31 @@
 import {
-  Key4,
+  Key3,
   removed2,
   make21,
   diffByKey2
-} from "./aisdk-native-eaj1djv9.js";
+} from "./instance-s8d7rejh.js";
 import {
   evaluate2
-} from "./aisdk-native-388d2z2c.js";
+} from "./instance-qm610anm.js";
 import {
-  Service39,
-  node42
-} from "./aisdk-native-48ysqhtp.js";
+  Service42,
+  node45
+} from "./instance-kmz07ghj.js";
 import {
   namespace2,
-  name14
-} from "./aisdk-native-74j38777.js";
+  name13
+} from "./instance-y3krmexz.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/mcp/instructions.ts
-var exports_instructions5 = {};
-__export(exports_instructions5, {
-  McpInstructions: () => exports_instructions5,
-  Service: () => Service37,
-  layer: () => layer13,
-  node: () => node40
+var exports_instructions3 = {};
+__export(exports_instructions3, {
+  McpInstructions: () => exports_instructions3,
+  Service: () => Service34,
+  layer: () => layer12,
+  node: () => node38
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -61,14 +61,14 @@ var update = (previous, current) => {
 `);
 };
 
-class Service37 extends Context.Service()("@opencode/McpInstructions") {
+class Service34 extends Context.Service()("@opencode/McpInstructions") {
 }
-var layer13 = Layer.effect(Service37, Effect.gen(function* () {
-  const mcp = yield* Service39;
-  return Service37.of({
+var layer12 = Layer.effect(Service34, Effect.gen(function* () {
+  const mcp = yield* Service42;
+  return Service34.of({
     load: Effect.fn("McpInstructions.load")(function* (permissions) {
       const source = (value) => make21({
-        key: Key4.make("core/mcp-guidance"),
+        key: Key3.make("core/mcp-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),
         read: Effect.succeed(value),
         render: {
@@ -86,7 +86,7 @@ var layer13 = Layer.effect(Service37, Effect.gen(function* () {
         const codemode = owned[0]?.codemode !== false;
         if (codemode && !canExecute)
           return [];
-        if (!owned.some((tool) => evaluate2(name14(tool.server, tool.name), "*", permissions).effect !== "deny"))
+        if (!owned.some((tool) => evaluate2(name13(tool.server, tool.name), "*", permissions).effect !== "deny"))
           return [];
         return [
           codemode ? { server: item.server, instructions: item.instructions } : { server: item.server, instructions: item.instructions, codemode: false }
@@ -96,6 +96,6 @@ var layer13 = Layer.effect(Service37, Effect.gen(function* () {
     })
   });
 }));
-var node40 = makeLocationNode({ service: Service37, layer: layer13, deps: [node42] });
+var node38 = makeLocationNode({ service: Service34, layer: layer12, deps: [node45] });
 
-export { Service37, layer13, node40, exports_instructions5 };
+export { Service34, layer12, node38, exports_instructions3 };

package/dist/chunks/{aisdk-native-yzft7j2c.js → instance-d04atdpy.js}

@@ -1,21 +1,21 @@
 import {
-  ID8,
+  ID13,
   isAISDK2,
   packageName2,
   mergeOverlay2
-} from "./aisdk-native-pz9d297f.js";
+} from "./instance-4wkp449m.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/aisdk.ts
 var exports_aisdk = {};
 __export(exports_aisdk, {
   AISDK: () => exports_aisdk,
   InitError: () => InitError2,
-  Service: () => Service54,
+  Service: () => Service74,
   locationLayer: () => locationLayer2,
-  node: () => node56
+  node: () => node78
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { APICallError } from "@ai-sdk/provider";
@@ -33,6 +33,8 @@ import { Auth, Endpoint, RequestExecutor } from "@opencode/ai/route";
 import { ProviderShared } from "@opencode/ai/protocols/shared";
 import { Cause, Context, Effect, Layer, Option, Schema, Scope, Stream } from "effect";
 import { makeParser } from "effect/unstable/encoding/Sse";
+import { HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+import { AsyncLocalStorage } from "node:async_hooks";
 var decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown));
 function wrapSSE(res, ms, ctl) {
   if (typeof ms !== "number" || ms <= 0)
@@ -118,19 +120,38 @@ function prepareOptions(model, pkg) {
         opts.body = JSON.stringify(mergeOverlay2(decoded, model.body));
       }
     }
-    const res = await (typeof customFetch === "function" ? customFetch : fetch)(input, {
-      ...opts,
-      timeout: false
-    });
+    const send = typeof customFetch === "function" ? customFetch : fetch;
+    const middleware = httpMiddleware.getStore();
+    const res = middleware ? await throughMiddleware(middleware, send, input, { ...opts, timeout: false }) : await send(input, { ...opts, timeout: false });
     if (!chunkAbortCtl || typeof chunkTimeout !== "number")
       return res;
     return wrapSSE(res, chunkTimeout, chunkAbortCtl);
   };
   return options;
 }
+var httpMiddleware = new AsyncLocalStorage;
+function throughMiddleware(store, send, input, init) {
+  const toError = (cause) => cause instanceof Error ? cause : new Error(String(cause));
+  const request = input instanceof Request ? new Request(input, init) : new Request(String(input), init);
+  return Effect.runPromiseWith(store.context)(Effect.gen(function* () {
+    const body = request.body ? new Uint8Array(yield* Effect.promise(() => request.arrayBuffer())) : undefined;
+    const response = yield* store.http(body ? HttpClientRequest.bodyUint8Array(HttpClientRequest.fromWeb(request), body, request.headers.get("content-type") ?? undefined) : HttpClientRequest.fromWeb(request), (sent) => Effect.gen(function* () {
+      const web = yield* HttpClientRequest.toWeb(sent);
+      const response = yield* Effect.tryPromise(async () => send(web.url, {
+        ...init,
+        method: web.method,
+        headers: web.headers,
+        body: web.body ? await web.arrayBuffer() : undefined
+      }));
+      return HttpClientResponse.fromWeb(sent, response);
+    }).pipe(Effect.mapError(toError)));
+    const stream = [204, 205, 304].includes(response.status) ? null : yield* Stream.toReadableStreamEffect(response.stream);
+    return new Response(stream, { status: response.status, headers: response.headers });
+  }), { signal: init.signal ?? undefined });
+}
 
 class InitError2 extends Schema.TaggedError()("AISDK.InitError", {
-  providerID: ID8,
+  providerID: ID13,
   cause: Schema.Defect()
 }) {
 }
@@ -138,9 +159,9 @@ function initError(providerID) {
   return Effect.catchCause((cause) => Effect.fail(new InitError2({ providerID, cause: Cause.squash(cause) })));
 }
 
-class Service54 extends Context.Service()("@opencode/AISDK") {
+class Service74 extends Context.Service()("@opencode/AISDK") {
 }
-var locationLayer2 = Layer.effect(Service54, Effect.gen(function* () {
+var locationLayer2 = Layer.effect(Service74, Effect.gen(function* () {
   let sdkHooks = [];
   let languageHooks = [];
   const languages = new Map;
@@ -178,7 +199,7 @@ var locationLayer2 = Layer.effect(Service54, Effect.gen(function* () {
     }
     return event;
   });
-  const service = Service54.of({
+  const service = Service74.of({
     hook: {
       sdk: register(() => sdkHooks, (next) => sdkHooks = next),
       language: register(() => languageHooks, (next) => languageHooks = next)
@@ -269,7 +290,7 @@ function modelFromLanguage(info, language) {
     with: () => route,
     model: (input) => LanguageModel.make({ ...input, provider: "provider" in input ? input.provider : providerID, route }),
     prepareTransport: (body) => Effect.succeed(body),
-    streamPrepared: (prepared) => streamLanguage(language, prepared)
+    streamPrepared: (prepared, _request, _runtime, options) => streamLanguage(language, prepared, options?.http)
   };
   return LanguageModel.make({
     id: info.modelID ?? info.id,
@@ -547,11 +568,14 @@ function metadataProviderOptions(input) {
     return;
   return Object.fromEntries(Object.entries(input).map(([key, value]) => [key, jsonObject(value)]));
 }
-function streamLanguage(language, options) {
+function streamLanguage(language, options, http) {
   const state = { step: 0, toolNames: {} };
-  return Stream.concat(Stream.make(LLMEvent.stepStart({ index: state.step })), Stream.unwrap(Effect.tryPromise({
-    try: () => language.doStream(options),
-    catch: (error) => llmError(error, "request")
+  return Stream.concat(Stream.make(LLMEvent.stepStart({ index: state.step })), Stream.unwrap(Effect.gen(function* () {
+    const context = yield* Effect.context();
+    return yield* Effect.tryPromise({
+      try: () => http ? httpMiddleware.run({ http, context }, () => language.doStream(options)) : language.doStream(options),
+      catch: (error) => llmError(error, "request")
+    });
   }).pipe(Effect.map((result) => Stream.fromReadableStream({
     evaluate: () => result.stream,
     onError: (error) => llmError(error, "read")
@@ -819,6 +843,6 @@ function providerErrorMessage(error) {
   const prefix = error.statusCode === undefined ? "Provider request failed" : `Provider request failed with HTTP ${error.statusCode}`;
   return error.message.trim() !== "" ? error.message : message ?? (code === undefined ? prefix : `${prefix}: ${code}`);
 }
-var node56 = makeLocationNode({ service: Service54, layer: locationLayer2, deps: [] });
+var node78 = makeLocationNode({ service: Service74, layer: locationLayer2, deps: [] });
 
-export { InitError2, Service54, locationLayer2, node56, exports_aisdk };
+export { InitError2, Service74, locationLayer2, node78, exports_aisdk };

package/dist/chunks/{aisdk-native-djszqvmq.js → instance-d4he2qe1.js}

@@ -1,22 +1,22 @@
 import {
   create3
-} from "./aisdk-native-rdw6cm16.js";
+} from "./instance-rdw6cm16.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/filesystem/location-watcher-policy.ts
 var exports_location_watcher_policy = {};
 __export(exports_location_watcher_policy, {
   LocationWatcherPolicy: () => exports_location_watcher_policy,
-  Service: () => Service10,
-  node: () => node12
+  Service: () => Service8,
+  node: () => node10
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Scope } from "effect";
-class Service10 extends Context.Service()("@opencode/LocationWatcherPolicy") {
+class Service8 extends Context.Service()("@opencode/LocationWatcherPolicy") {
 }
-var layer = Layer.effect(Service10, Effect.gen(function* () {
+var layer = Layer.effect(Service8, Effect.gen(function* () {
   const listeners = new Set;
   const state = create3({
     name: "location-watcher-policy",
@@ -41,13 +41,13 @@ var layer = Layer.effect(Service10, Effect.gen(function* () {
     yield* Scope.addFinalizer(scope, dispose);
     return { dispose };
   });
-  return Service10.of({
+  return Service8.of({
     transform: state.transform,
     reload: state.reload,
     current,
     observe
   });
 }));
-var node12 = makeLocationNode({ service: Service10, layer, deps: [] });
+var node10 = makeLocationNode({ service: Service8, layer, deps: [] });
 
-export { Service10, node12, exports_location_watcher_policy };
+export { Service8, node10, exports_location_watcher_policy };

package/dist/chunks/{aisdk-native-349ehsbg.js → instance-d8emr1nn.js}

@@ -1,56 +1,56 @@
 import {
   Service83,
   node87
-} from "./aisdk-native-dksrmg0f.js";
+} from "./instance-3cerfjhm.js";
 import {
-  Event16,
-  Service66,
-  node69
-} from "./aisdk-native-s9nv257w.js";
+  Event20,
+  Service79,
+  node83
+} from "./instance-sy5mz7yq.js";
 import {
-  Service51,
-  node53
-} from "./aisdk-native-vfbypwep.js";
+  Service52,
+  node55
+} from "./instance-7v5zyxc4.js";
 import {
   AbsolutePath2
-} from "./aisdk-native-922hggd3.js";
+} from "./instance-922hggd3.js";
 import {
   Service80,
   node84
-} from "./aisdk-native-xjxbvrd9.js";
+} from "./instance-h3yahare.js";
 import {
   substitute2
-} from "./aisdk-native-yrznvahk.js";
+} from "./instance-yrznvahk.js";
 import {
   normalize2
-} from "./aisdk-native-mr1wt611.js";
+} from "./instance-evqvn1bq.js";
 import {
   names4,
   discover3
-} from "./aisdk-native-6qr5d6vh.js";
+} from "./instance-13wg6e4h.js";
 import {
   plan2
-} from "./aisdk-native-j56e64zr.js";
+} from "./instance-j56e64zr.js";
 import {
-  Service52,
-  Event9,
-  node54
-} from "./aisdk-native-p3snnar0.js";
+  Service53,
+  Event11,
+  node56
+} from "./instance-20emab4w.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/config.ts
 var exports_config = {};
 __export(exports_config, {
   Config: () => exports_config,
-  Options: () => Options5,
-  Service: () => Service50,
+  Options: () => Options7,
+  Service: () => Service51,
   Test: () => Test2,
-  configured: () => configured5,
+  configured: () => configured7,
   latest: () => latest2,
-  layer: () => layer19,
-  node: () => node52,
+  layer: () => layer17,
+  node: () => node54,
   testLayer: () => testLayer2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -64,14 +64,14 @@ import { Global } from "@opencode/util/global";
 function latest2(entries, key) {
   return entries.findLast((entry) => entry.type === "document" && entry.info[key] !== undefined)?.info[key];
 }
-var Options5 = Schema.Struct({
+var Options7 = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
   global: Schema.optional(Schema.Boolean),
   file: Schema.optional(Schema.String),
   content: Schema.optional(Schema.String)
 });
 
-class Service50 extends Context.Service()("@opencode/Config") {
+class Service51 extends Context.Service()("@opencode/Config") {
 }
 
 class Test2 extends Context.Service()("@opencode/Config/Test") {
@@ -89,16 +89,16 @@ var testLayer2 = (initial = [], compatibility = {
     setEntries: (next) => Ref.set(entries, next),
     emitChange: (update) => PubSub.publish(updates, update).pipe(Effect.asVoid)
   });
-  return Context.empty().pipe(Context.add(Service50, service), Context.add(Test2, service));
+  return Context.empty().pipe(Context.add(Service51, service), Context.add(Test2, service));
 }));
-var layer19 = (options) => Layer.effect(Service50, Effect.gen(function* () {
+var layer17 = (options) => Layer.effect(Service51, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const location = yield* Service80;
-  const watcher = yield* Service51;
+  const watcher = yield* Service52;
   const bus = yield* Service83;
-  const credentials = yield* Service66;
+  const credentials = yield* Service79;
   const globalService = yield* Global.Service;
-  const wellknown = yield* Service52;
+  const wellknown = yield* Service53;
   const reloadLock = Semaphore.makeUnsafe(1);
   const updateLock = Semaphore.makeUnsafe(1);
   const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" };
@@ -221,8 +221,8 @@ var layer19 = (options) => Layer.effect(Service50, Effect.gen(function* () {
   }, (effect) => reloadLock.withPermit(effect));
   const pendingReloads = yield* PubSub.subscribe(reloads);
   yield* Stream.fromSubscription(pendingReloads).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event16.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event9.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event20.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event11.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* Effect.sleep("10 minutes").pipe(Effect.andThen(Effect.suspend(() => {
     if (!wellknown.snapshot().length)
       return Effect.void;
@@ -250,7 +250,7 @@ var layer19 = (options) => Layer.effect(Service50, Effect.gen(function* () {
 `);
     yield* requestReload;
   }, (effect) => updateLock.withPermit(effect));
-  return Service50.of({
+  return Service51.of({
     entries: Effect.fnUntraced(function* () {
       return configs;
     }),
@@ -262,13 +262,13 @@ var layer19 = (options) => Layer.effect(Service50, Effect.gen(function* () {
     update
   });
 }));
-function configured5(options) {
+function configured7(options) {
   return makeLocationNode({
-    service: Service50,
-    layer: layer19(options),
-    deps: [node53, node87, FSUtil.node, Global.node, node84, node69, node54]
+    service: Service51,
+    layer: layer17(options),
+    deps: [node55, node87, FSUtil.node, Global.node, node84, node83, node56]
   });
 }
-var node52 = configured5();
+var node54 = configured7();
 
-export { latest2, Options5, Service50, Test2, testLayer2, layer19, configured5, node52, exports_config };
+export { latest2, Options7, Service51, Test2, testLayer2, layer17, configured7, node54, exports_config };

package/dist/chunks/{aisdk-native-57ez7d0k.js → instance-d9s573fh.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath2
-} from "./aisdk-native-922hggd3.js";
+} from "./instance-922hggd3.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/project/schema.ts
 var exports_schema = {};

package/dist/chunks/{aisdk-native-8p4f9s12.js → instance-dj2t23y0.js}

@@ -1,10 +1,10 @@
 import {
   absoluteColumn2,
   absoluteArrayColumn2
-} from "./aisdk-native-6msgmcgs.js";
+} from "./instance-6msgmcgs.js";
 import {
   Timestamps2
-} from "./aisdk-native-qfa1cgps.js";
+} from "./instance-qfa1cgps.js";
 
 // src/project/sql.ts
 import { isNotNull, isNull, ne, or } from "drizzle-orm";

package/dist/chunks/{aisdk-native-vm665873.js → instance-dvy48r7d.js}

@@ -1,59 +1,59 @@
 import {
   Service84,
   node88
-} from "./aisdk-native-za3w5by2.js";
+} from "./instance-9c8x5hj6.js";
 import {
   Service83,
   node87
-} from "./aisdk-native-dksrmg0f.js";
+} from "./instance-3cerfjhm.js";
 import {
-  Service55,
-  node57
-} from "./aisdk-native-jj7mqc2j.js";
+  Service63,
+  node67
+} from "./instance-a68xx6mc.js";
 import {
-  Service44,
-  node46
-} from "./aisdk-native-51f5btjf.js";
+  Service61,
+  node65
+} from "./instance-ycjb11n5.js";
 import {
   SessionEvent2
-} from "./aisdk-native-ec1grn59.js";
+} from "./instance-ec1grn59.js";
 import {
-  make17
-} from "./aisdk-native-1acjjqhc.js";
+  make18
+} from "./instance-r8xr0va3.js";
 import {
   DrainResult2,
-  Service41
-} from "./aisdk-native-zcrspsvn.js";
+  Service59
+} from "./instance-n4r3xatb.js";
 import {
   UserInterruptedError2
-} from "./aisdk-native-gmjjhz4f.js";
+} from "./instance-ybhbtxjg.js";
 import {
-  Service75,
-  node79
-} from "./aisdk-native-2a9keyza.js";
+  Service70,
+  node74
+} from "./instance-rk498y91.js";
 import {
   toSessionError2
-} from "./aisdk-native-rtmswcvb.js";
+} from "./instance-ksfgay0w.js";
 import {
   nextPromotable2
-} from "./aisdk-native-28hmshjz.js";
+} from "./instance-9x58gdtd.js";
 import {
   __export
-} from "./aisdk-native-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/session/execution.ts
 var exports_execution = {};
 __export(exports_execution, {
-  Service: () => Service40,
+  Service: () => Service58,
   SessionExecution: () => exports_execution,
-  layer: () => layer16,
-  node: () => node43,
-  noopLayer: () => noopLayer2,
+  layer: () => layer22,
+  node: () => node63,
+  noopLayer: () => noopLayer3,
   terminal: () => terminal2
 });
 import { Cause, Context, Effect, Exit, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-class Service40 extends Context.Service()("@opencode/SessionExecution") {
+class Service58 extends Context.Service()("@opencode/SessionExecution") {
 }
 function terminal2(exit, reason) {
   if (Exit.isSuccess(exit))
@@ -65,11 +65,11 @@ function terminal2(exit, reason) {
     return { type: "interrupted", reason: "user" };
   return { type: "failed", error: toSessionError2(failure) };
 }
-var layer16 = Layer.effect(Service40, Effect.gen(function* () {
-  const store = yield* Service75;
-  const instances = yield* Service44;
+var layer22 = Layer.effect(Service58, Effect.gen(function* () {
+  const store = yield* Service70;
+  const instances = yield* Service61;
   const bus = yield* Service83;
-  const jobs = yield* Service55;
+  const jobs = yield* Service63;
   const db = (yield* Service84).db;
   const reportLifecycle = (sessionID, effect) => effect.pipe(Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to publish Session execution lifecycle", cause).pipe(Effect.annotateLogs({ sessionID }))), Effect.asVoid);
   const claimOnCommit = (sessionID) => ({
@@ -82,14 +82,14 @@ var layer16 = Layer.effect(Service40, Effect.gen(function* () {
     const session = yield* store.get(sessionID);
     if (!session)
       return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
-    const result = yield* Service41.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
+    const result = yield* Service59.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
     return yield* DrainResult2.$match(result, {
       Complete: () => Effect.void,
       Moved: (result) => drain(sessionID, false, result.continuation, promotable),
       Reloaded: (result) => drain(sessionID, result.force, result.continuation, promotable)
     });
   });
-  const coordinator = yield* make17({
+  const coordinator = yield* make18({
     started: (sessionID) => reportLifecycle(sessionID, bus.publish(SessionEvent2.Execution.Started, { sessionID }, claimOnCommit(sessionID))),
     drain: (sessionID, force, promotable) => drain(sessionID, force, undefined, promotable),
     settled: (sessionID, exit, reason) => reportLifecycle(sessionID, Effect.gen(function* () {
@@ -110,7 +110,7 @@ var layer16 = Layer.effect(Service40, Effect.gen(function* () {
       }, releaseOnCommit(sessionID));
     }))
   });
-  return Service40.of({
+  return Service58.of({
     active: coordinator.active,
     isActive: coordinator.isActive,
     interrupt: (sessionID, options) => Effect.gen(function* () {
@@ -129,12 +129,12 @@ var layer16 = Layer.effect(Service40, Effect.gen(function* () {
     awaitIdle: coordinator.awaitIdle
   });
 }));
-var node43 = makeGlobalNode({
-  service: Service40,
-  layer: layer16,
-  deps: [node79, node46, node87, node88, node57]
+var node63 = makeGlobalNode({
+  service: Service58,
+  layer: layer22,
+  deps: [node74, node65, node87, node88, node67]
 });
-var noopLayer2 = Layer.succeed(Service40, Service40.of({
+var noopLayer3 = Layer.succeed(Service58, Service58.of({
   active: Effect.succeed(new Set),
   isActive: () => Effect.succeed(false),
   resume: () => Effect.void,
@@ -143,4 +143,4 @@ var noopLayer2 = Layer.succeed(Service40, Service40.of({
   awaitIdle: () => Effect.void
 }));
 
-export { Service40, terminal2, layer16, node43, noopLayer2, exports_execution };
+export { Service58, terminal2, layer22, node63, noopLayer3, exports_execution };