@qlever-llc/trellis 0.10.22 → 0.11.0-rc.1

package/script/trellis.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Trellis_instances, _Trellis_log, _Trellis_tasks, _Trellis_hasExplicitApi, _Trellis_noResponderMaxRetries, _Trellis_noResponderRetryMs, _Trellis_onSessionNotFound, _Trellis_operationStore, _Trellis_eventConsumers, _Trellis_durableEventLoops, _Trellis_createStateFacade, _Trellis_createRpcFacade, _Trellis_createRpcHandleFacade, _Trellis_createEventFacade, _Trellis_createEventPublishFacade, _Trellis_createFeedFacade, _Trellis_createHandlerTrellis, _Trellis_createOperationFacade, _Trellis_unknownApiError, _Trellis_requestBuiltRpcUnknown, _Trellis_requestBuiltRpc, _Trellis_handleBrowserAuthRequired, _Trellis_authenticateFeedRequest, _Trellis_subscribeFeed, _Trellis_handleFeed, _Trellis_processFeedMessage, _Trellis_handleRPC, _Trellis_processRPCMessage, _Trellis_respondWithPayload, _Trellis_respondWithError, _Trellis_startEphemeralEvent, _Trellis_invokeEventHandler, _Trellis_resolveEventConsumerGroup, _Trellis_registerDurableEventHandler, _Trellis_startDurableEventConsumer, _Trellis_durableEventConsumerGroupReady, _Trellis_runDurableEventConsumer, _Trellis_handleDurableEvent, _Trellis_handleDurableEventConsumer, _Trellis_parseEventMessage, _Trellis_escapeSubjectToken, _Trellis_currentIat, _Trellis_createProof, _Trellis_requestMessageWithRetry, _Trellis_requestJson, _Trellis_watchJson;
+var _Trellis_instances, _Trellis_log, _Trellis_tasks, _Trellis_hasExplicitApi, _Trellis_noResponderMaxRetries, _Trellis_noResponderRetryMs, _Trellis_onSessionNotFound, _Trellis_operationStore, _Trellis_eventConsumers, _Trellis_durableEventConsumerBeforeReadinessCheck, _Trellis_durableEventLoops, _Trellis_durableEventListenersStopped, _Trellis_createStateFacade, _Trellis_createRpcFacade, _Trellis_createRpcHandleFacade, _Trellis_createEventFacade, _Trellis_createEventPublishFacade, _Trellis_createFeedFacade, _Trellis_createHandlerTrellis, _Trellis_createOperationFacade, _Trellis_unknownApiError, _Trellis_requestBuiltRpcUnknown, _Trellis_requestBuiltRpc, _Trellis_handleBrowserAuthRequired, _Trellis_authenticateFeedRequest, _Trellis_subscribeFeed, _Trellis_handleFeed, _Trellis_processFeedMessage, _Trellis_handleRPC, _Trellis_processRPCMessage, _Trellis_respondWithPayload, _Trellis_respondWithError, _Trellis_startEphemeralEvent, _Trellis_invokeEventHandler, _Trellis_resolveEventConsumerGroup, _Trellis_registerDurableEventHandler, _Trellis_startDurableEventConsumer, _Trellis_durableEventConsumerGroupReady, _Trellis_runDurableEventConsumer, _Trellis_handleDurableEvent, _Trellis_handleDurableEventConsumer, _Trellis_parseEventMessage, _Trellis_escapeSubjectToken, _Trellis_currentIat, _Trellis_createProof, _Trellis_requestMessageWithRetry, _Trellis_requestJson, _Trellis_watchJson;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trellis = exports.DurableOperationRecordSchema = void 0;
 exports.safeJson = safeJson;
@@ -321,25 +321,28 @@ function isTerminalRuntimeOperationSnapshot(value) {
         value.state === "cancelled");
 }
 function createEventListenerContext(args) {
-    const header = typeof args.payload === "object" && args.payload !== null
-        ? Reflect.get(args.payload, "header")
-        : undefined;
-    const id = typeof header === "object" && header !== null
-        ? Reflect.get(header, "id")
-        : undefined;
-    const time = typeof header === "object" && header !== null
-        ? Reflect.get(header, "time")
-        : undefined;
+    const messageId = readMessageHeader(args.message, "Nats-Msg-Id");
+    const messageTime = readMessageHeader(args.message, "Trellis-Event-Time");
     const sequence = Reflect.get(args.message, "seq");
     return {
-        id: typeof id === "string" ? id : "",
-        time: new Date(typeof time === "string" ? time : 0),
+        id: messageId ?? "",
+        time: new Date(messageTime ?? 0),
         subject: args.subject,
         mode: args.mode,
         ...(args.group ? { group: args.group } : {}),
         ...(typeof sequence === "number" ? { sequence } : {}),
     };
 }
