@relayfx/sdk 0.4.0 → 0.4.2

package/dist/{index-cs3be24t.js → index-4y9111jh.js}

@@ -8,7 +8,7 @@ import {
   SqlFailure,
   make,
   normalizeAcquisitionCause
-} from "./index-p43mg4kt.js";
+} from "./index-y9ncz0zd.js";
 
 // src/migration-errors.ts
 import { Cause, Effect, Function } from "effect";

package/dist/{index-p43mg4kt.js → index-y9ncz0zd.js}

@@ -10887,12 +10887,6 @@ var makeService = (initialTools) => Effect55.gen(function* () {
         yield* input.onRequested;
     }),
     run: Effect55.fn("ToolRuntime.run")(function* (input) {
-      let settlementSequence;
-      const beginSettlement = Effect55.suspend(() => {
-        if (settlementSequence !== undefined)
-          return Effect55.succeed(settlementSequence);
-        return (input.beforeSettlement ?? Effect55.succeed(input.eventSequence)).pipe(Effect55.tap((sequence) => Effect55.sync(() => settlementSequence = sequence)));
-      });
       const stored = yield* Ref12.get(tools);
       const registry = (input.extraTools ?? []).reduce(upsertTool, stored);
       const registeredTool = Chunk.findFirst(registry, sameToolName(input.call.name)).pipe(Option12.getOrUndefined);
@@ -10907,7 +10901,6 @@ var makeService = (initialTools) => Effect55.gen(function* () {
           yield* input.onRequested;
         const existingResult = yield* repository.getResult(input.executionId, input.call.id).pipe(Effect55.mapError(mapRepositoryError2));
         if (existingResult !== undefined) {
-          yield* beginSettlement;
           yield* repairResultEvent(eventLog, input, existingResult);
           return existingResult.result;
         }
@@ -10915,17 +10908,11 @@ var makeService = (initialTools) => Effect55.gen(function* () {
         if (registeredTool.definition.needs_approval === true) {
           const bypass = yield* hasPermissionApprovalBypass(waits, input);
           if (!bypass) {
-            const sequence = yield* beginSettlement;
+            const decision = yield* resolveApproval(waits, eventLog, input);
             effectiveInput = {
               ...input,
-              eventSequence: sequence,
-              createdAt: input.createdAt + sequence - input.eventSequence
-            };
-            const decision = yield* resolveApproval(waits, eventLog, effectiveInput);
-            effectiveInput = {
-              ...effectiveInput,
-              eventSequence: effectiveInput.eventSequence + 1,
-              createdAt: effectiveInput.createdAt + 1
+              eventSequence: input.eventSequence + 1,
+              createdAt: input.createdAt + 1
             };
             if (decision._tag === "denied") {
               const deniedRecord = yield* persistReceived(repository, effectiveInput, {
@@ -10944,18 +10931,8 @@ var makeService = (initialTools) => Effect55.gen(function* () {
           callId: input.call.id,
           startedAt: effectiveInput.createdAt
         }).pipe(Effect55.mapError(mapRepositoryError2), Effect55.flatMap(() => finalToolResult(registeredTool, effectiveInput, call.idempotencyKey)), Effect55.catchTag("ToolExecutionFailed", (error5) => Effect55.succeed(placementFailureResult(input, error5.message))));
-        const record2 = yield* Effect55.uninterruptibleMask((restore) => restore(executeHandler).pipe(Effect55.flatMap((rawResult) => input.transformResult === undefined || rawResult.error !== undefined ? Effect55.succeed(rawResult) : input.transformResult(rawResult)), Effect55.flatMap((result2) => persistReceived(repository, effectiveInput, result2))));
-        const result = record2.result;
-        if (effectiveInput === input) {
-          const sequence = yield* beginSettlement;
-          effectiveInput = {
-            ...input,
-            eventSequence: sequence,
-            createdAt: input.createdAt + sequence - input.eventSequence
-          };
-        }
-        const received = yield* recordReceived(eventLog, effectiveInput, record2);
-        yield* recordToolCall(input.call.name, result.error === undefined ? "success" : "failure");
+        const received = yield* Effect55.uninterruptibleMask((restore) => restore(executeHandler).pipe(Effect55.flatMap((rawResult) => input.transformResult === undefined || rawResult.error !== undefined ? Effect55.succeed(rawResult) : input.transformResult(rawResult)), Effect55.flatMap((result) => persistReceived(repository, effectiveInput, result)), Effect55.flatMap((record2) => recordReceived(eventLog, effectiveInput, record2))));
+        yield* recordToolCall(input.call.name, received.error === undefined ? "success" : "failure");
         return received;
       }).pipe(Effect55.tapError((error5) => recordToolCall(input.call.name, error5._tag === "ToolExecutionWaitRequested" ? "wait" : error5._tag === "ToolPermissionDenied" ? "denied" : "failure")));
     })
@@ -15616,15 +15593,6 @@ var boundResult = (config, result) => {
   return exports_tool_output.bound({ _tag: "Success", result: result.output, encodedResult: result.output }, { toolCallId: result.call_id, maxBytes: config.toolOutputMaxBytes }).pipe(Effect90.map((bounded) => ({ ...result, output: jsonValue5(bounded.encodedResult) })));
 };
 var batchKey = (request) => `${request.turn}:${request.toolCallBatch.calls.map((call) => call.id).join(":")}`;
-var gateKey = (turn, toolCallIndex) => `${turn}:${toolCallIndex}`;
-var gateFor = (gates, key4) => {
-  const existing = gates.get(key4);
-  if (existing !== undefined)
-    return existing;
-  const created = Deferred3.makeUnsafe();
-  gates.set(key4, created);
-  return created;
-};
 var callFrom = (call) => ({
   id: exports_ids_schema.ToolCallId.make(call.id),
   name: call.name,
@@ -15640,13 +15608,6 @@ var frameworkFailure = (call, error5) => {
 };
 var make9 = (config) => Effect90.sync(() => {
   const prepared = new Map;
-  const settled = new Map;
-  const awaitPrevious = (gates, request) => {
-    if (request.toolCallIndex === 0 || config.resumedToolCallId === request.call.id)
-      return Effect90.void;
-    return Deferred3.await(gateFor(gates, gateKey(request.turn, request.toolCallIndex - 1)));
-  };
-  const completeSettlement = (request) => Deferred3.succeed(gateFor(settled, gateKey(request.turn, request.toolCallIndex)), undefined).pipe(Effect90.asVoid);
   return exports_tool_executor.ToolExecutor.of({
     execute: (request) => {
       const key4 = batchKey(request);
@@ -15674,12 +15635,6 @@ var make9 = (config) => Effect90.sync(() => {
       }).pipe(Effect90.exit, Effect90.flatMap((exit) => Deferred3.done(preparation, exit)), Effect90.andThen(Deferred3.await(preparation)), Effect90.uninterruptible) : Deferred3.await(preparation);
       return Effect90.gen(function* () {
         yield* prepareBatch;
-        let settlementSequence;
-        const beginSettlement = Effect90.suspend(() => {
-          if (settlementSequence !== undefined)
-            return Effect90.succeed(settlementSequence);
-          return awaitPrevious(settled, request).pipe(Effect90.andThen(config.allocator.current), Effect90.map((sequence) => sequence - 1), Effect90.tap((sequence) => Effect90.sync(() => settlementSequence = sequence)));
-        });
         const first = yield* config.allocator.current;
         const call = callFrom(request.call);
         const existingRequest = yield* hasRequestedEvent(config, call.id);
@@ -15691,13 +15646,12 @@ var make9 = (config) => Effect90.sync(() => {
           eventSequence,
           createdAt: config.startedAt + eventSequence - config.eventSequence,
           ...config.extraTools === undefined ? {} : { extraTools: config.extraTools },
-          beforeSettlement: beginSettlement,
           transformResult: (result) => boundResult(config, result)
         }).pipe(Effect90.flatMap((result) => nextLoggedSequence2(config.eventLog, config.executionId, existingRequest ? first + 1 : first + 2).pipe(Effect90.flatMap(config.allocator.advanceTo), Effect90.as(result.error === undefined ? { _tag: "Success", result: result.output, encodedResult: result.output } : {
           _tag: "DomainFailure",
           failure: result.error,
           encodedFailure: result.error
-        }))), Effect90.catch((error5) => beginSettlement.pipe(Effect90.asVoid, Effect90.andThen(nextLoggedSequence2(config.eventLog, config.executionId, first)), Effect90.flatMap(config.allocator.advanceTo), Effect90.flatMap(() => {
+        }))), Effect90.catch((error5) => nextLoggedSequence2(config.eventLog, config.executionId, first).pipe(Effect90.flatMap(config.allocator.advanceTo), Effect90.flatMap(() => {
           if (error5._tag === "ToolExecutionWaitRequested") {
             return Effect90.succeed({ _tag: "Suspend", token: error5.wait_id });
           }
@@ -15706,7 +15660,7 @@ var make9 = (config) => Effect90.sync(() => {
             return Effect90.succeed({ _tag: "DomainFailure", failure: failure2, encodedFailure: failure2 });
           }
           return Effect90.fail(frameworkFailure(call, error5));
-        }))), Effect90.tap((outcome) => outcome._tag === "Suspend" ? Effect90.void : completeSettlement(request)), Effect90.onInterrupt(() => completeSettlement(request)));
+        }))));
       });
     }
   });
@@ -15772,6 +15726,13 @@ var modelMetadata = (agent) => ({
   model: agent.model.model,
   ...agent.model.registration_key === undefined ? {} : { registration_key: agent.model.registration_key }
 });
+var serviceTier = (part) => {
+  const openai = part.metadata.openai;
+  if (openai === null || typeof openai !== "object" || Array.isArray(openai))
+    return;
+  const value = openai.serviceTier;
+  return typeof value === "string" ? value : undefined;
+};
 var inputPreparedEvent = (input, definitions2) => ({
   id: exports_ids_schema.EventId.make(`event:${input.executionId}:model:${input.eventSequence}:input-prepared`),
   execution_id: input.executionId,
@@ -15787,25 +15748,30 @@ var inputPreparedEvent = (input, definitions2) => ({
   },
   created_at: input.startedAt
 });
-var usageReportedEvent = (input, part, sequence) => ({
-  id: exports_ids_schema.EventId.make(`event:${input.executionId}:model:${sequence}:usage`),
-  execution_id: input.executionId,
-  type: "model.usage.reported",
-  sequence,
-  cursor: `${input.executionId}:model:${sequence}:usage`,
-  data: {
-    provider: input.agent.model.provider,
-    model: input.agent.model.model,
-    finish_reason: part.reason,
-    input_tokens: part.usage.inputTokens.total ?? null,
-    input_tokens_uncached: part.usage.inputTokens.uncached ?? null,
-    input_tokens_cache_read: part.usage.inputTokens.cacheRead ?? null,
-    input_tokens_cache_write: part.usage.inputTokens.cacheWrite ?? null,
-    output_tokens: part.usage.outputTokens.total ?? null,
-    output_tokens_reasoning: part.usage.outputTokens.reasoning ?? null
-  },
-  created_at: input.startedAt + (sequence - input.eventSequence)
-});
+var usageReportedEvent = (input, part, modelSnapshot, sequence) => {
+  const tier = serviceTier(part);
+  return {
+    id: exports_ids_schema.EventId.make(`event:${input.executionId}:model:${sequence}:usage`),
+    execution_id: input.executionId,
+    type: "model.usage.reported",
+    sequence,
+    cursor: `${input.executionId}:model:${sequence}:usage`,
+    data: {
+      provider: input.agent.model.provider,
+      model: input.agent.model.model,
+      ...modelSnapshot === undefined ? {} : { model_snapshot: modelSnapshot },
+      ...tier === undefined ? {} : { service_tier: tier },
+      finish_reason: part.reason,
+      input_tokens: part.usage.inputTokens.total ?? null,
+      input_tokens_uncached: part.usage.inputTokens.uncached ?? null,
+      input_tokens_cache_read: part.usage.inputTokens.cacheRead ?? null,
+      input_tokens_cache_write: part.usage.inputTokens.cacheWrite ?? null,
+      output_tokens: part.usage.outputTokens.total ?? null,
+      output_tokens_reasoning: part.usage.outputTokens.reasoning ?? null
+    },
+    created_at: input.startedAt + (sequence - input.eventSequence)
+  };
+};
 var budgetExceededEvent = (input, tokensUsed, tokenBudget, sequence) => ({
   id: exports_ids_schema.EventId.make(`event:${input.executionId}:budget:${sequence}:exceeded`),
   execution_id: input.executionId,
@@ -16454,7 +16420,6 @@ var make12 = (layerOptions) => Effect93.gen(function* () {
         startedAt: input.startedAt,
         eventSequence: input.eventSequence,
         ...toolOutputMaxBytes === undefined ? {} : { toolOutputMaxBytes },
-        ...resumeToolCall === undefined ? {} : { resumedToolCallId: resumeToolCall.id },
         ...allCoreTools.length === 0 ? {} : { extraTools: allCoreTools }
       });
       const activeBlobStore = toolOutputMaxBytes === undefined || Option24.isNone(blobStore) ? undefined : blobStore.value;
@@ -16500,6 +16465,8 @@ var make12 = (layerOptions) => Effect93.gen(function* () {
             if (part.type === "tool-params-start") {
               return { ...state, toolCallNames: { ...state.toolCallNames, [part.id]: part.name } };
             }
+            if (part.type === "response-metadata")
+              return { ...state, modelId: part.modelId };
             if (part.type === "tool-params-delta") {
               const sequence = yield* allocator.allocate(1);
               const deltaIndex = state.toolCallDeltaIndexes[part.id] ?? 0;
@@ -16512,7 +16479,7 @@ var make12 = (layerOptions) => Effect93.gen(function* () {
             if (part.type === "finish") {
               const finish = part;
               const sequence = yield* allocator.allocate(1);
-              yield* appendEvent(eventLog, allocator, usageReportedEvent2(input, finish, sequence), sequence + 1);
+              yield* appendEvent(eventLog, allocator, usageReportedEvent2(input, finish, state.modelId, sequence), sequence + 1);
               yield* recordModelUsage({
                 provider: input.agent.model.provider,
                 model: input.agent.model.model,
@@ -16522,6 +16489,7 @@ var make12 = (layerOptions) => Effect93.gen(function* () {
               });
               return {
                 ...state,
+                modelId: undefined,
                 tokensUsed: state.tokensUsed + (finish.usage.inputTokens.total ?? 0) + (finish.usage.outputTokens.total ?? 0)
               };
             }
@@ -16555,6 +16523,7 @@ var make12 = (layerOptions) => Effect93.gen(function* () {
           text: "",
           transcript: undefined,
           turn: undefined,
+          modelId: undefined,
           tokensUsed: seededTokens,
           toolCallNames: {},
           toolCallDeltaIndexes: {}

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   exports_tool_runtime,
   exports_workflow_definition_host,
   makeDatabaseIdentity
-} from "./index-p43mg4kt.js";
+} from "./index-y9ncz0zd.js";
 import {
   exports_model_registry
 } from "./index-x32kbvxv.js";

package/dist/mysql.js

@@ -2,12 +2,12 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-cs3be24t.js";
+} from "./index-4y9111jh.js";
 import {
   MigratorError,
   RuntimeMigrationError,
   SqlFailure
-} from "./index-p43mg4kt.js";
+} from "./index-y9ncz0zd.js";
 import"./index-x32kbvxv.js";
 import"./index-3w6txjtg.js";
 import"./index-nb39b5ae.js";

package/dist/postgres.js

@@ -2,7 +2,7 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-cs3be24t.js";
+} from "./index-4y9111jh.js";
 import {
   Dialect,
   RuntimeMigrationError,
@@ -14,7 +14,7 @@ import {
   fromDbTimestamp,
   fromNullableDbTimestamp,
   timestampParam
-} from "./index-p43mg4kt.js";
+} from "./index-y9ncz0zd.js";
 import"./index-x32kbvxv.js";
 import {
   exports_ids_schema

package/dist/sqlite.js

@@ -2,7 +2,7 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-cs3be24t.js";
+} from "./index-4y9111jh.js";
 import {
   DatabaseAlreadyOwned,
   RuntimeConfigurationError,
@@ -12,7 +12,7 @@ import {
   make,
   makeDatabaseIdentity,
   runtimeLayer
-} from "./index-p43mg4kt.js";
+} from "./index-y9ncz0zd.js";
 import"./index-x32kbvxv.js";
 import"./index-3w6txjtg.js";
 import"./index-nb39b5ae.js";

package/dist/types/runtime/agent/agent-loop-events.d.ts

@@ -2,7 +2,7 @@ import { Content, Execution, Shared, Tool } from "../../schema/index";
 import type { Response } from "effect/unstable/ai";
 import type { RunInput } from "./agent-loop-service";
 declare const inputPreparedEvent: (input: RunInput, definitions: ReadonlyArray<Tool.Definition>) => Execution.ExecutionEvent;
-declare const usageReportedEvent: (input: RunInput, part: Response.FinishPart, sequence: Execution.ExecutionEventSequence) => Execution.ExecutionEvent;
+declare const usageReportedEvent: (input: RunInput, part: Response.FinishPart, modelSnapshot: string | undefined, sequence: Execution.ExecutionEventSequence) => Execution.ExecutionEvent;
 declare const budgetExceededEvent: (input: RunInput, tokensUsed: number, tokenBudget: number, sequence: Execution.ExecutionEventSequence) => Execution.ExecutionEvent;
 declare const outputDeltaEvent: (input: RunInput, part: Response.TextDeltaPart, deltaIndex: number) => Execution.ExecutionEvent;
 declare const reasoningDeltaEvent: (input: RunInput, part: Response.ReasoningPart | Response.ReasoningDeltaPart, deltaIndex: number) => Execution.ExecutionEvent;

package/dist/types/runtime/agent/relay-tool-executor.d.ts

@@ -15,7 +15,6 @@ export interface Config {
     readonly startedAt: number;
     readonly eventSequence: Execution.ExecutionEventSequence;
     readonly toolOutputMaxBytes?: number;
-    readonly resumedToolCallId?: Ids.ToolCallId;
     readonly extraTools?: ReadonlyArray<RegisteredTool>;
 }
 export declare const make: (config: Config) => Effect.Effect<ToolExecutor.Interface>;

package/dist/types/runtime/tool/tool-runtime-contract.d.ts

@@ -106,7 +106,6 @@ export interface RunInput {
     readonly createdAt: number;
     readonly extraTools?: ReadonlyArray<RegisteredTool>;
     readonly onRequested?: Effect.Effect<void>;
-    readonly beforeSettlement?: Effect.Effect<Execution.ExecutionEventSequence>;
     readonly transformResult?: (result: Tool.Result) => Effect.Effect<Tool.Result, ToolRuntimeError>;
 }
 export type RunError = ToolNotRegistered | ToolPermissionDenied | ToolInputInvalid | ToolExecutionFailed | ToolExecutionWaitRequested | ToolRuntimeError;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@relayfx/sdk",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Effect-native durable execution SDK for addressable agents and tools",
   "type": "module",
   "exports": {