@relkit/runtime-hono 0.3.0 → 0.5.0

package/dist/materialize-routes-validation.js

@@ -0,0 +1,28 @@
+import { getEntry, isRecord } from "./materialize-routes-utils.js";
+import { assertManifestCohort, RuntimeHonoManifestError } from "./manifest-validation.js";
+export function assertHttpManifest(options) {
+    const { manifest, plan } = options;
+    assertManifestCohort(manifest);
+    if (manifest.graphHash !== plan.graphHash)
+        throw new RuntimeHonoManifestError("RELKIT_GRAPH_MANIFEST_MISMATCH", `Manifest hash ${JSON.stringify(manifest.graphHash)} does not match plan hash ${JSON.stringify(plan.graphHash)}.`);
+    for (const middleware of plan.middlewares) {
+        const entry = getEntry(manifest.middleware, middleware.id);
+        if (!isRecord(entry) || entry.path !== middleware.path || typeof entry.handler !== "function")
+            throw new RuntimeHonoManifestError(entry === undefined
+                ? "RELKIT_MANIFEST_MIDDLEWARE_MISSING"
+                : "RELKIT_MANIFEST_MIDDLEWARE_MISMATCH", `Manifest middleware "${middleware.id}" is missing or does not match its graph node.`, middleware.id);
+    }
+    for (const trigger of plan.httpTriggers) {
+        if (trigger.config.rawHandler === true) {
+            const route = getEntry(manifest.routes ?? {}, trigger.id);
+            if (!isRecord(route) || typeof route.handler !== "function")
+                throw new RuntimeHonoManifestError("RELKIT_MANIFEST_RAW_ROUTE_MISSING", `Manifest raw route "${trigger.id}" is missing its handler.`, trigger.id);
+            continue;
+        }
+        for (const transform of trigger.config.transforms) {
+            if (getEntry(manifest.requestTransforms, transform.id) === undefined)
+                throw new RuntimeHonoManifestError("RELKIT_MANIFEST_TRANSFORM_MISSING", `Manifest request transform "${transform.id}" is missing.`, transform.id);
+        }
+    }
+}
+//# sourceMappingURL=materialize-routes-validation.js.map

