stitchkit 0.48.0 → 0.49.0

package/dist/index.js

@@ -295,7 +295,11 @@ function joinClientBaseUrl(baseUrl, relativeUrl) {
 }
 
 // src/browser/http.ts
-import ky, { isHTTPError } from "ky";
+import ky, {
+  isHTTPError,
+  isNetworkError,
+  isTimeoutError
+} from "ky";
 
 // src/observability/trace.ts
 var TRACEPARENT_RE = /^([0-9a-f]{2})-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})(.*)$/i;
@@ -371,6 +375,15 @@ class ApiError extends Error {
     return error instanceof ApiError;
   }
 }
+function shouldRetryBunNetworkError(error) {
+  if (ApiError.is(error) || isHTTPError(error) || isNetworkError(error) || isTimeoutError(error) || error instanceof RequestCancellationError || error instanceof DOMException && (error.name === "AbortError" || error.name === "TimeoutError")) {
+    return;
+  }
+  if (!(error instanceof Error))
+    return;
+  const code = Object.getOwnPropertyDescriptor(error, "code");
+  return code && "value" in code && code.value === "ConnectionRefused" ? true : undefined;
+}
 function parseApiErrorBody(body) {
   if (!isRecord(body) || !isRecord(body.error))
     return null;
@@ -384,6 +397,34 @@ function parseApiErrorBody(body) {
     hint: typeof error.hint === "string" ? error.hint : undefined
   };
 }
