@relayfx/sdk 0.0.10 → 0.0.12

package/dist/index.js

@@ -2140,7 +2140,7 @@ __export(exports_envelope_repository, {
   EnvelopeReadyClaimMismatch: () => EnvelopeReadyClaimMismatch,
   EnvelopeNotFound: () => EnvelopeNotFound
 });
-import { and as and2, asc as asc5, desc as desc2, eq as eq7, lte, or, sql as sql5 } from "drizzle-orm";
+import { and as and2, asc as asc5, desc as desc2, eq as eq7, inArray, lte, or, sql as sql5 } from "drizzle-orm";
 import { Context as Context9, Effect as Effect9, Layer as Layer9, Schema as Schema18 } from "effect";
 var WaitState = Schema18.Literals(["open", "resolved", "timed_out", "cancelled"]).annotate({
   identifier: "Relay.Store.WaitState"
@@ -2326,10 +2326,7 @@ var layer9 = Layer9.effect(Service9, Effect9.gen(function* () {
   });
   const claimReady = Effect9.fn("EnvelopeRepository.claimReady")(function* (input) {
     const tenantId2 = yield* current;
-    const candidates = yield* mapDatabaseError6(db.select().from(relayEnvelopeReady).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.routeType, input.routeType), input.routeKey === undefined ? undefined : eq7(relayEnvelopeReady.routeKey, input.routeKey), or(and2(eq7(relayEnvelopeReady.state, "ready"), lte(relayEnvelopeReady.availableAt, toPgDate(input.now))), and2(eq7(relayEnvelopeReady.state, "claimed"), lte(relayEnvelopeReady.claimExpiresAt, toPgDate(input.now)))))).orderBy(asc5(relayEnvelopeReady.availableAt), asc5(relayEnvelopeReady.createdAt)).limit(1));
-    const candidate = candidates[0];
-    if (candidate === undefined)
-      return;
+    const candidate = db.select({ id: relayEnvelopeReady.id }).from(relayEnvelopeReady).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.routeType, input.routeType), input.routeKey === undefined ? undefined : eq7(relayEnvelopeReady.routeKey, input.routeKey), or(and2(eq7(relayEnvelopeReady.state, "ready"), lte(relayEnvelopeReady.availableAt, toPgDate(input.now))), and2(eq7(relayEnvelopeReady.state, "claimed"), lte(relayEnvelopeReady.claimExpiresAt, toPgDate(input.now)))))).orderBy(asc5(relayEnvelopeReady.availableAt), asc5(relayEnvelopeReady.createdAt)).limit(1).for("update", { skipLocked: true });
     const rows = yield* mapDatabaseError6(db.update(relayEnvelopeReady).set({
       state: "claimed",
       claimOwner: input.workerId,
@@ -2337,19 +2334,11 @@ var layer9 = Layer9.effect(Service9, Effect9.gen(function* () {
       claimedAt: toPgDate(input.now),
       updatedAt: toPgDate(input.now),
       attempt: sql5`${relayEnvelopeReady.attempt} + 1`
-    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.id, candidate.id))).returning());
+    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, inArray(relayEnvelopeReady.id, candidate))).returning());
     return rows[0] === undefined ? undefined : toReadyRecord(rows[0]);
   });
   const releaseReady = Effect9.fn("EnvelopeRepository.releaseReady")(function* (input) {
     const tenantId2 = yield* current;
-    const current2 = yield* getReadyRow(db, tenantId2, input.id);
-    if (current2 === undefined)
-      return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-    if (current2.state === "acknowledged")
-      return toReadyRecord(current2);
-    if (current2.claimOwner !== input.workerId) {
-      return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
-    }
     const rows = yield* mapDatabaseError6(db.update(relayEnvelopeReady).set({
       state: "ready",
       availableAt: toPgDate(input.nextAvailableAt),
@@ -2357,31 +2346,33 @@ var layer9 = Layer9.effect(Service9, Effect9.gen(function* () {
       claimExpiresAt: null,
       lastError: input.error ?? null,
       updatedAt: toPgDate(input.nextAvailableAt)
-    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.id, input.id))).returning());
+    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.id, input.id), eq7(relayEnvelopeReady.claimOwner, input.workerId), eq7(relayEnvelopeReady.state, "claimed"))).returning());
     const row = rows[0];
-    if (row === undefined)
-      return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-    return toReadyRecord(row);
-  });
-  const ackReady = Effect9.fn("EnvelopeRepository.ackReady")(function* (input) {
-    const tenantId2 = yield* current;
+    if (row !== undefined)
+      return toReadyRecord(row);
     const current2 = yield* getReadyRow(db, tenantId2, input.id);
     if (current2 === undefined)
       return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-    if (current2.state === "acknowledged")
+    if (current2.state === "acknowledged" && current2.claimOwner === input.workerId)
       return toReadyRecord(current2);
-    if (current2.claimOwner !== input.workerId) {
-      return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
-    }
+    return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
+  });
+  const ackReady = Effect9.fn("EnvelopeRepository.ackReady")(function* (input) {
+    const tenantId2 = yield* current;
     const rows = yield* mapDatabaseError6(db.update(relayEnvelopeReady).set({
       state: "acknowledged",
       acknowledgedAt: toPgDate(input.now),
       updatedAt: toPgDate(input.now)
-    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.id, input.id))).returning());
+    }).where(predicate(tenantId2, relayEnvelopeReady.tenantId, eq7(relayEnvelopeReady.id, input.id), eq7(relayEnvelopeReady.claimOwner, input.workerId), eq7(relayEnvelopeReady.state, "claimed"))).returning());
     const row = rows[0];
-    if (row === undefined)
+    if (row !== undefined)
+      return toReadyRecord(row);
+    const current2 = yield* getReadyRow(db, tenantId2, input.id);
+    if (current2 === undefined)
       return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-    return toReadyRecord(row);
