@opencode/core 2.0.21 → 2.0.23

package/dist/chunks/{job-3smtnn6g.js → generate-3smtnn6g.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/mime.ts
 var exports_mime = {};

package/dist/chunks/{job-sk3qaz4a.js → generate-3t0ybcrp.js}

@@ -1,9 +1,9 @@
 // src/persistent-pty/daemon.ts
 import { spawn } from "node:child_process";
-import { readFile } from "node:fs/promises";
+import { mkdir, readFile, rename } from "node:fs/promises";
 import net from "node:net";
 import path from "node:path";
-import { Data, Duration, Effect, Schema, Semaphore } from "effect";
+import { Cause, Data, Duration, Effect, Schema, Semaphore } from "effect";
 var ProtocolVersion = 7;
 var MaxFrameBytes = 8 * 1024 * 1024;
 var Lifecycle = Schema.Union([
@@ -94,8 +94,9 @@ var WireResponse2 = Schema.Union([
 
 class DaemonError2 extends Data.TaggedError("PersistentPty.DaemonError") {
 }
-var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(function* (directory, binary = () => Promise.resolve(process.env.OPENCODE_PTY_BIN || "opencode-pty"), inherited) {
+var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(function* (root, initialID, binary = () => Promise.resolve(process.env.OPENCODE_PTY_BIN || "opencode-pty"), inherited) {
   const startup = Semaphore.makeUnsafe(1);
+  let id = initialID;
   let registration;
   let owner;
   let closed = false;
@@ -124,7 +125,7 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
     duration: Duration.seconds(5),
     orElse: () => Effect.fail(new DaemonError2({ kind: "connect", message: "PTY ownership claim timed out" }))
   }));
-  const discover = Effect.fn("PersistentPty.daemon.discover")(function* () {
+  const discover = Effect.fn("PersistentPty.daemon.discover")(function* (directory = path.join(root, id)) {
     const value = yield* Effect.tryPromise({
       try: () => readFile(path.join(directory, "service.json"), "utf8"),
       catch: (cause) => failure("connect", cause)
@@ -141,15 +142,11 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
       return yield* Effect.fail(new DaemonError2({ kind: "protocol", message: "opencode-pty registration mismatch" }));
     return decoded;
   });
-  const start = Effect.fn("PersistentPty.daemon.start")(function* () {
+  const spawnDaemon = Effect.fn("PersistentPty.daemon.spawn")(function* () {
     const executable = yield* Effect.tryPromise({ try: binary, catch: (cause) => failure("spawn", cause) });
     const child = yield* Effect.tryPromise({
       try: () => new Promise((resolve, reject) => {
-        const child = spawn(executable, ["daemon"], {
-          detached: true,
-          stdio: "ignore",
-          env: { ...process.env, OPENCODE_PTY_RUNTIME_DIR: directory }
-        });
+        const child = spawn(executable, ["daemon", "--runtime-dir", root, "--name", id], { detached: true, windowsHide: true, stdio: "ignore" });
         child.once("spawn", () => {
           child.unref();
           resolve(child);
@@ -161,7 +158,7 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
     return yield* Effect.gen(function* () {
       const deadline = Date.now() + 5000;
       let last;
-      while (Date.now() < deadline) {
+      while (Date.now() < deadline && child.exitCode === null && child.signalCode === null) {
         const found = yield* discover().pipe(Effect.map((value) => ({ value })), Effect.catch((error) => {
           last = error;
           return Effect.succeed(undefined);
@@ -177,6 +174,17 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
       child.kill("SIGTERM");
     })));
   });
+  const start = () => spawnDaemon().pipe(Effect.catch((error) => Effect.gen(function* () {
+    yield* Effect.logWarning("Starting opencode-pty in a fresh runtime directory", { cause: error.message });
+    abandon();
+    return yield* spawnDaemon();
+  })));
+  const abandon = () => {
+    owner?.socket.destroy();
+    owner = undefined;
+    registration = undefined;
+    id = crypto.randomUUID();
+  };
   const connect = Effect.fn("PersistentPty.daemon.connect")(function* (shouldStart) {
     if (closed)
       return yield* Effect.fail(new DaemonError2({ kind: "connect", message: "PTY owner scope is closed" }));
@@ -245,13 +253,18 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
     }));
     if (response.type !== "handoff")
       return yield* Effect.fail(new DaemonError2({ kind: "protocol", message: "Expected PTY handoff ticket" }));
-    return { directory, instanceID: registered.instance_id, ticket: response.ticket, expiresAt: response.expires_at };
+    return {
+      directory: path.join(root, id),
+      instanceID: registered.instance_id,
+      ticket: response.ticket,
+      expiresAt: response.expires_at
+    };
   }));
-  const subscribe = Effect.fn("PersistentPty.daemon.subscribe")(function* (id, input) {
+  const subscribe = Effect.fn("PersistentPty.daemon.subscribe")(function* (terminalID, input) {
     const attempt = Effect.gen(function* () {
       const current = yield* connect(false);
       return yield* Effect.tryPromise({
-        try: () => subscribePromise(current, id, input),
+        try: () => subscribePromise(current, terminalID, input),
         catch: (cause) => cause instanceof DaemonError2 ? cause : failure("connect", cause)
       }).pipe(Effect.catch((error) => {
         if (error.kind === "registration" && registration === current)
@@ -262,15 +275,40 @@ var makeDaemonTransport2 = Effect.fn("PersistentPty.makeDaemonTransport")(functi
     return yield* attempt.pipe(Effect.catch((error) => error.kind === "registration" ? attempt : Effect.fail(error)));
   });
   if (inherited) {
-    if (inherited.expiresAt <= Date.now())
-      return yield* Effect.fail(new DaemonError2({ kind: "registration", message: "PTY restart handoff expired" }));
-    const current = yield* discover();
-    if (current.instance_id !== inherited.instanceID)
-      return yield* Effect.fail(new DaemonError2({ kind: "registration", message: "PTY restart daemon changed" }));
-    yield* claim(current, inherited.ticket);
+    let found;
+    yield* Effect.gen(function* () {
+      if (inherited.expiresAt <= Date.now())
+        return yield* Effect.fail(new DaemonError2({ kind: "registration", message: "PTY restart handoff expired" }));
+      id = path.basename(inherited.directory);
+      found = yield* discover(inherited.directory);
+      if (found.instance_id !== inherited.instanceID)
+        return yield* Effect.fail(new DaemonError2({ kind: "registration", message: "PTY restart daemon changed" }));
+      if (path.resolve(inherited.directory) !== path.resolve(root, id))
+        yield* migrate(inherited.directory, path.join(root, id));
+      yield* claim(found, inherited.ticket);
+    }).pipe(Effect.catchCause((cause) => Effect.gen(function* () {
+      if (Cause.hasInterruptsOnly(cause))
+        return yield* Effect.failCause(cause);
+      yield* Effect.logWarning("Discarding PTY restart handoff; persistent terminals will start fresh", {
+        cause: Cause.pretty(cause)
+      });
+      if (found)
+        yield* oneShot(found, { op: "shutdown" }).pipe(Effect.ignore);
+      abandon();
+    })));
   }
   return { request, requestIfRunning, shutdown, handoff, subscribe };
 });
+var migrate = Effect.fn("PersistentPty.daemon.migrate")(function* (directory, target) {
+  yield* Effect.tryPromise({
+    try: async () => {
+      await mkdir(target, { recursive: true, mode: 448 });
+      await rename(path.join(directory, "service.lock"), path.join(target, "service.lock"));
+      await rename(path.join(directory, "service.json"), path.join(target, "service.json"));
+    },
+    catch: (cause) => failure("registration", cause)
+  });
+});
 async function openOwner(registration, ticket, signal) {
   const socket = net.createConnection({ path: registration.socket });
   const frames = decoder(socket);

package/dist/chunks/{job-3tvqynh2.js → generate-3tvqynh2.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/database/v1-migration.ts
 var exports_v1_migration = {};

package/dist/chunks/{job-7hxgqze9.js → generate-3x5f6s31.js}

@@ -1,51 +1,51 @@
 import {
   Metadata2,
   useragent2,
-  node42
-} from "./job-2b6sywcb.js";
+  node38
+} from "./generate-gk28ph79.js";
 import {
   provenance2,
   compatible2
-} from "./job-f29mbr7f.js";
+} from "./generate-h9wp8z5w.js";
 import {
   Service71,
   node75
-} from "./job-qwjmgwmn.js";
+} from "./generate-qwjmgwmn.js";
 import {
   DeclinedError2
-} from "./job-kfcwqfca.js";
+} from "./generate-8mnpn7jw.js";
 import {
   CancelledError2
-} from "./job-g0tt42na.js";
+} from "./generate-mmy17vwk.js";
 import {
-  Error2
-} from "./job-sgsdap7d.js";
+  Error4
+} from "./generate-vnh00gv4.js";
 import {
   get5
-} from "./job-54ma36ye.js";
+} from "./generate-54ma36ye.js";
 import {
-  Service32,
-  node35
-} from "./job-jy3q8cv1.js";
+  Service27,
+  node30
+} from "./generate-ffxkc1dx.js";
 import {
   make14
-} from "./job-57b9ws8p.js";
+} from "./generate-57b9ws8p.js";
 import {
   toLLMMessages2
-} from "./job-rk1r2hx8.js";
+} from "./generate-znsx74x0.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/model-request.ts
 var exports_model_request = {};
 __export(exports_model_request, {
-  Service: () => Service31,
+  Service: () => Service26,
   SessionModelRequest: () => exports_model_request,
   baseTranscript: () => baseTranscript2,
   boundImages: () => boundImages2,
-  layer: () => layer12,
-  node: () => node34,
+  layer: () => layer11,
+  node: () => node29,
   unsupportedParts: () => unsupportedParts2
 });
 import {
@@ -102,44 +102,40 @@ var unsupportedMedia = (mime, name, capabilities) => {
   const modality = mimeToModality(mime);
   if (!modality || capabilities.input.some((item) => item.startsWith(modality)))
     return;
-  return {
-    type: "text",
-    text: `ERROR: Cannot read ${name ? `"${name}"` : modality} (this model does not support ${modality} input). Inform the user.`
-  };
+  return `ERROR: Cannot read ${name ? `"${name}"` : modality} (this model does not support ${modality} input). Inform the user.`;
+};
+var mediaBytes = (media) => {
+  if (media.source.type === "base64")
+    return Buffer.byteLength(media.source.data);
+  if (media.source.type === "bytes")
+    return Math.ceil(media.source.data.byteLength / 3) * 4;
+  return 0;
 };
-var unsupportedParts2 = (messages, capabilities) => messages.map((message) => Message.make({
-  ...message,
-  content: message.content.map((part) => {
+var replaceMedia = (messages, replace) => messages.map((message) => {
+  const content = message.content.map((part) => {
     if (part.type === "media") {
-      return unsupportedMedia(part.media.mediaType, part.filename, capabilities) ?? part;
+      const text = replace({ mime: part.media.mediaType, name: part.filename, bytes: () => mediaBytes(part.media) });
+      return text === undefined ? part : Message.text(text);
     }
     if (part.type !== "tool-result" || part.result.type !== "content")
       return part;
-    return {
-      ...part,
-      result: {
-        ...part.result,
-        value: part.result.value.map((item) => {
-          if (item.type !== "file")
-            return item;
-          return unsupportedMedia(item.mime, item.name, capabilities) ?? item;
-        })
-      }
-    };
-  })
-}));
+    const result = part.result;
+    const value = result.value.map((item) => {
+      if (item.type !== "file")
+        return item;
+      const text = replace({ mime: item.mime, name: item.name, bytes: () => Buffer.byteLength(item.uri) });
+      return text === undefined ? item : { type: "text", text };
+    });
+    return value.every((item, index) => item === result.value[index]) ? part : { ...part, result: { ...result, value } };
+  });
+  return content.every((part, index) => part === message.content[index]) ? message : new Message({ ...message, content });
+});
+var unsupportedParts2 = (messages, capabilities) => replaceMedia(messages, (media) => unsupportedMedia(media.mime, media.name, capabilities));
 var boundImages2 = (messages) => {
   const isImage = (mime) => mime.toLowerCase().startsWith("image/");
-  const size = (media) => {
-    if (media.source.type === "base64")
-      return Buffer.byteLength(media.source.data);
-    if (media.source.type === "bytes")
-      return Math.ceil(media.source.data.byteLength / 3) * 4;
-    return 0;
-  };
   const imageBytes = messages.reduce((total, message) => total + message.content.reduce((sum, part) => {
     if (part.type === "media" && isImage(part.media.mediaType))
-      return sum + size(part.media);
+      return sum + mediaBytes(part.media);
     if (part.type !== "tool-result" || part.result.type !== "content")
       return sum;
     return sum + part.result.value.reduce((bytes, item) => bytes + (item.type === "file" && isImage(item.mime) ? Buffer.byteLength(item.uri) : 0), 0);
@@ -147,36 +143,19 @@ var boundImages2 = (messages) => {
   if (imageBytes <= IMAGE_BYTES_TRIGGER)
     return messages;
   let removed = 0;
-  return messages.map((message) => Message.make({
-    ...message,
-    content: message.content.map((part) => {
-      if (part.type === "media" && isImage(part.media.mediaType) && imageBytes - removed > IMAGE_BYTES_TARGET) {
-        removed += size(part.media);
-        return Message.text(IMAGE_REMOVED);
-      }
-      if (part.type !== "tool-result" || part.result.type !== "content")
-        return part;
-      return {
-        ...part,
-        result: {
-          ...part.result,
-          value: part.result.value.map((item) => {
-            if (item.type !== "file" || !isImage(item.mime) || imageBytes - removed <= IMAGE_BYTES_TARGET)
-              return item;
-            removed += Buffer.byteLength(item.uri);
-            return { type: "text", text: IMAGE_REMOVED };
-          })
-        }
-      };
-    })
-  }));
+  return replaceMedia(messages, (media) => {
+    if (!isImage(media.mime) || imageBytes - removed <= IMAGE_BYTES_TARGET)
+      return;
+    removed += media.bytes();
+    return IMAGE_REMOVED;
+  });
 };
 
-class Service31 extends Context.Service()("@opencode/SessionModelRequest") {
+class Service26 extends Context.Service()("@opencode/SessionModelRequest") {
 }
-var layer12 = Layer.effect(Service31, Effect.gen(function* () {
+var layer11 = Layer.effect(Service26, Effect.gen(function* () {
   const hooks = yield* Service71;
-  const transport = yield* Service32;
+  const transport = yield* Service27;
   const app = yield* Metadata2;
   const prepare = Effect.fn("SessionModelRequest.prepare")(function* (kind, input, shape) {
     const session = input.session;
@@ -184,7 +163,7 @@ var layer12 = Layer.effect(Service31, Effect.gen(function* () {
     const scope = { sessionID: session.id, agent: input.agent, model: model.ref, kind };
     const tools = input.tools ?? {
       definitions: [],
-      execute: () => new Error2({ message: "Tools are not available for this request" })
+      execute: () => new Error4({ message: "Tools are not available for this request" })
     };
     const given = new Map(tools.definitions.map((t) => [{ description: t.description, input: { ...t.inputSchema } }, t]));
     const shaped = yield* shape({
@@ -236,9 +215,8 @@ var layer12 = Layer.effect(Service31, Effect.gen(function* () {
     const request = LLMRequest.update(base, {
       model: route === base.model.route ? base.model : LanguageModel.update(base.model, { route }),
       http: new HttpOptions({
-        body: base.http?.body,
-        headers: Object.keys(modelHook.headers).length === 0 ? undefined : modelHook.headers,
-        query: base.http?.query
+        ...base.http,
+        headers: Object.keys(modelHook.headers).length === 0 ? undefined : modelHook.headers
       })
     });
     const selected = provenance2(model);
@@ -282,17 +260,17 @@ var layer12 = Layer.effect(Service31, Effect.gen(function* () {
     };
   });
   const agentHook = (name, agent) => (draft, tools) => hooks.trigger("session", name, { ...draft, agent, tools });
-  return Service31.of({
+  return Service26.of({
     primary: (input) => prepare("primary", input, agentHook("context", input.agent)),
     compaction: (input) => prepare("compaction", input, agentHook("compaction", input.agent)),
     generate: (input) => prepare("generate", input, agentHook("generate", input.agent)),
     title: (input) => prepare("title", input, (draft) => hooks.trigger("session", "title", draft))
   });
 }));
-var node34 = makeLocationNode({
-  service: Service31,
-  layer: layer12,
-  deps: [node75, node35, node42]
+var node29 = makeLocationNode({
+  service: Service26,
+  layer: layer11,
+  deps: [node75, node30, node38]
 });
 
-export { baseTranscript2, unsupportedParts2, boundImages2, Service31, layer12, node34, exports_model_request };
+export { baseTranscript2, unsupportedParts2, boundImages2, Service26, layer11, node29, exports_model_request };

package/dist/chunks/{job-3zsf4n22.js → generate-3zsf4n22.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/util/error-summary.ts
 var exports_error_summary = {};

package/dist/chunks/{job-deaeaxqh.js → generate-435eggbz.js}

@@ -1,33 +1,33 @@
 import {
   Service83,
   node87
-} from "./job-vdqv4tww.js";
+} from "./generate-z8hrkqzq.js";
 import {
   optional2,
   statics2
-} from "./job-922hggd3.js";
+} from "./generate-z5v4ffb3.js";
 import {
   Ref4,
   Service80,
   node84
-} from "./job-frdvpnjn.js";
+} from "./generate-yhecr6n4.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/rpc.ts
 var exports_rpc = {};
 __export(exports_rpc, {
   Rpc: () => exports_rpc,
-  Service: () => Service24,
+  Service: () => Service45,
   define: () => define2,
-  node: () => node27
+  node: () => node48
 });
 import { define as define2 } from "@opencode/schema/rpc";
 import { Event } from "@opencode/schema/event";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Deferred, Effect, JsonSchema, Layer, Schema, SchemaRepresentation, Stream } from "effect";
-class Service24 extends Context.Service()("@opencode/Rpc") {
+class Service45 extends Context.Service()("@opencode/Rpc") {
 }
 
 class DeclaredError extends Error {
@@ -39,7 +39,7 @@ class DeclaredError extends Error {
     this.data = data;
   }
 }
-var layer = Layer.effect(Service24, Effect.gen(function* () {
+var layer = Layer.effect(Service45, Effect.gen(function* () {
   const bus = yield* Service83;
   const location = yield* Service80;
   const ref = Ref4.make({ directory: location.directory, workspaceID: location.workspaceID });
@@ -123,9 +123,9 @@ var layer = Layer.effect(Service24, Effect.gen(function* () {
       }
     };
   };
-  return Service24.of({ register, call, client, close: Deferred.succeed(closed, undefined).pipe(Effect.asVoid) });
+  return Service45.of({ register, call, client, close: Deferred.succeed(closed, undefined).pipe(Effect.asVoid) });
 }));
-var node27 = makeLocationNode({ service: Service24, layer, deps: [node87, node84] });
+var node48 = makeLocationNode({ service: Service45, layer, deps: [node87, node84] });
 var fields = {
   id: Event.ID,
   created: Schema.Finite,
@@ -210,4 +210,4 @@ var logicalEvent = Effect.fn("Rpc.logicalEvent")(function* (definition, name, pa
   };
 });
 
-export { Service24, node27, exports_rpc, define2 };
+export { Service45, node48, exports_rpc, define2 };

package/dist/chunks/{job-ecfe7b91.js → generate-4eax54pa.js}

@@ -1,9 +1,12 @@
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./generate-ec1grn59.js";
 import {
   tokens2
-} from "./job-tdstcens.js";
+} from "./generate-tdstcens.js";
+import {
+  contentFilterError2
+} from "./generate-9sy6gwjh.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Effect, Fiber, Iterable } from "effect";
@@ -431,7 +434,7 @@ var createLLMEventPublisher2 = (bus, input) => {
         };
         if (event.reason.normalized === "content-filter") {
           providerFailed = true;
-          yield* failAssistant({ type: "provider.content-filter", message: "Provider blocked the response" });
+          yield* failAssistant(contentFilterError2("Provider blocked the response", event.reason));
           return;
         }
         return;

package/dist/chunks/{job-z8bzfx2e.js → generate-4kfhygng.js}

@@ -1,56 +1,56 @@
 import {
   Service84,
   node88
-} from "./job-vsq07z0a.js";
+} from "./generate-6zp854ra.js";
 import {
   Service83,
   node87
-} from "./job-vdqv4tww.js";
+} from "./generate-z8hrkqzq.js";
 import {
-  Service77,
-  node81
-} from "./job-ab1ys2yh.js";
+  Service46,
+  node49
+} from "./generate-gjv38h0k.js";
 import {
-  Service63,
-  node67
-} from "./job-v6gb7zv2.js";
+  Service35,
+  node37
+} from "./generate-cdm0dq9n.js";
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./generate-ec1grn59.js";
 import {
-  make18
-} from "./job-r8xr0va3.js";
+  make16
+} from "./generate-yp2x3t23.js";
 import {
   DrainResult2,
-  Service60
-} from "./job-zee1rnkq.js";
+  Service32
+} from "./generate-t2az9yje.js";
 import {
-  Service69,
-  node73
-} from "./job-2ydcz6pr.js";
+  Service59,
+  node62
+} from "./generate-g2xfdbz5.js";
 import {
   toSessionError2
-} from "./job-bz7b5t1b.js";
+} from "./generate-9sy6gwjh.js";
 import {
   nextPromotable2
-} from "./job-n8v4y01d.js";
+} from "./generate-hrs38e71.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/execution.ts
 var exports_execution = {};
 __export(exports_execution, {
-  Service: () => Service59,
+  Service: () => Service31,
   SessionExecution: () => exports_execution,
-  layer: () => layer22,
-  node: () => node64,
-  noopLayer: () => noopLayer3,
+  layer: () => layer15,
+  node: () => node34,
+  noopLayer: () => noopLayer2,
   terminal: () => terminal2
 });
 import { Cause, Context, Effect, Exit, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-class Service59 extends Context.Service()("@opencode/SessionExecution") {
+class Service31 extends Context.Service()("@opencode/SessionExecution") {
 }
 function terminal2(exit, reason) {
   if (Exit.isSuccess(exit))
@@ -59,11 +59,11 @@ function terminal2(exit, reason) {
     return { type: "interrupted", reason: reason ?? "shutdown" };
   return { type: "failed", error: toSessionError2(Cause.squash(exit.cause)) };
 }
-var layer22 = Layer.effect(Service59, Effect.gen(function* () {
-  const store = yield* Service69;
-  const instances = yield* Service63;
+var layer15 = Layer.effect(Service31, Effect.gen(function* () {
+  const store = yield* Service59;
+  const instances = yield* Service35;
   const bus = yield* Service83;
-  const jobs = yield* Service77;
+  const jobs = yield* Service46;
   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) => ({
@@ -76,14 +76,14 @@ var layer22 = Layer.effect(Service59, Effect.gen(function* () {
     const session = yield* store.get(sessionID);
     if (!session)
       return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
-    const result = yield* Service60.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* Service32.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* make18({
+  const coordinator = yield* make16({
     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* () {
@@ -104,7 +104,7 @@ var layer22 = Layer.effect(Service59, Effect.gen(function* () {
       }, releaseOnCommit(sessionID));
     }))
   });
-  return Service59.of({
+  return Service31.of({
     active: coordinator.active,
     isActive: coordinator.isActive,
     interrupt: (sessionID, options) => Effect.gen(function* () {
@@ -123,12 +123,12 @@ var layer22 = Layer.effect(Service59, Effect.gen(function* () {
     awaitIdle: coordinator.awaitIdle
   });
 }));
-var node64 = makeGlobalNode({
-  service: Service59,
-  layer: layer22,
-  deps: [node73, node67, node87, node88, node81]
+var node34 = makeGlobalNode({
+  service: Service31,
+  layer: layer15,
+  deps: [node62, node37, node87, node88, node49]
 });
-var noopLayer3 = Layer.succeed(Service59, Service59.of({
+var noopLayer2 = Layer.succeed(Service31, Service31.of({
   active: Effect.succeed(new Set),
   isActive: () => Effect.succeed(false),
   resume: () => Effect.void,
@@ -137,4 +137,4 @@ var noopLayer3 = Layer.succeed(Service59, Service59.of({
   awaitIdle: () => Effect.void
 }));
 
-export { Service59, terminal2, layer22, node64, noopLayer3, exports_execution };
+export { Service31, terminal2, layer15, node34, noopLayer2, exports_execution };