@cyanheads/mcp-ts-core 0.11.5 → 0.12.1

package/dist/utils/internal/performance.js

@@ -7,11 +7,13 @@
  */
 import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { config } from '../../config/index.js';
+import { isInputRequiredSignal } from '../../mcp-server/inputRequired.js';
 import { McpError } from '../../types-global/errors.js';
 import { getErrorCategory } from '../../utils/internal/error-handler/mappings.js';
 import { logger } from '../../utils/internal/logger.js';
+import { withActiveSpan, withExtra } from '../../utils/internal/requestContext.js';
 import { TELEMETRY_LOG_MESSAGES } from '../../utils/internal/telemetryMessages.js';
-import { ATTR_CODE_FUNCTION_NAME, ATTR_CODE_NAMESPACE, ATTR_MCP_PROMPT_DURATION_MS, ATTR_MCP_PROMPT_ERROR_CATEGORY, ATTR_MCP_PROMPT_ERROR_CODE, ATTR_MCP_PROMPT_INPUT_BYTES, ATTR_MCP_PROMPT_MESSAGE_COUNT, ATTR_MCP_PROMPT_NAME, ATTR_MCP_PROMPT_OUTPUT_BYTES, ATTR_MCP_PROMPT_SUCCESS, ATTR_MCP_RESOURCE_DURATION_MS, ATTR_MCP_RESOURCE_ERROR_CODE, ATTR_MCP_RESOURCE_MIME_TYPE, ATTR_MCP_RESOURCE_NAME, ATTR_MCP_RESOURCE_SIZE_BYTES, ATTR_MCP_RESOURCE_SUCCESS, ATTR_MCP_RESOURCE_URI, ATTR_MCP_TOOL_BATCH_FAILED, ATTR_MCP_TOOL_BATCH_SUCCEEDED, ATTR_MCP_TOOL_DURATION_MS, ATTR_MCP_TOOL_ERROR_CATEGORY, ATTR_MCP_TOOL_ERROR_CODE, ATTR_MCP_TOOL_INPUT_BYTES, ATTR_MCP_TOOL_NAME, ATTR_MCP_TOOL_OUTPUT_BYTES, ATTR_MCP_TOOL_PARTIAL_SUCCESS, ATTR_MCP_TOOL_SUCCESS, } from '../../utils/telemetry/attributes.js';
+import { ATTR_CODE_FUNCTION_NAME, ATTR_CODE_NAMESPACE, ATTR_MCP_PROMPT_DURATION_MS, ATTR_MCP_PROMPT_ERROR_CATEGORY, ATTR_MCP_PROMPT_ERROR_CODE, ATTR_MCP_PROMPT_INPUT_BYTES, ATTR_MCP_PROMPT_INPUT_REQUIRED, ATTR_MCP_PROMPT_MESSAGE_COUNT, ATTR_MCP_PROMPT_NAME, ATTR_MCP_PROMPT_OUTPUT_BYTES, ATTR_MCP_PROMPT_SUCCESS, ATTR_MCP_RESOURCE_DURATION_MS, ATTR_MCP_RESOURCE_ERROR_CODE, ATTR_MCP_RESOURCE_INPUT_REQUIRED, ATTR_MCP_RESOURCE_MIME_TYPE, ATTR_MCP_RESOURCE_NAME, ATTR_MCP_RESOURCE_SIZE_BYTES, ATTR_MCP_RESOURCE_SUCCESS, ATTR_MCP_RESOURCE_URI, ATTR_MCP_TOOL_BATCH_FAILED, ATTR_MCP_TOOL_BATCH_SUCCEEDED, ATTR_MCP_TOOL_DURATION_MS, ATTR_MCP_TOOL_ERROR_CATEGORY, ATTR_MCP_TOOL_ERROR_CODE, ATTR_MCP_TOOL_INPUT_BYTES, ATTR_MCP_TOOL_INPUT_REQUIRED, ATTR_MCP_TOOL_NAME, ATTR_MCP_TOOL_OUTPUT_BYTES, ATTR_MCP_TOOL_PARTIAL_SUCCESS, ATTR_MCP_TOOL_SUCCESS, } from '../../utils/telemetry/attributes.js';
 import { createCounter, createHistogram, createUpDownCounter } from '../../utils/telemetry/metrics.js';
 // OTel metric instruments for tool execution (lazy-initialized on first use)
 let toolCallCounter;
