@opencode-ai/core 0.0.0-beta-18992 → 0.0.0-beta-19059

package/dist/chunks/{aisdk-3h15wcjt.js → shell-pv8kr1wp.js}

@@ -1,18 +1,18 @@
 import {
   exports_instructions
-} from "./aisdk-c54e84vp.js";
+} from "./shell-c54e84vp.js";
 import {
   exports_state
-} from "./aisdk-dyrfpcd0.js";
-import {
-  AbsolutePath
-} from "./aisdk-j07kk359.js";
+} from "./shell-j6s3yjyb.js";
 import {
   exports_bus
-} from "./aisdk-gnp6ynf7.js";
+} from "./shell-07b0cypv.js";
+import {
+  AbsolutePath
+} from "./shell-j07kk359.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/instruction-discovery.ts
 var exports_instruction_discovery = {};

package/dist/chunks/{aisdk-pves38xm.js → shell-pves38xm.js}

@@ -1,9 +1,9 @@
 import {
   exports_app
-} from "./aisdk-hs51b0fc.js";
+} from "./shell-hs51b0fc.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/plugin/websearch/tavily.ts
 var exports_tavily = {};

package/dist/chunks/{aisdk-3ptfsnkd.js → shell-pvpv4rn6.js}

@@ -1,30 +1,30 @@
+import {
+  configuredSettings
+} from "./shell-kftmq20s.js";
 import {
   iife
-} from "./aisdk-ehj9csmv.js";
+} from "./shell-ehj9csmv.js";
 import {
-  configuredSettings
-} from "./aisdk-293pdfkt.js";
+  exports_integration
+} from "./shell-kk74kxfs.js";
 import {
   exports_app
-} from "./aisdk-hs51b0fc.js";
-import {
-  which
-} from "./aisdk-k3e42drn.js";
+} from "./shell-hs51b0fc.js";
 import {
-  exports_integration
-} from "./aisdk-yetdmp9r.js";
+  exports_provider
+} from "./shell-68yag814.js";
 import {
   exports_credential
-} from "./aisdk-fgs2symh.js";
+} from "./shell-ask3gap1.js";
 import {
-  exports_provider
-} from "./aisdk-68yag814.js";
+  which
+} from "./shell-k3e42drn.js";
 import {
   exports_bus
-} from "./aisdk-gnp6ynf7.js";
+} from "./shell-07b0cypv.js";
 import {
   __require
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/plugin/provider/azure.ts
 import { Clock, Effect, Schema, Semaphore, Stream } from "effect";

package/dist/chunks/{aisdk-xmvw7kbn.js → shell-q1w4qb6z.js}

@@ -1,15 +1,15 @@
 import {
   InstructionEntryTable
-} from "./aisdk-q606pcse.js";
+} from "./shell-q606pcse.js";
 import {
   exports_instructions
-} from "./aisdk-c54e84vp.js";
+} from "./shell-c54e84vp.js";
 import {
   exports_database
-} from "./aisdk-de1w1zbt.js";
+} from "./shell-t1qmyghk.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/session/instruction-entry.ts
 var exports_instruction_entry = {};

package/dist/chunks/{aisdk-q606pcse.js → shell-q606pcse.js}

@@ -1,13 +1,13 @@
 import {
   ProjectTable
-} from "./aisdk-c8ya26sa.js";
+} from "./shell-c8ya26sa.js";
 import {
   directoryColumn,
   pathColumn
-} from "./aisdk-zbqqnp0n.js";
+} from "./shell-zbqqnp0n.js";
 import {
   Timestamps
-} from "./aisdk-sem2g21k.js";
+} from "./shell-sem2g21k.js";
 
 // src/session/sql.ts
 import { sqliteTable, text, integer, index, primaryKey, real, uniqueIndex } from "drizzle-orm/sqlite-core";

package/dist/chunks/{aisdk-v50c2ssy.js → shell-q7reqpp2.js}

