@opencode/core 2.0.2 → 2.0.4

package/dist/chunks/{location-services-jv01nqvq.js → location-qn4ba14w.js}

@@ -1,15 +1,15 @@
 import {
   PositiveInt2
-} from "./location-services-922hggd3.js";
+} from "./location-922hggd3.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/v1/config/provider.ts
 var exports_provider2 = {};
 __export(exports_provider2, {
   ConfigProviderV1: () => exports_provider2,
-  Info: () => Info18,
+  Info: () => Info12,
   Model: () => Model2,
   ModelStatus: () => ModelStatus2
 });
@@ -61,7 +61,7 @@ var Model2 = Schema.Struct({
     disabled: Schema.optional(Schema.Boolean).annotate({ description: "Disable this variant for the model" })
   }), [Schema.Record(Schema.String, Schema.Any)])).annotate({ description: "Variant-specific configuration" }))
 });
-var Info18 = Schema.Struct({
+var Info12 = Schema.Struct({
   api: Schema.optional(Schema.String),
   name: Schema.optional(Schema.String),
   env: Schema.optional(Schema.mutable(Schema.Array(Schema.String))),
@@ -95,4 +95,4 @@ var Info18 = Schema.Struct({
   models: Schema.optional(Schema.Record(Schema.String, Model2))
 }).annotate({ identifier: "ProviderConfig" });
 
-export { ModelStatus2, Model2, Info18, exports_provider2 };
+export { ModelStatus2, Model2, Info12, exports_provider2 };

package/dist/chunks/{location-services-qsdy395h.js → location-qsdy395h.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/config/plugin/entry-observer.ts
 var exports_entry_observer = {};

package/dist/chunks/{location-services-2gv9ss0t.js → location-qx4vf964.js}

@@ -1,10 +1,10 @@
 import {
-  Service79,
-  node84
-} from "./location-services-69j49pks.js";
+  Service78,
+  node82
+} from "./location-tsjh32me.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/form.ts
 var exports_form = {};
@@ -12,40 +12,40 @@ __export(exports_form, {
   AlreadyExistsError: () => AlreadyExistsError2,
   AlreadySettledError: () => AlreadySettledError2,
   Answer: () => Answer2,
-  Event: () => Event16,
+  Event: () => Event20,
   Field: () => Field2,
   Fields: () => Fields2,
   Form: () => exports_form,
-  ID: () => ID10,
-  Info: () => Info24,
+  ID: () => ID16,
+  Info: () => Info31,
   InvalidAnswerError: () => InvalidAnswerError2,
   InvalidFormError: () => InvalidFormError2,
-  NotFoundError: () => NotFoundError7,
-  Reply: () => Reply2,
-  Service: () => Service67,
+  NotFoundError: () => NotFoundError10,
+  Reply: () => Reply3,
+  Service: () => Service75,
   State: () => State3,
   When: () => When2,
-  layer: () => layer24,
-  node: () => node72,
+  layer: () => layer25,
+  node: () => node79,
   validateAnswer: () => validateAnswer2,
   validateFields: () => validateFields2
 });
 import { Form } from "@opencode/schema/form";
 import { Cache, Context, Deferred, Duration, Effect, Exit, Layer, Option, Schema } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
-import { Event as Event16 } from "@opencode/schema/form";
+import { Event as Event20 } from "@opencode/schema/form";
 var RETENTION = Duration.minutes(10);
-var ID10 = Form.ID;
-var Info24 = Form.Info;
+var ID16 = Form.ID;
+var Info31 = Form.Info;
 var Field2 = Form.Field;
 var Fields2 = Form.Fields;
 var When2 = Form.When;
 var State3 = Form.State;
 var Answer2 = Form.Answer;
-var Reply2 = Form.Reply;
+var Reply3 = Form.Reply;
 
-class NotFoundError7 extends Schema.TaggedError()("Form.NotFoundError", {
-  id: ID10
+class NotFoundError10 extends Schema.TaggedError()("Form.NotFoundError", {
+  id: ID16
 }) {
   get message() {
     return `Form not found: ${this.id}`;
@@ -53,7 +53,7 @@ class NotFoundError7 extends Schema.TaggedError()("Form.NotFoundError", {
 }
 
 class AlreadySettledError2 extends Schema.TaggedError()("Form.AlreadySettledError", {
-  id: ID10
+  id: ID16
 }) {
   get message() {
     return `Form already settled: ${this.id}`;
@@ -61,7 +61,7 @@ class AlreadySettledError2 extends Schema.TaggedError()("Form.AlreadySettledErro
 }
 
 class AlreadyExistsError2 extends Schema.TaggedError()("Form.AlreadyExistsError", {
-  id: ID10
+  id: ID16
 }) {
   get message() {
     return `Form already exists: ${this.id}`;
@@ -69,7 +69,7 @@ class AlreadyExistsError2 extends Schema.TaggedError()("Form.AlreadyExistsError"
 }
 
 class InvalidAnswerError2 extends Schema.TaggedError()("Form.InvalidAnswerError", {
-  id: ID10,
+  id: ID16,
   message: Schema.String
 }) {
 }
@@ -79,17 +79,17 @@ class InvalidFormError2 extends Schema.TaggedError()("Form.InvalidFormError", {
 }) {
 }
 
-class Service67 extends Context.Service()("@opencode/Form") {
+class Service75 extends Context.Service()("@opencode/Form") {
 }
-var layer24 = Layer.effect(Service67, Effect.gen(function* () {
-  const bus = yield* Service79;
+var layer25 = Layer.effect(Service75, Effect.gen(function* () {
+  const bus = yield* Service78;
   const forms = yield* Cache.makeWith(() => Effect.die(new Error("Form cache must be used via set/getSuccess, never get")), {
     capacity: Number.MAX_SAFE_INTEGER,
     timeToLive: (exit) => Exit.isSuccess(exit) && exit.value.state.status === "pending" ? Duration.infinity : RETENTION
   });
-  const requireEntry = Effect.fn("Form.requireEntry")((id) => Cache.getSuccess(forms, id).pipe(Effect.flatMap((entry) => Effect.fromOption(entry, () => new NotFoundError7({ id })))));
+  const requireEntry = Effect.fn("Form.requireEntry")((id) => Cache.getSuccess(forms, id).pipe(Effect.flatMap((entry) => Effect.fromOption(entry, () => new NotFoundError10({ id })))));
   const create = Effect.fn("Form.create")((input) => Effect.uninterruptible(Effect.gen(function* () {
-    const id = input.id ?? ID10.create();
+    const id = input.id ?? ID16.create();
     const existing = yield* Cache.getSuccess(forms, id);
     if (Option.isSome(existing))
       return yield* new AlreadyExistsError2({ id });
@@ -153,9 +153,9 @@ var layer24 = Layer.effect(Service67, Effect.gen(function* () {
     yield* Deferred.succeed(entry.deferred, next);
   })));
   yield* Effect.addFinalizer(() => Cache.values(forms).pipe(Effect.flatMap((entries) => Effect.forEach(Array.from(entries).filter((entry) => entry.state.status === "pending"), (entry) => cancel(entry.form.id).pipe(Effect.ignore), { discard: true }))));
-  return Service67.of({ create, ask, get, list, state, reply, cancel });
+  return Service75.of({ create, ask, get, list, state, reply, cancel });
 }));
-var node72 = makeLocationNode({ service: Service67, layer: layer24, deps: [node84] });
+var node79 = makeLocationNode({ service: Service75, layer: layer25, deps: [node82] });
 function validateAnswer2(form, answer) {
   const fields = new Map(form.map((field) => [field.key, field]));
   for (const key of Object.keys(answer)) {
@@ -307,4 +307,4 @@ function isDateTime(value) {
   return !Number.isNaN(new Date(value).getTime());
 }
 
-export { ID10, Info24, Field2, Fields2, When2, State3, Answer2, Reply2, NotFoundError7, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service67, layer24, node72, validateAnswer2, validateFields2, exports_form, Event16 };
+export { ID16, Info31, Field2, Fields2, When2, State3, Answer2, Reply3, NotFoundError10, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service75, layer25, node79, validateAnswer2, validateFields2, exports_form, Event20 };

package/dist/chunks/{location-services-3z34j0cx.js → location-r54z1mhc.js}

@@ -1,32 +1,35 @@
 import {
   mergeOverlay2,
   mergeHeaders2
-} from "./location-services-33n3bzdy.js";
+} from "./location-1gfezbxs.js";
 import {
   latest2,
-  Service55
-} from "./location-services-req99jdj.js";
+  Service38
+} from "./location-pb8g46v2.js";
+import {
+  resolve4
+} from "./location-a8d2vvnh.js";
 import {
   observe2
-} from "./location-services-qsdy395h.js";
+} from "./location-qsdy395h.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/config/plugin/provider.ts
 var exports_provider = {};
 __export(exports_provider, {
   ConfigProviderPlugin: () => exports_provider,
-  Plugin: () => Plugin35
+  Plugin: () => Plugin24
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Money } from "@opencode/schema/money";
 import { Effect } from "effect";
-var Plugin35 = define({
+var Plugin24 = define({
   id: "opencode.config.provider",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service55;
-    const loaded = yield* observe2(config, ctx.event, ctx.integration.reload().pipe(Effect.andThen(ctx.catalog.reload())));
+    const config = yield* Service38;
+    const loaded = yield* observe2(config, ctx.event, ctx.integration.reload().pipe(Effect.andThen(ctx.provider.reload())));
     yield* ctx.integration.transform((integrations) => {
       for (const [id, provider] of configuredProviders(loaded.entries)) {
         const integrationID = id;
@@ -47,16 +50,18 @@ var Plugin35 = define({
         }
       }
     });
-    yield* ctx.catalog.transform((catalog) => {
-      const configuredDefault = latest2(loaded.entries, "model");
-      if (configuredDefault !== undefined)
-        catalog.model.default.set(configuredDefault.providerID, configuredDefault.model);
+    const sources = {
+      defaultModel: undefined,
+      models: new Map
+    };
+    yield* ctx.provider.transform((providers) => {
+      const next = new Map;
       for (const [id, item] of configuredProviders(loaded.entries)) {
         const providerID = id;
-        const current = catalog.provider.get(providerID);
-        const source = catalog.provider.get(item.canonical ?? current?.provider.canonical ?? providerID);
+        const current = providers.get(providerID);
+        const source = providers.get(item.canonical ?? current?.provider.canonical ?? providerID);
         const changed = item.canonical !== undefined && item.canonical !== current?.provider.canonical;
-        catalog.provider.update(providerID, (provider) => {
+        providers.update(providerID, (provider) => {
           if (changed && source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), {
               id: provider.id,
@@ -71,8 +76,8 @@ var Plugin35 = define({
             provider.package = item.package;
           if (item.compaction !== undefined)
             provider.compaction = { ...item.compaction };
-          if (item.websocket !== undefined)
-            provider.websocket = item.websocket;
+          if (item.transport !== undefined)
+            provider.transport = item.transport;
           if (item.settings !== undefined)
             provider.settings = mergeOverlay2(provider.settings, item.settings);
           if (item.headers !== undefined)
@@ -80,12 +85,39 @@ var Plugin35 = define({
           if (item.body !== undefined)
             provider.body = mergeOverlay2(provider.body, item.body);
         });
+        const definitions = new Map;
         for (const [id, config] of Object.entries(item.models ?? {})) {
           const base = source?.models.get(config.modelID ?? id) ?? source?.models.get(id);
-          const inherit = changed || !catalog.model.get(providerID, id);
-          catalog.model.update(providerID, id, (model) => {
-            if (inherit && base) {
+          const inherit = changed || !current?.models.has(id);
+          definitions.set(id, { inherit, base: base && structuredClone(base) });
+          if (!inherit)
+            continue;
+          providers.models.update(providerID, id, (model) => {
+            if (base)
               Object.assign(model, structuredClone(base));
+            if (item.package !== undefined)
+              model.package = undefined;
+            if (item.settings?.baseURL !== undefined && model.settings)
+              delete model.settings.baseURL;
+          });
+        }
+        next.set(item, { providerID, models: definitions });
+      }
+      sources.defaultModel = latest2(loaded.entries, "model");
+      sources.models = next;
+    });
+    yield* ctx.model.transform((models) => {
+      const configuredDefault = sources.defaultModel;
+      if (configuredDefault !== undefined)
+        models.default.set(configuredDefault.providerID, configuredDefault.model);
+      for (const [item, definition] of sources.models) {
+        const providerID = definition.providerID;
+        for (const [id, config] of Object.entries(item.models ?? {})) {
+          const source = definition.models.get(id);
+          const inherit = source?.inherit || !models.get(providerID, id);
+          models.update(providerID, id, (model) => {
+            if (inherit && source?.base) {
+              Object.assign(model, structuredClone(source.base));
               if (item.package !== undefined)
                 model.package = undefined;
               if (item.settings?.baseURL !== undefined && model.settings)
@@ -103,8 +135,8 @@ var Plugin35 = define({
               model.package = config.package;
             if (config.compaction !== undefined)
               model.compaction = { ...config.compaction };
-            if (config.websocket !== undefined)
-              model.websocket = config.websocket;
+            if (config.transport !== undefined)
+              model.transport = config.transport;
             if (config.settings !== undefined)
               model.settings = mergeOverlay2(model.settings, config.settings);
             if (config.headers !== undefined)
@@ -150,6 +182,15 @@ var Plugin35 = define({
             if (config.limit !== undefined)
               model.limit = { ...model.limit, ...config.limit };
           });
+          if (config.variants === undefined && !source?.base)
+            models.update(providerID, id, (model) => {
+              model.variants = [
+                ...resolve4({
+                  ...model,
+                  package: model.package ?? models.provider.get(providerID)?.provider.package
+                })
+              ];
+            });
         }
       }
     });
@@ -159,4 +200,4 @@ function configuredProviders(entries) {
   return entries.filter((entry) => entry.type === "document").flatMap((file) => Object.entries(file.info.providers ?? {}));
 }
 
-export { Plugin35, exports_provider };
+export { Plugin24, exports_provider };

package/dist/chunks/{location-services-20tey5zg.js → location-r62y7mfn.js}

@@ -1,41 +1,41 @@
 import {
-  Service69
-} from "./location-services-fe7neb4g.js";
+  Service64
+} from "./location-7x9k4znd.js";
 import {
-  ID11,
+  ID7,
   Name2,
   toModelOutput3,
   prepare3,
-  Service68
-} from "./location-services-dpv3ckk4.js";
+  Service63
+} from "./location-t5fxxz44.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/tool/plugin/skill.ts
 var exports_skill = {};
 __export(exports_skill, {
-  Input: () => Input10,
-  Output: () => Output7,
-  Plugin: () => Plugin11,
+  Input: () => Input12,
+  Output: () => Output8,
+  Plugin: () => Plugin13,
   SkillTool: () => exports_skill,
-  description: () => description4,
-  name: () => name10,
+  description: () => description5,
+  name: () => name12,
   toModelOutput: () => toModelOutput2
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import { FSUtil } from "@opencode/util/fs-util";
-var name10 = "skill";
-var Input10 = Schema.Struct({
-  id: ID11.annotate({ description: "The ID of an available skill or a skill explicitly referenced by the user" })
+var name12 = "skill";
+var Input12 = Schema.Struct({
+  id: ID7.annotate({ description: "The ID of an available skill or a skill explicitly referenced by the user" })
 });
-var Output7 = Schema.Struct({
+var Output8 = Schema.Struct({
   name: Name2,
   directory: Schema.String,
   output: Schema.String
 });
-var description4 = [
+var description5 = [
   "Load a specialized skill's instructions and resources into the current conversation when the task at hand matches its description.",
   "",
   "The skill ID must match an available skill or a skill explicitly referenced by the user."
@@ -43,25 +43,25 @@ var description4 = [
 `);
 var toModelOutput2 = toModelOutput3;
 var unableToLoad = (name, error) => new ToolFailure({ message: `Unable to load skill ${name}`, error });
-var Plugin11 = {
+var Plugin13 = {
   id: "opencode.tool.skill",
   effect: Effect.fn("SkillTool.Plugin")(function* (ctx) {
     const fs = yield* FSUtil.Service;
-    const skills = yield* Service68;
-    const permission = yield* Service69;
+    const skills = yield* Service63;
+    const permission = yield* Service64;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name10,
+      name: name12,
       options: { codemode: false },
-      description: description4,
-      input: Input10,
-      output: Output7,
+      description: description5,
+      input: Input12,
+      output: Output8,
       execute: (input, context) => Effect.gen(function* () {
         const skill = yield* skills.get(input.id);
         if (!skill)
           return yield* unableToLoad(input.id);
         return yield* Effect.gen(function* () {
           yield* permission.assert({
-            action: name10,
+            action: name12,
             resources: [skill.id],
             save: [skill.id],
             sessionID: context.sessionID,
@@ -79,4 +79,4 @@ var Plugin11 = {
   })
 };
 
-export { name10, Input10, Output7, description4, toModelOutput2, Plugin11, exports_skill };
+export { name12, Input12, Output8, description5, toModelOutput2, Plugin13, exports_skill };

package/dist/chunks/{location-services-r9mregkx.js → location-r9mregkx.js}

@@ -1,10 +1,10 @@
 import {
   definition2,
   normalizedName2
-} from "./location-services-3w5fmr99.js";
+} from "./location-3w5fmr99.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/codemode/tool.ts
 var exports_tool2 = {};

package/dist/chunks/{location-services-kg06axw8.js → location-rdw6cm16.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/state.ts
 var exports_state = {};
@@ -129,6 +129,8 @@ function create3(options) {
   }));
   return {
     get,
+    invalidate,
+    revision: () => version,
     transform: Effect.fn("State.transform")(function* (update) {
       yield* Effect.annotateCurrentSpan("state", options.name ?? "anonymous");
       const scope = yield* Scope.Scope;

package/dist/chunks/{location-services-rq8nv58m.js → location-rp6d2jqx.js}

@@ -1,30 +1,30 @@
 import {
-  Service80,
-  node85
-} from "./location-services-v9b1dqp1.js";
+  Service82,
+  node86
+} from "./location-yq2q1mjm.js";
 import {
   makeUnsafe2
-} from "./location-services-dpkg50ah.js";
+} from "./location-y71avatq.js";
 import {
-  Service79,
-  node84
-} from "./location-services-69j49pks.js";
+  Service78,
+  node82
+} from "./location-tsjh32me.js";
 import {
   SessionEvent2
-} from "./location-services-ec1grn59.js";
+} from "./location-ec1grn59.js";
 import {
   SessionMessage2
-} from "./location-services-gftt206x.js";
+} from "./location-gftt206x.js";
 import {
   SessionSchema2
-} from "./location-services-j7wq2tw5.js";
+} from "./location-7w99qc9d.js";
 import {
   SessionMessageTable2,
   SessionInboxTable2
-} from "./location-services-5c4hm403.js";
+} from "./location-a1bz86dw.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/session/inbox.ts
 var exports_inbox = {};
@@ -32,12 +32,12 @@ __export(exports_inbox, {
   Compaction: () => Compaction2,
   CompactionPayload: () => CompactionPayload2,
   Delivery: () => Delivery2,
-  Info: () => Info9,
+  Info: () => Info17,
   Item: () => Item2,
   LifecycleConflict: () => LifecycleConflict2,
   Move: () => Move2,
   MovePayload: () => MovePayload2,
-  Service: () => Service46,
+  Service: () => Service48,
   SessionInbox: () => exports_inbox,
   Synthetic: () => Synthetic2,
   SyntheticPayload: () => SyntheticPayload2,
@@ -45,9 +45,9 @@ __export(exports_inbox, {
   UserPayload: () => UserPayload2,
   find: () => find2,
   has: () => has2,
-  layer: () => layer19,
-  list: () => list3,
-  make: () => make18,
+  layer: () => layer20,
+  list: () => list4,
+  make: () => make16,
   moveIDs: () => moveIDs2,
   nextPromotable: () => nextPromotable2,
   node: () => node50,
@@ -65,7 +65,7 @@ import {
   Compaction as Compaction2,
   CompactionPayload as CompactionPayload2,
   Delivery as Delivery2,
-  Info as Info9,
+  Info as Info17,
   Item as Item2,
   Move as Move2,
   MovePayload as MovePayload2,
@@ -97,7 +97,7 @@ var fromRow = (row) => {
   const base = {
     id: SessionMessage2.ID.make(row.id),
     sessionID: SessionSchema2.ID.make(row.session_id),
-    timeCreated: DateTime.makeUnsafe(row.time_created)
+    time: { created: DateTime.makeUnsafe(row.time_created) }
   };
   if (row.type === "compaction")
     return Compaction2.make({
@@ -135,7 +135,7 @@ var promotedFromMessage = Effect.fn("SessionInbox.promotedFromMessage")(function
   if (row.session_id !== sessionID || row.type !== "user" && row.type !== "synthetic")
     return yield* new LifecycleConflict2({ id });
   const message = decodeMessage({ ...row.data, id: row.id, type: row.type });
-  const base = { id, sessionID, timeCreated: message.time.created, delivery };
+  const base = { id, sessionID, time: { created: message.time.created }, delivery };
   if (message.type === "user")
     return User2.make({
       ...base,
@@ -151,12 +151,12 @@ var promotedFromMessage = Effect.fn("SessionInbox.promotedFromMessage")(function
   return yield* new LifecycleConflict2({ id });
 });
 
-class Service46 extends Context.Service()("@opencode/SessionInbox") {
+class Service48 extends Context.Service()("@opencode/SessionInbox") {
 }
-var make18 = Effect.fn("SessionInbox.make")(function* () {
-  const database = yield* Service80;
+var make16 = Effect.fn("SessionInbox.make")(function* () {
+  const database = yield* Service82;
   const db = database.db;
-  const bus = yield* Service79;
+  const bus = yield* Service78;
   const reconcile = Effect.fn("SessionInbox.reconcile")(function* (request) {
     const existing = (yield* find2(db, request.id)) ?? (yield* promotedFromMessage(db, request.sessionID, request.id, request.delivery));
     if (existing === undefined)
@@ -173,10 +173,10 @@ var make18 = Effect.fn("SessionInbox.make")(function* () {
       inboxID: request.id,
       sessionID: request.sessionID,
       item: request.item
-    }).pipe(Effect.map((event) => Info9.make({
+    }).pipe(Effect.map((event) => Info17.make({
       id: request.id,
       sessionID: request.sessionID,
-      timeCreated: DateTime.makeUnsafe(event.created),
+      time: { created: DateTime.makeUnsafe(event.created) },
       ...request.item
     })), Effect.catchDefect((defect) => defect instanceof LifecycleConflict2 ? find2(db, request.id).pipe(Effect.flatMap((stored) => stored === undefined ? Effect.fail(defect) : Effect.succeed(stored))) : Effect.die(defect)));
     if (!matches(admitted, { ...request, type: request.item.type }))
@@ -193,7 +193,7 @@ var make18 = Effect.fn("SessionInbox.make")(function* () {
       }
       if (yield* promotedFromMessage(db, input.sessionID, input.id, input.delivery))
         return yield* new LifecycleConflict2({ id: input.id });
-      const pending = (yield* list3(db, input.sessionID)).find((item) => item.type === "compaction");
+      const pending = (yield* list4(db, input.sessionID)).find((item) => item.type === "compaction");
       if (pending)
         return pending;
       return yield* admit({
@@ -218,7 +218,7 @@ var make18 = Effect.fn("SessionInbox.make")(function* () {
     delivery: "queue"
   })));
   return {
-    list: (sessionID) => list3(db, sessionID),
+    list: (sessionID) => list4(db, sessionID),
     reconcile,
     admit,
     admitCompaction,
@@ -227,8 +227,8 @@ var make18 = Effect.fn("SessionInbox.make")(function* () {
     queue
   };
 });
-var layer19 = Layer.effect(Service46, make18());
-var node50 = makeGlobalNode({ service: Service46, layer: layer19, deps: [node85, node84] });
+var layer20 = Layer.effect(Service48, make16());
+var node50 = makeGlobalNode({ service: Service48, layer: layer20, deps: [node86, node82] });
 var projectAdmitted2 = Effect.fn("SessionInbox.projectAdmitted")(function* (db, request) {
   const message = yield* db.select({ id: SessionMessageTable2.id }).from(SessionMessageTable2).where(eq(SessionMessageTable2.id, request.id)).get().pipe(Effect.orDie);
   if (message !== undefined)
@@ -266,7 +266,7 @@ var projectDeliveryChanged2 = Effect.fn("SessionInbox.projectDeliveryChanged")((
   from: input.delivery === "steer" ? "queue" : "steer",
   to: input.delivery
 }));
-var list3 = Effect.fn("SessionInbox.list")(function* (db, sessionID) {
+var list4 = Effect.fn("SessionInbox.list")(function* (db, sessionID) {
   const rows = yield* db.select().from(SessionInboxTable2).where(eq(SessionInboxTable2.session_id, sessionID)).orderBy(asc(SessionInboxTable2.enqueued_seq)).all().pipe(Effect.orDie);
   return rows.map(fromRow);
 });
@@ -326,4 +326,4 @@ var pendingSteers = (db, sessionID) => db.select().from(SessionInboxTable2).wher
   return rows;
 }));
 
-export { Compaction2, CompactionPayload2, Delivery2, Info9, Item2, Move2, MovePayload2, Synthetic2, SyntheticPayload2, User2, UserPayload2, serialized2, LifecycleConflict2, find2, Service46, make18, layer19, node50, projectAdmitted2, projectDelivered2, projectCancelled2, projectDeliveryChanged2, list3, moveIDs2, nextPromotable2, has2, promote2, exports_inbox };
+export { Compaction2, CompactionPayload2, Delivery2, Info17, Item2, Move2, MovePayload2, Synthetic2, SyntheticPayload2, User2, UserPayload2, serialized2, LifecycleConflict2, find2, Service48, make16, layer20, node50, projectAdmitted2, projectDelivered2, projectCancelled2, projectDeliveryChanged2, list4, moveIDs2, nextPromotable2, has2, promote2, exports_inbox };