@@ -179,7 +181,10 @@ const toBytes = (payload) => {
  * `McpError` instances surface their numeric `code` as the error code attribute.
  *
  * @template T - The resolved type of the tool's return value.
- * @param toolLogicFn - Zero-argument async function containing the tool's business logic.
+ * @param toolLogicFn - Async function containing the tool's business logic. Receives
+ *   `context` re-bound to the execution span this function opens, so a handler
+ *   context built from it correlates to the span the handler actually runs in
+ *   rather than to the enclosing request span.
  * @param context - Request context extended with `toolName`; used for span/log correlation.
  * @param inputPayload - The raw input object passed to the tool, serialized to compute byte size.
  * @param successAttributes - Optional thunk evaluated after a successful run; its
@@ -192,6 +197,11 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
     const tracer = trace.getTracer(config.openTelemetry.serviceName, config.openTelemetry.serviceVersion);
     const { toolName } = context;
     return await tracer.startActiveSpan(`tool_execution:${toolName}`, async (span) => {
+        // The span is active from here down, so everything below — the handler
+        // context the logic function builds and this function's own completion log
+        // — correlates to `tool_execution:*` rather than to whatever was active
+        // when the caller built `context`.
+        const spanContext = withActiveSpan(context);
         const activeGauge = getActiveRequestsGauge();
         activeGauge.add(1);
         const t0 = nowMs();
@@ -202,6 +212,7 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
             [ATTR_MCP_TOOL_INPUT_BYTES]: inputBytes,
         });
         let ok = false;
+        let inputRequired = false;
         let errorCode;
         let errorCategory;
         let outputBytes = 0;
@@ -209,7 +220,7 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
         let batchSucceeded;
         let batchFailed;
         try {
-            const result = await toolLogicFn();
+            const result = await toolLogicFn(spanContext);
             ok = true;
             outputBytes = toBytes(result);
             // Detect partial success: handler returned but result contains a non-empty `failed` array.
@@ -238,8 +249,20 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
                 }
             }
             return result;
+            // `ctx.requestInput(...)` unwinds the handler as a thrown signal, but the
+            // round ended in `input_required` — protocol control flow, not a failure.
+            // Recording it as one would mark the span ERROR, increment the error
+            // counter, and log `isSuccess: false` for every legitimate
+            // multi-round-trip request.
         }
         catch (err) {
+            if (isInputRequiredSignal(err)) {
+                ok = true;
+                inputRequired = true;
+                span.setStatus({ code: SpanStatusCode.OK });
+                span.setAttribute(ATTR_MCP_TOOL_INPUT_REQUIRED, true);
+                throw err;
+            }
             if (err instanceof McpError) {
                 errorCode = String(err.code);
                 errorCategory = getErrorCategory(err.code);
@@ -274,7 +297,7 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
             m.toolCallCounter.add(1, metricAttrs);
             m.toolCallDuration.record(durationMs, metricAttrs);
             m.toolInputBytes.record(inputBytes, toolAttrs);
-            if (ok)
+            if (ok && !inputRequired)
                 m.toolOutputBytes.record(outputBytes, toolAttrs);
             if (!ok) {
                 m.toolCallErrors.add(1, {
@@ -288,17 +311,18 @@ export async function measureToolExecution(toolLogicFn, context, inputPayload, s
                     m.toolParamUsage.add(1, { [ATTR_MCP_TOOL_NAME]: toolName, 'mcp.tool.param': param });
                 }
             }
-            logger.info(TELEMETRY_LOG_MESSAGES.toolExecutionFinished, {
-                ...context,
+            logger.info(TELEMETRY_LOG_MESSAGES.toolExecutionFinished, withExtra(spanContext, {
+                toolName,
                 metrics: {
                     durationMs,
                     isSuccess: ok,
                     errorCode,
                     inputBytes,
                     outputBytes,
+                    ...(inputRequired && { inputRequired }),
                     ...(partialSuccess && { partialSuccess, batchSucceeded, batchFailed }),
                 },
-            });
+            }));
         }
     });
 }
