@cyanheads/mcp-ts-core 0.11.5 → 0.12.0

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,49 @@ 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;
 /**
  * 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 +161,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 +207,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 +252,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;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;AA6HD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB;IA1IhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;kCAC0B,0BAA0B,GAAQ,cAAc;IAmD7E;;;;;;;;;;;;;;;;;;;;;OAqBG;2BACoB,QAAQ,kBAAkB,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc;CAoCzB,CAAC"}

package/dist/utils/internal/requestContext.js

@@ -10,7 +10,7 @@
  * - `requestId` is inherited from a parent context when provided, otherwise a
  *   new unique ID is generated via {@link generateRequestContextId}.
  * - `tenantId` is resolved with the following priority (highest to lowest):
- *   `additionalContext.tenantId` → spread rest params → `parentContext.tenantId`
+ *   `additionalContext.tenantId` → the `tenantId` param → `parentContext.tenantId`
  *   → AsyncLocalStorage auth store (`authContext`).
  * - OpenTelemetry `traceId` and `spanId` are automatically injected from the
  *   active span when one exists.
@@ -33,6 +33,61 @@ function toAuthContext(info) {
         ...(info.token && { token: info.token }),
     };
 }
+/**
+ * The complete key set of {@link RequestContext}. The type is closed, so this
+ * list is its runtime mirror — used by {@link toCanonicalContext} to project a
+ * wider object back down to the contract.
+ */
+const CANONICAL_CONTEXT_KEYS = [
+    'auth',
+    'extra',
+    'operation',
+    'requestId',
+    'sessionId',
+    'spanId',
+    'tenantId',
+    'timestamp',
+    'traceId',
+];
+/**
+ * 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 function toCanonicalContext(context) {
+    const projected = {};
+    for (const key of CANONICAL_CONTEXT_KEYS) {
+        if (context[key] !== undefined)
+            projected[key] = context[key];
+    }
+    return projected;
+}
+/**
+ * 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 function withExtra(context, fields) {
+    return { ...context, extra: { ...context.extra, ...fields } };
+}
 /**
  * Singleton-like service object for managing request context operations.
  * @private
@@ -45,12 +100,11 @@ const requestContextServiceInstance = {
      * 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`.
@@ -69,8 +123,7 @@ const requestContextServiceInstance = {
      * ```
      */
     createRequestContext(params = {}) {
-        const { parentContext, additionalContext, operation, ...rest } = params;
-        const inheritedContext = parentContext && typeof parentContext === 'object' ? { ...parentContext } : {};
+        const { parentContext, additionalContext, operation, tenantId } = params;
         const authStore = alsAuthContext.getStore();
         const tenantIdFromAuth = authStore?.authInfo?.tenantId;
         // Bridge auth info from ALS into the context so ctx.auth is populated
@@ -78,25 +131,22 @@ const requestContextServiceInstance = {
         const authFromStore = authStore?.authInfo
             ? toAuthContext(authStore.authInfo)
             : undefined;
-        const requestId = typeof inheritedContext.requestId === 'string' && inheritedContext.requestId
-            ? inheritedContext.requestId
+        const requestId = parentContext?.requestId
+            ? parentContext.requestId
             : generateRequestContextId();
         const timestamp = new Date().toISOString();
-        const extractTenantId = (obj) => obj != null && typeof obj.tenantId === 'string' ? obj.tenantId : undefined;
-        const resolvedTenantId = extractTenantId(additionalContext) ??
-            extractTenantId(rest) ??
-            extractTenantId(inheritedContext) ??
-            tenantIdFromAuth;
-        // Strip system fields from additionalContext to prevent overwriting requestId/timestamp
-        const { requestId: _r, timestamp: _t, ...safeAdditional } = additionalContext && typeof additionalContext === 'object' ? additionalContext : {};
+        const additionalTenantId = typeof additionalContext?.tenantId === 'string' ? additionalContext.tenantId : undefined;
+        const resolvedTenantId = additionalTenantId ?? tenantId ?? parentContext?.tenantId ?? tenantIdFromAuth;
+        const extra = parentContext?.extra || additionalContext
+            ? { ...parentContext?.extra, ...additionalContext }
+            : undefined;
         const context = {
-            ...inheritedContext,
-            ...rest, // Spread any other properties from the params object
-            ...safeAdditional,
+            ...parentContext,
             requestId,
             timestamp,
+            ...(extra && { extra }),
             ...(resolvedTenantId ? { tenantId: resolvedTenantId } : {}),
-            ...(operation && typeof operation === 'string' ? { operation } : {}),
+            ...(operation ? { operation } : {}),
             ...(authFromStore && { auth: authFromStore }),
         };
         // --- OpenTelemetry Integration ---
@@ -134,17 +184,12 @@ const requestContextServiceInstance = {
      * ```
      */
     withAuthInfo(authInfo, parentContext) {
-        // Inherit the operation from parentContext when provided, so callers that
-        // already established an operation name (e.g. 'AutoTaskHandler') keep it.
-        const parentOp = parentContext && typeof parentContext.operation === 'string'
-            ? parentContext.operation
-            : undefined;
         const baseContext = this.createRequestContext({
-            operation: parentOp ?? 'withAuthInfo',
-            parentContext,
-            additionalContext: {
-                tenantId: authInfo.tenantId,
-            },
+            // Inherit the operation from parentContext when provided, so callers that
+            // already established an operation name keep it.
+            operation: parentContext?.operation ?? 'withAuthInfo',
+            ...(parentContext && { parentContext }),
+            ...(authInfo.tenantId && { tenantId: authInfo.tenantId }),
         });
         return {
             ...baseContext,

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

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

package/dist/utils/metrics/tokenCounter.d.ts

@@ -1,4 +1,4 @@
-import type { RequestContext, RequestContextLike } from '../../utils/internal/requestContext.js';
+import type { RequestContext } from '../../utils/internal/requestContext.js';
 /**
  * Minimal chat message shape used for token counting, intentionally provider-agnostic.
  * Covers the common subset of OpenAI-style chat message fields without depending on
@@ -65,7 +65,7 @@ export interface ModelHeuristics {
  * const tokens = await countTokens('Hello, world!');
  * // Returns approximately 4 (13 chars / 4 charsPerToken, rounded up)
  */
-export declare function countTokens(text: string, context?: RequestContextLike | RequestContext, model?: string): Promise<number>;
+export declare function countTokens(text: string, context?: RequestContext, model?: string): Promise<number>;
 /**
  * Estimates the total number of tokens for an array of chat messages using the same
  * heuristics as OpenAI's token-counting cookbook for gpt-4o-family models.
@@ -93,5 +93,5 @@ export declare function countTokens(text: string, context?: RequestContextLike |
  *   { role: 'assistant', content: 'It is 4.' },
  * ]);
  */
-export declare function countChatTokens(messages: ReadonlyArray<ChatMessage>, context?: RequestContextLike | RequestContext, model?: string): Promise<number>;
+export declare function countChatTokens(messages: ReadonlyArray<ChatMessage>, context?: RequestContext, model?: string): Promise<number>;
 //# sourceMappingURL=tokenCounter.d.ts.map

package/dist/utils/metrics/tokenCounter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenCounter.d.ts","sourceRoot":"","sources":["../../../src/utils/metrics/tokenCounter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7F;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,oFAAoF;IACpF,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACtF,+FAA+F;IAC/F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAClD,CAAC,GAAG,IAAI,CAAC;IACV,yFAAyF;IACzF,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,6FAA6F;IAC7F,gBAAgB,EAAE,MAAM,CAAC;IACzB,yFAAyF;IACzF,aAAa,EAAE,MAAM,CAAC;CACvB;AA2CD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,kBAAkB,GAAG,cAAc,EAC7C,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,EACpC,OAAO,CAAC,EAAE,kBAAkB,GAAG,cAAc,EAC7C,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAgEjB"}
+{"version":3,"file":"tokenCounter.d.ts","sourceRoot":"","sources":["../../../src/utils/metrics/tokenCounter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,oFAAoF;IACpF,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACtF,+FAA+F;IAC/F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAClD,CAAC,GAAG,IAAI,CAAC;IACV,yFAAyF;IACzF,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,6FAA6F;IAC7F,gBAAgB,EAAE,MAAM,CAAC;IACzB,yFAAyF;IACzF,aAAa,EAAE,MAAM,CAAC;CACvB;AA2CD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,EACxB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,EACpC,OAAO,CAAC,EAAE,cAAc,EACxB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAgEjB"}

package/dist/utils/metrics/tokenCounter.js.map

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

package/dist/utils/network/fetchWithTimeout.d.ts

@@ -1,4 +1,4 @@
-import type { RequestContext, RequestContextLike } from '../../utils/internal/requestContext.js';
+import { type RequestContext } from '../../utils/internal/requestContext.js';
 /** Eagerly creates the HTTP client duration histogram so the series exists from startup. */
 export declare function initHttpClientMetrics(): void;
 /**
@@ -152,5 +152,5 @@ export interface FetchWithTimeoutOptions extends Omit<RequestInit, 'signal'> {
  * );
  * ```
  */
-export declare function fetchWithTimeout(url: string | URL, timeoutMs: number, context: RequestContextLike | RequestContext, options?: FetchWithTimeoutOptions): Promise<Response>;
+export declare function fetchWithTimeout(url: string | URL, timeoutMs: number, context: RequestContext, options?: FetchWithTimeoutOptions): Promise<Response>;
 //# sourceMappingURL=fetchWithTimeout.d.ts.map

package/dist/utils/network/fetchWithTimeout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchWithTimeout.d.ts","sourceRoot":"","sources":["../../../src/utils/network/fetchWithTimeout.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AA8C7F,4FAA4F;AAC5F,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AA2BD;;;;;;GAMG;AACH,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC;IAC1E;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAkSD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kBAAkB,GAAG,cAAc,EAC5C,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,QAAQ,CAAC,CAuPnB"}
+{"version":3,"file":"fetchWithTimeout.d.ts","sourceRoot":"","sources":["../../../src/utils/network/fetchWithTimeout.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,cAAc,EAAa,MAAM,oCAAoC,CAAC;AAoCpF,4FAA4F;AAC5F,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AA2BD;;;;;;GAMG;AACH,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC;IAC1E;;;;;;;;;OASG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAkSD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,QAAQ,CAAC,CAwPnB"}

package/dist/utils/network/fetchWithTimeout.js

@@ -5,6 +5,7 @@
  */
 import { JsonRpcErrorCode, McpError, serviceUnavailable, timeout, validationError, } from '../../types-global/errors.js';
 import { logger } from '../../utils/internal/logger.js';
+import { withExtra } from '../../utils/internal/requestContext.js';
 import { runtimeCaps } from '../../utils/internal/runtime.js';
 import { httpStatusToErrorCode } from '../../utils/network/httpError.js';
 import { readBoundedResponseText } from '../../utils/network/responseBody.js';
@@ -25,15 +26,6 @@ const ERROR_BODY_SCAN_LIMIT = 16_384;
  * exactly this set, so these responses are returned untouched.
  */
 const NULL_BODY_STATUS = new Set([204, 205, 304]);
-/**
- * Reads the optional `operation` label off a context argument. It is an ad-hoc
- * field of the `RequestContext` bag, absent from both `RequestContextLike` and
- * the handler-facing `Context`.
- */
-function contextOperation(context) {
-    const operation = context.operation;
-    return typeof operation === 'string' ? operation : undefined;
-}
 let clientDurationHistogram;
 function getHttpClientMetrics() {
     clientDurationHistogram ??= createHistogram('http.client.request.duration', 'Duration of outbound HTTP requests', 's');
@@ -477,23 +469,17 @@ export async function fetchWithTimeout(url, timeoutMs, context, options) {
     let deadlineFollowsBody = false;
     const errorIdentity = {
         requestId: context.requestId,
-        operation: contextOperation(context),
+        operation: context.operation,
     };
     const timeoutFailure = () => {
-        logger.error(`${operationDescription} timed out after ${timeoutMs}ms.`, {
-            ...context,
-            errorSource: 'FetchTimeout',
-        });
+        logger.error(`${operationDescription} timed out after ${timeoutMs}ms.`, withExtra(context, { errorSource: 'FetchTimeout' }));
         return timeout(`${operationDescription} timed out.`, {
             ...errorIdentity,
             errorSource: 'FetchTimeout',
         });
     };
     const abortedFailure = () => {
-        logger.info(`${operationDescription} aborted by caller.`, {
-            ...context,
-            errorSource: 'FetchAborted',
-        });
+        logger.info(`${operationDescription} aborted by caller.`, withExtra(context, { errorSource: 'FetchAborted' }));
         return new McpError(JsonRpcErrorCode.InternalError, `${operationDescription} was aborted.`, {
             ...errorIdentity,
             errorSource: 'FetchAborted',
@@ -536,13 +522,12 @@ export async function fetchWithTimeout(url, timeoutMs, context, options) {
                 // Callers that treat a status as expected (e.g. 404 → empty result) get a
                 // debug line instead of error; the thrown McpError below is unchanged.
                 const logMessage = `Fetch failed for ${redactUrl(currentUrl)} with status ${response.status}.`;
-                const logPayload = {
-                    ...context,
+                const logPayload = withExtra(context, {
                     statusCode: response.status,
                     statusText: response.statusText,
                     responseBody,
                     errorSource: 'FetchHttpError',
-                };
+                });
                 if (expectedStatuses?.includes(response.status)) {
                     logger.debug(logMessage, logPayload);
                 }
@@ -614,11 +599,10 @@ export async function fetchWithTimeout(url, timeoutMs, context, options) {
             throw abortedFailure();
         }
         const errorMessage = error instanceof Error ? error.message : String(error);
-        logger.error(`Network error during ${operationDescription}: ${errorMessage}`, {
-            ...context,
+        logger.error(`Network error during ${operationDescription}: ${errorMessage}`, withExtra(context, {
             originalErrorName: error instanceof Error ? error.name : 'UnknownError',
             errorSource: 'FetchNetworkError',
-        });
+        }));
         if (error instanceof McpError) {
             throw error;
         }