@@ -1,12 +1,12 @@
 import {
   exports_wellknown
-} from "./aisdk-6qgmssvv.js";
+} from "./shell-s231yqcx.js";
 import {
   exports_bus
-} from "./aisdk-gnp6ynf7.js";
+} from "./shell-07b0cypv.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/wellknown/plugin.ts
 var exports_plugin = {};

package/dist/chunks/{aisdk-rgseqz2v.js → shell-qbfqnn1d.js}

@@ -1,18 +1,18 @@
 import {
   SessionMessage
-} from "./aisdk-8rpfd2h6.js";
+} from "./shell-8rpfd2h6.js";
 import {
   SessionSchema
-} from "./aisdk-bjwj8hwv.js";
+} from "./shell-bjwj8hwv.js";
 import {
   exports_id
-} from "./aisdk-x4az4y7r.js";
+} from "./shell-x4az4y7r.js";
 import {
   exports_kv
-} from "./aisdk-v05j4md8.js";
+} from "./shell-j9a1jgvn.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/job.ts
 var exports_job = {};
@@ -94,13 +94,13 @@ var make = Effect.gen(function* () {
       ...job.info.error !== undefined ? { error: job.info.error } : {}
     });
   });
-  const settle = Effect.fnUntraced(function* (id, token, exit) {
+  const settle = Effect.fnUntraced(function* (id, scope, exit) {
     const completed_at = yield* Clock.currentTimeMillis;
     const result = yield* SynchronizedRef.modifyEffect(state.jobs, Effect.fnUntraced(function* (jobs) {
       const job = jobs.get(id);
       if (!job)
         return [{}, jobs];
-      if (job.token !== token)
+      if (job.scope !== scope)
         return [{}, jobs];
       if (job.info.status !== "running")
         return [{ info: snapshot(job) }, jobs];
@@ -145,7 +145,6 @@ var make = Effect.gen(function* () {
           return [{ info: snapshot(existing) }, jobs];
         }
         const scope = yield* Scope.fork(state.scope, "parallel");
-        const token = {};
         const job = {
           info: {
             id,
@@ -159,15 +158,14 @@ var make = Effect.gen(function* () {
           done,
           backgrounded,
           scope,
-          token,
           blockingSessions: new Map,
           isBackgrounded: false,
           recovery: input.recovery
         };
-        return [{ info: snapshot(job), scope, token }, new Map(jobs).set(id, job)];
+        return [{ info: snapshot(job), scope }, new Map(jobs).set(id, job)];
       }));
       if ("scope" in result)
-        yield* restore(input.run).pipe(Effect.exit, Effect.flatMap((exit) => settle(id, result.token, exit)), Effect.asVoid, Effect.forkIn(result.scope, { startImmediately: true }));
+        yield* restore(input.run).pipe(Effect.exit, Effect.flatMap((exit) => settle(id, result.scope, exit)), Effect.asVoid, Effect.forkIn(result.scope, { startImmediately: true }));
       return result.info;
     }));
   });

package/dist/chunks/{aisdk-qf52r0wh.js → shell-qf52r0wh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/plugin/instance.ts
 var exports_instance = {};

package/dist/chunks/{aisdk-qfvp8zq7.js → shell-qfvp8zq7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/v1/config/permission.ts
 var exports_permission = {};

package/dist/chunks/{aisdk-e46yy00n.js → shell-qkccxvz6.js}

@@ -1,20 +1,20 @@
 import {
   exports_mime
-} from "./aisdk-kq3q54gz.js";
+} from "./shell-kq3q54gz.js";
 import {
   exports_filesystem
-} from "./aisdk-hs4fs4fk.js";
+} from "./shell-7rd51vdr.js";
 import {
   exports_environment1 as exports_environment
-} from "./aisdk-5mc8c0j5.js";
+} from "./shell-tde1y35v.js";
 import {
   NonNegativeInt,
   PositiveInt,
   RelativePath
-} from "./aisdk-j07kk359.js";
+} from "./shell-j07kk359.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/tool/read-filesystem.ts
 var exports_read_filesystem = {};

package/dist/chunks/{aisdk-qpxzqy01.js → shell-qpxzqy01.js}

@@ -1,6 +1,6 @@
 import {
   exports_provider
-} from "./aisdk-68yag814.js";
+} from "./shell-68yag814.js";
 
 // src/plugin/provider/cerebras.ts
 import { Effect } from "effect";