@@ -321,7 +345,8 @@ function getResourceMetrics() {
  * and a structured log. Mirrors {@link measureToolExecution} but tuned for resource reads.
  *
  * @template T - The resolved type of the resource handler's return value.
- * @param resourceLogicFn - Zero-argument async function containing the resource handler.
+ * @param resourceLogicFn - Async function containing the resource handler. Receives
+ *   `context` re-bound to the execution span this function opens.
  * @param context - Request context extended with `resourceName`; used for span/log correlation.
  * @param meta - Resource metadata: URI and MIME type for span attributes.
  * @returns A promise that resolves with the handler's return value or rejects with the original error.
@@ -330,6 +355,8 @@ export async function measureResourceExecution(resourceLogicFn, context, meta) {
     const tracer = trace.getTracer(config.openTelemetry.serviceName, config.openTelemetry.serviceVersion);
     const { resourceName } = context;
     return await tracer.startActiveSpan(`resource_read:${resourceName}`, async (span) => {
+        // Active from here down — see the note in `measureToolExecution`.
+        const spanContext = withActiveSpan(context);
         const activeGauge = getActiveRequestsGauge();
         activeGauge.add(1);
         const t0 = nowMs();
@@ -340,17 +367,30 @@ export async function measureResourceExecution(resourceLogicFn, context, meta) {
             [ATTR_MCP_RESOURCE_MIME_TYPE]: meta.mimeType,
         });
         let ok = false;
+        let inputRequired = false;
         let errorCode;
         let outputBytes = 0;
         try {
-            const result = await resourceLogicFn();
+            const result = await resourceLogicFn(spanContext);
             ok = true;
             outputBytes = toBytes(result);
             span.setStatus({ code: SpanStatusCode.OK });
             span.setAttribute(ATTR_MCP_RESOURCE_SIZE_BYTES, outputBytes);
             return result;
+            // `ctx.requestInput(...)` unwinds the handler as a thrown signal, but the
+            // round ended in `input_required` — protocol control flow, not a failure.
+            // Recording it as one would mark the span ERROR, increment the error
+            // counter, and log `isSuccess: false` for every legitimate
+            // multi-round-trip request.
         }
         catch (err) {
+            if (isInputRequiredSignal(err)) {
+                ok = true;
+                inputRequired = true;
+                span.setStatus({ code: SpanStatusCode.OK });
+                span.setAttribute(ATTR_MCP_RESOURCE_INPUT_REQUIRED, true);
+                throw err;
+            }
             if (err instanceof McpError)
                 errorCode = String(err.code);
             else if (err instanceof Error)
@@ -384,21 +424,22 @@ export async function measureResourceExecution(resourceLogicFn, context, meta) {
             const resourceAttrs = { [ATTR_MCP_RESOURCE_NAME]: resourceName };
             m.resourceReadCounter.add(1, metricAttrs);
             m.resourceReadDuration.record(durationMs, metricAttrs);
-            if (ok)
+            if (ok && !inputRequired)
                 m.resourceOutputBytes.record(outputBytes, resourceAttrs);
             if (!ok)
                 m.resourceReadErrors.add(1, resourceAttrs);
-            logger.info(TELEMETRY_LOG_MESSAGES.resourceReadFinished, {
-                ...context,
+            logger.info(TELEMETRY_LOG_MESSAGES.resourceReadFinished, withExtra(spanContext, {
+                resourceName,
                 metrics: {
                     durationMs,
                     isSuccess: ok,
                     errorCode,
                     outputBytes,
+                    ...(inputRequired && { inputRequired }),
                     uri: meta.uri,
                     mimeType: meta.mimeType,
                 },
-            });
+            }));
         }
     });
 }
@@ -446,6 +487,10 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
     const tracer = trace.getTracer(config.openTelemetry.serviceName, config.openTelemetry.serviceVersion);
     const { promptName } = context;
     return await tracer.startActiveSpan(`prompt_generation:${promptName}`, async (span) => {
+        // Active from here down — see the note in `measureToolExecution`. Prompt
+        // generators take no handler context, so this only re-binds the completion
+        // log below.
+        const spanContext = withActiveSpan(context);
         const activeGauge = getActiveRequestsGauge();
         activeGauge.add(1);
         const t0 = nowMs();
@@ -456,6 +501,7 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
             [ATTR_MCP_PROMPT_INPUT_BYTES]: inputBytes,
         });
         let ok = false;
+        let inputRequired = false;
         let errorCode;
         let errorCategory;
         let outputBytes = 0;
@@ -470,8 +516,20 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
             span.setAttribute(ATTR_MCP_PROMPT_OUTPUT_BYTES, outputBytes);
             span.setAttribute(ATTR_MCP_PROMPT_MESSAGE_COUNT, messageCount);
             return result;
+            // `ctx.requestInput(...)` unwinds the handler as a thrown signal, but the
+            // round ended in `input_required` — protocol control flow, not a failure.
+            // Recording it as one would mark the span ERROR, increment the error
+            // counter, and log `isSuccess: false` for every legitimate
+            // multi-round-trip request.
         }
         catch (err) {
+            if (isInputRequiredSignal(err)) {
+                ok = true;
+                inputRequired = true;
+                span.setStatus({ code: SpanStatusCode.OK });
+                span.setAttribute(ATTR_MCP_PROMPT_INPUT_REQUIRED, true);
+                throw err;
+            }
             if (err instanceof McpError) {
                 errorCode = String(err.code);
                 errorCategory = getErrorCategory(err.code);
@@ -505,7 +563,7 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
             m.promptGenCounter.add(1, metricAttrs);
             m.promptGenDuration.record(durationMs, metricAttrs);
             m.promptInputBytes.record(inputBytes, promptAttrs);
-            if (ok) {
+            if (ok && !inputRequired) {
                 m.promptOutputBytes.record(outputBytes, promptAttrs);
                 m.promptMessageCount.record(messageCount, promptAttrs);
             }
@@ -519,8 +577,8 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
             const promptMessage = ok
                 ? TELEMETRY_LOG_MESSAGES.promptGenerationFinished
                 : TELEMETRY_LOG_MESSAGES.promptGenerationFailed;
-            logFn.call(logger, promptMessage, {
-                ...context,
+            logFn.call(logger, promptMessage, withExtra(spanContext, {
+                promptName,
                 metrics: {
                     durationMs,
                     isSuccess: ok,
@@ -528,8 +586,9 @@ export async function measurePromptGeneration(promptLogicFn, context, inputPaylo
                     inputBytes,
                     outputBytes,
                     messageCount,
+                    ...(inputRequired && { inputRequired }),
                 },
-            });
+            }));
         }
     });
 }

