@noodleseed/one 0.139.3 → 0.140.0

package/node_modules/@noodle-borg/transport-http/dist/serve-request.js

@@ -3,7 +3,7 @@ import { createDualEraMcpHandler, handleStatelessHttp, JSON_RPC, } from '@noodle
 import { admissionContexts, requestsInvocationContext } from './admission-context.js';
 import { authorizeIdentityMode, authorizeMixedMode, authorizePublicServiceMode, canonicalResourceUrl, isIdentityMode, } from './identity-authorization.js';
 import { invocationClientHint } from './invocation-client-hints.js';
-import { emitIntentEvents, emitRequestEvent, header } from './request-capture.js';
+import { emitDeniedRequestEvent, emitIntentEvents, emitRequestEvent, header, } from './request-capture.js';
 import { admissionRpcError, rpcError, sendJson } from './responses.js';
 import { preflightServicePrincipalToolCall, sendServicePrincipalToolDenial, } from './service-principal-authorization.js';
 import { preflightToolAuthorization, sendToolAuthorizationDenial } from './tool-authorization.js';
@@ -18,6 +18,22 @@ import { widgetDomainProjectionForRequest } from './widget-host.js';
 export async function serveRequest(req, res, target, auth, routeId, maxBody, allowed, tenant) {
     const startedAt = Date.now();
     const requestId = randomUUID();
+    // Every structured log line for this request carries the analytics correlation id (#1309).
+    // Field merge, not `child()`: injected loggers are only guaranteed the four level methods.
+    const logger = {
+        info: (event, fields) => auth.logger.info(event, { requestId, ...fields }),
+        warn: (event, fields) => auth.logger.warn(event, { requestId, ...fields }),
+    };
+    const denied = (errorKind, parsedBody) => emitDeniedRequestEvent({
+        req,
+        auth,
+        tenant,
+        target,
+        ...(parsedBody === undefined ? {} : { parsed: parsedBody }),
+        startedAt,
+        requestId,
+        errorKind,
+    });
     const origin = header(req, 'origin');
     if (origin !== undefined && !originAllowed(origin, allowed)) {
         return sendJson(res, 403, rpcError(JSON_RPC.INVALID_REQUEST, 'origin not allowed'));
@@ -37,7 +53,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
     if (isIdentityMode(auth.accessMode)) {
         const authResult = await authorizeIdentityMode(req, res, auth);
         if (!authResult.allow)
-            return;
+            return denied(`auth_denied.${authResult.reason}`);
         if (authResult.caller !== undefined) {
             protocolContext = {
                 ...protocolContext,
@@ -59,7 +75,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
     else if (auth.accessMode === 'mixed') {
         const authResult = await authorizeMixedMode(req, res, auth);
         if (!authResult.allow)
-            return;
+            return denied(`auth_denied.${authResult.reason}`);
         if (authResult.caller !== undefined) {
             protocolContext = {
                 ...protocolContext,
@@ -117,7 +133,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
         const decision = auth.admissionGate
             ? await auth.admissionGate(context)
             : { allow: true };
-        auth.logger.info('mcp.admission', {
+        logger.info('mcp.admission', {
             routeId: context.routeId,
             method: context.method,
             category: context.category,
@@ -134,12 +150,13 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
             if (decision.retryAfterSeconds !== undefined) {
                 res.setHeader('Retry-After', String(decision.retryAfterSeconds));
             }
-            return sendJson(res, decision.status ?? 403, admissionRpcError(context, decision));
+            sendJson(res, decision.status ?? 403, admissionRpcError(context, decision));
+            return denied(`admission_denied.${boundedReason(decision.reason)}`, parsed);
         }
     }
     const authorization = preflightToolAuthorization(parsed, target, protocolContext.caller);
     for (const observation of authorization.observations) {
-        auth.logger.info('mcp.tool_authorization', {
+        logger.info('mcp.tool_authorization', {
             toolName: observation.toolName,
             decision: observation.decision,
             reason: observation.reason,
@@ -149,12 +166,12 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
     }
     if (authorization.denial !== undefined) {
         sendToolAuthorizationDenial(req, res, auth, authorization.denial);
-        return;
+        return denied(`auth_denied.${authorization.denial.decision.reason}`, parsed);
     }
     const serviceAuthorization = preflightServicePrincipalToolCall(parsed, target, protocolContext.caller);
     const serviceSubject = protocolContext.caller?.identityKind === 'service' ? protocolContext.caller.subject : undefined;
     for (const observation of serviceAuthorization.observations) {
-        auth.logger.info('mcp.service_principal_tool_authorization', {
+        logger.info('mcp.service_principal_tool_authorization', {
             subject: serviceSubject,
             toolName: observation.toolName,
             decision: observation.decision,
@@ -176,7 +193,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
         }
         catch {
             try {
-                auth.logger.warn('mcp.tool_authorization.observer_failed', {
+                logger.warn('mcp.tool_authorization.observer_failed', {
                     toolName: observation.toolName,
                     decision: observation.decision,
                 });
@@ -188,7 +205,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
     }
     if (serviceAuthorization.denial !== undefined) {
         sendServicePrincipalToolDenial(res, serviceAuthorization.denial);
-        return;
+        return denied(`auth_denied.${serviceAuthorization.denial.reason}`, parsed);
     }
     if (auth.resolveInvocationContext !== undefined && requestsInvocationContext(parsed)) {
         const clientHint = invocationClientHint(parsed);
@@ -220,6 +237,7 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
             },
         };
     }
+    const dispatchedAt = Date.now();
     if (auth.protocolMode === 'legacy-only') {
         await handleStatelessHttp(target, req, res, parsed, protocolContext);
     }
@@ -251,9 +269,21 @@ export async function serveRequest(req, res, target, auth, routeId, maxBody, all
         observed,
         startedAt,
         requestId,
+        timing: { queueMs: dispatchedAt - startedAt, execMs: Date.now() - dispatchedAt },
     });
     emitIntentEvents({ req, target, auth, tenant, parsed, observations, requestId });
 }
+/** Bound a gate-supplied denial reason into a low-cardinality token for the analytics errorKind. */
+function boundedReason(reason) {
+    if (reason === undefined)
+        return 'denied';
+    const token = reason
+        .toLowerCase()
+        .replace(/[^a-z0-9_-]+/g, '_')
+        .replace(/^_+|_+$/g, '')
+        .slice(0, 32);
+    return token.length === 0 ? 'denied' : token;
+}
 export function originAllowed(origin, allowed) {
     if (allowed === undefined)
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noodleseed/one",
-  "version": "0.139.3",
+  "version": "0.140.0",
   "private": false,
   "description": "Noodle CLI by Noodle Seed — author, run, and deploy declarative MCP servers. Embedding the assistant in your own web app is @noodleseed/assistant.",
   "license": "Apache-2.0",
@@ -236,7 +236,7 @@
     "@modelcontextprotocol/client": "2.0.0",
     "@modelcontextprotocol/server": "2.0.0",
     "@noodle-borg/admission-limits": "0.0.0",
-    "@noodle-borg/agent-kit": "0.84.0",
+    "@noodle-borg/agent-kit": "0.84.1",
     "@noodle-borg/app-audit": "0.0.0",
     "@noodle-borg/app-package": "0.0.0",
     "@noodle-borg/assistant-gateway": "0.0.0",