package/dist/chunks/{aisdk-r7a2r1m6.js → shell-r7a2r1m6.js}

@@ -1,9 +1,9 @@
 import {
   exports_promise
-} from "./aisdk-hy5n5jcn.js";
+} from "./shell-hy5n5jcn.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/plugin/module.ts
 var exports_module = {};

package/dist/chunks/{aisdk-z2xq9v2r.js → shell-r7gm0yzj.js}

@@ -1,12 +1,12 @@
 import {
   EffectSQLiteSession
-} from "./aisdk-kr52k73r.js";
+} from "./shell-kk70vshc.js";
 import {
   SQLiteEffectDatabase
-} from "./aisdk-6d5j92cz.js";
+} from "./shell-c3rqq6n4.js";
 import {
   jitCompatCheck
-} from "./aisdk-k8b45nas.js";
+} from "./shell-k8b45nas.js";
 
 // src/database/drizzle/effect-sqlite/driver.ts
 import * as Effect from "effect/Effect";

package/dist/chunks/{aisdk-r7z6wjth.js → shell-r7z6wjth.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/integration/connection.ts
 var exports_connection = {};

package/dist/chunks/{aisdk-ft2nxz8a.js → shell-r8f3g7x9.js}

@@ -1,30 +1,36 @@
 import {
   exports_watcher
-} from "./aisdk-aqq7me5d.js";
-import {
-  exports_variable
-} from "./aisdk-6vbv4je1.js";
+} from "./shell-v9qxqszp.js";
 import {
   exports_normalize
-} from "./aisdk-sp0z572a.js";
+} from "./shell-j5vqta4j.js";
 import {
-  exports_credential
-} from "./aisdk-fgs2symh.js";
+  exports_discovery
+} from "./shell-1n0ft3sp.js";
+import {
+  exports_watch
+} from "./shell-zwfcr2t4.js";
+import {
+  exports_variable
+} from "./shell-6vbv4je1.js";
 import {
   exports_wellknown
-} from "./aisdk-6qgmssvv.js";
+} from "./shell-s231yqcx.js";
 import {
-  exports_location
-} from "./aisdk-8ntbqk35.js";
+  exports_credential
+} from "./shell-ask3gap1.js";
 import {
-  AbsolutePath
-} from "./aisdk-j07kk359.js";
+  exports_location
+} from "./shell-6qqxywp2.js";
 import {
   exports_bus
-} from "./aisdk-gnp6ynf7.js";
+} from "./shell-07b0cypv.js";
+import {
+  AbsolutePath
+} from "./shell-j07kk359.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/config.ts
 var exports_config = {};
@@ -43,7 +49,7 @@ import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import path from "path";
 import { isDeepStrictEqual } from "node:util";
 import { parse } from "jsonc-parser";