package/dist/utils/internal/performance.js.map

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

package/dist/utils/internal/requestContext.d.ts

@@ -36,9 +36,13 @@ export interface AuthContext {
 /**
  * Core context object associated with a single request or operation.
  *
- * Every handler invocation receives a `RequestContext` (wrapped in `Context`).
- * It is the authoritative source for log correlation (`requestId`, `traceId`,
- * `spanId`), multi-tenancy isolation (`tenantId`), and auth (`auth`).
+ * The one canonical request-shape type. Handler-facing `Context` extends it, so
+ * a handler's `ctx` is accepted anywhere a `RequestContext` is — services,
+ * storage, the logger — with no slice helper and no index-signature gymnastics.
+ *
+ * Closed by design: a misspelled canonical field (`tenatId`) is a type error
+ * rather than a silently-ignored key. Operation-specific data goes in
+ * {@link RequestContext.extra}, the one place that is explicitly an open bag.
  *
  * Optional fields (`traceId`, `spanId`) are injected automatically when an
  * OpenTelemetry active span exists at context-creation time.
@@ -55,12 +59,33 @@ export interface RequestContext {
      * `undefined` when the request is unauthenticated or auth mode is `none`.
      */
     auth?: AuthContext | undefined;
+    /**
+     * Operation-specific correlation data — tool name, resource URI, retry
+     * attempt, whatever the call site wants carried alongside the canonical
+     * fields. Flattened into every log line written with this context, so the
+     * emitted shape is the same as the pre-0.12 open-bag spread.
+     *
+     * Add to it with {@link withExtra} rather than by hand: that merges into any
+     * value a parent context already carried instead of replacing it.
+     */
+    extra?: Readonly<Record<string, unknown>> | undefined;
+    /**
+     * Human-readable label for the operation this context belongs to. Set from
+     * `createRequestContext({ operation })` and read by the storage layer's
+     * tenant assertion and the network helpers' error reporting.
+     */
+    operation?: string | undefined;
     /**
      * Unique identifier for this request, used to correlate log entries across
      * service boundaries. Inherited from a parent context when provided;
      * otherwise generated by {@link generateRequestContextId}.
      */
     requestId: string;
+    /**
+     * MCP session identifier, when the request carries a durable session.
+     * `undefined` for stdio and for stateless HTTP.
+     */
+    sessionId?: string | undefined;
     /**
      * OpenTelemetry span ID from the active span at context-creation time.
      * `undefined` when no active span exists.
@@ -69,7 +94,7 @@ export interface RequestContext {
     /**
      * Tenant identifier used for multi-tenancy data isolation.
      * Resolved in priority order: `additionalContext.tenantId` →
-     * rest params → `parentContext.tenantId` → AsyncLocalStorage auth store.
+     * `tenantId` param → `parentContext.tenantId` → AsyncLocalStorage auth store.
      */
     tenantId?: string | undefined;
     /**
@@ -81,47 +106,62 @@ export interface RequestContext {
      * `undefined` when no active span exists.
      */
     traceId?: string | undefined;
-    /**
-     * Additional arbitrary key-value pairs for operation-specific context.
-     * Consumers must type-check before accessing extended properties.
-     *
-     * Note: optional fields above are typed `?: T | undefined` (not just `?: T`)
-     * so the handler-facing `Context` — which carries strict-optional fields
-     * under `exactOptionalPropertyTypes` — is structurally assignable to
-     * {@link RequestContextLike} (the closed canonical-field projection used by
-     * service-layer signatures). `RequestContext` itself remains the open
-     * "context bag" that the logger and `createRequestContext` build by spread.
-     */
-    [key: string]: unknown;
 }
 /**
- * Closed, canonical-field projection of {@link RequestContext} for service
- * signatures. The handler-facing `Context` carries strict-optional fields with
- * `| undefined` and lacks the `[key: string]: unknown` index signature, so it
- * is not assignable to `RequestContext` itself; this projection is what both
- * `Context` and `RequestContext` are structurally assignable to.
- *
- * Service and canvas method signatures accept `RequestContextLike` instead of
- * `RequestContext` so consumers can pass the handler `ctx` directly without a
- * slice helper. Internal context construction (`createRequestContext`,
- * `enriched` log dispatch) still produces `RequestContext`, preserving the
- * open-bag spread pattern.
+ * @deprecated Use {@link RequestContext}. It was the closed projection that
+ * existed only because `RequestContext` carried an index signature; now that
+ * the index signature is gone, `RequestContext` *is* the closed projection.
+ * Kept as an alias for one minor.
  */