+function readMessageHeader(message, key) {
+    const headers = Reflect.get(message, "headers");
+    if (typeof headers !== "object" || headers === null)
+        return undefined;
+    const get = Reflect.get(headers, "get");
+    if (typeof get !== "function")
+        return undefined;
+    const value = get.call(headers, key);
+    return typeof value === "string" ? value : undefined;
+}
 function eventConsumerGroupEvents(group) {
     const events = new Set();
     for (const groupEvents of Object.values(group.uses ?? {})) {
@@ -350,21 +353,25 @@ function eventConsumerGroupEvents(group) {
         events.add(event);
     return [...events].sort();
 }
-let pendingInternalEventConsumers;
+function isConsumerNotFoundError(error) {
+    return error instanceof Error && (error.name === "ConsumerNotFoundError" ||
+        error.message.includes("consumer not found"));
+}
+const internalEventConsumers = Symbol("trellis.internal.eventConsumers");
+const internalDurableEventConsumerBeforeReadinessCheck = Symbol("trellis.internal.durableEventConsumerBeforeReadinessCheck");
 /**
  * Creates a Trellis runtime with bootstrap-resolved bindings.
  *
  * @internal
  */
 function createTrellisInternal(name, nats, auth, opts) {
-    const { eventConsumers, ...publicOpts } = opts ?? {};
-    pendingInternalEventConsumers = eventConsumers;
-    try {
-        return new Trellis(name, nats, auth, publicOpts);
-    }
-    finally {
-        pendingInternalEventConsumers = undefined;
-    }
+    const { durableEventConsumerBeforeReadinessCheck, eventConsumers, ...publicOpts } = opts ?? {};
+    const internalOpts = {
+        ...publicOpts,
+        [internalEventConsumers]: eventConsumers,
+        [internalDurableEventConsumerBeforeReadinessCheck]: durableEventConsumerBeforeReadinessCheck,
+    };
+    return new Trellis(name, nats, auth, internalOpts);
 }
 function surfaceGroupName(key) {
     return lowerCamelIdent(key.split(".")[0] ?? key);
@@ -460,7 +467,23 @@ function joinStatePath(prefix, key) {
         .join("/");
 }
 function validateStateValue(schema, value) {
-    return parseRuntimeSchema(schema, value);
+    const result = parseRuntimeSchema(schema, value);
+    // State validation is an internal path; collapse SchemaValidationError
+    // into ValidationError to keep internal error types narrow.
+    if (result.isOk()) {
+        return result;
+    }
+    const resultError = result.error;
+    if (resultError instanceof index_js_1.SchemaValidationError) {
+        return result_1.Result.err(new index_js_1.ValidationError({
+            errors: resultError.issues.map((i) => ({
+                path: i.path,
+                message: i.message,
+            })),
+            cause: resultError.cause,
+        }));
+    }
+    return result;
 }
 function validateStateGetResult(descriptor, result) {
     if ("migrationRequired" in result) {
@@ -820,7 +843,10 @@ class Trellis {
         _Trellis_onSessionNotFound.set(this, void 0);
         _Trellis_operationStore.set(this, void 0);
         _Trellis_eventConsumers.set(this, void 0);
+        _Trellis_durableEventConsumerBeforeReadinessCheck.set(this, void 0);
         _Trellis_durableEventLoops.set(this, new Map());
+        _Trellis_durableEventListenersStopped.set(this, false);
+        const internalOpts = opts;
         const api = opts?.api;
         this.name = name;
         this.nats = nats;
@@ -838,7 +864,8 @@ class Trellis {
         __classPrivateFieldSet(this, _Trellis_noResponderRetryMs, opts?.noResponderRetry?.baseDelayMs ??
             DEFAULT_NO_RESPONDER_RETRY_MS, "f");
         __classPrivateFieldSet(this, _Trellis_onSessionNotFound, opts?.onSessionNotFound, "f");
-        __classPrivateFieldSet(this, _Trellis_eventConsumers, pendingInternalEventConsumers ?? {}, "f");
+        __classPrivateFieldSet(this, _Trellis_eventConsumers, internalOpts?.[internalEventConsumers] ?? {}, "f");
+        __classPrivateFieldSet(this, _Trellis_durableEventConsumerBeforeReadinessCheck, internalOpts?.[internalDurableEventConsumerBeforeReadinessCheck], "f");
         this.connection = opts?.connection ??
             new connection_js_1.TrellisConnection({ kind: "client" });
         __classPrivateFieldSet(this, _Trellis_tasks, new tasks_js_1.TrellisTasks({ log: __classPrivateFieldGet(this, _Trellis_log, "f") }), "f");
@@ -987,10 +1014,7 @@ class Trellis {
                 id: (0, ulid_1.ulid)(),
                 time: new Date().toISOString(),
             };
-            const payload = Object.freeze({
-                ...data,
-                header: Object.freeze(header),
-            });
+            const payload = Object.freeze({ ...data });
             const msg = (0, codec_js_1.encodeSchema)(ctx.event, payload).take();
             if ((0, result_1.isErr)(msg)) {
                 globals_js_1.logger.error({ err: msg.error }, "Failed to encode event.");
@@ -1005,6 +1029,7 @@ class Trellis {
             }
             const headers = (0, nats_core_1.headers)();
             headers.set("Nats-Msg-Id", header.id);
+            headers.set("Trellis-Event-Time", header.time);
             (0, mod_js_2.injectTraceContext)((0, mod_js_2.createNatsHeaderCarrier)(headers));
             const headerRecord = {};
             for (const [key, value] of headers) {
@@ -1013,6 +1038,7 @@ class Trellis {
             return (0, result_1.ok)(Object.freeze({
                 event: event.toString(),
                 subject,
+                header: Object.freeze(header),
                 payload,
                 encodedPayload: msg,
                 headers: Object.freeze(headerRecord),
@@ -1085,7 +1111,7 @@ class Trellis {
                 if ((0, result_1.isErr)(subject))
                     return subject;
                 if (opts?.mode === "ephemeral") {
-                    return __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_startEphemeralEvent).call(this, eventName, ctx, subject, fn, opts.signal);
+                    return await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_startEphemeralEvent).call(this, eventName, ctx, subject, fn, opts.signal);
                 }
                 if (opts?.durableName) {
                     return (0, result_1.err)(new index_js_1.UnexpectedError({
@@ -1118,6 +1144,14 @@ class Trellis {
     wait() {
         return __classPrivateFieldGet(this, _Trellis_tasks, "f").wait();
     }
+    /** Stops durable event listener loops without closing the underlying transport. */
+    stopEventListeners() {
+        __classPrivateFieldSet(this, _Trellis_durableEventListenersStopped, true, "f");
+        for (const loop of __classPrivateFieldGet(this, _Trellis_durableEventLoops, "f").values()) {
+            loop.registrations.splice(0, loop.registrations.length);
+            loop.messages?.stop();
+        }
+    }
     // FIXME: If are validating things twice in most cases...
     template(subject, data, allowWildcards = false) {
         // Find all template placeholders and check if values exist
@@ -1155,7 +1189,7 @@ class Trellis {
     }
 }
 exports.Trellis = Trellis;
-_Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplicitApi = new WeakMap(), _Trellis_noResponderMaxRetries = new WeakMap(), _Trellis_noResponderRetryMs = new WeakMap(), _Trellis_onSessionNotFound = new WeakMap(), _Trellis_operationStore = new WeakMap(), _Trellis_eventConsumers = new WeakMap(), _Trellis_durableEventLoops = new WeakMap(), _Trellis_instances = new WeakSet(), _Trellis_createStateFacade = function _Trellis_createStateFacade(state) {
+_Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplicitApi = new WeakMap(), _Trellis_noResponderMaxRetries = new WeakMap(), _Trellis_noResponderRetryMs = new WeakMap(), _Trellis_onSessionNotFound = new WeakMap(), _Trellis_operationStore = new WeakMap(), _Trellis_eventConsumers = new WeakMap(), _Trellis_durableEventConsumerBeforeReadinessCheck = new WeakMap(), _Trellis_durableEventLoops = new WeakMap(), _Trellis_durableEventListenersStopped = new WeakMap(), _Trellis_instances = new WeakSet(), _Trellis_createStateFacade = function _Trellis_createStateFacade(state) {
     const stores = (state ?? {});
     const facade = Object.fromEntries(Object.entries(stores).map(([store, descriptor]) => {
         if (descriptor.kind === "value") {
@@ -1275,6 +1309,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         prepare: (event, data) => this.prepare(event, data),
         publish: (event, data) => this.publish(event, data),
         publishPrepared: (event) => this.publishPrepared(event),
+        stopEventListeners: () => this.stopEventListeners(),
     };
 }, _Trellis_createOperationFacade = function _Trellis_createOperationFacade() {
     const surface = {};
@@ -1993,6 +2028,8 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             }
             let caller;
             const callerSessionKey = msg.headers?.get("session-key") ?? "";
+            const handlerRequestIdFromHeader = msg.headers?.get("request-id") ?? "";
+            const handlerTraceIdFromHeader = traceIdFromTraceparent(msg.headers?.get("traceparent"));
             const authRequired = ctx.authRequired ?? true;
             if (!authRequired) {
                 caller = {
@@ -2204,6 +2241,8 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 context: {
                     caller,
                     sessionKey: callerSessionKey,
+                    requestId: handlerRequestIdFromHeader || undefined,
+                    traceId: handlerTraceIdFromHeader || undefined,
                 },
                 client: handlerTrellis,
             })));
@@ -2340,14 +2379,29 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         return;
     }
     __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_respondWithPayload).call(this, msg, serialized.take(), { headers: hdrs }, { method: context.method, responseKind: "error" });
-}, _Trellis_startEphemeralEvent = function _Trellis_startEphemeralEvent(event, ctx, subject, fn, signal) {
-    const sub = this.nats.subscribe(subject);
-    if (signal) {
-        if (signal.aborted) {
+}, _Trellis_startEphemeralEvent = async function _Trellis_startEphemeralEvent(event, ctx, subject, fn, signal) {
+    let sub;
+    try {
+        sub = this.nats.subscribe(subject);
+        if (signal) {
+            if (signal.aborted) {
+                sub.unsubscribe();
+                return (0, result_1.ok)(undefined);
+            }
+            signal.addEventListener("abort", () => sub?.unsubscribe(), {
+                once: true,
+            });
+        }
+        await this.nats.flush();
+    }
+    catch (cause) {
+        if (sub) {
             sub.unsubscribe();
-            return (0, result_1.ok)(undefined);
         }
-        signal.addEventListener("abort", () => sub.unsubscribe(), { once: true });
+        return (0, result_1.err)(new index_js_1.UnexpectedError({
+            cause,
+            context: { event: String(event), subject },
+        }));
     }
     const task = result_1.AsyncResult.try(async () => {
         for await (const msg of sub) {
@@ -2398,7 +2452,6 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     };
     try {
         const result = await Promise.resolve(args.fn(args.payload, createEventListenerContext({
-            payload: args.payload,
             subject: args.message.subject,
             mode: args.mode,
             ...(args.group ? { group: args.group } : {}),
@@ -2455,7 +2508,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     }
     return (0, result_1.ok)(group);
 }, _Trellis_registerDurableEventHandler = function _Trellis_registerDurableEventHandler(args) {
-    if (args.signal?.aborted)
+    if (args.signal?.aborted || __classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f"))
         return;
     const loop = __classPrivateFieldGet(this, _Trellis_durableEventLoops, "f").get(args.group) ?? {
         registrations: [],
@@ -2479,7 +2532,8 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     }, { once: true });
     __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_startDurableEventConsumer).call(this, args.group, loop);
 }, _Trellis_startDurableEventConsumer = function _Trellis_startDurableEventConsumer(group, loop) {
-    if (loop.started || !__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
+    if (__classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f") || loop.started ||
+        !__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
         return;
     }
     loop.started = true;
@@ -2504,10 +2558,21 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 return await jsm.consumers.info(binding.stream, binding.consumerName);
             });
             const info = infoResult.take();
-            if ((0, result_1.isErr)(info))
+            if ((0, result_1.isErr)(info)) {
+                if (__classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f") ||
+                    !__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
+                    return (0, result_1.ok)(undefined);
+                }
+                if (isConsumerNotFoundError(info.error.cause)) {
+                    __classPrivateFieldGet(this, _Trellis_log, "f").debug({ group, stream: binding.stream, consumer: binding.consumerName }, "Durable event consumer is not available yet; retrying");
+                    await sleep(25);
+                    return (0, result_1.ok)(undefined);
+                }
                 return info;
+            }
             const consumer = this.js.consumers.getConsumerFromInfo(info);
-            while (__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
+            while (!__classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f") &&
+                __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
                 const messages = await consumer.fetch({
                     max_messages: 1,
                     expires: 30_000,
@@ -2521,10 +2586,24 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     .orThrow();
             }
         }
+        catch (cause) {
+            if (__classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f") ||
+                !__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
+                return (0, result_1.ok)(undefined);
+            }
+            if (isConsumerNotFoundError(cause)) {
+                __classPrivateFieldGet(this, _Trellis_log, "f").debug({ group, stream: binding.stream, consumer: binding.consumerName }, "Durable event consumer is not available yet; retrying");
+                await sleep(25);
+                return (0, result_1.ok)(undefined);
+            }
+            return (0, result_1.err)(new index_js_1.UnexpectedError({ cause, context: { group } }));
+        }
         finally {
             loop.started = false;
             loop.messages = undefined;
-            __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_startDurableEventConsumer).call(this, group, loop);
+            if (!__classPrivateFieldGet(this, _Trellis_durableEventListenersStopped, "f")) {
+                __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_startDurableEventConsumer).call(this, group, loop);
+            }
         }
         return (0, result_1.ok)(undefined);
     })());
@@ -2561,6 +2640,10 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
 }, _Trellis_handleDurableEventConsumer = function _Trellis_handleDurableEventConsumer(group, loop, messages) {
     return result_1.AsyncResult.try(async () => {
         for await (const msg of messages) {
+            await __classPrivateFieldGet(this, _Trellis_durableEventConsumerBeforeReadinessCheck, "f")?.call(this, {
+                group,
+                subject: msg.subject,
+            });
             if (!__classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_durableEventConsumerGroupReady).call(this, group, loop)) {
                 messages.stop();
                 break;

package/src/auth/mod.ts

@@ -90,6 +90,8 @@ export {
   AuthCapabilityGroupsListSchema,
   AuthCapabilityGroupsPutResponseSchema,
   AuthCapabilityGroupsPutSchema,
+  AuthCatalogIssuesResolveResponseSchema,
+  AuthCatalogIssuesResolveSchema,
   type AuthDeployment,
   type AuthDeploymentAuthorityAcceptMigrationInput,
   AuthDeploymentAuthorityAcceptMigrationSchema,
@@ -189,6 +191,10 @@ export {
   AuthPortalsLoginSettingsGetSchema,
   AuthPortalsLoginSettingsResponseSchema,
   AuthPortalsLoginSettingsUpdateSchema,
+  AuthPortalsPutResponseSchema,
+  AuthPortalsPutSchema,
+  AuthPortalsRemoveResponseSchema,
+  AuthPortalsRemoveSchema,
   AuthPortalsRoutesPutResponseSchema,
   AuthPortalsRoutesPutSchema,
   AuthPortalsRoutesRemoveResponseSchema,
@@ -270,6 +276,7 @@ export {
   DeploymentAuthorityUpdateSchema,
   DeploymentPortalRouteSchema,
   DeploymentResourceBindingSchema,
+  DeviceActivationActorSchema,
   type DeviceActivationRecord,
   DeviceActivationRecordSchema,
   DeviceActivationReviewSchema,

package/src/browser.ts

@@ -39,7 +39,7 @@ export {
 export type { InferSchemaType, JsonValue, TrellisAPI } from "./contracts.js";
 export { TrellisConnection } from "./connection.js";
 export type { TrellisConnectionStatus } from "./connection.js";
-export { defineError } from "./contract_support/mod.js";
+export { defineError, withTrellisValidation } from "./contract_support/mod.js";
 export {
   buildCursorPage,
   buildPageResponse,
@@ -65,6 +65,8 @@ export type {
   RpcErrorClass,
   RuntimeRpcErrorDesc,
   SerializableErrorData,
+  TrellisValidationExtension,
+  TrellisValidationIssueHint,
 } from "./contract_support/mod.js";
 export {
   defineAgentContract,
@@ -170,7 +172,6 @@ export type {
   AcceptedOperation,
   ClientTrellis,
   ConnectedTrellisClient,
-  EventHandler,
   EventListenerContext,
   EventName,
   EventOpts,
@@ -187,25 +188,22 @@ export type {
   HandlerTrellisForContract,
   MapStateStoreClient,
   OperationHandlerContext,
+  OperationHandlerErrorOf,
   OperationRegistration,
   OperationRuntimeHandle,
   OperationTransferContextOf,
   OperationTransferHandle,
   PreparedTrellisEvent,
   RequestOpts,
-  RpcArgs,
   RpcHandlerContext,
-  RpcHandlerErrorOf,
-  RpcHandlerFn,
   RpcInputOf,
   RpcMethodNameOf,
   RpcOutputOf,
   RpcRequestErrorOf,
-  RpcResult,
   RuntimeStateStoresForContract,
   RuntimeStateStoreShape,
+  SessionCaller,
   StateFacade,
-  TrellisFor,
   ValueStateStoreClient,
 } from "./trellis.js";
 export type { TrellisAuth } from "./trellis.js";