-import { Context, Effect, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect";
+import { Context, Effect, FiberMap, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect";
 import {
   AgentsDirectory,
   ClaudeDirectory,
@@ -82,15 +88,12 @@ var testLayer = (initial = []) => Layer.effectContext(Effect.gen(function* () {
 }));
 var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const global = yield* Global.Service;
   const location = yield* exports_location.Service;
   const watcher = yield* exports_watcher.Service;
   const bus = yield* exports_bus.Service;
   const credentials = yield* exports_credential.Service;
   const wellknown = yield* exports_wellknown.Service;
-  const names = ["opencode.json", "opencode.jsonc"];
   const reloadLock = Semaphore.makeUnsafe(1);
-  const fileTargets = new Set;
   const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" };
   const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions);
   const parseInfo = Effect.fn("Config.parseInfo")(function* (text, source) {
@@ -157,56 +160,27 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   });
   const loadDirectory = Effect.fnUntraced(function* (directory) {
     return [
-      ...yield* Effect.forEach(names, (file) => loadFile(path.join(directory, file))).pipe(Effect.map((configs2) => configs2.filter((config) => config !== undefined))),
+      ...yield* Effect.forEach(exports_discovery.names, (file) => loadFile(path.join(directory, file))).pipe(Effect.map((configs2) => configs2.filter((config) => config !== undefined))),
       new Directory({ type: "directory", path: directory })
     ];
   });
-  const discover = Effect.fn("Config.discover")(function* () {
-    const globalDirectory = AbsolutePath.make(global.config);
-    const globalAgentsDirectory = AbsolutePath.make(path.join(global.home, ".agents"));
-    const globalClaudeDirectory = AbsolutePath.make(path.join(global.home, ".claude"));
-    const globalRoots = yield* Effect.forEach([globalDirectory, globalClaudeDirectory, globalAgentsDirectory], (item) => fs.resolve(item));
-    const locationIsGlobal = (yield* fs.resolve(location.directory)) === globalRoots[0];
-    const discovered = locationIsGlobal || options?.project === false ? [] : yield* fs.up({
-      targets: [".opencode", ".claude", ".agents", ...names.toReversed()],
-      start: location.directory
-    }).pipe(Effect.flatMap((items) => Effect.forEach(items, (item) => fs.resolve(item).pipe(Effect.map((resolved) => ({ item, resolved }))))), Effect.orDie);
-    const globalEnabled = options?.global !== false;
-    const globalFiles = yield* Effect.forEach(names, (name) => fs.resolve(path.join(globalDirectory, name)));
-    const visible = discovered.filter(({ resolved }) => globalEnabled ? !globalRoots.includes(resolved) && !globalFiles.includes(resolved) : !globalRoots.some((root) => resolved === root || resolved.startsWith(root + path.sep))).map(({ item }) => item);
-    const claude = [
-      ...new Set([
-        ...globalEnabled && (yield* fs.isDir(globalClaudeDirectory)) ? [globalClaudeDirectory] : [],
-        ...visible.filter((item) => path.basename(item) === ".claude").toReversed()
-      ])
-    ].map((directory) => new ClaudeDirectory({ type: "claude", path: AbsolutePath.make(directory) }));
-    const agents = [
-      ...new Set([
-        ...globalEnabled && (yield* fs.isDir(globalAgentsDirectory)) ? [globalAgentsDirectory] : [],
-        ...visible.filter((item) => path.basename(item) === ".agents").toReversed()
-      ])
-    ].map((directory) => new AgentsDirectory({ type: "agents", path: AbsolutePath.make(directory) }));
-    const projectDirectories = visible.filter((item) => path.basename(item) === ".opencode").toReversed().map((directory) => AbsolutePath.make(directory));
-    const directPaths = visible.filter((item) => ![".agents", ".claude", ".opencode"].includes(path.basename(item))).toReversed();
-    fileTargets.clear();
-    directPaths.forEach((filepath) => fileTargets.add(AbsolutePath.make(filepath)));
-    const direct = yield* Effect.forEach(directPaths, (filepath) => loadFile(filepath)).pipe(Effect.orDie, Effect.map((entries) => entries.filter((entry) => entry !== undefined)));
-    const file = options?.file;
-    if (file)
-      fileTargets.add(AbsolutePath.make(path.resolve(file)));
-    const explicit = file ? yield* loadFile(path.resolve(file)).pipe(Effect.map((config) => config ? [config] : []), Effect.orDie) : [];
+  const load = Effect.fn("Config.load")(function* (sources) {
+    const claude = yield* Effect.filter(sources.claude, (path2) => fs.isDir(path2));
+    const agents = yield* Effect.filter(sources.agents, (path2) => fs.isDir(path2));
+    const direct = yield* Effect.forEach(sources.direct, (filepath) => loadFile(filepath)).pipe(Effect.orDie, Effect.map((entries) => entries.filter((entry) => entry !== undefined)));
+    const explicit = sources.explicit ? yield* loadFile(sources.explicit).pipe(Effect.map((config) => config ? [config] : []), Effect.orDie) : [];
     const content = options?.content !== undefined ? yield* exports_variable.substitute({
       type: "virtual",
       source: "OPENCODE_CONFIG_CONTENT",
       dir: location.directory,
       text: options.content
     }).pipe(Effect.flatMap((text) => parseInfo(text, "OPENCODE_CONFIG_CONTENT")), Effect.map((info) => info ? [new Document({ type: "document", info })] : []), Effect.orDie) : [];
-    const globalSupplementary = globalEnabled ? yield* loadDirectory(globalDirectory).pipe(Effect.orDie) : [];
-    const projectSupplementary = yield* Effect.forEach(projectDirectories, loadDirectory).pipe(Effect.orDie, Effect.map((entries) => entries.flat()));
+    const globalSupplementary = sources.global ? yield* loadDirectory(sources.global).pipe(Effect.orDie) : [];
+    const projectSupplementary = yield* Effect.forEach(sources.project.filter((root) => root.present), (root) => loadDirectory(root.path)).pipe(Effect.orDie, Effect.map((entries) => entries.flat()));
     return [
       ...yield* loadWellknown().pipe(Effect.orDie),
-      ...claude,
-      ...agents,
+      ...claude.map((path2) => new ClaudeDirectory({ type: "claude", path: path2 })),
+      ...agents.map((path2) => new AgentsDirectory({ type: "agents", path: path2 })),
       ...globalSupplementary,
       ...explicit,
       ...direct,
@@ -214,39 +188,33 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       ...content
     ];
   });
-  const initial = yield* discover();
-  let configs = initial;
+  const initial = yield* exports_discovery.discover(options);
+  let configs = yield* load(initial);
   const updates = yield* PubSub.unbounded();
-  const ignore = ["node_modules", ".git", "**/{node_modules,.git}/**"];
-  const watched = new Set;
-  const reconcile = Effect.fn("Config.reconcileWatches")(function* (entries) {
-    const directories = entries.flatMap((entry) => entry.type === "directory" ? [entry.path] : []);
-    const files = [
-      ...entries.flatMap((entry) => entry.type === "document" && entry.path ? [entry.path] : []),
-      ...fileTargets
-    ];
-    const targets = [
-      ...directories.map((path2) => ({ path: path2, type: "directory", ignore })),
-      ...files.filter((file) => !directories.some((directory) => FSUtil.contains(directory, file))).map((path2) => ({ path: path2, type: "file" }))
-    ];
-    for (const target of targets) {
-      const key = JSON.stringify(target);
-      if (watched.has(key))
-        continue;
-      watched.add(key);
-      const stream = yield* watcher.subscribe(target);
-      yield* stream.pipe(Stream.runForEach((update) => PubSub.publish(updates, update)), Effect.forkScoped({ startImmediately: true }));
+  const reloads = yield* PubSub.sliding(1);
+  const requestReload = PubSub.publish(reloads, undefined).pipe(Effect.asVoid);
+  const watched = yield* FiberMap.make();
+  const reconcile = Effect.fn("Config.reconcileWatches")(function* (sources) {
+    const plan = exports_watch.plan(sources);
+    for (const key of Array.from(watched, ([key2]) => key2)) {
+      if (!plan.has(key))
+        yield* FiberMap.remove(watched, key);
+    }
+    for (const [key, target] of plan) {
+      yield* watcher.subscribe(target, requestReload).pipe(Effect.flatMap(Stream.runForEach((update) => PubSub.publish(updates, update).pipe(Effect.andThen(requestReload)))), FiberMap.run(watched, key, { onlyIfMissing: true, startImmediately: true }));
     }
   });
   const reload = Effect.fn("Config.reload")(function* () {
-    const next = yield* discover();
-    yield* reconcile(next);
+    const sources = yield* exports_discovery.discover(options);
+    const next = yield* load(sources);
+    yield* reconcile(sources);
     if (isDeepStrictEqual(configs, next))
       return;
     configs = next;
     yield* bus.publish(Event.Updated, {});
   }, (effect) => reloadLock.withPermit(effect));
-  yield* Stream.fromPubSub(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach((update) => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { path: update.path, cause })))), Effect.forkScoped({ startImmediately: true }));
+  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(exports_credential.Event.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(exports_wellknown.Event.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(() => {
@@ -258,7 +226,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         yield* reload();
     }).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to refresh wellknown config", { cause })));
   })), Effect.forever, Effect.forkScoped({ startImmediately: true }));
-  yield* reconcile(initial);
+  yield* reloadLock.withPermit(reconcile(initial));
   return Service.of({
     entries: Effect.fnUntraced(function* () {
       return configs;

package/dist/chunks/{aisdk-r9d3d23r.js → shell-r9d3d23r.js}

@@ -1,6 +1,6 @@
 import {
   which
-} from "./aisdk-k3e42drn.js";
+} from "./shell-k3e42drn.js";
 
 // src/formatter/builtins.ts
 import { Effect } from "effect";

package/dist/chunks/{aisdk-rahat93a.js → shell-rahat93a.js}

@@ -1,6 +1,6 @@
 import {
   which
-} from "./aisdk-k3e42drn.js";
+} from "./shell-k3e42drn.js";
 
 // src/ripgrep/binary.ts
 import path from "path";

package/dist/chunks/{aisdk-jr5m26np.js → shell-rpa95wsa.js}

@@ -1,9 +1,9 @@
 import {
   webSocketConstructor
-} from "./aisdk-326j4s6w.js";
+} from "./shell-326j4s6w.js";
 import {
   __export
-} from "./aisdk-vpjkya7h.js";
+} from "./shell-vpjkya7h.js";
 
 // src/session/model-transport.ts
 var exports_model_transport = {};
@@ -80,7 +80,7 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
         operation: "read",
         code: "close",
         phase: "close",
-        delivery: channel.active.lifecycle.delivery === "queued" || channel.active.lifecycle.delivery === "connecting" || channel.active.lifecycle.delivery === "ready" ? "not-sent" : channel.active.lifecycle.delivery === "provider-observed" || channel.active.lifecycle.delivery === "terminal" ? "accepted" : "ambiguous"
+        delivery: channel.active.delivery === "provider-observed" || channel.active.delivery === "terminal" ? "accepted" : "ambiguous"
       })));
     yield* metric("close");
   });