-export type RequestContextLike = {
-    auth?: AuthContext | undefined;
-    requestId: string;
-    spanId?: string | undefined;
-    tenantId?: string | undefined;
-    timestamp: string;
-    traceId?: string | undefined;
-};
+export type RequestContextLike = RequestContext;
+/**
+ * Projects any context-shaped object down to the {@link RequestContext}
+ * contract, dropping every key the type does not declare.
+ *
+ * TypeScript cannot enforce this at the call site: excess-property checking
+ * applies to object *literals*, not to a variable, so a handler `ctx` — which
+ * carries live request machinery (`log`, `signal`, `state`) and, after a
+ * multi-round-trip round, the user-entered content in `inputs.responses` —
+ * satisfies a `RequestContext` parameter and arrives whole. Anything that
+ * serializes a caller-supplied context onto a wire or into a log must project
+ * first, or that payload rides along.
+ *
+ * Allowlist, not denylist: a field added to a handler context later is dropped
+ * by default rather than silently published.
+ */
+export declare function toCanonicalContext(context: Readonly<Record<string, unknown>>): RequestContext;
+/**
+ * Returns a copy of `context` with `fields` merged into its {@link
+ * RequestContext.extra} bag.
+ *
+ * Replaces the `{ ...context, someField }` spread the open-bag type used to
+ * allow. Merging rather than replacing means a child call site can add its own
+ * correlation data without dropping what a parent already attached.
+ *
+ * @example
+ * ```typescript
+ * logger.warning('Retrying upstream call', withExtra(ctx, { attempt, url }));
+ * ```
+ */
+export declare function withExtra(context: RequestContext, fields: Readonly<Record<string, unknown>>): RequestContext;
+/**
+ * Returns a copy of `context` whose `traceId` / `spanId` name the span that is
+ * active *now*, rather than the one that was active when the context was built.
+ *
+ * A context created before a span opens carries the enclosing span's IDs, so a
+ * handler running inside a `tool_execution:*` span would advertise the request
+ * span instead of its own. Re-binding at the point the span becomes active is
+ * what makes `ctx.spanId` name the execution the handler is part of.
+ *
+ * Returns the input unchanged when no valid span is active, so a
+ * telemetry-disabled path is untouched.
+ */
+export declare function withActiveSpan<T extends RequestContext>(context: T): T;
 /**
  * Parameters accepted by {@link requestContextService.createRequestContext}.
  *
- * Named fields (`parentContext`, `additionalContext`, `operation`) receive
- * special handling. All other properties are spread directly onto the resulting
- * {@link RequestContext} as-is, allowing ad-hoc context extension without
- * modifying this interface.
+ * Closed, like the context it builds. Operation-specific keys go in
+ * `additionalContext`, which lands on {@link RequestContext.extra}.
  *
  * @example
  * ```typescript
@@ -134,25 +174,23 @@ export type RequestContextLike = {
  */
 export interface CreateRequestContextParams {
     /**
-     * Key-value pairs merged into the context after `parentContext` properties
-     * but before `requestId`/`timestamp` are pinned. Takes precedence over
-     * `parentContext` for overlapping keys. `requestId` and `timestamp` keys in
-     * `additionalContext` are silently stripped to prevent overwrites.
+     * Operation-specific key-value pairs, merged into the new context's
+     * {@link RequestContext.extra} on top of whatever the parent carried.
      */
-    additionalContext?: Record<string, unknown>;
+    additionalContext?: Readonly<Record<string, unknown>> | undefined;
     /**
      * Human-readable label for the operation creating this context.
      * Written onto the context as `context.operation` when provided.
      */
-    operation?: string;
+    operation?: string | undefined;
     /**
      * Parent context whose properties are inherited as the base. When
      * `parentContext.requestId` is a non-empty string it is reused as-is,
      * preserving the same request ID across a call chain.
      */
-    parentContext?: Record<string, unknown> | RequestContext | undefined;
-    /** Any additional key-value pairs spread directly onto the resulting context. */
-    [key: string]: unknown;
+    parentContext?: Partial<RequestContext> | undefined;
+    /** Explicit tenant, ranked below `additionalContext.tenantId`. */
+    tenantId?: string | undefined;
 }
 /**
  * Service for creating and enriching {@link RequestContext} instances.
@@ -182,12 +220,11 @@ export declare const requestContextService: {
      * Merge order (later entries win, except `requestId`/`timestamp` which are
      * always generated fresh or inherited):
      * 1. `parentContext` properties (base)
-     * 2. Remaining spread params (everything in `params` except named fields)
-     * 3. `additionalContext` properties (`requestId`/`timestamp` stripped)
-     * 4. Resolved `requestId` and `timestamp` (canonical, never overwritten)
-     * 5. Resolved `tenantId` (see priority order in {@link RequestContext.tenantId})
-     * 6. `operation` (written as `context.operation` when provided)
-     * 7. OTel `traceId`/`spanId` from the active span (when present)
+     * 2. Resolved `requestId` and `timestamp` (canonical, never overwritten)
+     * 3. `extra` — the parent's bag with `additionalContext` merged over it
+     * 4. Resolved `tenantId` (see priority order in {@link RequestContext.tenantId})
+     * 5. `operation` (written as `context.operation` when provided)
+     * 6. OTel `traceId`/`spanId` from the active span (when present)
      *
      * @param params - Context creation parameters. Defaults to `{}`.
      * @returns A fully constructed `RequestContext`.
@@ -228,6 +265,6 @@ export declare const requestContextService: {
      * // context now includes: { requestId, timestamp, tenantId, auth: {...}, ... }
      * ```
      */
