@opencode-ai/core 0.0.0-beta-18600 → 0.0.0-beta-18707

package/dist/chunks/{project-ayrkq19e.js → model-kvhsphac.js}

@@ -1,48 +1,52 @@
 import {
   SessionInboxTable,
   SessionMessageTable
-} from "./project-q606pcse.js";
+} from "./model-q606pcse.js";
 import {
   SessionMessage
-} from "./project-8rpfd2h6.js";
+} from "./model-8rpfd2h6.js";
+import {
+  SessionSchema
+} from "./model-bjwj8hwv.js";
 import {
   SessionEvent
-} from "./project-a83yvq99.js";
+} from "./model-a83yvq99.js";
 import {
-  SessionSchema
-} from "./project-bjwj8hwv.js";
+  exports_bus
+} from "./model-vwkfg4n5.js";
+import {
+  exports_database
+} from "./model-rrbd0qbq.js";
 import {
   exports_keyed_mutex
-} from "./project-0kvmztkf.js";
+} from "./model-0kvmztkf.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-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 }));
-});
-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);
+  return yield* new LifecycleConflict({ id });
 });
-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/{project-3qv8nf0b.js → model-kww0mg52.js}

@@ -1,6 +1,6 @@
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./model-fex42j86.js";
 
 // src/plugin/provider/nvidia.ts
 import { Effect } from "effect";

package/dist/chunks/{project-sag4arrb.js → model-mdperjk5.js}

@@ -1,12 +1,12 @@
-import {
-  exports_state
-} from "./project-x89rah0x.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./model-vwkfg4n5.js";
+import {
+  exports_state
+} from "./model-x89rah0x.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/command.ts
 var exports_command = {};

package/dist/chunks/{project-mf0hyk7z.js → model-mf0hyk7z.js}

@@ -1,6 +1,6 @@
 import {
   Timestamps
-} from "./project-sem2g21k.js";
+} from "./model-sem2g21k.js";
 
 // src/credential/sql.ts
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{project-qfwv4tag.js → model-mfzf5b1q.js}

@@ -1,27 +1,27 @@
 import {
-  exports_filesystem
-} from "./project-brrb2k9c.js";
+  exports_location_mutation
+} from "./model-zyaamr6c.js";
 import {
   exports_permission
-} from "./project-12r08axk.js";
+} from "./model-955f6cmy.js";
+import {
+  exports_filesystem
+} from "./model-mn601gd8.js";
 import {
   exports_ripgrep
-} from "./project-8t2ap2vm.js";
+} from "./model-j8pa1s6t.js";
 import {
   exports_environment1 as exports_environment
-} from "./project-0xzcm754.js";
-import {
-  exports_location_mutation
-} from "./project-sg39537v.js";
+} from "./model-bach7bae.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./model-xy3y21dp.js";
 import {
   RelativePath
-} from "./project-j07kk359.js";
+} from "./model-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/tool/plugin/grep.ts
 var exports_grep = {};

package/dist/chunks/{project-brrb2k9c.js → model-mn601gd8.js}

@@ -1,16 +1,16 @@
 import {
   exports_search
-} from "./project-hxw68eqm.js";
+} from "./model-pdyjpm6a.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./model-xy3y21dp.js";
 import {
   PositiveInt,
   RelativePath
-} from "./project-j07kk359.js";
+} from "./model-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/filesystem.ts
 var exports_filesystem = {};

package/dist/chunks/{project-mnb85w6b.js → model-mnb85w6b.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./model-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/worktree/directory.ts
 var exports_directory = {};

package/dist/chunks/{project-mx048vt2.js → model-mvnt3mgd.js}

@@ -1,12 +1,9 @@
 import {
   exports_permission
-} from "./project-12r08axk.js";
-import {
-  exports_agent
-} from "./project-vqt151v9.js";
+} from "./model-955f6cmy.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/plugin/plan.ts
 var exports_plan = {};
@@ -16,10 +13,11 @@ __export(exports_plan, {
 });
 import { Message, ToolFailure } from "@opencode-ai/ai";
 import { define } from "@opencode-ai/plugin/effect/plugin";
+import { Agent } from "@opencode-ai/schema/agent";
 import { Global } from "@opencode-ai/util/global";
 import { Effect, Stream } from "effect";
 import path from "path";