@@ -123,7 +123,7 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
             code: "idle-data",
             phase: "receive"
           });
-        active.lifecycle.delivery = "provider-observed";
+        active.delivery = "provider-observed";
         if (typeof message !== "string")
           return yield* transportError("Unsupported binary WebSocket frame", {
             url: exchange.connect.url,
@@ -142,7 +142,7 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
         });
       })), Effect.catch((error) => channel.closing ? Effect.void : poison(owner, channel, annotate(error, {
         phase: error.reason._tag === "Transport" && error.reason.phase === "close" ? "close" : "receive",
-        delivery: channel.active?.lifecycle.delivery === "provider-observed" || channel.active?.lifecycle.delivery === "terminal" || error.reason._tag === "Transport" && error.reason.code === "queue-overflow" ? "accepted" : error.reason._tag === "Transport" && error.reason.code === "1009" ? "rejected" : "ambiguous"
+        delivery: channel.active?.delivery === "provider-observed" || channel.active?.delivery === "terminal" || error.reason._tag === "Transport" && error.reason.code === "queue-overflow" ? "accepted" : error.reason._tag === "Transport" && error.reason.code === "1009" ? "rejected" : "ambiguous"
       }))), Effect.forkIn(scope, { startImmediately: true }));
       yield* Effect.logDebug("session websocket connected", {
         sessionTransport: "websocket",
@@ -156,7 +156,7 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
     frames: exchange.fallback(),
     complete: Effect.void
   });