+    if (current2.state === "acknowledged" && current2.claimOwner === input.workerId)
+      return toReadyRecord(current2);
+    return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
   });
   const completeWait = Effect9.fn("EnvelopeRepository.completeWait")(function* (input) {
     const tenantId2 = yield* current;
@@ -2525,9 +2516,9 @@ var memoryLayer7 = Layer9.sync(Service9, () => {
       const current2 = getReady(input.id);
       if (current2 === undefined)
         return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-      if (current2.state === "acknowledged")
+      if (current2.state === "acknowledged" && current2.claimOwner === input.workerId)
         return current2;
-      if (current2.claimOwner !== input.workerId) {
+      if (current2.state !== "claimed" || current2.claimOwner !== input.workerId) {
         return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
       }
       const released = {
@@ -2547,9 +2538,9 @@ var memoryLayer7 = Layer9.sync(Service9, () => {
       const current2 = getReady(input.id);
       if (current2 === undefined)
         return yield* Effect9.fail(new EnvelopeReadyNotFound({ id: input.id }));
-      if (current2.state === "acknowledged")
+      if (current2.state === "acknowledged" && current2.claimOwner === input.workerId)
         return current2;
-      if (current2.claimOwner !== input.workerId) {
+      if (current2.state !== "claimed" || current2.claimOwner !== input.workerId) {
         return yield* Effect9.fail(new EnvelopeReadyClaimMismatch({ id: input.id, worker_id: input.workerId }));
       }
       const acknowledged = {
@@ -3156,8 +3147,8 @@ var transition = Effect11.fn("ExecutionRepository.transition.call")(function* (i
   return yield* repository.transition(input);
 });
 // ../store-sql/src/idempotency/idempotency-repository.ts
-import { eq as eq10 } from "drizzle-orm";
-import { Context as Context12, Effect as Effect12, HashMap, Layer as Layer12, Option as Option3, Ref, Schema as Schema21 } from "effect";
+import { eq as eq10, sql as sql7 } from "drizzle-orm";
+import { Context as Context12, Effect as Effect12, HashMap, Layer as Layer12, Option as Option3, Ref, Schema as Schema21, Semaphore } from "effect";
 class IdempotencyRepositoryError extends Schema21.TaggedErrorClass()("IdempotencyRepositoryError", {
   message: Schema21.String
 }) {
@@ -3191,29 +3182,36 @@ var toInsert3 = (tenantId2, input, result) => ({
   updatedAt: toPgDate(input.createdAt),
   ...input.expiresAt === undefined ? {} : { expiresAt: toPgDate(input.expiresAt) }
 });
-var mapDatabaseError9 = (effect) => effect.pipe(Effect12.mapError((error) => new IdempotencyRepositoryError({ message: String(error) })));
 var layer12 = Layer12.effect(Service12, Effect12.gen(function* () {
   const db = yield* Service;
   const runOnce = (input, create3) => Effect12.gen(function* () {
     const tenantId2 = yield* current;
-    const existingRows = yield* mapDatabaseError9(db.select().from(relayIdempotencyKeys).where(predicate(tenantId2, relayIdempotencyKeys.tenantId, eq10(relayIdempotencyKeys.scope, input.scope), eq10(relayIdempotencyKeys.operation, input.operation), eq10(relayIdempotencyKeys.key, input.key))).limit(1));
-    const existing = existingRows[0];
-    if (existing !== undefined)
-      return { replayed: true, record: toRecord6(existing) };
-    const result = yield* create3;
-    const rows = yield* mapDatabaseError9(db.insert(relayIdempotencyKeys).values(toInsert3(tenantId2, input, result)).returning());
-    const row = rows[0];
-    if (row === undefined) {
-      return yield* Effect12.fail(new IdempotencyRepositoryError({ message: "Idempotency insert returned no row" }));
-    }
-    return { replayed: false, record: toRecord6(row) };
+    return yield* db.transaction((tx) => Effect12.gen(function* () {
+      yield* tx.execute(sql7`select pg_advisory_xact_lock(hashtextextended(${`${tenantId2}:${operationId(input)}`}, 0))`);
+      const existingRows = yield* tx.select().from(relayIdempotencyKeys).where(predicate(tenantId2, relayIdempotencyKeys.tenantId, eq10(relayIdempotencyKeys.scope, input.scope), eq10(relayIdempotencyKeys.operation, input.operation), eq10(relayIdempotencyKeys.key, input.key))).limit(1);
+      const existing = existingRows[0];
+      if (existing !== undefined)
+        return { replayed: true, record: toRecord6(existing) };
+      const result = yield* create3;
+      const rows = yield* tx.insert(relayIdempotencyKeys).values(toInsert3(tenantId2, input, result)).onConflictDoNothing().returning();
+      const row = rows[0];
+      if (row !== undefined)
+        return { replayed: false, record: toRecord6(row) };
+      const winnerRows = yield* tx.select().from(relayIdempotencyKeys).where(predicate(tenantId2, relayIdempotencyKeys.tenantId, eq10(relayIdempotencyKeys.scope, input.scope), eq10(relayIdempotencyKeys.operation, input.operation), eq10(relayIdempotencyKeys.key, input.key))).limit(1);
+      const winner = winnerRows[0];
+      if (winner === undefined) {
+        return yield* Effect12.fail(new IdempotencyRepositoryError({ message: "Idempotency insert returned no row" }));
+      }
+      return { replayed: true, record: toRecord6(winner) };
+    })).pipe(Effect12.mapError((error) => error instanceof IdempotencyRepositoryError ? error : new IdempotencyRepositoryError({ message: String(error) })));
   });
   const transaction = (effect) => db.transaction((tx) => effect.pipe(Effect12.provideService(Service, tx))).pipe(Effect12.mapError((error) => new IdempotencyRepositoryError({ message: String(error) })));
   return Service12.of({ runOnce, transaction });
 }));
 var memoryLayer10 = Layer12.effect(Service12, Effect12.gen(function* () {
   const records = yield* Ref.make(HashMap.empty());
-  const runOnce = (input, create3) => Effect12.gen(function* () {
+  const semaphore = Semaphore.makeUnsafe(1);
+  const runOnce = (input, create3) => semaphore.withPermits(1)(Effect12.gen(function* () {
     const id2 = operationId(input);
     const store = yield* Ref.get(records);
     const existing = HashMap.get(store, id2).pipe(Option3.getOrUndefined);
@@ -3231,7 +3229,7 @@ var memoryLayer10 = Layer12.effect(Service12, Effect12.gen(function* () {
     };
     yield* Ref.update(records, (current2) => HashMap.set(current2, id2, record2));
     return { replayed: false, record: record2 };
-  });
+  }));
   const transaction = (effect) => Effect12.gen(function* () {
     const snapshot = yield* Ref.get(records);
     return yield* effect.pipe(Effect12.catch((error) => Ref.set(records, snapshot).pipe(Effect12.flatMap(() => Effect12.fail(error)))));
@@ -3249,7 +3247,7 @@ __export(exports_memory_repository, {
   Service: () => Service13,
   MemoryRepositoryError: () => MemoryRepositoryError
 });
-import { sql as sql7 } from "drizzle-orm";
+import { sql as sql8 } from "drizzle-orm";
 import { Context as Context13, Effect as Effect13, Layer as Layer13, Ref as Ref2, Schema as Schema22 } from "effect";
 class MemoryRepositoryError extends Schema22.TaggedErrorClass()("MemoryRepositoryError", {
   message: Schema22.String
@@ -3276,7 +3274,7 @@ var queryRowToRecord = (row) => ({
   metadata: row.metadataJson,
   createdAt: fromPgDate(row.createdAt)
 });
-var mapDatabaseError10 = (effect) => effect.pipe(Effect13.mapError((error) => new MemoryRepositoryError({ message: String(error) })));
+var mapDatabaseError9 = (effect) => effect.pipe(Effect13.mapError((error) => new MemoryRepositoryError({ message: String(error) })));
 var parsePgFloatArray = (value) => {
   const body = value.startsWith("{") && value.endsWith("}") ? value.slice(1, -1) : value;
   if (body.length === 0)
@@ -3320,7 +3318,7 @@ var layer13 = Layer13.effect(Service13, Effect13.gen(function* () {
   const upsert2 = Effect13.fn("MemoryRepository.upsert")(function* (input) {
     const tenantId2 = yield* current;
     yield* validateVector("embedding", input.embedding);
-    const rows = yield* mapDatabaseError10(db.insert(relayMemoryRecords).values({
+    const rows = yield* mapDatabaseError9(db.insert(relayMemoryRecords).values({
       tenantId: tenantId2,
       id: input.id,
       agent: input.agent,
@@ -3350,8 +3348,8 @@ var layer13 = Layer13.effect(Service13, Effect13.gen(function* () {
     yield* validateVector("query embedding", input.embedding);
     if (input.topK <= 0)
       return [];
-    const queryEmbeddingSql = sql7`array[${sql7.join(input.embedding.map((value) => sql7`${value}`), sql7`, `)}]::double precision[]`;
-    const rows = yield* mapDatabaseError10(db.execute(sql7`
+    const queryEmbeddingSql = sql8`array[${sql8.join(input.embedding.map((value) => sql8`${value}`), sql8`, `)}]::double precision[]`;
+    const rows = yield* mapDatabaseError9(db.execute(sql8`
           with query_embedding as (
             select ${queryEmbeddingSql} as embedding
           ),
@@ -3506,13 +3504,13 @@ var toRecord8 = (row) => ({
   rule: row.ruleJson,
   createdAt: fromPgDate(row.createdAt)
 });
-var mapDatabaseError11 = (effect) => effect.pipe(Effect14.mapError((error) => new PermissionRuleRepositoryError({ message: String(error) })));
+var mapDatabaseError10 = (effect) => effect.pipe(Effect14.mapError((error) => new PermissionRuleRepositoryError({ message: String(error) })));
 var memoryKey = (agent, scope, pattern) => `${agent}\x00${scope}\x00${pattern}`;
 var layer14 = Layer14.effect(Service14, Effect14.gen(function* () {
   const db = yield* Service;
   const remember = Effect14.fn("PermissionRuleRepository.remember")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError11(db.insert(relayPermissionRules).values({
+    const rows = yield* mapDatabaseError10(db.insert(relayPermissionRules).values({
       tenantId: tenantId2,
       agent: input.agent,
       scope: input.scope,
@@ -3539,7 +3537,7 @@ var layer14 = Layer14.effect(Service14, Effect14.gen(function* () {
   });
   const list6 = Effect14.fn("PermissionRuleRepository.list")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError11(db.select().from(relayPermissionRules).where(predicate(tenantId2, relayPermissionRules.tenantId, eq11(relayPermissionRules.agent, input.agent), eq11(relayPermissionRules.scope, input.scope))).orderBy(asc7(relayPermissionRules.createdAt), asc7(relayPermissionRules.pattern)));
+    const rows = yield* mapDatabaseError10(db.select().from(relayPermissionRules).where(predicate(tenantId2, relayPermissionRules.tenantId, eq11(relayPermissionRules.agent, input.agent), eq11(relayPermissionRules.scope, input.scope))).orderBy(asc7(relayPermissionRules.createdAt), asc7(relayPermissionRules.pattern)));
     return rows.map(toRecord8);
   });
   return Service14.of({ remember, list: list6 });
@@ -3597,7 +3595,7 @@ var toRecord9 = (row) => ({
   dynamicSourceIds: row.dynamicSourceIdsJson,
   openedAt: fromPgDate(row.openedAt)
 });
-var mapDatabaseError12 = (effect) => effect.pipe(Effect15.mapError((error) => new ContextEpochRepositoryError({ message: String(error) })));
+var mapDatabaseError11 = (effect) => effect.pipe(Effect15.mapError((error) => new ContextEpochRepositoryError({ message: String(error) })));
 var sameEpoch = (record2, input) => record2.baseline === input.baseline && JSON.stringify(record2.dynamicSourceIds) === JSON.stringify(input.dynamicSourceIds);
 var conflict2 = (executionId) => new ContextEpochRepositoryError({ message: `Context epoch already exists with different payload: ${executionId}` });
 var cloneRecord5 = (record2) => structuredClone(record2);
@@ -3605,12 +3603,12 @@ var layer15 = Layer15.effect(Service15, Effect15.gen(function* () {
   const db = yield* Service;
   const get6 = Effect15.fn("ContextEpochRepository.get")(function* (executionId) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError12(db.select().from(relayExecutionContextEpochs).where(predicate(tenantId2, relayExecutionContextEpochs.tenantId, eq12(relayExecutionContextEpochs.executionId, executionId))).limit(1));
+    const rows = yield* mapDatabaseError11(db.select().from(relayExecutionContextEpochs).where(predicate(tenantId2, relayExecutionContextEpochs.tenantId, eq12(relayExecutionContextEpochs.executionId, executionId))).limit(1));
     return rows[0] === undefined ? undefined : toRecord9(rows[0]);
   });
   const save2 = Effect15.fn("ContextEpochRepository.save")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError12(db.insert(relayExecutionContextEpochs).values({
+    const rows = yield* mapDatabaseError11(db.insert(relayExecutionContextEpochs).values({
       tenantId: tenantId2,
       executionId: input.executionId,
       baseline: input.baseline,
@@ -3684,7 +3682,7 @@ __export(exports_schedule_repository, {
   ScheduleNotFound: () => ScheduleNotFound,
   ScheduleClaimMismatch: () => ScheduleClaimMismatch
 });
-import { and as and4, asc as asc8, eq as eq13, lte as lte2, or as or4, sql as sql8 } from "drizzle-orm";
+import { and as and4, asc as asc8, eq as eq13, inArray as inArray2, lte as lte2, or as or4, sql as sql9 } from "drizzle-orm";
 import { Context as Context16, Effect as Effect16, Layer as Layer16, Schema as Schema25 } from "effect";
 class ScheduleRepositoryError extends Schema25.TaggedErrorClass()("ScheduleRepositoryError", {
   message: Schema25.String
@@ -3751,12 +3749,12 @@ var toRecord10 = (row) => ({
   created_at: fromPgDate(row.createdAt),
   updated_at: fromPgDate(row.updatedAt)
 });
-var mapDatabaseError13 = (effect) => effect.pipe(Effect16.mapError((error) => new ScheduleRepositoryError({ message: String(error) })));
+var mapDatabaseError12 = (effect) => effect.pipe(Effect16.mapError((error) => new ScheduleRepositoryError({ message: String(error) })));
 var cancellableStates = new Set(["active", "claimed"]);
 var layer16 = Layer16.effect(Service16, Effect16.gen(function* () {
   const db = yield* Service;
-  const getRow = (tenantId2, id2) => mapDatabaseError13(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, id2))).limit(1)).pipe(Effect16.map((rows) => rows[0]));
-  const getByIdempotencyKey = (tenantId2, key2) => mapDatabaseError13(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.idempotencyKey, key2))).limit(1)).pipe(Effect16.map((rows) => rows[0]));
+  const getRow = (tenantId2, id2) => mapDatabaseError12(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, id2))).limit(1)).pipe(Effect16.map((rows) => rows[0]));
+  const getByIdempotencyKey = (tenantId2, key2) => mapDatabaseError12(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.idempotencyKey, key2))).limit(1)).pipe(Effect16.map((rows) => rows[0]));
   const create3 = Effect16.fn("ScheduleRepository.create")(function* (input) {
     const tenantId2 = yield* current;
     const invalid = validationError(input);
@@ -3767,7 +3765,7 @@ var layer16 = Layer16.effect(Service16, Effect16.gen(function* () {
       if (existing !== undefined)
         return toRecord10(existing);
     }
-    const rows = yield* mapDatabaseError13(db.insert(relaySchedules).values(toInsert4(tenantId2, input)).returning());
+    const rows = yield* mapDatabaseError12(db.insert(relaySchedules).values(toInsert4(tenantId2, input)).returning());
     const row = rows[0];
     if (row === undefined) {
       return yield* Effect16.fail(new ScheduleRepositoryError({ message: `Schedule ${input.id} was not persisted` }));
@@ -3781,86 +3779,73 @@ var layer16 = Layer16.effect(Service16, Effect16.gen(function* () {
   });
   const list7 = Effect16.fn("ScheduleRepository.list")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError13(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, input.state === undefined ? undefined : eq13(relaySchedules.state, input.state))).orderBy(asc8(relaySchedules.nextRunAt), asc8(relaySchedules.createdAt)));
+    const rows = yield* mapDatabaseError12(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, input.state === undefined ? undefined : eq13(relaySchedules.state, input.state))).orderBy(asc8(relaySchedules.nextRunAt), asc8(relaySchedules.createdAt)));
     return rows.map(toRecord10);
   });
   const cancel = Effect16.fn("ScheduleRepository.cancel")(function* (input) {
     const tenantId2 = yield* current;
-    const current2 = yield* getRow(tenantId2, input.id);
-    if (current2 === undefined)
-      return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    if (current2.state === "cancelled")
-      return toRecord10(current2);
-    if (!cancellableStates.has(current2.state)) {
-      return yield* Effect16.fail(new ScheduleRepositoryError({ message: `Schedule ${input.id} cannot be cancelled from ${current2.state}` }));
-    }
-    const rows = yield* mapDatabaseError13(db.update(relaySchedules).set({
+    const rows = yield* mapDatabaseError12(db.update(relaySchedules).set({
       state: "cancelled",
       claimOwner: null,
       claimExpiresAt: null,
       updatedAt: toPgDate(input.cancelledAt)
-    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id))).returning());
+    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id), inArray2(relaySchedules.state, [...cancellableStates]))).returning());
     const row = rows[0];
-    if (row === undefined)
+    if (row !== undefined)
+      return toRecord10(row);
+    const current2 = yield* getRow(tenantId2, input.id);
+    if (current2 === undefined)
       return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    return toRecord10(row);
+    if (current2.state === "cancelled")
+      return toRecord10(current2);
+    return yield* Effect16.fail(new ScheduleRepositoryError({ message: `Schedule ${input.id} cannot be cancelled from ${current2.state}` }));
   });
   const claimDue = Effect16.fn("ScheduleRepository.claimDue")(function* (input) {
     const tenantId2 = yield* current;
-    const candidates = yield* mapDatabaseError13(db.select().from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, or4(and4(eq13(relaySchedules.state, "active"), lte2(relaySchedules.nextRunAt, toPgDate(input.now))), and4(eq13(relaySchedules.state, "claimed"), lte2(relaySchedules.claimExpiresAt, toPgDate(input.now)))))).orderBy(asc8(relaySchedules.nextRunAt), asc8(relaySchedules.createdAt)).limit(1));
-    const candidate = candidates[0];
-    if (candidate === undefined)
-      return;
-    const rows = yield* mapDatabaseError13(db.update(relaySchedules).set({
+    const candidate = db.select({ id: relaySchedules.id }).from(relaySchedules).where(predicate(tenantId2, relaySchedules.tenantId, or4(and4(eq13(relaySchedules.state, "active"), lte2(relaySchedules.nextRunAt, toPgDate(input.now))), and4(eq13(relaySchedules.state, "claimed"), lte2(relaySchedules.claimExpiresAt, toPgDate(input.now)))))).orderBy(asc8(relaySchedules.nextRunAt), asc8(relaySchedules.createdAt)).limit(1).for("update", { skipLocked: true });
+    const rows = yield* mapDatabaseError12(db.update(relaySchedules).set({
       state: "claimed",
       claimOwner: input.workerId,
       claimExpiresAt: toPgDate(input.claimExpiresAt),
       updatedAt: toPgDate(input.now),
-      attempt: sql8`${relaySchedules.attempt} + 1`
-    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, candidate.id))).returning());
+      attempt: sql9`${relaySchedules.attempt} + 1`
+    }).where(predicate(tenantId2, relaySchedules.tenantId, inArray2(relaySchedules.id, candidate))).returning());
     return rows[0] === undefined ? undefined : toRecord10(rows[0]);
   });
   const ack = Effect16.fn("ScheduleRepository.ack")(function* (input) {
     const tenantId2 = yield* current;
-    const current2 = yield* getRow(tenantId2, input.id);
-    if (current2 === undefined)
-      return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    if (current2.state === "completed")
-      return toRecord10(current2);
-    if (current2.claimOwner !== input.workerId) {
-      return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
-    }
-    const rows = yield* mapDatabaseError13(db.update(relaySchedules).set({
-      ...input.nextRunAt === undefined ? { state: "completed" } : { state: "active", nextRunAt: toPgDate(input.nextRunAt) },
-      claimOwner: null,
+    const rows = yield* mapDatabaseError12(db.update(relaySchedules).set({
+      ...input.nextRunAt === undefined ? { state: "completed" } : { state: "active", nextRunAt: toPgDate(input.nextRunAt), claimOwner: null },
       claimExpiresAt: null,
       updatedAt: toPgDate(input.now)
-    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id))).returning());
+    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id), eq13(relaySchedules.claimOwner, input.workerId), eq13(relaySchedules.state, "claimed"))).returning());
     const row = rows[0];
-    if (row === undefined)
+    if (row !== undefined)
+      return toRecord10(row);
+    const current2 = yield* getRow(tenantId2, input.id);
+    if (current2 === undefined)
       return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    return toRecord10(row);
+    if (current2.state === "completed" && current2.claimOwner === input.workerId)
+      return toRecord10(current2);
+    return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
   });
   const release = Effect16.fn("ScheduleRepository.release")(function* (input) {
     const tenantId2 = yield* current;
-    const current2 = yield* getRow(tenantId2, input.id);
-    if (current2 === undefined)
-      return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    if (current2.claimOwner !== input.workerId) {
-      return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
-    }
-    const rows = yield* mapDatabaseError13(db.update(relaySchedules).set({
+    const rows = yield* mapDatabaseError12(db.update(relaySchedules).set({
       state: "active",
       nextRunAt: toPgDate(input.nextAvailableAt),
       claimOwner: null,
       claimExpiresAt: null,
       lastError: input.error,
       updatedAt: toPgDate(input.nextAvailableAt)
-    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id))).returning());
+    }).where(predicate(tenantId2, relaySchedules.tenantId, eq13(relaySchedules.id, input.id), eq13(relaySchedules.claimOwner, input.workerId), eq13(relaySchedules.state, "claimed"))).returning());
     const row = rows[0];
-    if (row === undefined)
+    if (row !== undefined)
+      return toRecord10(row);
+    const current2 = yield* getRow(tenantId2, input.id);
+    if (current2 === undefined)
       return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    return toRecord10(row);
+    return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
   });
   return Service16.of({ create: create3, get: get7, list: list7, cancel, claimDue, ack, release });
 }));
@@ -3949,14 +3934,15 @@ var memoryLayer14 = Layer16.sync(Service16, () => {
     const current2 = schedules.get(input.id);
     if (current2 === undefined)
       return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    if (current2.record.state === "completed")
+    if (current2.record.state === "completed" && current2.claimOwner === input.workerId)
       return current2.record;
-    if (current2.claimOwner !== input.workerId) {
+    if (current2.record.state !== "claimed" || current2.claimOwner !== input.workerId) {
       return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
     }
     const acked = input.nextRunAt === undefined ? { ...current2.record, state: "completed", updated_at: input.now } : { ...current2.record, state: "active", next_run_at: input.nextRunAt, updated_at: input.now };
     yield* Effect16.sync(() => schedules.set(input.id, {
       record: acked,
+      ...input.nextRunAt === undefined ? { claimOwner: input.workerId } : {},
       ...current2.idempotencyKey === undefined ? {} : { idempotencyKey: current2.idempotencyKey }
     }));
     return acked;
@@ -3965,7 +3951,7 @@ var memoryLayer14 = Layer16.sync(Service16, () => {
     const current2 = schedules.get(input.id);
     if (current2 === undefined)
       return yield* Effect16.fail(new ScheduleNotFound({ id: input.id }));
-    if (current2.claimOwner !== input.workerId) {
+    if (current2.record.state !== "claimed" || current2.claimOwner !== input.workerId) {
       return yield* Effect16.fail(new ScheduleClaimMismatch({ id: input.id, worker_id: input.workerId }));
     }
     const released = {
@@ -4109,7 +4095,7 @@ var toEntryRecord = (row) => {
       return Effect17.fail(new SessionRepositoryError({ message: `Unknown session entry tag: ${row.tag}` }));
   }
 };
-var mapDatabaseError14 = (effect) => effect.pipe(Effect17.mapError((error) => new SessionRepositoryError({ message: String(error) })));
+var mapDatabaseError13 = (effect) => effect.pipe(Effect17.mapError((error) => new SessionRepositoryError({ message: String(error) })));
 var mapWriteError = (effect) => effect.pipe(Effect17.mapError((error) => error instanceof SessionRepositoryError ? error : new SessionRepositoryError({ message: String(error) })));
 var maxListLimit3 = 100;
 var defaultListLimit2 = 50;
@@ -4166,11 +4152,11 @@ var validateCompaction = (currentPath, input) => {
 var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
   const db = yield* Service;
   const getForTenant = Effect17.fn("SessionRepository.getForTenant")(function* (tenantId2, id2) {
-    const rows = yield* mapDatabaseError14(db.select().from(relaySessions).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, id2))).limit(1));
+    const rows = yield* mapDatabaseError13(db.select().from(relaySessions).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, id2))).limit(1));
     return rows[0] === undefined ? undefined : toSessionRecord(rows[0]);
   });
   const entryById = Effect17.fn("SessionRepository.entryById")(function* (tenantId2, sessionId, id2) {
-    const rows = yield* mapDatabaseError14(db.select().from(relaySessionEntries).where(predicate(tenantId2, relaySessionEntries.tenantId, eq14(relaySessionEntries.id, id2), eq14(relaySessionEntries.sessionId, sessionId))).limit(1));
+    const rows = yield* mapDatabaseError13(db.select().from(relaySessionEntries).where(predicate(tenantId2, relaySessionEntries.tenantId, eq14(relaySessionEntries.id, id2), eq14(relaySessionEntries.sessionId, sessionId))).limit(1));
     return rows[0] === undefined ? undefined : yield* toEntryRecord(rows[0]);
   });
   const pathForTenant = Effect17.fn("SessionRepository.pathForTenant")(function* (tenantId2, input) {
@@ -4205,7 +4191,7 @@ var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
     const existing = yield* getForTenant(tenantId2, input.id);
     if (existing !== undefined)
       return yield* Effect17.fail(new DuplicateSession({ id: input.id }));
-    const rows = yield* mapDatabaseError14(db.insert(relaySessions).values({
+    const rows = yield* mapDatabaseError13(db.insert(relaySessions).values({
       tenantId: tenantId2,
       id: input.id,
       rootAddressId: input.rootAddressId,
@@ -4224,13 +4210,13 @@ var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
     if (existing !== undefined) {
       if (existing.rootAddressId !== input.rootAddressId)
         return yield* Effect17.fail(rootMismatch(input.id));
-      const rows2 = yield* mapDatabaseError14(db.update(relaySessions).set({ updatedAt: toPgDate(input.now) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.id))).returning());
+      const rows2 = yield* mapDatabaseError13(db.update(relaySessions).set({ updatedAt: toPgDate(input.now) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.id))).returning());
       const row2 = rows2[0];
       if (row2 === undefined)
         return yield* Effect17.fail(missingSession(input.id));
       return toSessionRecord(row2);
     }
-    const rows = yield* mapDatabaseError14(db.insert(relaySessions).values({
+    const rows = yield* mapDatabaseError13(db.insert(relaySessions).values({
       tenantId: tenantId2,
       id: input.id,
       rootAddressId: input.rootAddressId,
@@ -4250,14 +4236,14 @@ var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
   const list8 = Effect17.fn("SessionRepository.list")(function* (input) {
     const tenantId2 = yield* current;
     const limit = listLimit3(input);
-    const rows = yield* mapDatabaseError14(db.select().from(relaySessions).where(predicate(tenantId2, relaySessions.tenantId, ...listConditions2(input))).orderBy(desc5(relaySessions.updatedAt), desc5(relaySessions.id)).limit(limit + 1));
+    const rows = yield* mapDatabaseError13(db.select().from(relaySessions).where(predicate(tenantId2, relaySessions.tenantId, ...listConditions2(input))).orderBy(desc5(relaySessions.updatedAt), desc5(relaySessions.id)).limit(limit + 1));
     const records = rows.slice(0, limit).map(toSessionRecord);
     const nextCursor = nextCursorOf2(records, rows.length, limit);
     return nextCursor === undefined ? { records } : { records, nextCursor };
   });
   const touch = Effect17.fn("SessionRepository.touch")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError14(db.update(relaySessions).set({ updatedAt: toPgDate(input.updatedAt) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.id))).returning());
+    const rows = yield* mapDatabaseError13(db.update(relaySessions).set({ updatedAt: toPgDate(input.updatedAt) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.id))).returning());
     const row = rows[0];
     if (row === undefined)
       return yield* Effect17.fail(missingSession(input.id));
@@ -4279,7 +4265,7 @@ var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
       if (entry === undefined)
         return yield* Effect17.fail(missingEntry(input.id));
     }
-    yield* mapDatabaseError14(db.update(relaySessions).set({ leafEntryId: input.id, updatedAt: toPgDate(input.updatedAt) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.sessionId))));
+    yield* mapDatabaseError13(db.update(relaySessions).set({ leafEntryId: input.id, updatedAt: toPgDate(input.updatedAt) }).where(predicate(tenantId2, relaySessions.tenantId, eq14(relaySessions.id, input.sessionId))));
   });
   const setLeaf = Effect17.fn("SessionRepository.setLeaf")(function* (input) {
     const tenantId2 = yield* current;
@@ -4333,7 +4319,7 @@ var layer17 = Layer17.effect(Service17, Effect17.gen(function* () {
   });
   const countEntries = Effect17.fn("SessionRepository.countEntries")(function* (sessionId) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError14(db.select({ value: count() }).from(relaySessionEntries).where(predicate(tenantId2, relaySessionEntries.tenantId, eq14(relaySessionEntries.sessionId, sessionId))));
+    const rows = yield* mapDatabaseError13(db.select({ value: count() }).from(relaySessionEntries).where(predicate(tenantId2, relaySessionEntries.tenantId, eq14(relaySessionEntries.sessionId, sessionId))));
     return Number(rows[0]?.value ?? 0);
   });
   return Service17.of({ create: create4, ensure, get: get8, list: list8, touch, appendEntry, countEntries, path, setLeaf, leaf });
@@ -4522,8 +4508,8 @@ __export(exports_skill_definition_repository, {
   SkillDefinitionRepositoryError: () => SkillDefinitionRepositoryError,
   Service: () => Service18
 });
-import { asc as asc9, desc as desc6, eq as eq15, inArray, sql as sql9 } from "drizzle-orm";
-import { Context as Context18, Effect as Effect18, HashSet, Layer as Layer18, Schema as Schema27, Semaphore } from "effect";
+import { asc as asc9, desc as desc6, eq as eq15, inArray as inArray3, sql as sql10 } from "drizzle-orm";
+import { Context as Context18, Effect as Effect18, HashSet, Layer as Layer18, Schema as Schema27, Semaphore as Semaphore2 } from "effect";
 class SkillDefinitionRepositoryError extends Schema27.TaggedErrorClass()("SkillDefinitionRepositoryError", {
   message: Schema27.String
 }) {
@@ -4585,10 +4571,10 @@ var missingSkillMessage = (requested, records) => {
   const found = HashSet.fromIterable(records.map((record2) => record2.id));
   return `Skill definition not found: ${requested.find((id2) => !HashSet.has(found, id2)) ?? requested[0]}`;
 };
-var mapDatabaseError15 = (effect) => effect.pipe(Effect18.mapError((error) => new SkillDefinitionRepositoryError({ message: String(error) })));
+var mapDatabaseError14 = (effect) => effect.pipe(Effect18.mapError((error) => new SkillDefinitionRepositoryError({ message: String(error) })));
 var mapPutError2 = (effect) => effect.pipe(Effect18.mapError((error) => error instanceof SkillDefinitionRepositoryError ? error : new SkillDefinitionRepositoryError({ message: String(error) })));
 var skillPinLockKey = (tenantId2, executionId) => `skill-pins:${tenantId2}:${executionId}`;
-var lockExecutionPins = (db, tenantId2, executionId) => mapDatabaseError15(db.execute(sql9`select pg_advisory_xact_lock(hashtext(${skillPinLockKey(tenantId2, executionId)}))`)).pipe(Effect18.asVoid);
+var lockExecutionPins = (db, tenantId2, executionId) => mapDatabaseError14(db.execute(sql10`select pg_advisory_xact_lock(hashtext(${skillPinLockKey(tenantId2, executionId)}))`)).pipe(Effect18.asVoid);
 var layer18 = Layer18.effect(Service18, Effect18.gen(function* () {
   const db = yield* Service;
   const put2 = Effect18.fn("SkillDefinitionRepository.put")(function* (input) {
@@ -4606,7 +4592,7 @@ var layer18 = Layer18.effect(Service18, Effect18.gen(function* () {
         target: [relaySkillDefinitions.tenantId, relaySkillDefinitions.id],
         set: {
           name: input.definition.frontmatter.name,
-          currentRevision: sql9`${relaySkillDefinitions.currentRevision} + 1`,
+          currentRevision: sql10`${relaySkillDefinitions.currentRevision} + 1`,
           definitionJson: input.definition,
           updatedAt: toPgDate(input.now)
         }
@@ -4631,32 +4617,32 @@ var layer18 = Layer18.effect(Service18, Effect18.gen(function* () {
   });
   const get9 = Effect18.fn("SkillDefinitionRepository.get")(function* (id2) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId, eq15(relaySkillDefinitions.id, id2))).limit(1));
+    const rows = yield* mapDatabaseError14(db.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId, eq15(relaySkillDefinitions.id, id2))).limit(1));
     return rows[0] === undefined ? undefined : toRecord11(rows[0]);
   });
   const getRevision2 = Effect18.fn("SkillDefinitionRepository.getRevision")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relaySkillDefinitionRevisions).where(predicate(tenantId2, relaySkillDefinitionRevisions.tenantId, eq15(relaySkillDefinitionRevisions.skillDefinitionId, input.id), eq15(relaySkillDefinitionRevisions.revision, input.revision))).limit(1));
+    const rows = yield* mapDatabaseError14(db.select().from(relaySkillDefinitionRevisions).where(predicate(tenantId2, relaySkillDefinitionRevisions.tenantId, eq15(relaySkillDefinitionRevisions.skillDefinitionId, input.id), eq15(relaySkillDefinitionRevisions.revision, input.revision))).limit(1));
     return rows[0] === undefined ? undefined : toRevisionRecord2(rows[0]);
   });
   const list9 = Effect18.fn("SkillDefinitionRepository.list")(function* () {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId)).orderBy(desc6(relaySkillDefinitions.createdAt), asc9(relaySkillDefinitions.id)));
+    const rows = yield* mapDatabaseError14(db.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId)).orderBy(desc6(relaySkillDefinitions.createdAt), asc9(relaySkillDefinitions.id)));
     return rows.map(toRecord11);
   });
   const listRevisions2 = Effect18.fn("SkillDefinitionRepository.listRevisions")(function* (id2) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relaySkillDefinitionRevisions).where(predicate(tenantId2, relaySkillDefinitionRevisions.tenantId, eq15(relaySkillDefinitionRevisions.skillDefinitionId, id2))).orderBy(desc6(relaySkillDefinitionRevisions.revision)));
+    const rows = yield* mapDatabaseError14(db.select().from(relaySkillDefinitionRevisions).where(predicate(tenantId2, relaySkillDefinitionRevisions.tenantId, eq15(relaySkillDefinitionRevisions.skillDefinitionId, id2))).orderBy(desc6(relaySkillDefinitionRevisions.revision)));
     return rows.map(toRevisionRecord2);
   });
   const listPins = Effect18.fn("SkillDefinitionRepository.listPins")(function* (executionId) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relayExecutionSkillPins).where(predicate(tenantId2, relayExecutionSkillPins.tenantId, eq15(relayExecutionSkillPins.executionId, executionId))).orderBy(asc9(relayExecutionSkillPins.skillDefinitionId)));
+    const rows = yield* mapDatabaseError14(db.select().from(relayExecutionSkillPins).where(predicate(tenantId2, relayExecutionSkillPins.tenantId, eq15(relayExecutionSkillPins.executionId, executionId))).orderBy(asc9(relayExecutionSkillPins.skillDefinitionId)));
     return rows.map(toPinRecord);
   });
   const getPinned = Effect18.fn("SkillDefinitionRepository.getPinned")(function* (input) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError15(db.select().from(relayExecutionSkillPins).where(predicate(tenantId2, relayExecutionSkillPins.tenantId, eq15(relayExecutionSkillPins.executionId, input.executionId), eq15(relayExecutionSkillPins.skillDefinitionId, input.skillDefinitionId))).limit(1));
+    const rows = yield* mapDatabaseError14(db.select().from(relayExecutionSkillPins).where(predicate(tenantId2, relayExecutionSkillPins.tenantId, eq15(relayExecutionSkillPins.executionId, input.executionId), eq15(relayExecutionSkillPins.skillDefinitionId, input.skillDefinitionId))).limit(1));
     return rows[0] === undefined ? undefined : toPinRecord(rows[0]);
   });
   const pinExecution = Effect18.fn("SkillDefinitionRepository.pinExecution")(function* (input) {
@@ -4676,7 +4662,7 @@ var layer18 = Layer18.effect(Service18, Effect18.gen(function* () {
         }
         return existing;
       }
-      const currentRows = yield* tx.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId, inArray(relaySkillDefinitions.id, [...requestedIds])));
+      const currentRows = yield* tx.select().from(relaySkillDefinitions).where(predicate(tenantId2, relaySkillDefinitions.tenantId, inArray3(relaySkillDefinitions.id, [...requestedIds])));
       const currentRecords = currentRows.map(toRecord11);
       if (currentRecords.length !== requestedIds.length) {
         return yield* Effect18.fail(new SkillDefinitionRepositoryError({ message: missingSkillMessage(requestedIds, currentRecords) }));
@@ -4695,7 +4681,7 @@ var layer18 = Layer18.effect(Service18, Effect18.gen(function* () {
   return Service18.of({ put: put2, get: get9, getRevision: getRevision2, list: list9, listRevisions: listRevisions2, pinExecution, listPins, getPinned });
 }));
 var memoryLayer16 = Layer18.sync(Service18, () => {
-  const semaphore = Semaphore.makeUnsafe(1);
+  const semaphore = Semaphore2.makeUnsafe(1);
   const records = new Map;
   const revisions = new Map;
   const pins = new Map;
@@ -4825,7 +4811,7 @@ __export(exports_steering_repository, {
   SteeringRepositoryError: () => SteeringRepositoryError,
   Service: () => Service19
 });
-import { asc as asc10, eq as eq16, inArray as inArray2, isNull, max as max2, sql as sql10 } from "drizzle-orm";
+import { asc as asc10, eq as eq16, inArray as inArray4, isNull, max as max2, sql as sql11 } from "drizzle-orm";
 import { Context as Context19, Effect as Effect19, Layer as Layer19, Ref as Ref3, Schema as Schema28 } from "effect";
 class SteeringRepositoryError extends Schema28.TaggedErrorClass()("SteeringRepositoryError", {
   message: Schema28.String
@@ -4835,7 +4821,7 @@ class SteeringRepositoryError extends Schema28.TaggedErrorClass()("SteeringRepos
 class Service19 extends Context19.Service()("@relayfx/store-sql/SteeringRepository") {
 }
 var SteeringKindSchema = Schema28.Literals(["steering", "follow_up"]);
-var mapDatabaseError16 = (effect) => effect.pipe(Effect19.mapError((error) => new SteeringRepositoryError({ message: String(error) })));
+var mapDatabaseError15 = (effect) => effect.pipe(Effect19.mapError((error) => new SteeringRepositoryError({ message: String(error) })));
 var mapTransactionError = (effect) => effect.pipe(Effect19.mapError((error) => error instanceof SteeringRepositoryError ? error : new SteeringRepositoryError({ message: String(error) })));
 var toMessageRecord = (row) => {
   const consumedAt = fromNullablePgDate(row.consumedAt);
@@ -4876,15 +4862,15 @@ var consumedMessage = (message, input) => ({
 var messagesForDrain = (db, tenantId2, drain) => Effect19.gen(function* () {
   if (drain.messageSequences.length === 0)
     return { drain, messages: [] };
-  const rows = yield* mapDatabaseError16(db.select().from(relaySteeringMessages).where(predicate(tenantId2, relaySteeringMessages.tenantId, eq16(relaySteeringMessages.executionId, drain.executionId), eq16(relaySteeringMessages.kind, drain.kind), inArray2(relaySteeringMessages.sequence, [...drain.messageSequences]))).orderBy(asc10(relaySteeringMessages.sequence)));
+  const rows = yield* mapDatabaseError15(db.select().from(relaySteeringMessages).where(predicate(tenantId2, relaySteeringMessages.tenantId, eq16(relaySteeringMessages.executionId, drain.executionId), eq16(relaySteeringMessages.kind, drain.kind), inArray4(relaySteeringMessages.sequence, [...drain.messageSequences]))).orderBy(asc10(relaySteeringMessages.sequence)));
   return { drain, messages: rows.map(toMessageRecord) };
 });
 var findDrain = (db, tenantId2, input) => Effect19.gen(function* () {
-  const rows = yield* mapDatabaseError16(db.select().from(relaySteeringDrains).where(predicate(tenantId2, relaySteeringDrains.tenantId, eq16(relaySteeringDrains.executionId, input.executionId), eq16(relaySteeringDrains.kind, input.kind), eq16(relaySteeringDrains.drainId, input.drainId))).limit(1));
+  const rows = yield* mapDatabaseError15(db.select().from(relaySteeringDrains).where(predicate(tenantId2, relaySteeringDrains.tenantId, eq16(relaySteeringDrains.executionId, input.executionId), eq16(relaySteeringDrains.kind, input.kind), eq16(relaySteeringDrains.drainId, input.drainId))).limit(1));
   const row = rows[0];
   return row === undefined ? undefined : toDrainRecord(row);
 });
-var lockQueue = (db, tenantId2, executionId, kind) => mapDatabaseError16(db.execute(sql10`select pg_advisory_xact_lock(hashtext(${queueKey(tenantId2, executionId, kind)}))`)).pipe(Effect19.asVoid);
+var lockQueue = (db, tenantId2, executionId, kind) => mapDatabaseError15(db.execute(sql11`select pg_advisory_xact_lock(hashtext(${queueKey(tenantId2, executionId, kind)}))`)).pipe(Effect19.asVoid);
 var runningExecutionStatus = (db, tenantId2, executionId) => db.select({ status: relayExecutions.status }).from(relayExecutions).where(predicate(tenantId2, relayExecutions.tenantId, eq16(relayExecutions.id, executionId))).for("update").limit(1).pipe(Effect19.map((rows) => rows[0]?.status));
 var layer19 = Layer19.effect(Service19, Effect19.gen(function* () {
   const db = yield* Service;
@@ -4941,7 +4927,7 @@ var layer19 = Layer19.effect(Service19, Effect19.gen(function* () {
       const messages = sequences.length === 0 ? [] : yield* tx.update(relaySteeringMessages).set({
         drainId: input.drainId,
         consumedAt: toPgDate(input.consumedAt)
-      }).where(predicate(tenantId2, relaySteeringMessages.tenantId, eq16(relaySteeringMessages.executionId, input.executionId), eq16(relaySteeringMessages.kind, input.kind), inArray2(relaySteeringMessages.sequence, sequences))).returning();
+      }).where(predicate(tenantId2, relaySteeringMessages.tenantId, eq16(relaySteeringMessages.executionId, input.executionId), eq16(relaySteeringMessages.kind, input.kind), inArray4(relaySteeringMessages.sequence, sequences))).returning();
       const messageBySequence = new Map(messages.map((message) => [message.sequence, message]));
       const orderedMessages = sequences.flatMap((sequence) => {
         const message = messageBySequence.get(sequence);
@@ -5122,15 +5108,15 @@ var toResultRecord = (row) => ({
   },
   createdAt: fromPgDate(row.createdAt)
 });
-var mapDatabaseError17 = (effect) => effect.pipe(Effect20.mapError((error) => new ToolCallRepositoryError({ message: String(error) })));
+var mapDatabaseError16 = (effect) => effect.pipe(Effect20.mapError((error) => new ToolCallRepositoryError({ message: String(error) })));
 var layer20 = Layer20.effect(Service20, Effect20.gen(function* () {
   const db = yield* Service;
   const recordCall = Effect20.fn("ToolCallRepository.recordCall")(function* (input) {
     const tenantId2 = yield* current;
-    const existingRows = yield* mapDatabaseError17(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, input.call.id))).limit(1));
+    const existingRows = yield* mapDatabaseError16(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, input.call.id))).limit(1));
     if (existingRows[0] !== undefined)
       return yield* Effect20.fail(new DuplicateToolCall({ id: input.call.id }));
-    const rows = yield* mapDatabaseError17(db.insert(relayToolCalls).values(toCallInsert(tenantId2, input)).returning());
+    const rows = yield* mapDatabaseError16(db.insert(relayToolCalls).values(toCallInsert(tenantId2, input)).returning());
     const row = rows[0];
     if (row === undefined) {
       return yield* Effect20.fail(new ToolCallRepositoryError({ message: "Tool call insert returned no row" }));
@@ -5139,24 +5125,24 @@ var layer20 = Layer20.effect(Service20, Effect20.gen(function* () {
   });
   const getCall = Effect20.fn("ToolCallRepository.getCall")(function* (id2) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError17(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, id2))).limit(1));
+    const rows = yield* mapDatabaseError16(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, id2))).limit(1));
     return rows[0] === undefined ? undefined : toCallRecord(rows[0]);
   });
   const listCalls = Effect20.fn("ToolCallRepository.listCalls")(function* (executionId) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError17(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.executionId, executionId))).orderBy(asc11(relayToolCalls.createdAt)));
+    const rows = yield* mapDatabaseError16(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.executionId, executionId))).orderBy(asc11(relayToolCalls.createdAt)));
     return rows.map(toCallRecord);
   });
   const recordResult = Effect20.fn("ToolCallRepository.recordResult")(function* (input) {
     const tenantId2 = yield* current;
-    const callRows = yield* mapDatabaseError17(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, input.result.call_id))).limit(1));
+    const callRows = yield* mapDatabaseError16(db.select().from(relayToolCalls).where(predicate(tenantId2, relayToolCalls.tenantId, eq17(relayToolCalls.id, input.result.call_id))).limit(1));
     if (callRows[0] === undefined)
       return yield* Effect20.fail(new ToolCallNotFound({ id: input.result.call_id }));
-    const existingRows = yield* mapDatabaseError17(db.select().from(relayToolResults).where(predicate(tenantId2, relayToolResults.tenantId, eq17(relayToolResults.toolCallId, input.result.call_id))).limit(1));
+    const existingRows = yield* mapDatabaseError16(db.select().from(relayToolResults).where(predicate(tenantId2, relayToolResults.tenantId, eq17(relayToolResults.toolCallId, input.result.call_id))).limit(1));
     if (existingRows[0] !== undefined) {
       return yield* Effect20.fail(new DuplicateToolResult({ call_id: input.result.call_id }));
     }
-    const rows = yield* mapDatabaseError17(db.insert(relayToolResults).values(toResultInsert(tenantId2, input)).returning());
+    const rows = yield* mapDatabaseError16(db.insert(relayToolResults).values(toResultInsert(tenantId2, input)).returning());
     const row = rows[0];
     if (row === undefined) {
       return yield* Effect20.fail(new ToolCallRepositoryError({ message: "Tool result insert returned no row" }));
@@ -5165,7 +5151,7 @@ var layer20 = Layer20.effect(Service20, Effect20.gen(function* () {
   });
   const getResult = Effect20.fn("ToolCallRepository.getResult")(function* (callId) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError17(db.select().from(relayToolResults).where(predicate(tenantId2, relayToolResults.tenantId, eq17(relayToolResults.toolCallId, callId))).limit(1));
+    const rows = yield* mapDatabaseError16(db.select().from(relayToolResults).where(predicate(tenantId2, relayToolResults.tenantId, eq17(relayToolResults.toolCallId, callId))).limit(1));
     return rows[0] === undefined ? undefined : toResultRecord(rows[0]);
   });
   return Service20.of({ recordCall, getCall, listCalls, recordResult, getResult });
@@ -5316,8 +5302,8 @@ var toSnapshotRecord = (row) => ({
   metadata: row.metadataJson,
   created_at: fromPgDate(row.createdAt)
 });
-var mapDatabaseError18 = (effect) => effect.pipe(Effect21.mapError((error) => new WorkspaceLeaseRepositoryError({ message: String(error) })));
-var updateLease = (db, tenantId2, executionId, values) => mapDatabaseError18(db.update(relayWorkspaceLeases).set(values).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, executionId))).returning()).pipe(Effect21.flatMap((rows) => {
+var mapDatabaseError17 = (effect) => effect.pipe(Effect21.mapError((error) => new WorkspaceLeaseRepositoryError({ message: String(error) })));
+var updateLease = (db, tenantId2, executionId, values) => mapDatabaseError17(db.update(relayWorkspaceLeases).set(values).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, executionId))).returning()).pipe(Effect21.flatMap((rows) => {
   const row = rows[0];
   if (row === undefined)
     return Effect21.fail(new WorkspaceLeaseNotFound({ execution_id: executionId }));
@@ -5327,16 +5313,16 @@ var layer21 = Layer21.effect(Service21, Effect21.gen(function* () {
   const db = yield* Service;
   const getByExecution = Effect21.fn("WorkspaceLeaseRepository.getByExecution")(function* (id2) {
     const tenantId2 = yield* current;
-    const rows = yield* mapDatabaseError18(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, id2))).limit(1));
+    const rows = yield* mapDatabaseError17(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, id2))).limit(1));
     return rows[0] === undefined ? undefined : toLeaseRecord(rows[0]);
   });
   const plan = Effect21.fn("WorkspaceLeaseRepository.plan")(function* (input) {
     const tenantId2 = yield* current;
-    const existing = yield* mapDatabaseError18(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, input.executionId), notInArray(relayWorkspaceLeases.status, [...terminalStatuses]))).limit(1));
+    const existing = yield* mapDatabaseError17(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, input.executionId), notInArray(relayWorkspaceLeases.status, [...terminalStatuses]))).limit(1));
     if (existing[0] !== undefined) {
       return yield* Effect21.fail(new DuplicateWorkspaceLease({ execution_id: input.executionId }));
     }
-    const rows = yield* mapDatabaseError18(db.insert(relayWorkspaceLeases).values(toPlanInsert(tenantId2, input)).returning());
+    const rows = yield* mapDatabaseError17(db.insert(relayWorkspaceLeases).values(toPlanInsert(tenantId2, input)).returning());
     const row = rows[0];
     if (row === undefined) {
       return yield* Effect21.fail(new WorkspaceLeaseRepositoryError({ message: "Workspace lease insert returned no row" }));
@@ -5368,11 +5354,11 @@ var layer21 = Layer21.effect(Service21, Effect21.gen(function* () {
   });
   const recordSnapshot = Effect21.fn("WorkspaceLeaseRepository.recordSnapshot")(function* (input) {
     const tenantId2 = yield* current;
-    const leaseRows = yield* mapDatabaseError18(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, input.executionId))).limit(1));
+    const leaseRows = yield* mapDatabaseError17(db.select().from(relayWorkspaceLeases).where(predicate(tenantId2, relayWorkspaceLeases.tenantId, eq18(relayWorkspaceLeases.executionId, input.executionId))).limit(1));
     if (leaseRows[0] === undefined) {
       return yield* Effect21.fail(new WorkspaceLeaseNotFound({ execution_id: input.executionId }));
     }
-    const rows = yield* mapDatabaseError18(db.insert(relayWorkspaceSnapshots).values(toSnapshotInsert(tenantId2, input)).returning());
+    const rows = yield* mapDatabaseError17(db.insert(relayWorkspaceSnapshots).values(toSnapshotInsert(tenantId2, input)).returning());
     const row = rows[0];
     if (row === undefined) {
       return yield* Effect21.fail(new WorkspaceLeaseRepositoryError({ message: "Workspace snapshot insert returned no row" }));
@@ -8347,7 +8333,7 @@ __export(exports_model_registry, {
   Service: () => Service28,
   LanguageModelNotRegistered: () => LanguageModelNotRegistered
 });
-import { Chunk as Chunk2, Context as Context40, Effect as Effect47, Layer as Layer41, Option as Option17, Ref as Ref11, Schema as Schema45, Semaphore as Semaphore2 } from "effect";
+import { Chunk as Chunk2, Context as Context40, Effect as Effect47, Layer as Layer41, Option as Option17, Ref as Ref11, Schema as Schema45, Semaphore as Semaphore3 } from "effect";
 import * as Ai10 from "effect/unstable/ai";
 
 class LanguageModelNotRegistered extends Schema45.TaggedErrorClass()("LanguageModelNotRegistered", {
@@ -8380,7 +8366,7 @@ var registrationFromLayer = (input) => Ai10.Model.make(input.provider, input.mod
 })));
 var layer31 = (initialRegistrations = [], options) => Layer41.effect(Service28, Effect47.gen(function* () {
   const registry = yield* Ref11.make(initialRegistrations.reduce(upsertRegistration, Chunk2.empty()));
-  const semaphore = options?.maxConcurrentModelCalls === undefined ? undefined : yield* Semaphore2.make(options.maxConcurrentModelCalls);
+  const semaphore = options?.maxConcurrentModelCalls === undefined ? undefined : yield* Semaphore3.make(options.maxConcurrentModelCalls);
   const register4 = Effect47.fn("ModelRegistry.register")(function* (input) {
     yield* Ref11.update(registry, (items) => upsertRegistration(items, input.registration));
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@relayfx/sdk",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "type": "module",
   "exports": {
     ".": {