+function createRetryAwareFetch() {
+  const runtimeFetch = globalThis.fetch.bind(globalThis);
+  let attempt = 0;
+  return (input, init) => {
+    attempt += 1;
+    if (attempt === 1) {
+      return runtimeFetch(input, init);
+    }
+    if (!(input instanceof Request))
+      return runtimeFetch(input, init);
+    const streamedBody = input.body ? { body: input.body, duplex: "half" } : {};
+    return runtimeFetch(input.url, {
+      ...init,
+      method: input.method,
+      headers: input.headers,
+      ...streamedBody,
+      cache: input.cache,
+      credentials: input.credentials,
+      integrity: input.integrity,
+      keepalive: input.keepalive,
+      mode: input.mode,
+      redirect: input.redirect,
+      referrer: input.referrer,
+      referrerPolicy: input.referrerPolicy,
+      signal: input.signal
+    });
+  };
+}
 function createHttpClient(config) {
   let ssrCookies = null;
   let isLoggedOut = false;
@@ -404,7 +445,8 @@ function createHttpClient(config) {
     retry: {
       limit: config.retry?.limit ?? 2,
       methods: config.retry?.methods ?? ["get"],
-      statusCodes: config.retry?.statusCodes ?? []
+      statusCodes: config.retry?.statusCodes ?? [],
+      shouldRetry: ({ error }) => shouldRetryBunNetworkError(error)
     },
     hooks: {
       beforeRequest: [
@@ -448,6 +490,7 @@ function createHttpClient(config) {
   async function request(method, url, data, options = {}) {
     const cancellation = createRequestCancellation(options.signal, options.timeout ?? config.timeout ?? 30000);
     const kyOptions = {
+      fetch: createRetryAwareFetch(),
       timeout: false,
       signal: cancellation.signal
     };
@@ -657,6 +700,7 @@ function createHttpExecutor(endpoint, prefix, client, config) {
   };
 }
 function createFetchExecutor(endpoint, prefix, config, contractConfig) {
+  const executeFetch = config.fetch ?? globalThis.fetch;
   return async (requestArgs, options) => {
     const plan = planClientRequest(endpoint, prefix, requestArgs, contractConfig);
     const url = joinClientBaseUrl(config.baseUrl, plan.relativeUrl);
@@ -671,7 +715,7 @@ function createFetchExecutor(endpoint, prefix, config, contractConfig) {
     try {
       return await cancellation.run(async (signal) => {
         const body = endpoint.multipart ? buildMultipartForm(endpoint.multipart, plan.remainingArgs) : hasBody ? JSON.stringify(plan.remainingArgs) : undefined;
-        const res = await fetch(url, {
+        const res = await executeFetch(url, {
           method: endpoint.method,
           headers,
           credentials: config.credentials,

package/dist/node.d.ts

@@ -6,10 +6,11 @@
  */
 export { AppError, appError, badRequest, conflict, forbidden, notFound, rateLimited, unauthorized, } from './contract';
 export { createHandler } from './server/create';
-export { createImplement, implement } from './server/implement';
+export { createImplement, createImplementRegistry, type ExactRegistryHandlers, type ImplementationRegistry, implement, implementRegistry, type RegistryHandlers, } from './server/implement';
 export type { LogFormat } from './server/logger';
-export { type NodeServerConfig, type NodeServerHandle, serveNode } from './server/node';
+export { type NodeRuntimeServer, type NodeServerConfig, type NodeServerHandle, type NodeSocketLifecycle, serveNode, } from './server/node';
 export { bindRealtimeServer, type RealtimeServer, type RealtimeServerConnection, type RealtimeServerHandle, } from './server/realtime';
-export { createNodeSocketIOServer as createSocketIOServer, type NodeSocketIOServerHandle as SocketIOServerHandle, type SocketIOServerConfig, } from './server/socket-io-node';
+export { type ManagedServerHandle, type ShutdownOptions, ShutdownOptionsSchema, type ShutdownResult, ShutdownResultSchema, type ShutdownState, ShutdownStateSchema, type ShutdownStatus, ShutdownStatusSchema, } from './server/shutdown';
+export { createNodeSocketIOServer as createSocketIOServer, type NodeSocketIOServerHandle as SocketIOServerHandle, type SocketIORequestPolicy, type SocketIOServerConfig, } from './server/socket-io-node';
 export type { FetchComposition, FetchHandler, HandlerConfig, LoggingConfig, LogOutcome, RawRoute, RawRouteContext, ServiceDef, } from './server/types';
 //# sourceMappingURL=node.d.ts.map

package/dist/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,GACb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EACL,kBAAkB,EAClB,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,wBAAwB,IAAI,oBAAoB,EAChD,KAAK,wBAAwB,IAAI,oBAAoB,EACrD,KAAK,oBAAoB,GAC1B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,UAAU,EACV,QAAQ,EACR,eAAe,EACf,UAAU,GACX,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,GACb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,SAAS,EACT,iBAAiB,EACjB,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,SAAS,GACV,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,qBAAqB,EACrB,KAAK,cAAc,EACnB,oBAAoB,EACpB,KAAK,aAAa,EAClB,mBAAmB,EACnB,KAAK,cAAc,EACnB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,wBAAwB,IAAI,oBAAoB,EAChD,KAAK,wBAAwB,IAAI,oBAAoB,EACrD,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,UAAU,EACV,QAAQ,EACR,eAAe,EACf,UAAU,GACX,MAAM,gBAAgB,CAAC"}

package/dist/node.js

@@ -1,10 +1,17 @@
 import {
+  ShutdownOptionsSchema,
+  ShutdownResultSchema,
+  ShutdownStateSchema,
+  ShutdownStatusSchema,
   bindRealtimeServer,
   createHandler,
   createImplement,
+  createImplementRegistry,
+  createServerLifecycle,
   createSocketIOServer,
-  implement
-} from "./index-44xysy8r.js";
+  implement,
+  implementRegistry
+} from "./index-fjfzsq6y.js";
 import"./index-r1qp4rve.js";
 import {
   AppError,
@@ -15,29 +22,111 @@ import {
   notFound,
   rateLimited,
   unauthorized
-} from "./index-ee621cmy.js";
+} from "./index-jewp9r0a.js";
+import"./index-h05ygjqx.js";
 // src/server/node.ts
-import { serve } from "srvx";
+import { serve } from "srvx/node";
 async function serveNode(config) {
   const { port = 3000, hostname, socket, wrapFetch, ...handlerConfig } = config;
   const handler = createHandler(handlerConfig);
-  const fetch = wrapFetch ? wrapFetch(handler) : handler;
-  const server = serve({ port, hostname, fetch });
-  await server.ready();
-  if (socket) {
-    const nodeServer = server.node?.server;
-    if (!nodeServer || !("maxRequestsPerSocket" in nodeServer)) {
-      throw new Error("[stitchkit] serveNode: expected a node:http.Server for Socket.IO (none / http2).");
+  let runtime;
+  let nodeServer;
+  const sockets = new Set;
+  const upgradedSockets = new Set;
+  const responses = new Set;
+  const socketDrainWaiters = new Set;
+  const resolveSocketDrain = () => {
+    if (sockets.size !== 0)
+      return;
+    for (const resolve of socketDrainWaiters)
+      resolve();
+    socketDrainWaiters.clear();
+  };
+  const waitForSocketDrain = () => {
+    if (sockets.size === 0)
+      return Promise.resolve();
+    return new Promise((resolve) => socketDrainWaiters.add(resolve));
+  };
+  const requireRuntime = () => {
+    if (!runtime)
+      throw new Error("[stitchkit] Node server lifecycle started before srvx");
+    return runtime;
+  };
+  const requireNodeServer = () => {
+    if (!nodeServer)
+      throw new Error("[stitchkit] Node HTTP server is unavailable");
+    return nodeServer;
+  };
+  const adapter = {
+    beginShutdown: () => socket?.beginShutdown(),
+    pendingRequests: () => responses.size,
+    pendingWebSockets: () => upgradedSockets.size,
+    closeRealtime: () => socket?.close() ?? Promise.resolve(),
+    async stopGracefully() {
+      const runtimeClose = socket ? Promise.resolve() : requireRuntime().close(false);
+      requireNodeServer().closeIdleConnections?.();
+      await runtimeClose;
+      await waitForSocketDrain();
+    },
+    async forceStop() {
+      const activeServer = requireNodeServer();
+      const logicalClose = socket?.close();
+      const physicalClosures = [...sockets].map((activeSocket) => new Promise((resolve) => {
+        if (activeSocket.closed)
+          resolve();
+        else
+          activeSocket.once("close", () => resolve());
+      }));
+      activeServer.closeAllConnections?.();
+      for (const activeSocket of sockets)
+        activeSocket.destroy();
+      if (logicalClose)
+        await logicalClose;
+      else
+        await requireRuntime().close(true);
+      await Promise.all(physicalClosures);
+      responses.clear();
     }
-    socket.attach(nodeServer);
+  };
+  const lifecycle = createServerLifecycle(() => adapter);
+  const consumerFetch = wrapFetch ? wrapFetch(handler) : handler;
+  const fetch = lifecycle.wrapFetch(consumerFetch);
+  runtime = serve({ port, hostname, fetch, gracefulShutdown: false });
+  await runtime.ready();
+  const candidate = runtime.node?.server;
+  if (!candidate || !("maxRequestsPerSocket" in candidate)) {
+    await runtime.close(true);
+    throw new Error("[stitchkit] serveNode: expected a node:http.Server for the managed lifecycle.");
   }
-  const listenUrl = server.url ?? `http://${hostname ?? "localhost"}:${port}`;
+  nodeServer = candidate;
+  nodeServer.on("connection", (activeSocket) => {
+    sockets.add(activeSocket);
+    activeSocket.once("close", () => {
+      sockets.delete(activeSocket);
+      upgradedSockets.delete(activeSocket);
+      resolveSocketDrain();
+    });
+  });
+  nodeServer.on("upgrade", (request) => upgradedSockets.add(request.socket));
+  nodeServer.prependListener("request", (_request, response) => {
+    responses.add(response);
+    const complete = () => responses.delete(response);
+    response.once("finish", complete);
+    response.once("close", complete);
+  });
+  socket?.attach(nodeServer);
+  const listenUrl = runtime.url ?? `http://${hostname ?? "localhost"}:${port}`;
   const resolvedPort = Number(new URL(listenUrl).port) || port;
   const resolvedHost = hostname ?? "localhost";
+  const server = runtime;
   return {
     url: `http://${resolvedHost}:${resolvedPort}`,
     port: resolvedPort,
-    close: (closeActive) => server.close(closeActive)
+    runtime: server,
+    get status() {
+      return lifecycle.status;
+    },
+    shutdown: lifecycle.shutdown
   };
 }
 // src/server/socket-io-node.ts
@@ -49,14 +138,20 @@ export {
   serveNode,
   rateLimited,
   notFound,
+  implementRegistry,
   implement,
   forbidden,
   createNodeSocketIOServer as createSocketIOServer,
+  createImplementRegistry,
   createImplement,
   createHandler,
   conflict,
   bindRealtimeServer,
   badRequest,
   appError,
+  ShutdownStatusSchema,
+  ShutdownStateSchema,
+  ShutdownResultSchema,
+  ShutdownOptionsSchema,
   AppError
 };

package/dist/observability/audit.d.ts

@@ -2,6 +2,7 @@ import type { ToolCallHooks } from '../tools/execute';
 import { type RequestContext } from './context';
 import type { RequestEvent } from './event';
 import { type SanitizeOptions } from './sanitize';
+import { type ObservabilityDrainReport, type ObservabilityStatus } from './status';
 /** One isolated RequestEvent sink and its sanitisation policy. */
 export interface RequestEventSinkConfig {
     /**
@@ -56,8 +57,10 @@ export interface Observability {
     toolCall: ToolCallHooks;
     /** Wait for events admitted before this call. */
     flush(): Promise<void>;
+    /** Read an immutable snapshot of each enabled sink and their aggregate. */
+    getStatus(): ObservabilityStatus;
     /** Stop admission and drain every previously accepted event. Idempotent. */
-    close(): Promise<void>;
+    close(): Promise<ObservabilityDrainReport>;
 }
 export declare function createObservability(config: ObservabilityConfig): Observability;
 //# sourceMappingURL=audit.d.ts.map

package/dist/observability/audit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/observability/audit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAe,KAAK,eAAe,EAAmB,MAAM,YAAY,CAAC;AAGhF,kEAAkE;AAClE,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,iFAAiF;IACjF,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC;IAC1C,yEAAyE;IACzE,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,8DAA8D;IAC9D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,sBAAsB;IACxE,2DAA2D;IAC3D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,gEAAgE;AAChE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5B;AAED,0EAA0E;AAC1E,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI,CAAC;CACnD;AAED,iFAAiF;AACjF,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,aAAa,CAAC;IACxB,iDAAiD;IACjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,4EAA4E;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAuKD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa,CAkI9E"}
+{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/observability/audit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAc,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAe,KAAK,eAAe,EAAmB,MAAM,YAAY,CAAC;AAChF,OAAO,EAEL,KAAK,wBAAwB,EAI7B,KAAK,mBAAmB,EAEzB,MAAM,UAAU,CAAC;AAGlB,kEAAkE;AAClE,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,iFAAiF;IACjF,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC;IAC1C,yEAAyE;IACzE,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,8DAA8D;IAC9D,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,sBAAsB;IACxE,2DAA2D;IAC3D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,gEAAgE;AAChE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5B;AAED,0EAA0E;AAC1E,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI,CAAC;CACnD;AAED,iFAAiF;AACjF,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,aAAa,CAAC;IACxB,iDAAiD;IACjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,2EAA2E;IAC3E,SAAS,IAAI,mBAAmB,CAAC;IACjC,4EAA4E;IAC5E,KAAK,IAAI,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAC5C;AAkOD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa,CAyJ9E"}

package/dist/observability/index.d.ts

@@ -10,5 +10,6 @@ export { createObservability, type HttpRequestCompletion, type HttpRequestObserv
 export { getRequestContext, getTraceId, getUserId, type RequestContext, runWithRequestContext, setRequestDimensions, setRequestEndpoint, setRequestError, setRequestUser, type WrapRequestContextOptions, wrapInRequestContext, } from './context';
 export type { RequestEvent } from './event';
 export { type JsonValue, measureSize, redact, type SanitizeOptions, type SizeMeasure, sanitizePayload, truncatePreview, } from './sanitize';
+export { type ObservabilityDrainReport, ObservabilityDrainReportSchema, type ObservabilitySinkStatus, ObservabilitySinkStatusSchema, type ObservabilityStatus, ObservabilityStatusSchema, } from './status';
 export { childSpan, createTraceContext, formatTraceparent, parseTraceparent, resolvePropagationContext, resolveTraceContext, type TraceContext, } from './trace';
 //# sourceMappingURL=index.d.ts.map

package/dist/observability/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,mBAAmB,EACnB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,SAAS,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,KAAK,cAAc,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,KAAK,yBAAyB,EAC9B,oBAAoB,GACrB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACL,KAAK,SAAS,EACd,WAAW,EACX,MAAM,EACN,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,KAAK,YAAY,GAClB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,mBAAmB,EACnB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,SAAS,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,KAAK,cAAc,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,KAAK,yBAAyB,EAC9B,oBAAoB,GACrB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACL,KAAK,SAAS,EACd,WAAW,EACX,MAAM,EACN,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,KAAK,wBAAwB,EAC7B,8BAA8B,EAC9B,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,KAAK,mBAAmB,EACxB,yBAAyB,GAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,KAAK,YAAY,GAClB,MAAM,SAAS,CAAC"}

package/dist/observability/index.js

@@ -3,26 +3,85 @@ import {
   redact,
   sanitizePayload,
   truncatePreview
-} from "../index-8ekq6res.js";
+} from "../index-v58mwa19.js";
 import {
-  childSpan,
-  createTraceContext,
-  formatTraceparent,
   getRequestContext,
   getTraceId,
   getUserId,
-  isRecord,
-  parseTraceparent,
   recordedErrorMessage,
-  resolvePropagationContext,
-  resolveTraceContext,
   runWithRequestContext,
   setRequestDimensions,
   setRequestEndpoint,
   setRequestError,
   setRequestUser,
   wrapInRequestContext
-} from "../index-ee621cmy.js";
+} from "../index-jewp9r0a.js";
+import {
+  childSpan,
+  createTraceContext,
+  formatTraceparent,
+  isRecord,
+  parseTraceparent,
+  resolvePropagationContext,
+  resolveTraceContext
+} from "../index-h05ygjqx.js";
+
+// src/observability/status.ts
+import { z } from "zod";
+var NonNegativeIntegerSchema = z.number().int().nonnegative();
+var ObservabilitySinkStatusSchema = z.object({
+  capacity: NonNegativeIntegerSchema,
+  received: NonNegativeIntegerSchema,
+  accepted: NonNegativeIntegerSchema,
+  filtered: NonNegativeIntegerSchema,
+  completed: NonNegativeIntegerSchema,
+  dropped: NonNegativeIntegerSchema,
+  failed: NonNegativeIntegerSchema,
+  preparationFailed: NonNegativeIntegerSchema,
+  preparing: NonNegativeIntegerSchema,
+  pending: NonNegativeIntegerSchema,
+  closed: z.boolean()
+}).readonly();
+var ObservabilityStatusObjectSchema = z.object({
+  request: ObservabilitySinkStatusSchema.optional(),
+  tools: ObservabilitySinkStatusSchema.optional(),
+  total: ObservabilitySinkStatusSchema
+});
+var ObservabilityStatusSchema = ObservabilityStatusObjectSchema.readonly();
+var ObservabilityDrainReportSchema = ObservabilityStatusObjectSchema.extend({
+  durationMs: z.number().nonnegative()
+}).readonly();
+var SUMMED_STATUS_KEYS = [
+  "capacity",
+  "received",
+  "accepted",
+  "filtered",
+  "completed",
+  "dropped",
+  "failed",
+  "preparationFailed",
+  "preparing",
+  "pending"
+];
+function aggregateObservabilityStatus(surfaces, closed) {
+  const totals = {
+    capacity: 0,
+    received: 0,
+    accepted: 0,
+    filtered: 0,
+    completed: 0,
+    dropped: 0,
+    failed: 0,
+    preparationFailed: 0,
+    preparing: 0,
+    pending: 0
+  };
+  for (const surface of surfaces) {
+    for (const key of SUMMED_STATUS_KEYS)
+      totals[key] += surface[key];
+  }
+  return ObservabilitySinkStatusSchema.parse({ ...totals, closed });
+}
 
 // src/observability/audit.ts
 function toolErrorMessage(result) {
@@ -76,6 +135,13 @@ function createSinkManager(config) {
   }
   let sequence = 0;
   let closed = false;
+  let received = 0;
+  let accepted = 0;
+  let filtered = 0;
+  let completed = 0;
+  let dropped = 0;
+  let failed = 0;
+  let preparationFailed = 0;
   let closePromise;
   const preparing = new Map;
   const writes = new Map;
@@ -87,17 +153,27 @@ function createSinkManager(config) {
   };
   const admit = (id, event) => {
     try {
-      if (config.filter && !config.filter(event))
+      if (config.filter && !config.filter(event)) {
+        filtered += 1;
         return;
+      }
     } catch (error) {
+      preparationFailed += 1;
       reportError(error, event);
       return;
     }
     if (writes.size >= maxPending) {
+      dropped += 1;
       reportDrop("capacity", event);
       return;
     }
-    const write = Promise.resolve().then(() => config.write(event)).catch((error) => reportError(error, event)).finally(() => writes.delete(id));
+    accepted += 1;
+    const write = Promise.resolve().then(() => config.write(event)).then(() => {
+      completed += 1;
+    }).catch((error) => {
+      failed += 1;
+      reportError(error, event);
+    }).finally(() => writes.delete(id));
     writes.set(id, write);
   };
   const awaitGeneration = async (boundary) => {
@@ -107,22 +183,59 @@ function createSinkManager(config) {
   };
   return {
     submit(produce) {
+      received += 1;
       const id = ++sequence;
       if (closed) {
-        Promise.resolve().then(produce).then((event) => reportDrop("closed", event)).catch((error) => reportError(error));
+        Promise.resolve().then(produce).then((event) => {
+          dropped += 1;
+          reportDrop("closed", event);
+        }).catch((error) => {
+          preparationFailed += 1;
+          reportError(error);
+        });
         return;
       }
-      const preparation = Promise.resolve().then(produce).then((event) => admit(id, event)).catch((error) => reportError(error)).finally(() => preparing.delete(id));
+      const preparation = Promise.resolve().then(produce).then((event) => admit(id, event)).catch((error) => {
+        preparationFailed += 1;
+        reportError(error);
+      }).finally(() => preparing.delete(id));
       preparing.set(id, preparation);
     },
     flush() {
       return awaitGeneration(sequence);
     },
+    getStatus() {
+      return ObservabilitySinkStatusSchema.parse({
+        capacity: maxPending,
+        received,
+        accepted,
+        filtered,
+        completed,
+        dropped,
+        failed,
+        preparationFailed,
+        preparing: preparing.size,
+        pending: writes.size,
+        closed
+      });
+    },
     close() {
       if (closePromise)
         return closePromise;
       closed = true;
-      closePromise = awaitGeneration(sequence);
+      closePromise = awaitGeneration(sequence).then(() => ObservabilitySinkStatusSchema.parse({
+        capacity: maxPending,
+        received,
+        accepted,
+        filtered,
+        completed,
+        dropped,
+        failed,
+        preparationFailed,
+        preparing: preparing.size,
+        pending: writes.size,
+        closed
+      }));
       return closePromise;
     }
   };
@@ -130,6 +243,7 @@ function createSinkManager(config) {
 function createObservability(config) {
   const requestManager = config.request ? createSinkManager(config.request) : undefined;
   const toolManager = config.tools ? createSinkManager(config.tools) : undefined;
+  let closed = false;
   let closePromise;
   const request = config.request ? {
     includePayload: config.request.includePayload ?? false,
@@ -228,16 +342,33 @@ function createObservability(config) {
       } catch {}
     }
   } : undefined;
+  const getStatus = () => {
+    const requestStatus = requestManager?.getStatus();
+    const toolsStatus = toolManager?.getStatus();
+    const surfaces = [requestStatus, toolsStatus].filter((status) => status !== undefined);
+    return ObservabilityStatusSchema.parse({
+      ...requestStatus && { request: requestStatus },
+      ...toolsStatus && { tools: toolsStatus },
+      total: aggregateObservabilityStatus(surfaces, closed)
+    });
+  };
   return {
     ...request && { request },
     toolCall: toolCall ?? {},
     async flush() {
       await Promise.all([requestManager?.flush(), toolManager?.flush()]);
     },
+    getStatus,
     close() {
       if (!closePromise) {
+        closed = true;
+        const startedAt = performance.now();
         closePromise = Promise.all([requestManager?.close(), toolManager?.close()]).then(() => {
-          return;
+          const status = getStatus();
+          return ObservabilityDrainReportSchema.parse({
+            ...status,
+            durationMs: performance.now() - startedAt
+          });
         });
       }
       return closePromise;
@@ -264,5 +395,8 @@ export {
   formatTraceparent,
   createTraceContext,
   createObservability,
-  childSpan
+  childSpan,
+  ObservabilityStatusSchema,
+  ObservabilitySinkStatusSchema,
+  ObservabilityDrainReportSchema
 };