-  const start = Effect.fn("SessionModelTransport.start")(function* (owner, exchange, lifecycle) {
+  const start = Effect.fn("SessionModelTransport.start")(function* (owner, exchange) {
     if (owner.closed)
       return yield* transportError("Session WebSocket owner is closed", {
         operation: "request",
@@ -181,7 +181,6 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
       yield* metric("reconnect");
       yield* closeChannel(owner, current);
     }
-    lifecycle.delivery = owner.channel ? "ready" : "connecting";
     if (owner.channel)
       yield* Effect.logDebug("session websocket reused", {
         sessionTransport: "websocket",
@@ -197,7 +196,6 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
     }).pipe(Effect.andThen(metric("connect_failure")), Effect.andThen(metric("fallback")), Effect.as(undefined))));
     if (!channel)
       return fallback(exchange);
-    lifecycle.delivery = "ready";
     if (channel.pending) {
       channel.pending = undefined;
       channel.checkpoint = undefined;
@@ -205,9 +203,11 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
     const create = yield* exchange.driver.create(channel.checkpoint).pipe(Effect.tapError(() => closeChannel(owner, channel)), Effect.onInterrupt(() => closeChannel(owner, channel)));
     if (create.mode === "full")
       channel.checkpoint = undefined;
-    const active = { queue: yield* Queue.bounded(INBOUND_CAPACITY), lifecycle };
+    const active = {
+      queue: yield* Queue.bounded(INBOUND_CAPACITY),
+      delivery: "send-attempted"
+    };
     channel.active = active;
-    lifecycle.delivery = "send-attempted";
     const sent = yield* channel.connection.sendText(create.message).pipe(Effect.withSpan("SessionModelTransport.send"), Effect.onInterrupt(() => closeChannel(owner, channel)), Effect.result);
     if (sent._tag === "Failure") {
       const failure = new AIError({
@@ -237,13 +237,13 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
         operation: "read",
         code: "idle-timeout",
         phase: "receive",
-        delivery: lifecycle.delivery === "provider-observed" ? "accepted" : "ambiguous"
+        delivery: active.delivery === "provider-observed" ? "accepted" : "ambiguous"
       }))
     }), Stream.mapEffect((frame) => exchange.driver.observe(create, frame)), Stream.tap((observation) => Effect.sync(() => {
       if (!observationTerminal(observation))
         return;
       terminal = observation;
-      lifecycle.delivery = "terminal";
+      active.delivery = "terminal";
       const staged = observation.type === "completed" ? observation.checkpoint : undefined;
       if (staged)
         channel.pending = { token, checkpoint: staged };
@@ -276,7 +276,7 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
         operation: "read",
         code: "incomplete",
         phase: "receive",
-        delivery: lifecycle.delivery === "provider-observed" ? "accepted" : "ambiguous"
+        delivery: active.delivery === "provider-observed" ? "accepted" : "ambiguous"
       });
       yield* poison(owner, channel, error);
     })), Stream.catch((error) => {
@@ -301,13 +301,12 @@ var makeLayer = (connector) => Layer.effect(Service, Effect.gen(function* () {
   const bind = (sessionID) => ({
     execute: (exchange) => {
       const owner = state(sessionID);
-      const lifecycle = { delivery: "queued" };
       let execution;
       return Effect.succeed({
         get http() {
           return execution?.http;
         },
-        frames: Stream.unwrap(Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(Effect.andThen(start(owner, exchange, lifecycle)), Effect.tap((started) => Effect.sync(() => {
+        frames: Stream.unwrap(Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(Effect.andThen(start(owner, exchange)), Effect.tap((started) => Effect.sync(() => {
           execution = started;
         })), Effect.map((started) => started.frames))),
         complete: Effect.suspend(() => execution?.complete ?? Effect.void)