-    withAuthInfo(authInfo: AuthInfo, parentContext?: Record<string, unknown> | RequestContext): RequestContext;
+    withAuthInfo(authInfo: AuthInfo, parentContext?: Partial<RequestContext>): RequestContext;
 };
 //# sourceMappingURL=requestContext.d.ts.map

package/dist/utils/internal/requestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestContext.d.ts","sourceRoot":"","sources":["../../../src/utils/internal/requestContext.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAc9E;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,WAAW;IAC1B,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,2HAA2H;IAC3H,GAAG,EAAE,MAAM,CAAC;IACZ,wFAAwF;IACxF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IAEtE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;;;;;OAUG;IAEH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5C;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,GAAG,SAAS,CAAC;IAErE,iFAAiF;IAEjF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAmJD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB;IAhKhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;kCAC0B,0BAA0B,GAAQ,cAAc;IA8D7E;;;;;;;;;;;;;;;;;;;;;OAqBG;2BAES,QAAQ,kBACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,GACvD,cAAc;CA2C+C,CAAC"}
+{"version":3,"file":"requestContext.d.ts","sourceRoot":"","sources":["../../../src/utils/internal/requestContext.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAc9E;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,WAAW;IAC1B,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,2HAA2H;IAC3H,GAAG,EAAE,MAAM,CAAC;IACZ,wFAAwF;IACxF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IAEtE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAE/B;;;;;;;;OAQG;IAEH,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAEtD;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAmBhD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,cAAc,CAM7F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,cAAc,CAEhB;AAmBD;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAKtE;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAElE;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEpD,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AA0HD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB;IAvIhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;kCAC0B,0BAA0B,GAAQ,cAAc;IAgD7E;;;;;;;;;;;;;;;;;;;;;OAqBG;2BACoB,QAAQ,kBAAkB,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc;CAoCzB,CAAC"}