-var plan = exports_agent.ID.make("plan");
+var plan = Agent.ID.make("plan");
 var enter = (directory) => `<system-reminder>
 You are in Plan mode. You may optionally create or update plan documents in:
 ${directory}
@@ -39,7 +37,7 @@ var Plugin = define({
     const enterReminder = enter(directory);
     yield* ctx.agent.transform((draft) => {
       draft.update(plan, (item) => {
-        item.name = exports_agent.Name.make("Plan");
+        item.name = Agent.Name.make("Plan");
         item.description = "Read-only agent for exploring the codebase and planning work before implementation.";
         item.mode = "primary";
         item.permissions.push({ action: "question", resource: "*", effect: "allow" });

package/dist/chunks/{project-mxvw03gv.js → model-mxvw03gv.js}

@@ -1,6 +1,6 @@
 import {
   __require
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/plugin/provider/openai-compatible.ts
 import { Effect } from "effect";

package/dist/chunks/{project-vphhr7s2.js → model-mzdc39r5.js}

@@ -1,15 +1,15 @@
 import {
   exports_entry_observer
-} from "./project-kp1t5rcy.js";
+} from "./model-kp1t5rcy.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./model-qmpdqet2.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./model-fex42j86.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/config/plugin/provider.ts
 var exports_provider2 = {};

package/dist/chunks/{project-qmbgqwhj.js → model-n45137pn.js}

@@ -1,12 +1,12 @@
 import {
   exports_kv
-} from "./project-cbdh5emr.js";
+} from "./model-19q29b17.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./model-vwkfg4n5.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./model-rvfvac9x.js";
 
 // src/wellknown.ts
 var exports_wellknown = {};
@@ -96,53 +96,47 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     return entries;
   });
   const refresh = Effect.fn("WellKnown.refresh")(function* () {
-    return yield* lock.withPermit(Effect.gen(function* () {
-      const value = yield* kv.get(sourcesKey);
-      const origins = Schema.is(Sources)(value) ? value : [];
-      if (!origins.length)
-        return false;
-      const entries = yield* Effect.forEach(origins, loadEntry);
-      const next = new Map(entries.map((entry) => [entry.origin, entry]));
-      const changed = !isDeepStrictEqual(Ref.getUnsafe(cache), next);
-      if (!changed)
-        return false;
-      yield* Ref.set(cache, next);
-      yield* bus.publish(Event.Updated, {});
-      return true;
-    }));
-  });
+    const value = yield* kv.get(sourcesKey);
+    const origins = Schema.is(Sources)(value) ? value : [];
+    if (!origins.length)
+      return false;
+    const entries = yield* Effect.forEach(origins, loadEntry);
+    const next = new Map(entries.map((entry) => [entry.origin, entry]));
+    const changed = !isDeepStrictEqual(Ref.getUnsafe(cache), next);
+    if (!changed)
+      return false;
+    yield* Ref.set(cache, next);
+    yield* bus.publish(Event.Updated, {});
+    return true;
+  }, (effect) => lock.withPermit(effect));
   return Service.of({
     entries: load,
     snapshot: () => Array.from(Ref.getUnsafe(cache).values()),
     refresh,
     add: Effect.fn("WellKnown.add")(function* (value) {
-      return yield* lock.withPermit(Effect.gen(function* () {
-        const origin = value.replace(/\/+$/, "");
-        const entry = yield* loadEntry(origin);
-        if (!entry.manifest.auth)
-          return yield* Effect.fail(new Error(`No authentication method found at ${origin}`));
-        const sources = yield* kv.get(sourcesKey);
-        const origins = Schema.is(Sources)(sources) ? sources : [];
-        yield* kv.set(sourcesKey, Array.from(new Set([...origins, origin])));
-        yield* Ref.update(cache, (current) => new Map(current).set(origin, entry));
-        yield* bus.publish(Event.Updated, {});
-        return entry;
-      }));
-    }),
+      const origin = value.replace(/\/+$/, "");
+      const entry = yield* loadEntry(origin);
+      if (!entry.manifest.auth)
+        return yield* Effect.fail(new Error(`No authentication method found at ${origin}`));
+      const sources = yield* kv.get(sourcesKey);
+      const origins = Schema.is(Sources)(sources) ? sources : [];
+      yield* kv.set(sourcesKey, Array.from(new Set([...origins, origin])));
+      yield* Ref.update(cache, (current) => new Map(current).set(origin, entry));
+      yield* bus.publish(Event.Updated, {});
+      return entry;
+    }, (effect, _value) => lock.withPermit(effect)),
     remove: Effect.fn("WellKnown.remove")(function* (value) {
-      yield* lock.withPermit(Effect.gen(function* () {
-        const origin = value.replace(/\/+$/, "");
-        const sources = yield* kv.get(sourcesKey);
-        const origins = Schema.is(Sources)(sources) ? sources : [];
-        yield* kv.set(sourcesKey, origins.filter((item) => item !== origin));
-        yield* Ref.update(cache, (current) => {
-          const next = new Map(current);
-          next.delete(origin);
-          return next;
-        });
-        yield* bus.publish(Event.Updated, {});
-      }));
-    }),
+      const origin = value.replace(/\/+$/, "");
+      const sources = yield* kv.get(sourcesKey);
+      const origins = Schema.is(Sources)(sources) ? sources : [];
+      yield* kv.set(sourcesKey, origins.filter((item) => item !== origin));
+      yield* Ref.update(cache, (current) => {
+        const next = new Map(current);
+        next.delete(origin);
+        return next;
+      });
+      yield* bus.publish(Event.Updated, {});
+    }, (effect, _value) => lock.withPermit(effect)),
     resolve: Effect.fn("WellKnown.resolveEntry")((entry, variables) => resolveEntry(entry, variables).pipe(Effect.provideService(HttpClient.HttpClient, http)))
   });
 }));