@opencode-ai/core 0.0.0-dev-18673 → 0.0.0-dev-18680

package/dist/chunks/{job-ecft2zb7.js → session-6vrp5bxn.js}

@@ -1,48 +1,52 @@
 import {
   SessionInboxTable,
   SessionMessageTable
-} from "./job-q606pcse.js";
+} from "./session-q606pcse.js";
 import {
   SessionEvent
-} from "./job-a83yvq99.js";
+} from "./session-a83yvq99.js";
 import {
   SessionMessage
-} from "./job-8rpfd2h6.js";
+} from "./session-8rpfd2h6.js";
 import {
   SessionSchema
-} from "./job-bjwj8hwv.js";
+} from "./session-bjwj8hwv.js";
+import {
+  exports_bus
+} from "./session-21dv21pt.js";
+import {
+  exports_database
+} from "./session-s3h4mm47.js";
 import {
   exports_keyed_mutex
-} from "./job-0kvmztkf.js";
+} from "./session-0kvmztkf.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/session/inbox.ts
 var exports_inbox = {};
 __export(exports_inbox, {
-  steer: () => steer,
   serialized: () => serialized,
-  reconcile: () => reconcile,
-  queue: () => queue,
   promote: () => promote,
   projectDeliveryChanged: () => projectDeliveryChanged,
   projectDelivered: () => projectDelivered,
   projectCancelled: () => projectCancelled,
   projectAdmitted: () => projectAdmitted,
+  node: () => node,
   nextPromotable: () => nextPromotable,
   moveIDs: () => moveIDs,
+  make: () => make,
   list: () => list,
+  layer: () => layer,
   has: () => has,
   find: () => find,
-  cancel: () => cancel,
-  admitCompaction: () => admitCompaction,
-  admit: () => admit,
   UserPayload: () => UserPayload,
   User: () => User,
   SyntheticPayload: () => SyntheticPayload,
   Synthetic: () => Synthetic,
   SessionInbox: () => exports_inbox,
+  Service: () => Service,
   MovePayload: () => MovePayload,
   Move: () => Move,
   LifecycleConflict: () => LifecycleConflict,
@@ -53,7 +57,8 @@ __export(exports_inbox, {
   Compaction: () => Compaction
 });
 import { and, asc, eq, or } from "drizzle-orm";
-import { DateTime, Effect, Schema } from "effect";
+import { Context, DateTime, Effect, Layer, Schema } from "effect";
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
 import {
   Compaction,
   CompactionPayload,
@@ -83,6 +88,9 @@ class LifecycleConflict extends Schema.TaggedError()("SessionInbox.LifecycleConf
   id: SessionMessage.ID
 }) {
 }
+function matches(stored, request) {
+  return stored.sessionID === request.sessionID && stored.type === request.type;
+}
 var fromRow = (row) => {
   const base = {
     id: SessionMessage.ID.make(row.id),
@@ -123,7 +131,7 @@ var promotedFromMessage = Effect.fn("SessionInbox.promotedFromMessage")(function
   if (row === undefined)
     return;
   if (row.session_id !== sessionID || row.type !== "user" && row.type !== "synthetic")
-    return yield* Effect.die(new LifecycleConflict({ id }));
+    return yield* new LifecycleConflict({ id });
   const message = decodeMessage({ ...row.data, id: row.id, type: row.type });
   const base = { id, sessionID, timeCreated: message.time.created, delivery };
   if (message.type === "user")
@@ -138,55 +146,87 @@ var promotedFromMessage = Effect.fn("SessionInbox.promotedFromMessage")(function
       type: "synthetic",
       payload: decodeSynthetic(message)
     });
-  return yield* Effect.die(new LifecycleConflict({ id }));
+  return yield* new LifecycleConflict({ id });
 });
-var reconcile = Effect.fn("SessionInbox.reconcile")(function* (db, request) {
-  const existing = yield* find(db, request.id);
-  if (existing !== undefined) {
-    if (existing.type === "compaction")
-      return yield* Effect.die(new LifecycleConflict({ id: request.id }));
-    return existing;
-  }
-  return yield* promotedFromMessage(db, request.sessionID, request.id, request.delivery);
-});
-var admit = Effect.fn("SessionInbox.admit")(function* (db, bus, request) {
-  const existing = yield* reconcile(db, { ...request, delivery: request.item.delivery });
-  if (existing !== undefined)
+
+class Service extends Context.Service()("@opencode/SessionInbox") {
+}
+var make = Effect.fn("SessionInbox.make")(function* () {
+  const database = yield* exports_database.Service;
+  const db = database.db;
+  const bus = yield* exports_bus.Service;
+  const reconcile = Effect.fn("SessionInbox.reconcile")(function* (request) {
+    const existing = (yield* find(db, request.id)) ?? (yield* promotedFromMessage(db, request.sessionID, request.id, request.delivery));
+    if (existing === undefined)
+      return;
+    if (existing.type === "compaction" || !matches(existing, request))
+      return yield* new LifecycleConflict({ id: request.id });
     return existing;
-  return yield* bus.publish(SessionEvent.InboxEnqueued, {
-    inboxID: request.id,
-    sessionID: request.sessionID,
-    item: request.item
-  }).pipe(Effect.map((event) => Info.make({
-    id: request.id,
-    sessionID: request.sessionID,
-    timeCreated: DateTime.makeUnsafe(event.created),
-    ...request.item
-  })), Effect.catchDefect((defect) => find(db, request.id).pipe(Effect.flatMap((stored) => stored?.type === request.item.type ? Effect.succeed(stored) : Effect.die(defect)))));
-});
-var admitCompaction = Effect.fn("SessionInbox.admitCompaction")(function* (db, bus, input) {
-  return yield* serialized(input.sessionID, Effect.gen(function* () {
-    const exact = yield* find(db, input.id);
-    if (exact) {
-      if (exact.type === "compaction" && exact.sessionID === input.sessionID)
-        return exact;
-      return yield* Effect.die(new LifecycleConflict({ id: input.id }));
-    }
-    if (yield* promotedFromMessage(db, input.sessionID, input.id, input.delivery))
-      return yield* Effect.die(new LifecycleConflict({ id: input.id }));
-    const pending = (yield* list(db, input.sessionID)).find((item) => item.type === "compaction");
-    if (pending)
-      return pending;
-    const admitted = yield* admit(db, bus, {
-      id: input.id,
-      sessionID: input.sessionID,
-      item: Item.make({ type: "compaction", payload: {}, delivery: input.delivery })
-    });
-    if (admitted.type === "compaction")
-      return admitted;
-    return yield* Effect.die(new LifecycleConflict({ id: input.id }));
-  }));
+  });
+  const admit = Effect.fn("SessionInbox.admit")(function* (request) {
+    const existing = yield* reconcile({ ...request, type: request.item.type, delivery: request.item.delivery });
+    if (existing !== undefined)
+      return existing;
+    const admitted = yield* bus.publish(SessionEvent.InboxEnqueued, {
+      inboxID: request.id,
+      sessionID: request.sessionID,
+      item: request.item
+    }).pipe(Effect.map((event) => Info.make({
+      id: request.id,
+      sessionID: request.sessionID,
+      timeCreated: DateTime.makeUnsafe(event.created),
+      ...request.item
+    })), Effect.catchDefect((defect) => defect instanceof LifecycleConflict ? find(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 }))
+      return yield* new LifecycleConflict({ id: request.id });
+    return admitted;
+  });
+  const admitCompaction = Effect.fn("SessionInbox.admitCompaction")(function* (input) {
+    return yield* serialized(input.sessionID, Effect.gen(function* () {
+      const exact = yield* find(db, input.id);
+      if (exact) {
+        if (exact.type === "compaction" && exact.sessionID === input.sessionID)
+          return exact;
+        return yield* new LifecycleConflict({ id: input.id });
+      }
+      if (yield* promotedFromMessage(db, input.sessionID, input.id, input.delivery))
+        return yield* new LifecycleConflict({ id: input.id });
+      const pending = (yield* list(db, input.sessionID)).find((item) => item.type === "compaction");
+      if (pending)
+        return pending;
+      return yield* admit({
+        id: input.id,
+        sessionID: input.sessionID,
+        item: { type: "compaction", payload: {}, delivery: Delivery.make(input.delivery) }
+      });
+    }));
+  });
+  const cancel = Effect.fn("SessionInbox.cancel")((input) => publishMutation(input, bus.publish(SessionEvent.InboxCancelled, {
+    sessionID: input.sessionID,
+    inboxID: input.id
+  })));
+  const steer = Effect.fn("SessionInbox.steer")((input) => publishMutation(input, bus.publish(SessionEvent.InboxDeliveryChanged, {
+    sessionID: input.sessionID,
+    inboxID: input.id,
+    delivery: "steer"
+  })));
+  const queue = Effect.fn("SessionInbox.queue")((input) => publishMutation(input, bus.publish(SessionEvent.InboxDeliveryChanged, {
+    sessionID: input.sessionID,
+    inboxID: input.id,
+    delivery: "queue"
+  })));
+  return {
+    list: (sessionID) => list(db, sessionID),
+    reconcile,
+    admit,
+    admitCompaction,
+    cancel,
+    steer,
+    queue
+  };
 });
+var layer = Layer.effect(Service, make());
+var node = makeGlobalNode({ service: Service, layer, deps: [exports_database.node, exports_bus.node] });
 var projectAdmitted = Effect.fn("SessionInbox.projectAdmitted")(function* (db, request) {
   const message = yield* db.select({ id: SessionMessageTable.id }).from(SessionMessageTable).where(eq(SessionMessageTable.id, request.id)).get().pipe(Effect.orDie);
   if (message !== undefined)
@@ -245,21 +285,7 @@ var has = Effect.fn("SessionInbox.has")(function* (db, sessionID, scope) {
   const row = yield* db.select({ id: SessionInboxTable.id }).from(SessionInboxTable).where(and(eq(SessionInboxTable.session_id, sessionID), scope === "input" ? or(eq(SessionInboxTable.delivery, "steer"), eq(SessionInboxTable.delivery, "queue")) : eq(SessionInboxTable.delivery, scope))).limit(1).get().pipe(Effect.orDie);
   return row !== undefined;
 });
-var publishMutation = (input, effect) => serialized(input.sessionID, effect).pipe(Effect.asVoid);
-var cancel = Effect.fn("SessionInbox.cancel")((bus, input) => publishMutation(input, bus.publish(SessionEvent.InboxCancelled, {
-  sessionID: input.sessionID,
-  inboxID: input.id
-})));
-var steer = Effect.fn("SessionInbox.steer")((bus, input) => publishMutation(input, bus.publish(SessionEvent.InboxDeliveryChanged, {
-  sessionID: input.sessionID,
-  inboxID: input.id,
-  delivery: "steer"
-})));
-var queue = Effect.fn("SessionInbox.queue")((bus, input) => publishMutation(input, bus.publish(SessionEvent.InboxDeliveryChanged, {
-  sessionID: input.sessionID,
-  inboxID: input.id,
-  delivery: "queue"
-})));
+var publishMutation = (input, effect) => serialized(input.sessionID, effect).pipe(Effect.asVoid, Effect.catchDefect((defect) => defect instanceof LifecycleConflict ? Effect.fail(defect) : Effect.die(defect)));
 var publish = Effect.fn("SessionInbox.publish")(function* (db, bus, sessionID, rows) {
   yield* Effect.forEach(rows, (row) => {
     const entry = fromRow(row);
@@ -268,7 +294,7 @@ var publish = Effect.fn("SessionInbox.publish")(function* (db, bus, sessionID, r
     return bus.publish(SessionEvent.InboxDelivered, {
       sessionID,
       inboxID: entry.id
-    }).pipe(Effect.catchDefect((defect) => defect instanceof LifecycleConflict ? promotedFromMessage(db, sessionID, entry.id, entry.delivery).pipe(Effect.flatMap((stored) => stored !== undefined ? Effect.void : Effect.die(defect))) : Effect.die(defect)));
+    }).pipe(Effect.catchDefect((defect) => defect instanceof LifecycleConflict ? promotedFromMessage(db, sessionID, entry.id, entry.delivery).pipe(Effect.flatMap((stored) => stored !== undefined ? Effect.void : Effect.die(defect)), Effect.orDie) : Effect.die(defect)));
   }, { discard: true });
   return rows.length;
 });
@@ -290,4 +316,4 @@ var promote = Effect.fn("SessionInbox.promote")(function* (db, bus, sessionID, s
 });
 var pendingSteers = (db, sessionID) => db.select().from(SessionInboxTable).where(and(eq(SessionInboxTable.session_id, sessionID), eq(SessionInboxTable.delivery, "steer"))).orderBy(asc(SessionInboxTable.enqueued_seq)).all().pipe(Effect.orDie);
 
-export { Compaction, CompactionPayload, Delivery, Info, Item, Move, MovePayload, Synthetic, SyntheticPayload, User, UserPayload, serialized, LifecycleConflict, find, reconcile, admit, admitCompaction, projectAdmitted, projectDelivered, projectCancelled, projectDeliveryChanged, list, moveIDs, nextPromotable, has, cancel, steer, queue, promote, exports_inbox };
+export { Compaction, CompactionPayload, Delivery, Info, Item, Move, MovePayload, Synthetic, SyntheticPayload, User, UserPayload, serialized, LifecycleConflict, find, Service, make, layer, node, projectAdmitted, projectDelivered, projectCancelled, projectDeliveryChanged, list, moveIDs, nextPromotable, has, promote, exports_inbox };

package/dist/chunks/{job-6wkzvma0.js → session-6wkzvma0.js}

@@ -1,9 +1,9 @@
 import {
   exports_state
-} from "./job-x89rah0x.js";
+} from "./session-x89rah0x.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/filesystem/location-watcher-policy.ts
 var exports_location_watcher_policy = {};