package/dist/materialize-routes-validation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"materialize-routes-validation.js","sourceRoot":"","sources":["../src/materialize-routes-validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAG1F,MAAM,UAAU,kBAAkB,CAAC,OAAoC;IACrE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACnC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS;QACvC,MAAM,IAAI,wBAAwB,CAChC,gCAAgC,EAChC,iBAAiB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAClH,CAAC;IACJ,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;YAC3F,MAAM,IAAI,wBAAwB,CAChC,KAAK,KAAK,SAAS;gBACjB,CAAC,CAAC,oCAAoC;gBACtC,CAAC,CAAC,qCAAqC,EACzC,wBAAwB,UAAU,CAAC,EAAE,gDAAgD,EACrF,UAAU,CAAC,EAAE,CACd,CAAC;IACN,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACxC,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;gBACzD,MAAM,IAAI,wBAAwB,CAChC,mCAAmC,EACnC,uBAAuB,OAAO,CAAC,EAAE,2BAA2B,EAC5D,OAAO,CAAC,EAAE,CACX,CAAC;YACJ,SAAS;QACX,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAAE,CAAC,KAAK,SAAS;gBAClE,MAAM,IAAI,wBAAwB,CAChC,mCAAmC,EACnC,+BAA+B,SAAS,CAAC,EAAE,eAAe,EAC1D,SAAS,CAAC,EAAE,CACb,CAAC;QACN,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/materialize-routes.d.ts

@@ -1,4 +1,5 @@
 import type { Hono } from "hono";
+import type { UpgradeWebSocket } from "hono/ws";
 import { GENERATOR_VERSION, MANIFEST_VERSION, type MaybePromise } from "@relkit/contracts";
 import type { HttpTriggerRegistration, RegistrationPlan } from "@relkit/graph";
 import type { RequestRecordSink } from "@relkit/observability";
@@ -9,6 +10,12 @@ import { type RateLimitRuntimeOptions } from "./rate-limit.js";
 import { type HttpAuthInvocation, type HttpAuthRuntime } from "./auth.js";
 import { type McpOptions } from "./mcp.js";
 import { type StaticFilesOptions } from "./static-files.js";
+import type { ClientIdentityRuntime } from "./client-identity.js";
+import type { TransportSecurityOptions } from "./transport-security.js";
+import type { RealtimeRuntime } from "./realtime-runtime.js";
+import type { AgentRuntime } from "./agent-runtime.js";
+import type { JobsRpcRuntime } from "./jobs/types.js";
+export { assertHttpManifest } from "./materialize-routes-validation.js";
 export { RuntimeHonoManifestError } from "./manifest-validation.js";
 export type { RuntimeHonoManifestErrorCode } from "./manifest-validation.js";
 export type ManifestEntries<T> = Readonly<Record<string, T>> | ReadonlyMap<string, T>;
@@ -20,9 +27,13 @@ export interface RuntimeManifest {
     readonly runtimeIntegrationsPlan: import("@relkit/contracts").RuntimeIntegrationPlanReference;
     readonly functions: ManifestEntries<unknown>;
     readonly targets?: ManifestEntries<unknown>;
+    readonly agents?: ManifestEntries<unknown>;
+    readonly channels?: ManifestEntries<unknown>;
     readonly routes?: ManifestEntries<unknown>;
     readonly tools?: ManifestEntries<unknown>;
     readonly services?: ManifestEntries<unknown>;
+    readonly tasks?: ManifestEntries<unknown>;
+    readonly jobs?: ManifestEntries<unknown>;
     readonly hooks?: ManifestEntries<unknown>;
     readonly application?: {
         readonly env: unknown;
@@ -41,6 +52,8 @@ export interface HttpInvocationOptions {
     readonly correlationId?: string;
     readonly timeoutMs?: number;
     readonly auth?: HttpAuthInvocation;
+    readonly trigger?: unknown;
+    readonly progressSink?: import("@relkit/invocation").ProgressSink;
     readonly toolHooks?: {
         readonly onBefore?: (value: unknown, context: unknown) => unknown;
         readonly onAfter?: (value: unknown, context: unknown) => unknown;
@@ -69,8 +82,16 @@ export interface RouteMaterializationOptions {
     readonly observability?: RequestRecordSink;
     readonly rateLimitRuntime?: RateLimitRuntimeOptions;
     readonly auth?: HttpAuthRuntime;
+    readonly clientIdentity?: ClientIdentityRuntime;
+    readonly transportSecurity?: TransportSecurityOptions;
+    readonly realtime?: RealtimeRuntime;
+    readonly agentRuntime?: AgentRuntime;
+    readonly jobs?: JobsRpcRuntime;
+    /** Compatibility alias for callers that name the service explicitly. */
+    readonly jobsRuntime?: JobsRpcRuntime;
     readonly mcp?: McpOptions;
     readonly staticFiles?: StaticFilesOptions;
+    readonly upgradeWebSocket?: UpgradeWebSocket;
     readonly middlewareContext?: (options: {
         readonly middlewareId: string;
         readonly signal: AbortSignal;
@@ -80,7 +101,6 @@ export interface RouteMaterializationOptions {
         readonly traceId?: string;
     }) => MaybePromise<MiddlewareContext>;
 }
-export declare function assertHttpManifest(options: RouteMaterializationOptions): void;
 export declare function materializeRoutes(app: Hono, options: RouteMaterializationOptions): void;
 export { FRAMEWORK_MIDDLEWARE_ORDER };
 export type { FrameworkMiddleware, FrameworkMiddlewareName };

package/dist/materialize-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-routes.d.ts","sourceRoot":"","sources":["../src/materialize-routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"materialize-routes.d.ts","sourceRoot":"","sources":["../src/materialize-routes.ts"],"names":[],"mappings":"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"}

package/dist/materialize-routes.js

@@ -5,36 +5,13 @@ import { FRAMEWORK_MIDDLEWARE_ORDER, } from "./middleware.js";
 import { withRateLimit } from "./rate-limit.js";
 import { registerAuthMiddleware } from "./auth.js";
 import { installRpc } from "./rpc.js";
+import { installRpcWebSocket } from "./rpc-websocket.js";
 import { installMcp } from "./mcp.js";
 import { installStaticFiles } from "./static-files.js";
-import { assertManifestCohort, RuntimeHonoManifestError } from "./manifest-validation.js";
+import { RuntimeHonoManifestError } from "./manifest-validation.js";
+import { assertHttpManifest } from "./materialize-routes-validation.js";
+export { assertHttpManifest } from "./materialize-routes-validation.js";
 export { RuntimeHonoManifestError } from "./manifest-validation.js";
-export function assertHttpManifest(options) {
-    const { manifest, plan } = options;
-    assertManifestCohort(manifest);
-    if (manifest.graphHash !== plan.graphHash)
-        throw new RuntimeHonoManifestError("RELKIT_GRAPH_MANIFEST_MISMATCH", `Manifest hash ${JSON.stringify(manifest.graphHash)} does not match plan hash ${JSON.stringify(plan.graphHash)}.`);
-    for (const middleware of plan.middlewares) {
-        const entry = getEntry(manifest.middleware, middleware.id);
-        if (!isRecord(entry) || entry.path !== middleware.path || typeof entry.handler !== "function")
-            throw new RuntimeHonoManifestError(entry === undefined
-                ? "RELKIT_MANIFEST_MIDDLEWARE_MISSING"
-                : "RELKIT_MANIFEST_MIDDLEWARE_MISMATCH", `Manifest middleware "${middleware.id}" is missing or does not match its graph node.`, middleware.id);
-    }
-    for (const trigger of plan.httpTriggers) {
-        if (trigger.config.rawHandler === true) {
-            const route = getEntry(manifest.routes ?? {}, trigger.id);
-            if (!isRecord(route) || typeof route.handler !== "function") {
-                throw new RuntimeHonoManifestError("RELKIT_MANIFEST_RAW_ROUTE_MISSING", `Manifest raw route "${trigger.id}" is missing its handler.`, trigger.id);
-            }
-            continue;
-        }
-        for (const transform of trigger.config.transforms) {
-            if (getEntry(manifest.requestTransforms, transform.id) === undefined)
-                throw new RuntimeHonoManifestError("RELKIT_MANIFEST_TRANSFORM_MISSING", `Manifest request transform "${transform.id}" is missing.`, transform.id);
-        }
-    }
-}
 export function materializeRoutes(app, options) {
     assertHttpManifest(options);
     registerAuthMiddleware(app, options.auth);
@@ -55,6 +32,9 @@ export function materializeRoutes(app, options) {
             }
         }
     }
+    if (options.upgradeWebSocket !== undefined) {
+        installRpcWebSocket(app, options, options.upgradeWebSocket);
+    }
     installRpc(app, options);
     installMcp(app, options);
     installStaticFiles(app, options.staticFiles);
@@ -65,7 +45,11 @@ function registerRawRoute(app, trigger, options) {
         return;
     const handler = route.handler;
     for (const path of trigger.config.runtimePaths ?? [trigger.config.path]) {
-        app.all(path, (context) => Promise.resolve(handler(context.req.raw)));
+        const run = (context) => Promise.resolve(handler(context.req.raw));
+        if (trigger.config.method === "ALL")
+            app.all(path, run);
+        else
+            app.on(trigger.config.method, path, run);
     }
 }
 export { FRAMEWORK_MIDDLEWARE_ORDER };

package/dist/materialize-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-routes.js","sourceRoot":"","sources":["../src/materialize-routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAqB,MAAM,mBAAmB,CAAC;AAK3F,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EACL,0BAA0B,GAG3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAgC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAiD,MAAM,WAAW,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAA2B,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AA4EpE,MAAM,UAAU,kBAAkB,CAAC,OAAoC;IACrE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACnC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS;QACvC,MAAM,IAAI,wBAAwB,CAChC,gCAAgC,EAChC,iBAAiB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAClH,CAAC;IACJ,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;YAC3F,MAAM,IAAI,wBAAwB,CAChC,KAAK,KAAK,SAAS;gBACjB,CAAC,CAAC,oCAAoC;gBACtC,CAAC,CAAC,qCAAqC,EACzC,wBAAwB,UAAU,CAAC,EAAE,gDAAgD,EACrF,UAAU,CAAC,EAAE,CACd,CAAC;IACN,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACxC,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;gBAC5D,MAAM,IAAI,wBAAwB,CAChC,mCAAmC,EACnC,uBAAuB,OAAO,CAAC,EAAE,2BAA2B,EAC5D,OAAO,CAAC,EAAE,CACX,CAAC;YACJ,CAAC;YACD,SAAS;QACX,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAAE,CAAC,KAAK,SAAS;gBAClE,MAAM,IAAI,wBAAwB,CAChC,mCAAmC,EACnC,+BAA+B,SAAS,CAAC,EAAE,eAAe,EAC1D,SAAS,CAAC,EAAE,CACb,CAAC;QACN,CAAC;IACH,CAAC;AACH,CAAC;AACD,MAAM,UAAU,iBAAiB,CAAC,GAAS,EAAE,OAAoC;IAC/E,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC5B,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAClD,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAChG,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACvC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACxE,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACrC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACpC,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IACD,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACzB,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC;AACD,SAAS,gBAAgB,CACvB,GAAS,EACT,OAAgC,EAChC,OAAoC;IAEpC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;QAAE,OAAO;IACpE,MAAM,OAAO,GAAG,KAAK,CAAC,OAA6D,CAAC;IACpF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AACD,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"materialize-routes.js","sourceRoot":"","sources":["../src/materialize-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAqB,MAAM,mBAAmB,CAAC;AAK3F,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EACL,0BAA0B,GAG3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAgC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAiD,MAAM,WAAW,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAA2B,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAMpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AA0FpE,MAAM,UAAU,iBAAiB,CAAC,GAAS,EAAE,OAAoC;IAC/E,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC5B,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAClD,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAChG,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YACvC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACtF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACxE,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACrC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACpC,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC3C,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IACD,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACzB,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;AAC/C,CAAC;AACD,SAAS,gBAAgB,CACvB,GAAS,EACT,OAAgC,EAChC,OAAoC;IAEpC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;QAAE,OAAO;IACpE,MAAM,OAAO,GAAG,KAAK,CAAC,OAA6D,CAAC;IACpF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxE,MAAM,GAAG,GAAG,CAAC,OAAoD,EAAE,EAAE,CACnE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,KAAK;YAAE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;;YACnD,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AACD,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/mcp.js

@@ -44,7 +44,6 @@ async function invoke(tool, runtime, input, context, options) {
             source: "tool",
             ...(state?.signal === undefined ? {} : { signal: state.signal }),
             ...(state?.requestId === undefined ? {} : { requestId: state.requestId }),
-            ...(state?.requestId === undefined ? {} : { correlationId: state.requestId }),
             ...(state?.traceId === undefined ? {} : { traceId: state.traceId }),
             ...(tool.timeoutMs === undefined ? {} : { timeoutMs: tool.timeoutMs }),
             ...(options.auth === undefined ? {} : { auth: options.auth.contextFor(context.req.raw) }),

package/dist/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"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"}

package/dist/middleware-limits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-limits.d.ts","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAOL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAG/B,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAiEvF"}
+{"version":3,"file":"middleware-limits.d.ts","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAOL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAI/B,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAqEvF"}

package/dist/middleware-limits.js

@@ -1,10 +1,13 @@
 import { createFallbackState, emitLifecycle, getRequestState, lifecycleEvent, setRequestState, validateLimit, } from "./middleware-utils.js";
 import { ensureRequestRecord, finishRequestRecord } from "./request-record-middleware.js";
+import { isRelkitControlPlanePath } from "./control-plane.js";
 export function limitsMiddleware(options = {}) {
     validateLimit(options.maxBodyBytes, "maxBodyBytes");
     validateLimit(options.timeoutMs, "timeoutMs");
     return async (context, next) => {
-        const current = ensureRequestRecord(context, getRequestState(context) ?? createFallbackState(context, options), options);
+        const controlPlane = isRelkitControlPlanePath(context.req.path);
+        const state = getRequestState(context) ?? createFallbackState(context, options);
+        const current = controlPlane ? state : ensureRequestRecord(context, state, options);
         const length = Number(context.req.header("content-length"));
         if (options.maxBodyBytes !== undefined &&
             Number.isSafeInteger(length) &&
@@ -21,9 +24,11 @@ export function limitsMiddleware(options = {}) {
             current.requestRecord?.setOutcome("validation-error");
             setRequestState(context, Object.freeze({ ...current, signal: context.req.raw.signal }));
             context.res = response;
-            finishRequestRecord(context, current, options, "validation-error");
-            await emitLifecycle(options, lifecycleEvent(context, current, "request.started"), "onStart");
-            await emitLifecycle(options, lifecycleEvent(context, current, "request.completed", undefined, response.status), "onComplete");
+            if (!controlPlane) {
+                finishRequestRecord(context, current, options, "validation-error");
+                await emitLifecycle(options, lifecycleEvent(context, current, "request.started"), "onStart");
+                await emitLifecycle(options, lifecycleEvent(context, current, "request.completed", undefined, response.status), "onComplete");
+            }
             return response;
         }
         const controller = new AbortController();

package/dist/middleware-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-limits.js","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"middleware-limits.js","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"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"}

package/dist/middleware-utils.d.ts

@@ -1,16 +1,24 @@
-import type { MaybePromise, RequestId, TraceId } from "@relkit/contracts";
+import type { MaybePromise, RequestId, SpanContext, TraceId } from "@relkit/contracts";
 import type { RequestRecordBuilder, RequestRecordSink } from "@relkit/observability";
 import type { Context } from "hono";
+import type { RelkitSpan, SpanRuntime } from "@relkit/invocation";
 export declare const REQUEST_ID_HEADER: "x-request-id";
 export declare const TRACE_ID_HEADER: "x-trace-id";
 export declare const REQUEST_CONTEXT_KEY: "relkit.request";
 export interface HttpRequestState {
     readonly requestId: RequestId;
     readonly traceId: TraceId;
+    readonly remoteParent?: SpanContext;
+    readonly serverSpan?: RelkitSpan;
     readonly signal: AbortSignal;
     readonly startedAt: number;
     readonly deadlineMs?: number;
     readonly requestRecord?: RequestRecordBuilder;
+    readonly lifecycleStarted?: true;
+    readonly runtimeSignal?: {
+        current: AbortSignal;
+        terminalLifecycle?: boolean;
+    };
 }
 export type RequestLifecycleType = "request.started" | "request.completed" | "request.failed" | "request.cancelled";
 export interface RequestLifecycleEvent {
@@ -45,6 +53,7 @@ export interface HttpMiddlewareOptions {
     readonly observability?: RequestRecordSink;
     readonly lifecycle?: RequestLifecycleHooks;
     readonly onLifecycleEvent?: (event: RequestLifecycleEvent) => MaybePromise<void>;
+    readonly spanRuntime?: SpanRuntime;
 }
 export declare function getRequestState(context: Context): HttpRequestState | undefined;
 export declare function setRequestState(context: Context, state: HttpRequestState): void;
@@ -53,5 +62,6 @@ export declare function createFallbackState(context: Context, options: HttpMiddl
 export declare function readId<T extends RequestId | TraceId>(incoming: string | undefined, generate: (() => string) | undefined, prefix: string, normalize: (value: unknown) => T): T;
 export declare function lifecycleEvent(context: Context, state: HttpRequestState, type: RequestLifecycleType, error?: unknown, status?: number): RequestLifecycleEvent;
 export declare function emitLifecycle(options: HttpMiddlewareOptions, event: RequestLifecycleEvent, hook: keyof RequestLifecycleHooks): Promise<void>;
+export declare function emitTerminalLifecycle(options: HttpMiddlewareOptions, state: HttpRequestState, event: RequestLifecycleEvent, hook: keyof RequestLifecycleHooks): Promise<void>;
 export declare function validateLimit(value: number | undefined, name: string): void;
 //# sourceMappingURL=middleware-utils.d.ts.map

package/dist/middleware-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-utils.d.ts","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"middleware-utils.d.ts","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}

package/dist/middleware-utils.js

@@ -1,7 +1,8 @@
-import { toRequestId, toTraceId } from "@relkit/contracts";
+import { createTraceId, parseTraceParent, toRequestId, toTraceId } from "@relkit/contracts";
 export const REQUEST_ID_HEADER = "x-request-id";
 export const TRACE_ID_HEADER = "x-trace-id";
 export const REQUEST_CONTEXT_KEY = "relkit.request";
+const terminalLifecycleStates = new WeakSet();
 export function getRequestState(context) {
     const value = context.get(REQUEST_CONTEXT_KEY);
     return isRequestState(value) ? value : undefined;
@@ -12,6 +13,8 @@ export function setRequestState(context, state) {
     target.set("requestId", state.requestId);
     target.set("traceId", state.traceId);
     target.set("signal", state.signal);
+    if (state.runtimeSignal !== undefined)
+        state.runtimeSignal.current = state.signal;
 }
 export function setResponseHeader(context, name, value) {
     const response = context.res;
@@ -25,18 +28,21 @@ export function setResponseHeader(context, name, value) {
 }
 export function createFallbackState(context, options) {
     return Object.freeze({
-        requestId: readId(context.req.header(options.requestIdHeader ?? REQUEST_ID_HEADER), options.requestId, "request", toRequestId),
-        traceId: readId(context.req.header(options.traceIdHeader ?? TRACE_ID_HEADER), options.traceId, "trace", toTraceId),
+        requestId: readId(undefined, options.requestId, "request", toRequestId),
+        traceId: parseTraceParent(context.req.header("traceparent"), context.req.header("tracestate"))
+            ?.traceId ?? readId(undefined, options.traceId, "trace", toTraceId),
         signal: context.req.raw.signal,
+        runtimeSignal: { current: context.req.raw.signal },
         startedAt: Date.now(),
     });
 }
 export function readId(incoming, generate, prefix, normalize) {
+    const fallback = () => prefix === "trace" ? createTraceId() : `${prefix}-${crypto.randomUUID()}`;
     try {
-        return normalize(incoming ?? generate?.() ?? `${prefix}-${crypto.randomUUID()}`);
+        return normalize(incoming ?? generate?.() ?? fallback());
     }
     catch {
-        return normalize(`${prefix}-${crypto.randomUUID()}`);
+        return normalize(fallback());
     }
 }
 export function lifecycleEvent(context, state, type, error, status) {
@@ -63,6 +69,14 @@ export async function emitLifecycle(options, event, hook) {
     await call(options.lifecycle?.emit, event);
     await call(options.lifecycle?.[hook], event);
 }
+export async function emitTerminalLifecycle(options, state, event, hook) {
+    if (state.runtimeSignal?.terminalLifecycle === true || terminalLifecycleStates.has(state))
+        return;
+    if (state.runtimeSignal !== undefined)
+        state.runtimeSignal.terminalLifecycle = true;
+    terminalLifecycleStates.add(state);
+    await emitLifecycle(options, event, hook);
+}
 export function validateLimit(value, name) {
     if (value !== undefined && (!Number.isSafeInteger(value) || value < 1))
         throw new TypeError(`${name} must be a positive integer`);

package/dist/middleware-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-utils.js","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"middleware-utils.js","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAUL,KAAK,qBAAqB,EAK3B,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,0BAA0B,8DAK5B,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAElF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;CACrC;AAED,4EAA4E;AAC5E,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,qBAA0B,GAClC,SAAS,mBAAmB,EAAE,CAOhC;AAED,eAAO,MAAM,oBAAoB,kCAA4B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CA+B1F;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAsBtF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAgDjG"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAWL,KAAK,qBAAqB,EAK3B,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,0BAA0B,8DAK5B,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAElF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;CACrC;AAED,4EAA4E;AAC5E,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,qBAA0B,GAClC,SAAS,mBAAmB,EAAE,CAQhC;AAED,eAAO,MAAM,oBAAoB,kCAA4B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAkC1F;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAEtF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAqCjG"}

package/dist/middleware.js

@@ -1,8 +1,10 @@
-import { toRequestId, toTraceId } from "@relkit/contracts";
-import { createFallbackState, emitLifecycle, getRequestState, lifecycleEvent, readId, REQUEST_ID_HEADER, setResponseHeader, setRequestState, TRACE_ID_HEADER, } from "./middleware-utils.js";
-import { ensureRequestRecord, finishRequestRecord } from "./request-record-middleware.js";
+import { parseTraceParent, toRequestId } from "@relkit/contracts";
+import { createFallbackState, emitLifecycle, emitTerminalLifecycle, getRequestState, lifecycleEvent, readId, REQUEST_ID_HEADER, setResponseHeader, setRequestState, TRACE_ID_HEADER, } from "./middleware-utils.js";
+import { ensureRequestRecord } from "./request-record-middleware.js";
 import { limitsMiddleware } from "./middleware-limits.js";
 import { failureOutcome } from "./request-record-utils.js";
+import { createHttpSpanRuntime, httpSpanMiddleware, outerHttpState } from "./http-span.js";
+import { isRelkitControlPlanePath } from "./control-plane.js";
 export { REQUEST_CONTEXT_KEY, REQUEST_ID_HEADER, TRACE_ID_HEADER, getRequestState, } from "./middleware-utils.js";
 export const FRAMEWORK_MIDDLEWARE_ORDER = Object.freeze([
     "request-id",
@@ -12,30 +14,41 @@ export const FRAMEWORK_MIDDLEWARE_ORDER = Object.freeze([
 ]);
 /** Installs the four framework-owned HTTP middleware layers in v3 order. */
 export function createFrameworkMiddleware(options = {}) {
+    options = { ...options, spanRuntime: createHttpSpanRuntime(options) };
     return Object.freeze([
-        { name: "request-id", handler: requestIdMiddleware(options) },
-        { name: "trace", handler: traceMiddleware(options) },
+        { name: "request-id", handler: applicationOnly(requestIdMiddleware(options)) },
+        { name: "trace", handler: applicationOnly(traceMiddleware(options)) },
         { name: "limits", handler: limitsMiddleware(options) },
-        { name: "request-record", handler: requestLifecycleMiddleware(options) },
+        { name: "request-record", handler: applicationOnly(requestLifecycleMiddleware(options)) },
     ]);
 }
 export const createHttpMiddleware = createFrameworkMiddleware;
 export { limitsMiddleware } from "./middleware-limits.js";
 export function requestIdMiddleware(options = {}) {
     return async (context, next) => {
-        const requestId = readId(context.req.header(options.requestIdHeader ?? REQUEST_ID_HEADER), options.requestId, "request", toRequestId);
-        const traceId = readId(context.req.header(options.traceIdHeader ?? TRACE_ID_HEADER), options.traceId, "trace", toTraceId);
+        const outer = outerHttpState(context.req.raw);
+        if (outer !== undefined) {
+            setRequestState(context, outer);
+            context.header(options.requestIdHeader ?? REQUEST_ID_HEADER, outer.requestId);
+            await next();
+            setResponseHeader(context, options.requestIdHeader ?? REQUEST_ID_HEADER, outer.requestId);
+            return;
+        }
+        const requestId = readId(undefined, options.requestId, "request", toRequestId);
+        const remoteParent = parseTraceParent(context.req.header("traceparent"), context.req.header("tracestate"));
+        const traceId = remoteParent?.traceId ?? createFallbackState(context, options).traceId;
         const startedAt = options.now?.() ?? Date.now();
         const state = Object.freeze({
             requestId,
             traceId,
             signal: context.req.raw.signal,
+            runtimeSignal: { current: context.req.raw.signal },
             startedAt,
+            ...(remoteParent === undefined ? {} : { remoteParent }),
         });
         setRequestState(context, state);
         ensureRequestRecord(context, state, options);
         context.header(options.requestIdHeader ?? REQUEST_ID_HEADER, requestId);
-        context.header(options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
         try {
             await next();
         }
@@ -45,36 +58,21 @@ export function requestIdMiddleware(options = {}) {
     };
 }
 export function traceMiddleware(options = {}) {
-    return async (context, next) => {
-        const current = ensureRequestRecord(context, getRequestState(context) ?? createFallbackState(context, options), options);
-        const traceId = readId(context.req.header(options.traceIdHeader ?? TRACE_ID_HEADER), options.traceId, "trace", toTraceId);
-        current.requestRecord?.setTraceId(traceId);
-        setRequestState(context, Object.freeze({ ...current, traceId }));
-        context.header(options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
-        try {
-            await next();
-        }
-        finally {
-            setResponseHeader(context, options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
-        }
-    };
+    return httpSpanMiddleware(options);
 }
 export function requestLifecycleMiddleware(options = {}) {
     return async (context, next) => {
         const state = ensureRequestRecord(context, getRequestState(context) ?? createFallbackState(context, options), options);
-        const started = lifecycleEvent(context, state, "request.started");
-        await emitLifecycle(options, started, "onStart");
-        let failure;
-        let cancelled = state.signal.aborted;
-        let cancellation;
-        const onAbort = () => {
-            cancelled = true;
-            cancellation = emitLifecycle(options, lifecycleEvent(context, state, "request.cancelled"), "onCancel");
+        if (!state.lifecycleStarted) {
+            const started = lifecycleEvent(context, state, "request.started");
+            await emitLifecycle(options, started, "onStart");
+        }
+        const signal = state.runtimeSignal?.current ?? state.signal;
+        const cancelled = () => {
+            void emitTerminalLifecycle(options, state, lifecycleEvent(context, state, "request.cancelled"), "onCancel");
         };
-        if (state.signal.aborted)
-            onAbort();
-        else
-            state.signal.addEventListener("abort", onAbort, { once: true });
+        signal.addEventListener("abort", cancelled, { once: true });
+        let failure;
         try {
             await next();
         }
@@ -83,24 +81,22 @@ export function requestLifecycleMiddleware(options = {}) {
             throw cause;
         }
         finally {
-            state.signal.removeEventListener("abort", onAbort);
-            if (cancellation !== undefined)
-                await cancellation;
-            if (cancelled) {
+            signal.removeEventListener("abort", cancelled);
+            if (state.signal.aborted) {
                 state.requestRecord?.setOutcome("cancelled");
-                finishRequestRecord(context, state, options, "cancelled");
                 return;
             }
             const outcome = failure === undefined ? undefined : failureOutcome(failure, state.signal);
             if (outcome !== undefined)
                 state.requestRecord?.setOutcome(outcome.outcome, outcome.errorId);
-            if (failure !== undefined)
-                finishRequestRecord(context, state, options, outcome.outcome);
-            else
-                finishRequestRecord(context, state, options, "success");
-            const type = failure === undefined ? "request.completed" : "request.failed";
-            await emitLifecycle(options, lifecycleEvent(context, state, type, failure), failure === undefined ? "onComplete" : "onError");
         }
     };
 }
+function applicationOnly(handler) {
+    return async (context, next) => {
+        if (isRelkitControlPlanePath(context.req.path))
+            return next();
+        return handler(context, next);
+    };
+}
 //# sourceMappingURL=middleware.js.map