@qlever-llc/trellis 0.10.10 → 0.10.12

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_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_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;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trellis = exports.DurableOperationRecordSchema = void 0;
 exports.safeJson = safeJson;
@@ -21,6 +21,7 @@ exports.sha256 = sha256;
 exports.buildProofInput = buildProofInput;
 exports.isOperationDeferred = isOperationDeferred;
 exports.isResultLike = isResultLike;
+exports.annotateHandlerBoundaryError = annotateHandlerBoundaryError;
 exports.buildRuntimeOperationSnapshot = buildRuntimeOperationSnapshot;
 exports.isTerminalRuntimeOperationSnapshot = isTerminalRuntimeOperationSnapshot;
 exports.createTrellisInternal = createTrellisInternal;
@@ -28,7 +29,7 @@ const jetstream_1 = require("@nats-io/jetstream");
 const nats_core_1 = require("@nats-io/nats-core");
 const mod_js_1 = require("./contract_support/mod.js");
 const result_1 = require("@qlever-llc/result");
-const tracing_js_1 = require("./tracing.js");
+const mod_js_2 = require("./telemetry/mod.js");
 const typebox_1 = require("typebox");
 const value_1 = require("typebox/value");
 const ulid_1 = require("ulid");
@@ -204,6 +205,27 @@ function isOperationDeferred(value) {
 function isResultLike(value) {
     return value instanceof result_1.Result;
 }
+function compactHandlerErrorContext(context) {
+    return Object.fromEntries(Object.entries(context).filter(([key, value]) => key !== "traceId" && value !== undefined));
+}
+function sanitizeHandlerErrorContext(error) {
+    delete error.getContext().subject;
+}
+function annotateHandlerBoundaryError(cause, context) {
+    const error = cause instanceof result_1.BaseError && !(cause instanceof RemoteError_js_1.RemoteError)
+        ? cause
+        : new index_js_1.UnexpectedError({ cause });
+    sanitizeHandlerErrorContext(error);
+    error.withContext(compactHandlerErrorContext(context));
+    error.withTraceId(context.traceId);
+    return error;
+}
+function recordRuntimeError(error, attributes) {
+    (0, mod_js_2.recordTrellisError)(error, {
+        messagingSystem: "nats",
+        ...attributes,
+    });
+}
 const DurableOperationSignalSchema = typebox_1.Type.Object({
     operationId: typebox_1.Type.String(),
     sequence: typebox_1.Type.Number(),
@@ -234,8 +256,11 @@ const DurableOperationSnapshotSchema = typebox_1.Type.Object({
     })),
     output: typebox_1.Type.Optional(typebox_1.Type.Any()),
     error: typebox_1.Type.Optional(typebox_1.Type.Object({
+        id: typebox_1.Type.Optional(typebox_1.Type.String()),
         type: typebox_1.Type.String(),
         message: typebox_1.Type.String(),
+        context: typebox_1.Type.Optional(typebox_1.Type.Record(typebox_1.Type.String(), typebox_1.Type.Unknown())),
+        traceId: typebox_1.Type.Optional(typebox_1.Type.String()),
     })),
 });
 exports.DurableOperationRecordSchema = typebox_1.Type.Object({
@@ -741,6 +766,18 @@ class Trellis {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "contractId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "contractDigest", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "nats", {
             enumerable: true,
             configurable: true,
@@ -783,6 +820,8 @@ class Trellis {
         __classPrivateFieldSet(this, _Trellis_log, (opts?.log ?? globals_js_1.logger).child({ lib: "trellis" }), "f");
         this.timeout = opts?.timeout ?? 3000;
         this.stream = opts?.stream ?? "trellis";
+        this.contractId = opts?.contractId;
+        this.contractDigest = opts?.contractDigest;
         __classPrivateFieldSet(this, _Trellis_hasExplicitApi, api !== undefined, "f");
         __classPrivateFieldSet(this, _Trellis_noResponderMaxRetries, opts?.noResponderRetry?.maxAttempts ??
             DEFAULT_NO_RESPONDER_MAX_RETRIES, "f");
@@ -917,14 +956,27 @@ class Trellis {
             const eventName = event;
             const ctx = this.api["events"][eventName];
             if (!ctx) {
-                return (0, result_1.err)(new index_js_1.UnexpectedError({
+                const error = new index_js_1.UnexpectedError({
                     cause: __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_unknownApiError).call(this, "event", event.toString()),
                     context: { event: event.toString() },
-                }));
+                });
+                recordRuntimeError(error, {
+                    surface: "event",
+                    direction: "publisher",
+                    operation: event,
+                    phase: "prepare",
+                });
+                return (0, result_1.err)(error);
             }
             const subject = this.template(ctx.subject, data).take();
             if ((0, result_1.isErr)(subject)) {
                 globals_js_1.logger.error({ err: subject.error }, "Failed to template event.");
+                recordRuntimeError(subject.error, {
+                    surface: "event",
+                    direction: "publisher",
+                    operation: event,
+                    phase: "request_encoding",
+                });
                 return subject;
             }
             const header = {
@@ -938,11 +990,18 @@ class Trellis {
             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.");
-                return (0, result_1.err)(new index_js_1.UnexpectedError({ cause: msg.error }));
+                const error = new index_js_1.UnexpectedError({ cause: msg.error });
+                recordRuntimeError(error, {
+                    surface: "event",
+                    direction: "publisher",
+                    operation: event,
+                    phase: "request_encoding",
+                });
+                return (0, result_1.err)(error);
             }
             const headers = (0, nats_core_1.headers)();
             headers.set("Nats-Msg-Id", header.id);
-            (0, tracing_js_1.injectTraceContext)((0, tracing_js_1.createNatsHeaderCarrier)(headers));
+            (0, mod_js_2.injectTraceContext)((0, mod_js_2.createNatsHeaderCarrier)(headers));
             const headerRecord = {};
             for (const [key, value] of headers) {
                 headerRecord[key] = value.join(",");
@@ -956,7 +1015,17 @@ class Trellis {
             }));
         }
         catch (cause) {
-            return (0, result_1.err)(new index_js_1.UnexpectedError({ cause, context: { event: event.toString() } }));
+            const error = new index_js_1.UnexpectedError({
+                cause,
+                context: { event: event.toString() },
+            });
+            recordRuntimeError(error, {
+                surface: "event",
+                direction: "publisher",
+                operation: event,
+                phase: "prepare",
+            });
+            return (0, result_1.err)(error);
         }
     }
     /**
@@ -975,7 +1044,17 @@ class Trellis {
                 return (0, result_1.ok)(undefined);
             }
             catch (cause) {
-                return (0, result_1.err)(new index_js_1.UnexpectedError({ cause, context: { event: event.event } }));
+                const error = new index_js_1.UnexpectedError({
+                    cause,
+                    context: { event: event.event },
+                });
+                recordRuntimeError(error, {
+                    surface: "event",
+                    direction: "publisher",
+                    operation: event.event,
+                    phase: "publish",
+                });
+                return (0, result_1.err)(error);
             }
         })());
     }
@@ -1212,13 +1291,25 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         __classPrivateFieldGet(this, _Trellis_log, "f").trace({ method: String(method) }, `Calling ${method.toString()}.`);
         const msg = encodeRuntimeSchema(ctx.input, input).take();
         if ((0, result_1.isErr)(msg)) {
+            recordRuntimeError(msg.error, {
+                surface: "rpc",
+                direction: "client",
+                operation: method,
+                phase: "request_encoding",
+            });
             return msg;
         }
         const subject = this.template(ctx.subject, input).take();
         if ((0, result_1.isErr)(subject)) {
+            recordRuntimeError(subject.error, {
+                surface: "rpc",
+                direction: "client",
+                operation: method,
+                phase: "request_encoding",
+            });
             return subject;
         }
-        const span = (0, tracing_js_1.startClientSpan)(method, subject);
+        const span = (0, mod_js_2.startClientSpan)(method, subject);
         const attempt = async () => {
             const authHeaders = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_createProof).call(this, subject, msg);
             const headers = (0, nats_core_1.headers)();
@@ -1226,7 +1317,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             headers.set("proof", authHeaders.proof);
             headers.set("iat", String(authHeaders.iat));
             headers.set("request-id", authHeaders.requestId);
-            (0, tracing_js_1.injectTraceContext)((0, tracing_js_1.createNatsHeaderCarrier)(headers), span);
+            (0, mod_js_2.injectTraceContext)((0, mod_js_2.createNatsHeaderCarrier)(headers), span);
             const msgResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_requestMessageWithRetry).call(this, {
                 method,
                 subject,
@@ -1237,30 +1328,50 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             });
             const response = msgResult.take();
             if ((0, result_1.isErr)(response)) {
+                recordRuntimeError(response.error, {
+                    surface: "rpc",
+                    direction: "client",
+                    operation: method,
+                    phase: "request_send",
+                });
                 return response;
             }
             if (response.headers?.get("status") === "error") {
                 const json = safeJson(response).take();
                 if ((0, result_1.isErr)(json)) {
-                    return (0, result_1.err)(requestFailedTransportError({
+                    const error = requestFailedTransportError({
                         code: "trellis.request.invalid_response",
                         message: "Trellis returned an invalid response.",
                         hint: "Retry the request. If it keeps happening, check the Trellis capability handling this request.",
                         method,
                         subject,
                         cause: json.error.cause,
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "client",
+                        operation: method,
+                        phase: "response_decoding",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 const errorData = (0, codec_js_1.parse)(TrellisError_js_1.TrellisErrorDataSchema, json).take();
                 if ((0, result_1.isErr)(errorData)) {
-                    return (0, result_1.err)(requestFailedTransportError({
+                    const error = requestFailedTransportError({
                         code: "trellis.request.invalid_response",
                         message: "Trellis returned an invalid response.",
                         hint: "Retry the request. If it keeps happening, check the Trellis capability handling this request.",
                         method,
                         subject,
                         cause: errorData.error,
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "client",
+                        operation: method,
+                        phase: "response_decoding",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 const declaredErrorTypes = Array.isArray(ctx.declaredErrorTypes)
                     ? ctx.declaredErrorTypes.filter((value) => typeof value === "string")
@@ -1271,41 +1382,66 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 const reconstructed = reconstructDeclaredRpcError(declaredErrorTypes, runtimeErrors, errorData, json);
                 if (reconstructed) {
                     await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_handleBrowserAuthRequired).call(this, reconstructed);
+                    recordRuntimeError(new RemoteError_js_1.RemoteError({ error: errorData }), {
+                        surface: "rpc",
+                        direction: "client",
+                        operation: method,
+                        phase: "remote_error",
+                    });
                     return (0, result_1.err)(reconstructed);
                 }
                 const remoteError = new RemoteError_js_1.RemoteError({ error: errorData });
                 await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_handleBrowserAuthRequired).call(this, remoteError);
+                recordRuntimeError(remoteError, {
+                    surface: "rpc",
+                    direction: "client",
+                    operation: method,
+                    phase: "remote_error",
+                });
                 return (0, result_1.err)(remoteError);
             }
             const json = safeJson(response).take();
             if ((0, result_1.isErr)(json)) {
-                return (0, result_1.err)(requestFailedTransportError({
+                const error = requestFailedTransportError({
                     code: "trellis.request.invalid_response",
                     message: "Trellis returned an invalid response.",
                     hint: "Retry the request. If it keeps happening, check the Trellis capability handling this request.",
                     method,
                     subject,
                     cause: json.error.cause,
-                }));
+                });
+                recordRuntimeError(error, {
+                    surface: "rpc",
+                    direction: "client",
+                    operation: method,
+                    phase: "response_decoding",
+                });
+                return (0, result_1.err)(error);
             }
             const outputResult = parseRuntimeSchema(ctx.output, json).take();
             if ((0, result_1.isErr)(outputResult)) {
+                recordRuntimeError(outputResult.error, {
+                    surface: "rpc",
+                    direction: "client",
+                    operation: method,
+                    phase: "response_decoding",
+                });
                 return (0, result_1.err)(outputResult.error);
             }
             return (0, result_1.ok)(outputResult);
         };
-        return await (0, tracing_js_1.withSpanAsync)(span, async () => {
+        return await (0, mod_js_2.withSpanAsync)(span, async () => {
             try {
                 const result = await attempt();
                 const value = result.take();
                 if ((0, result_1.isErr)(value)) {
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: value.error.message,
                     });
                 }
                 else {
-                    span.setStatus({ code: tracing_js_1.SpanStatusCode.OK });
+                    span.setStatus({ code: mod_js_2.SpanStatusCode.OK });
                 }
                 return result;
             }
@@ -1314,10 +1450,16 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     ? cause
                     : new index_js_1.UnexpectedError({ cause });
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: unexpected.message,
                 });
                 span.recordException(unexpected);
+                recordRuntimeError(unexpected, {
+                    surface: "rpc",
+                    direction: "client",
+                    operation: method,
+                    phase: "unexpected",
+                });
                 return (0, result_1.err)(unexpected);
             }
             finally {
@@ -1386,18 +1528,32 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
 }, _Trellis_subscribeFeed = function _Trellis_subscribeFeed(feed, descriptor, input, opts) {
     return result_1.AsyncResult.from((async () => {
         const payload = encodeRuntimeSchema(descriptor.input, input).take();
-        if ((0, result_1.isErr)(payload))
+        if ((0, result_1.isErr)(payload)) {
+            recordRuntimeError(payload.error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "request_encoding",
+            });
             return payload;
+        }
         const subject = this.template(descriptor.subject, input).take();
-        if ((0, result_1.isErr)(subject))
+        if ((0, result_1.isErr)(subject)) {
+            recordRuntimeError(subject.error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "request_template",
+            });
             return subject;
+        }
         const authHeaders = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_createProof).call(this, subject, payload);
         const headers = (0, nats_core_1.headers)();
         headers.set("session-key", this.auth.sessionKey);
         headers.set("proof", authHeaders.proof);
         headers.set("iat", String(authHeaders.iat));
         headers.set("request-id", authHeaders.requestId);
-        (0, tracing_js_1.injectTraceContext)((0, tracing_js_1.createNatsHeaderCarrier)(headers));
+        (0, mod_js_2.injectTraceContext)((0, mod_js_2.createNatsHeaderCarrier)(headers));
         const inbox = (0, nats_core_1.createInbox)(`_INBOX.${this.auth.sessionKey.slice(0, 16)}`);
         const sub = this.nats.subscribe(inbox);
         const iterator = sub[Symbol.asyncIterator]();
@@ -1410,13 +1566,20 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         catch (cause) {
             opts?.signal?.removeEventListener("abort", abort);
             sub.unsubscribe();
-            return (0, result_1.err)(createTransportError({
+            const error = createTransportError({
                 code: "trellis.feed.subscribe_failed",
                 message: "Trellis could not subscribe to the feed.",
                 hint: "Retry the subscription. If it keeps failing, check Trellis runtime health.",
                 cause,
                 context: { feed, subject },
-            }));
+            });
+            recordRuntimeError(error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "request_send",
+            });
+            return (0, result_1.err)(error);
         }
         let timeoutId;
         let abortHandler;
@@ -1442,7 +1605,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         if (firstFrame === "timeout" || firstFrame === "aborted") {
             opts?.signal?.removeEventListener("abort", abort);
             sub.unsubscribe();
-            return (0, result_1.err)(createTransportError({
+            const error = createTransportError({
                 code: firstFrame === "timeout"
                     ? "trellis.feed.subscribe_timeout"
                     : "trellis.feed.subscribe_aborted",
@@ -1453,28 +1616,49 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     ? "Check that the target service is running and has the current deployment digest, then retry."
                     : "Retry the subscription if the feed is still needed.",
                 context: { feed, subject },
-            }));
+            });
+            recordRuntimeError(error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "handshake",
+            });
+            return (0, result_1.err)(error);
         }
         if (firstFrame.done) {
             opts?.signal?.removeEventListener("abort", abort);
             sub.unsubscribe();
-            return (0, result_1.err)(createTransportError({
+            const error = createTransportError({
                 code: "trellis.feed.subscribe_closed",
                 message: "Trellis closed the feed before acknowledging it.",
                 hint: "Retry the subscription. If it keeps failing, check Trellis runtime health.",
                 context: { feed, subject },
-            }));
+            });
+            recordRuntimeError(error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "handshake",
+            });
+            return (0, result_1.err)(error);
         }
         const firstMessage = firstFrame.value;
         if (firstMessage.headers?.get("status") === "error") {
             opts?.signal?.removeEventListener("abort", abort);
             sub.unsubscribe();
-            return (0, result_1.err)(createTransportError({
+            const error = createTransportError({
                 code: "trellis.feed.failed",
                 message: "Trellis rejected the feed subscription.",
                 hint: "Retry the subscription. If it keeps failing, check Trellis runtime health and permissions.",
                 context: { feed, subject, frame: firstMessage.string() },
-            }));
+            });
+            recordRuntimeError(error, {
+                surface: "feed",
+                direction: "client",
+                operation: feed,
+                phase: "remote_error",
+            });
+            return (0, result_1.err)(error);
         }
         const firstEvent = firstMessage.headers?.get("feed-status") === "ready"
             ? undefined
@@ -1484,19 +1668,40 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             try {
                 const parseFeedFrame = (msg) => {
                     if (msg.headers?.get("status") === "error") {
-                        throw createTransportError({
+                        const error = createTransportError({
                             code: "trellis.feed.failed",
                             message: "Trellis stopped the feed.",
                             hint: "Retry the subscription. If it keeps failing, check Trellis runtime health.",
                             context: { feed, subject, frame: msg.string() },
                         });
+                        recordRuntimeError(error, {
+                            surface: "feed",
+                            direction: "client",
+                            operation: feed,
+                            phase: "remote_error",
+                        });
+                        throw error;
                     }
                     const json = safeJson(msg).take();
-                    if ((0, result_1.isErr)(json))
+                    if ((0, result_1.isErr)(json)) {
+                        recordRuntimeError(json.error, {
+                            surface: "feed",
+                            direction: "client",
+                            operation: feed,
+                            phase: "event_decoding",
+                        });
                         throw json.error;
+                    }
                     const parsed = parseRuntimeSchema(eventSchema, json).take();
-                    if ((0, result_1.isErr)(parsed))
+                    if ((0, result_1.isErr)(parsed)) {
+                        recordRuntimeError(parsed.error, {
+                            surface: "feed",
+                            direction: "client",
+                            operation: feed,
+                            phase: "event_validation",
+                        });
                         throw parsed.error;
+                    }
                     return parsed;
                 };
                 if (firstEvent)
@@ -1524,13 +1729,20 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         await this.nats.flush();
     }
     catch (cause) {
-        throw createTransportError({
+        const error = createTransportError({
             code: "trellis.feed.listen_failed",
             message: "Trellis could not listen for feed requests.",
             hint: "Check the service deployment digest and runtime permissions, then restart the service.",
             cause,
             context: { feed, subject },
         });
+        recordRuntimeError(error, {
+            surface: "feed",
+            direction: "server",
+            operation: feed,
+            phase: "listen",
+        });
+        throw error;
     }
     const task = result_1.AsyncResult.try(async () => {
         for await (const msg of sub) {
@@ -1543,9 +1755,20 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     }
                 }
                 catch (cause) {
-                    const error = cause instanceof result_1.BaseError
-                        ? cause
-                        : new index_js_1.UnexpectedError({ cause });
+                    const error = annotateHandlerBoundaryError(cause, {
+                        feed,
+                        requestId: msg.headers?.get("request-id"),
+                        service: this.name,
+                        contractId: this.contractId,
+                        contractDigest: this.contractDigest,
+                        traceId: traceIdFromTraceparent(msg.headers?.get("traceparent")),
+                    });
+                    recordRuntimeError(error, {
+                        surface: "feed",
+                        direction: "server",
+                        operation: feed,
+                        phase: "handler_throw",
+                    });
                     __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_respondWithError).call(this, msg, error);
                 }
             })();
@@ -1554,11 +1777,25 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     __classPrivateFieldGet(this, _Trellis_tasks, "f").add(`feed:${feed}`, task);
 }, _Trellis_processFeedMessage = async function _Trellis_processFeedMessage(feed, descriptor, msg, handler) {
     const json = safeJson(msg).take();
-    if ((0, result_1.isErr)(json))
+    if ((0, result_1.isErr)(json)) {
+        recordRuntimeError(json.error, {
+            surface: "feed",
+            direction: "server",
+            operation: feed,
+            phase: "request_decoding",
+        });
         return json;
+    }
     const parsed = parseRuntimeSchema(descriptor.input, json).take();
-    if ((0, result_1.isErr)(parsed))
+    if ((0, result_1.isErr)(parsed)) {
+        recordRuntimeError(parsed.error, {
+            surface: "feed",
+            direction: "server",
+            operation: feed,
+            phase: "input_validation",
+        });
         return parsed;
+    }
     const caller = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_authenticateFeedRequest).call(this, {
         feed,
         subject: msg.subject,
@@ -1567,12 +1804,26 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         requiredCapabilities: descriptor.subscribeCapabilities,
     });
     const callerValue = caller.take();
-    if ((0, result_1.isErr)(callerValue))
+    if ((0, result_1.isErr)(callerValue)) {
+        recordRuntimeError(callerValue.error, {
+            surface: "feed",
+            direction: "server",
+            operation: feed,
+            phase: "auth",
+        });
         return callerValue;
+    }
     if (!msg.reply) {
-        return (0, result_1.err)(new index_js_1.UnexpectedError({
+        const error = new index_js_1.UnexpectedError({
             context: { feed, reason: "missing_reply" },
-        }));
+        });
+        recordRuntimeError(error, {
+            surface: "feed",
+            direction: "server",
+            operation: feed,
+            phase: "handshake",
+        });
+        return (0, result_1.err)(error);
     }
     const readyHeaders = (0, nats_core_1.headers)();
     readyHeaders.set("feed-status", "ready");
@@ -1580,24 +1831,73 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     await this.nats.flush();
     const controller = new AbortController();
     try {
-        await handler({
+        const handlerResult = await handler({
             input: parsed,
             caller: callerValue,
             signal: controller.signal,
             emit: (event) => result_1.AsyncResult.from((async () => {
                 const payload = encodeRuntimeSchema(descriptor.event, event).take();
-                if ((0, result_1.isErr)(payload))
+                if ((0, result_1.isErr)(payload)) {
+                    recordRuntimeError(payload.error, {
+                        surface: "feed",
+                        direction: "server",
+                        operation: feed,
+                        phase: "event_encoding",
+                    });
                     return payload;
+                }
                 if (!msg.reply) {
-                    return (0, result_1.err)(new index_js_1.UnexpectedError({
+                    const error = new index_js_1.UnexpectedError({
                         context: { feed, reason: "missing_reply" },
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "feed",
+                        direction: "server",
+                        operation: feed,
+                        phase: "event_publish",
+                    });
+                    return (0, result_1.err)(error);
+                }
+                try {
+                    this.nats.publish(msg.reply, payload);
+                    await this.nats.flush();
+                }
+                catch (cause) {
+                    const error = new index_js_1.UnexpectedError({
+                        cause,
+                        context: { feed },
+                    });
+                    recordRuntimeError(error, {
+                        surface: "feed",
+                        direction: "server",
+                        operation: feed,
+                        phase: "event_publish",
+                    });
+                    return (0, result_1.err)(error);
                 }
-                this.nats.publish(msg.reply, payload);
-                await this.nats.flush();
                 return (0, result_1.ok)(undefined);
             })()),
         });
+        const handlerOutcome = isResultLike(handlerResult)
+            ? handlerResult.take()
+            : handlerResult;
+        if ((0, result_1.isErr)(handlerOutcome)) {
+            const error = annotateHandlerBoundaryError(handlerOutcome.error, {
+                feed,
+                requestId: msg.headers?.get("request-id"),
+                service: this.name,
+                contractId: this.contractId,
+                contractDigest: this.contractDigest,
+                traceId: traceIdFromTraceparent(msg.headers?.get("traceparent")),
+            });
+            recordRuntimeError(error, {
+                surface: "feed",
+                direction: "server",
+                operation: feed,
+                phase: "handler_result",
+            });
+            return (0, result_1.err)(error);
+        }
         return (0, result_1.ok)(undefined);
     }
     finally {
@@ -1648,31 +1948,43 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
 }, _Trellis_processRPCMessage = async function _Trellis_processRPCMessage(method, ctx, msg, fn, handlerTrellis) {
     __classPrivateFieldGet(this, _Trellis_log, "f").debug({ method: String(method), subject: msg.subject }, "Processing RPC message");
     // Extract trace context from incoming NATS headers
-    const parentContext = (0, tracing_js_1.extractTraceContext)((0, tracing_js_1.createNatsHeaderCarrier)({
+    const parentContext = (0, mod_js_2.extractTraceContext)((0, mod_js_2.createNatsHeaderCarrier)({
         get: (k) => msg.headers?.get(k) ?? undefined,
         set: () => { }, // Server doesn't need to set headers on incoming messages
     }));
     // Start a server span for this RPC handler
-    const span = (0, tracing_js_1.startServerSpan)(method, msg.subject, parentContext);
+    const span = (0, mod_js_2.startServerSpan)(method, msg.subject, parentContext);
     const incomingTraceId = traceIdFromTraceparent(msg.headers?.get("traceparent"));
     // Execute the handler within the span's context
-    return (0, tracing_js_1.withSpanAsync)(span, async () => {
+    return (0, mod_js_2.withSpanAsync)(span, async () => {
         const execute = async () => {
             const jsonData = safeJson(msg).take();
             if ((0, result_1.isErr)(jsonData)) {
                 __classPrivateFieldGet(this, _Trellis_log, "f").warn({ method, error: jsonData.error.message }, "Failed to parse JSON");
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: "Failed to parse JSON",
                 });
+                recordRuntimeError(jsonData.error, {
+                    surface: "rpc",
+                    direction: "server",
+                    operation: String(method),
+                    phase: "parse",
+                });
                 return jsonData;
             }
             const parsedInput = parseRuntimeSchema(ctx.input, jsonData).take();
             if ((0, result_1.isErr)(parsedInput)) {
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: "Input validation failed",
                 });
+                recordRuntimeError(parsedInput.error, {
+                    surface: "rpc",
+                    direction: "server",
+                    operation: String(method),
+                    phase: "input_validation",
+                });
                 return parsedInput;
             }
             let caller;
@@ -1695,22 +2007,43 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 if (!sessionKey) {
                     __classPrivateFieldGet(this, _Trellis_log, "f").warn({ method }, "Missing session-key header");
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Missing session-key",
                     });
-                    return (0, result_1.err)(new index_js_1.AuthError({ reason: "missing_session_key" }));
+                    const error = new index_js_1.AuthError({ reason: "missing_session_key" });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 if (!proof) {
                     __classPrivateFieldGet(this, _Trellis_log, "f").warn({ method }, "Missing proof in request");
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Missing proof",
                     });
-                    return (0, result_1.err)(new index_js_1.AuthError({ reason: "missing_proof" }));
+                    const error = new index_js_1.AuthError({ reason: "missing_proof" });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 const iat = Number(iatHeader);
                 if (!Number.isSafeInteger(iat) || !requestId) {
-                    return (0, result_1.err)(new index_js_1.AuthError({ reason: "invalid_signature" }));
+                    const error = new index_js_1.AuthError({ reason: "invalid_signature" });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 // Verify proof signature locally using the raw request bytes we received.
                 const payloadBytes = msg.data ?? new Uint8Array();
@@ -1726,13 +2059,20 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     verifyResult.take() === true;
                 if (!signatureOk) {
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Invalid signature",
                     });
-                    return (0, result_1.err)(new index_js_1.AuthError({
+                    const error = new index_js_1.AuthError({
                         reason: "invalid_signature",
                         context: { sessionKey },
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 let auth;
                 for (let attempt = 0; attempt < DEFAULT_AUTH_VALIDATE_SESSION_RETRY_ATTEMPTS; attempt++) {
@@ -1758,9 +2098,16 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     await sleep(DEFAULT_AUTH_VALIDATE_SESSION_RETRY_MS * (attempt + 1));
                 }
                 if (!auth) {
-                    return (0, result_1.err)(new index_js_1.UnexpectedError({
+                    const error = new index_js_1.UnexpectedError({
                         context: { reason: "missing_auth_validate_result" },
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 if (auth instanceof Error) {
                     __classPrivateFieldGet(this, _Trellis_log, "f").warn({
@@ -1772,37 +2119,64 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                             : undefined,
                     }, "Auth.Requests.Validate failed");
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Auth.Requests.Validate failed",
                     });
                     if (auth instanceof result_1.BaseError) {
+                        recordRuntimeError(auth, {
+                            surface: "rpc",
+                            direction: "server",
+                            operation: String(method),
+                            phase: "auth",
+                        });
                         return (0, result_1.err)(auth);
                     }
-                    return (0, result_1.err)(new index_js_1.UnexpectedError({ cause: auth }));
+                    const error = new index_js_1.UnexpectedError({ cause: auth });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 if (!auth.allowed) {
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Insufficient permissions",
                     });
-                    return (0, result_1.err)(new index_js_1.AuthError({
+                    const error = new index_js_1.AuthError({
                         reason: "insufficient_permissions",
                         context: {
                             requiredCapabilities: ctx.callerCapabilities,
                             userCapabilities: auth.caller.capabilities,
                         },
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 if (typeof msg.reply !== "string" ||
                     !msg.reply.startsWith(`${auth.inboxPrefix}.`)) {
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: "Reply subject mismatch",
                     });
-                    return (0, result_1.err)(new index_js_1.AuthError({
+                    const error = new index_js_1.AuthError({
                         reason: "reply_subject_mismatch",
                         context: { expected: auth.inboxPrefix, actual: msg.reply },
-                    }));
+                    });
+                    recordRuntimeError(error, {
+                        surface: "rpc",
+                        direction: "server",
+                        operation: String(method),
+                        phase: "auth",
+                    });
+                    return (0, result_1.err)(error);
                 }
                 caller = auth.caller;
             }
@@ -1830,7 +2204,14 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 client: handlerTrellis,
             })));
             if (handlerResultWrapped.isErr()) {
-                const error = handlerResultWrapped.error.withContext({ method });
+                const error = annotateHandlerBoundaryError(handlerResultWrapped.error, {
+                    method: String(method),
+                    requestId: msg.headers?.get("request-id"),
+                    service: this.name,
+                    contractId: this.contractId,
+                    contractDigest: this.contractDigest,
+                    traceId: activeTraceId(span) ?? incomingTraceId,
+                });
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
                     method,
                     error: error.message,
@@ -1839,20 +2220,29 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                         : error.cause,
                 }, "Handler threw unexpectedly.");
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: error.message,
                 });
                 span.recordException(error);
+                recordRuntimeError(error, {
+                    surface: "rpc",
+                    direction: "server",
+                    operation: String(method),
+                    phase: "handler_throw",
+                });
                 return (0, result_1.err)(error);
             }
             const handlerResult = handlerResultWrapped.take();
             const handlerOutcome = handlerResult.take();
             if ((0, result_1.isErr)(handlerOutcome)) {
-                const handlerError = handlerOutcome.error;
-                const error = handlerError instanceof result_1.BaseError &&
-                    !(handlerError instanceof RemoteError_js_1.RemoteError)
-                    ? handlerError
-                    : new index_js_1.UnexpectedError({ cause: handlerError });
+                const error = annotateHandlerBoundaryError(handlerOutcome.error, {
+                    method: String(method),
+                    requestId: msg.headers?.get("request-id"),
+                    service: this.name,
+                    contractId: this.contractId,
+                    contractDigest: this.contractDigest,
+                    traceId: activeTraceId(span) ?? incomingTraceId,
+                });
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
                     method,
                     error: error.message,
@@ -1862,20 +2252,32 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                         : error.cause,
                 }, "Handler returned error.");
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: error.message,
                 });
+                recordRuntimeError(error, {
+                    surface: "rpc",
+                    direction: "server",
+                    operation: String(method),
+                    phase: "handler_result",
+                });
                 return (0, result_1.err)(error);
             }
             const encoded = (0, codec_js_1.encodeSchema)(ctx.output, handlerOutcome).take();
             if ((0, result_1.isErr)(encoded)) {
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: "Output encoding failed",
                 });
+                recordRuntimeError(encoded.error, {
+                    surface: "rpc",
+                    direction: "server",
+                    operation: String(method),
+                    phase: "output_encoding",
+                });
                 return encoded;
             }
-            span.setStatus({ code: tracing_js_1.SpanStatusCode.OK });
+            span.setStatus({ code: mod_js_2.SpanStatusCode.OK });
             return (0, result_1.ok)(encoded);
         };
         const result = await execute();
@@ -1949,17 +2351,31 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             const m = parsedEvent.take();
             if ((0, result_1.isErr)(m)) {
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({ error: m.error }, "Event validation failed");
+                recordRuntimeError(m.error, {
+                    surface: "event",
+                    direction: "consumer",
+                    operation: String(event),
+                    phase: "input_validation",
+                });
                 continue;
             }
-            const handlerResult = await result_1.AsyncResult.lift(fn(m, createEventListenerContext({
+            const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                event,
                 payload: m,
-                subject: msg.subject,
                 mode: "ephemeral",
                 message: msg,
-            })));
-            if (handlerResult.isErr()) {
+                fn,
+            });
+            const handlerValue = handlerResult.take();
+            if ((0, result_1.isErr)(handlerValue)) {
+                recordRuntimeError(handlerValue.error, {
+                    surface: "event",
+                    direction: "consumer",
+                    operation: String(event),
+                    phase: "handler_result",
+                });
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                    error: handlerResult.error.toSerializable(),
+                    error: handlerValue.error.toSerializable(),
                     event,
                     subject: msg.subject,
                 }, "Event handler failed");
@@ -1968,6 +2384,31 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     });
     __classPrivateFieldGet(this, _Trellis_tasks, "f").add(`event:${event}:${(0, ulid_1.ulid)()}`, task);
     return (0, result_1.ok)(undefined);
+}, _Trellis_invokeEventHandler = async function _Trellis_invokeEventHandler(args) {
+    const annotation = {
+        event: String(args.event),
+        service: this.name,
+        contractId: this.contractId,
+        contractDigest: this.contractDigest,
+        traceId: traceIdFromTraceparent(args.message.headers?.get("traceparent")),
+    };
+    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 } : {}),
+            message: args.message,
+        })));
+        const outcome = isResultLike(result) ? result.take() : result;
+        if ((0, result_1.isErr)(outcome)) {
+            return (0, result_1.err)(annotateHandlerBoundaryError(outcome.error, annotation));
+        }
+        return (0, result_1.ok)(undefined);
+    }
+    catch (cause) {
+        return (0, result_1.err)(annotateHandlerBoundaryError(cause, annotation));
+    }
 }, _Trellis_resolveEventConsumerGroup = function _Trellis_resolveEventConsumerGroup(event, opts) {
     const metadata = __classPrivateFieldGet(this, _Trellis_eventConsumers, "f").metadata;
     const bindings = __classPrivateFieldGet(this, _Trellis_eventConsumers, "f").bindings ?? {};
@@ -2093,15 +2534,17 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 msg.term();
                 continue;
             }
-            const handlerResult = await result_1.AsyncResult.lift(fn(m, createEventListenerContext({
+            const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                event,
                 payload: m,
-                subject: msg.subject,
                 mode: "durable",
                 message: msg,
-            })));
-            if (handlerResult.isErr()) {
+                fn,
+            });
+            const handlerValue = handlerResult.take();
+            if ((0, result_1.isErr)(handlerValue)) {
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                    error: handlerResult.error.toSerializable(),
+                    error: handlerValue.error.toSerializable(),
                     event,
                     subject: msg.subject,
                 }, "Event handler failed");
@@ -2130,20 +2573,34 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 const eventPayload = parsedEvent.take();
                 if ((0, result_1.isErr)(eventPayload)) {
                     __classPrivateFieldGet(this, _Trellis_log, "f").error({ error: eventPayload.error }, "Event validation failed");
+                    recordRuntimeError(eventPayload.error, {
+                        surface: "event",
+                        direction: "consumer",
+                        operation: String(registration.event),
+                        phase: "input_validation",
+                    });
                     msg.term();
                     failed = true;
                     break;
                 }
-                const handlerResult = await result_1.AsyncResult.lift(registration.fn(eventPayload, createEventListenerContext({
+                const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                    event: registration.event,
                     payload: eventPayload,
-                    subject: msg.subject,
                     mode: "durable",
                     group,
                     message: msg,
-                })));
-                if (handlerResult.isErr()) {
+                    fn: registration.fn,
+                });
+                const handlerValue = handlerResult.take();
+                if ((0, result_1.isErr)(handlerValue)) {
+                    recordRuntimeError(handlerValue.error, {
+                        surface: "event",
+                        direction: "consumer",
+                        operation: String(registration.event),
+                        phase: "handler_result",
+                    });
                     __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                        error: handlerResult.error.toSerializable(),
+                        error: handlerValue.error.toSerializable(),
                         event: registration.event,
                         subject: msg.subject,
                     }, "Event handler failed");
@@ -2217,8 +2674,8 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     }));
 }, _Trellis_requestJson = function _Trellis_requestJson(subject, body) {
     return result_1.AsyncResult.from((async () => {
-        const span = (0, tracing_js_1.startClientSpan)(subject, subject);
-        return await (0, tracing_js_1.withSpanAsync)(span, async () => {
+        const span = (0, mod_js_2.startClientSpan)(subject, subject);
+        return await (0, mod_js_2.withSpanAsync)(span, async () => {
             try {
                 const payload = JSON.stringify(body);
                 const authHeaders = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_createProof).call(this, subject, payload);
@@ -2227,7 +2684,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 headers.set("proof", authHeaders.proof);
                 headers.set("iat", String(authHeaders.iat));
                 headers.set("request-id", authHeaders.requestId);
-                (0, tracing_js_1.injectTraceContext)((0, tracing_js_1.createNatsHeaderCarrier)(headers), span);
+                (0, mod_js_2.injectTraceContext)((0, mod_js_2.createNatsHeaderCarrier)(headers), span);
                 const response = (await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_requestMessageWithRetry).call(this, {
                     subject,
                     payload,
@@ -2236,9 +2693,15 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 })).take();
                 if ((0, result_1.isErr)(response)) {
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: response.error.message,
                     });
+                    recordRuntimeError(response.error, {
+                        surface: "operation",
+                        direction: "client",
+                        operation: "requestJson",
+                        phase: "request_send",
+                    });
                     return response;
                 }
                 const json = safeJson(response).take();
@@ -2251,21 +2714,33 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                         context: { subject },
                     });
                     span.setStatus({
-                        code: tracing_js_1.SpanStatusCode.ERROR,
+                        code: mod_js_2.SpanStatusCode.ERROR,
                         message: error.message,
                     });
+                    recordRuntimeError(error, {
+                        surface: "operation",
+                        direction: "client",
+                        operation: "requestJson",
+                        phase: "response_decoding",
+                    });
                     return (0, result_1.err)(error);
                 }
-                span.setStatus({ code: tracing_js_1.SpanStatusCode.OK });
+                span.setStatus({ code: mod_js_2.SpanStatusCode.OK });
                 return (0, result_1.ok)(json);
             }
             catch (cause) {
                 const error = new index_js_1.UnexpectedError({ cause });
                 span.setStatus({
-                    code: tracing_js_1.SpanStatusCode.ERROR,
+                    code: mod_js_2.SpanStatusCode.ERROR,
                     message: error.message,
                 });
                 span.recordException(error);
+                recordRuntimeError(error, {
+                    surface: "operation",
+                    direction: "client",
+                    operation: "requestJson",
+                    phase: "unexpected",
+                });
                 return (0, result_1.err)(error);
             }
             finally {
@@ -2293,35 +2768,56 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
         }
         catch (cause) {
             sub.unsubscribe();
-            return (0, result_1.err)(createTransportError({
+            const error = createTransportError({
                 code: "trellis.watch.failed",
                 message: "Trellis could not start the operation watch.",
                 hint: "Retry watching the operation. If it keeps failing, reconnect to Trellis and try again.",
                 cause,
                 context: { subject },
-            }));
+            });
+            recordRuntimeError(error, {
+                surface: "operation",
+                direction: "client",
+                operation: "watchJson",
+                phase: "request_send",
+            });
+            return (0, result_1.err)(error);
         }
         return (0, result_1.ok)((async function* () {
             try {
                 for await (const msg of sub) {
                     if (msg.headers?.get("status") === "error") {
-                        yield (0, result_1.err)(createTransportError({
+                        const error = createTransportError({
                             code: "trellis.watch.failed",
                             message: "Trellis stopped the operation watch.",
                             hint: "Retry watching the operation. If it keeps happening, reconnect to Trellis and try again.",
                             context: { subject, frame: msg.string() },
-                        }));
+                        });
+                        recordRuntimeError(error, {
+                            surface: "operation",
+                            direction: "client",
+                            operation: "watchJson",
+                            phase: "remote_error",
+                        });
+                        yield (0, result_1.err)(error);
                         continue;
                     }
                     const json = safeJson(msg).take();
                     if ((0, result_1.isErr)(json)) {
-                        yield (0, result_1.err)(createTransportError({
+                        const error = createTransportError({
                             code: "trellis.watch.invalid_response",
                             message: "Trellis returned an invalid watch update.",
                             hint: "Retry watching the operation. If it keeps happening, reconnect to Trellis and try again.",
                             cause: json.error.cause,
                             context: { subject },
-                        }));
+                        });
+                        recordRuntimeError(error, {
+                            surface: "operation",
+                            direction: "client",
+                            operation: "watchJson",
+                            phase: "response_decoding",
+                        });
+                        yield (0, result_1.err)(error);
                         continue;
                     }
                     yield (0, result_1.ok)(json);