@jsonstudio/llms 0.6.3551 → 0.6.3685

package/dist/conversion/hub/pipeline/hub-pipeline.js

@@ -1,5 +1,6 @@
 import { Readable } from "node:stream";
 import { isJsonObject, jsonClone } from "../types/json.js";
+import { convertMessagesToBridgeInput } from "../../bridge-message-utils.js";
 import { VirtualRouterEngine } from "../../../router/virtual-router/engine.js";
 import { providerErrorCenter } from "../../../router/virtual-router/error-center.js";
 import { providerSuccessCenter } from "../../../router/virtual-router/success-center.js";
@@ -14,6 +15,7 @@ import { ChatFormatAdapter } from "../format-adapters/chat-format-adapter.js";
 import { ChatSemanticMapper } from "../semantic-mappers/chat-mapper.js";
 import { createSnapshotRecorder } from "../snapshot-recorder.js";
 import { shouldRecordSnapshots } from "../../snapshot-utils.js";
+import { measureHubStage } from "./hub-stage-timing.js";
 import { runReqInboundStage1FormatParse } from "./stages/req_inbound/req_inbound_stage1_format_parse/index.js";
 import { runReqInboundStage2SemanticMap } from "./stages/req_inbound/req_inbound_stage2_semantic_map/index.js";
 import { runChatContextCapture, captureResponsesContextSnapshot, } from "./stages/req_inbound/req_inbound_stage3_context_capture/index.js";
@@ -32,6 +34,8 @@ import { isCompactionRequest } from "../../compaction-detect.js";
 import { applyHubProviderOutboundPolicy, recordHubPolicyObservation, setHubPolicyRuntimePolicy, } from "../policy/policy-engine.js";
 import { applyProviderOutboundToolSurface, } from "../tool-surface/tool-surface-engine.js";
 import { cloneRuntimeMetadata, ensureRuntimeMetadata, readRuntimeMetadata, } from "../../runtime-metadata.js";
+import { containsImageAttachment, stripHistoricalImageAttachments, stripHistoricalVisualToolOutputs, } from "../process/chat-process-media.js";
+import { estimateChatProcessSessionInputTokensDetailed, saveChatProcessSessionInputEstimate, } from "../process/chat-process-session-usage.js";
 function isTruthyEnv(value) {
     const v = typeof value === "string" ? value.trim().toLowerCase() : "";
     return v === "1" || v === "true" || v === "yes" || v === "on";
@@ -52,6 +56,109 @@ function resolveApplyPatchToolModeFromEnv() {
         return "freeform";
     return undefined;
 }
+function applyChatProcessEntryMediaCleanup(request) {
+    return {
+        ...request,
+        messages: stripHistoricalVisualToolOutputs(stripHistoricalImageAttachments(request.messages)),
+    };
+}
+function readResponsesResumeFromMetadata(metadata) {
+    if (!metadata || typeof metadata !== "object") {
+        return undefined;
+    }
+    const resume = metadata.responsesResume;
+    return resume && isJsonObject(resume)
+        ? resume
+        : undefined;
+}
+function readResponsesResumeFromRequestSemantics(request) {
+    try {
+        const semantics = request?.semantics;
+        const responses = semantics &&
+            typeof semantics === "object" &&
+            !Array.isArray(semantics) &&
+            semantics.responses &&
+            typeof semantics.responses === "object" &&
+            !Array.isArray(semantics.responses)
+            ? semantics.responses
+            : undefined;
+        const resume = responses &&
+            responses.resume &&
+            typeof responses.resume === "object" &&
+            !Array.isArray(responses.resume)
+            ? responses.resume
+            : undefined;
+        return resume;
+    }
+    catch {
+        return undefined;
+    }
+}
+function liftResponsesResumeIntoSemantics(request, metadata) {
+    const resumeMeta = readResponsesResumeFromMetadata(metadata);
+    if (!resumeMeta) {
+        return request;
+    }
+    const next = {
+        ...request,
+        semantics: {
+            ...(request.semantics ??
+                {}),
+        },
+    };
+    const semantics = next.semantics;
+    if (!semantics.responses ||
+        typeof semantics.responses !== "object" ||
+        Array.isArray(semantics.responses)) {
+        semantics.responses = {};
+    }
+    const responsesNode = semantics.responses;
+    if (responsesNode.resume === undefined) {
+        responsesNode.resume = jsonClone(resumeMeta);
+    }
+    delete metadata.responsesResume;
+    return next;
+}
+function syncResponsesContextFromCanonicalMessages(request) {
+    const semantics = request?.semantics;
+    const responsesNode = semantics &&
+        typeof semantics === "object" &&
+        !Array.isArray(semantics) &&
+        semantics.responses &&
+        typeof semantics.responses === "object" &&
+        !Array.isArray(semantics.responses)
+        ? semantics.responses
+        : undefined;
+    const contextNode = responsesNode &&
+        responsesNode.context &&
+        typeof responsesNode.context === "object" &&
+        !Array.isArray(responsesNode.context)
+        ? responsesNode.context
+        : undefined;
+    if (!contextNode) {
+        return request;
+    }
+    const bridge = convertMessagesToBridgeInput({
+        messages: request.messages ?? [],
+        tools: Array.isArray(request.tools)
+            ? request.tools
+            : undefined,
+    });
+    return {
+        ...request,
+        semantics: {
+            ...semantics,
+            responses: {
+                ...responsesNode,
+                context: {
+                    ...contextNode,
+                    input: jsonClone(bridge.input),
+                    originalSystemMessages: jsonClone(bridge.originalSystemMessages),
+                },
+            },
+        },
+    };
+}
 function resolveApplyPatchToolModeFromTools(toolsRaw) {
     return resolveApplyPatchToolModeFromToolsWithNative(toolsRaw);
 }
@@ -303,23 +410,6 @@ export class HubPipeline {
     async executeRequestStagePipeline(normalized, hooks) {
         const semanticMapper = hooks.createSemanticMapper();
         const rawRequest = this.asJsonObject(normalized.payload);
-        // Detect applyPatchToolMode (runtime/tooling hint). Client tool schemas are captured as chat semantics
-        // in req_inbound_stage2_semantic_map; they must not be stored in metadata.
-        try {
-            const toolsRaw = Array.isArray(rawRequest?.tools)
-                ? rawRequest.tools
-                : null;
-            const applyPatchToolMode = resolveApplyPatchToolModeFromEnv() ??
-                resolveApplyPatchToolModeFromTools(toolsRaw);
-            if (applyPatchToolMode) {
-                normalized.metadata = normalized.metadata || {};
-                const rt = ensureRuntimeMetadata(normalized.metadata);
-                rt.applyPatchToolMode = applyPatchToolMode;
-            }
-        }
-        catch {
-            // best-effort: do not block request handling due to tool scan failures
-        }
         if (isCompactionRequest(rawRequest)) {
             normalized.metadata = normalized.metadata || {};
             const rt = ensureRuntimeMetadata(normalized.metadata);
@@ -341,16 +431,13 @@ export class HubPipeline {
             stageRecorder: inboundRecorder,
             requestId: normalized.id,
         });
-        const formatEnvelope = await runReqInboundStage1FormatParse({
+        const formatEnvelope = await measureHubStage(normalized.id, "request_stage.req_inbound.format_parse", () => runReqInboundStage1FormatParse({
             rawRequest,
             adapterContext: inboundAdapterContext,
             stageRecorder: inboundRecorder,
-        });
-        const responsesResumeFromMetadata = normalized.metadata &&
-            typeof normalized.metadata.responsesResume === "object"
-            ? normalized.metadata.responsesResume
-            : undefined;
-        const inboundStage2 = await runReqInboundStage2SemanticMap({
+        }));
+        const responsesResumeFromMetadata = readResponsesResumeFromMetadata(normalized.metadata);
+        const inboundStage2 = await measureHubStage(normalized.id, "request_stage.req_inbound.semantic_map", () => runReqInboundStage2SemanticMap({
             adapterContext: inboundAdapterContext,
             formatEnvelope,
             semanticMapper,
@@ -358,48 +445,23 @@ export class HubPipeline {
                 ? { responsesResume: responsesResumeFromMetadata }
                 : {}),
             stageRecorder: inboundRecorder,
-        });
+        }));
         // responsesResume must not enter chat_process as metadata; it is lifted into chat.semantics in stage2.
         if (responsesResumeFromMetadata &&
             normalized.metadata &&
             Object.prototype.hasOwnProperty.call(normalized.metadata, "responsesResume")) {
             delete normalized.metadata.responsesResume;
         }
-        const contextSnapshot = await hooks.captureContext({
+        const contextSnapshot = await measureHubStage(normalized.id, "request_stage.req_inbound.context_capture", () => hooks.captureContext({
             rawRequest,
             adapterContext: inboundAdapterContext,
+            chatEnvelope: inboundStage2.chatEnvelope,
             stageRecorder: inboundRecorder,
-        });
-        let standardizedRequest = inboundStage2.standardizedRequest;
-        // 全局唯一的历史图片清理：在 chat process 入口处，清理非最新 user 消息中的图片信息
-        try {
-            const { stripHistoricalImageAttachments } = await import("../process/chat-process-media.js");
-            standardizedRequest = {
-                ...standardizedRequest,
-                messages: stripHistoricalImageAttachments(standardizedRequest.messages),
-            };
-        }
-        catch {
-            // best-effort: don't block on media cleanup failures
-        }
-        try {
-            const rt = readRuntimeMetadata(normalized.metadata);
-            const mode = String(rt?.applyPatchToolMode || "")
-                .trim()
-                .toLowerCase();
-            if (mode === "freeform" || mode === "schema") {
-                standardizedRequest.metadata.applyPatchToolMode = mode;
-            }
-        }
-        catch {
-            // best-effort: do not block request handling due to metadata propagation failures
-        }
+        }));
+        let standardizedRequest = applyChatProcessEntryMediaCleanup(inboundStage2.standardizedRequest);
         const activeProcessMode = resolveActiveProcessMode(normalized.processMode, standardizedRequest.messages);
         if (activeProcessMode !== normalized.processMode) {
             normalized.processMode = activeProcessMode;
-            normalized.metadata = normalized.metadata || {};
-            normalized.metadata.processMode =
-                activeProcessMode;
         }
         const passthroughAudit = activeProcessMode === "passthrough"
             ? buildPassthroughAudit(rawRequest, normalized.providerProtocol)
@@ -442,14 +504,15 @@ export class HubPipeline {
         let processedRequest;
         if (activeProcessMode !== "passthrough") {
             assertNoMappableSemanticsInMetadata(metaBase, "chat_process.request.entry");
-            const processResult = await runReqProcessStage1ToolGovernance({
+            const processResult = await measureHubStage(normalized.id, "request_stage.req_process.tool_governance", () => runReqProcessStage1ToolGovernance({
                 request: standardizedRequest,
                 rawPayload: rawRequest,
                 metadata: metaBase,
                 entryEndpoint: normalized.entryEndpoint,
                 requestId: normalized.id,
+                applyPatchToolMode: normalized.applyPatchToolMode,
                 stageRecorder: inboundRecorder,
-            });
+            }));
             processedRequest = processResult.processedRequest;
             // Surface request-side clock reservation into pipeline metadata so response conversion
             // can commit delivery only after a successful response is produced.
@@ -482,17 +545,59 @@ export class HubPipeline {
                 annotatePassthroughGovernanceSkip(passthroughAudit);
             }
         }
-        let workingRequest = processedRequest ?? standardizedRequest;
+        let workingRequest = syncResponsesContextFromCanonicalMessages(processedRequest ?? standardizedRequest);
+        const sessionIdentifiers = extractSessionIdentifiersFromMetadata(normalized.metadata);
+        if (sessionIdentifiers.sessionId &&
+            normalized.metadata &&
+            typeof normalized.metadata === "object") {
+            normalized.metadata.sessionId =
+                sessionIdentifiers.sessionId;
+        }
+        if (sessionIdentifiers.conversationId &&
+            normalized.metadata &&
+            typeof normalized.metadata === "object") {
+            normalized.metadata.conversationId =
+                sessionIdentifiers.conversationId;
+        }
         // 使用与 VirtualRouter 一致的 tiktoken 计数逻辑，对标准化请求进行一次
         // 上下文 token 估算，供后续 usage 归一化与统计使用。
         try {
-            const estimatedTokens = computeRequestTokens(workingRequest, "");
+            const sessionEstimate = await measureHubStage(normalized.id, "request_stage.req_process.token_estimate.session_delta", () => estimateChatProcessSessionInputTokensDetailed({
+                sessionId: sessionIdentifiers.sessionId,
+                conversationId: sessionIdentifiers.conversationId,
+            }, workingRequest), {
+                mapCompletedDetails: (value) => ({
+                    forceLog: value.mode === "unavailable" ||
+                        value.mode === "session_reuse" ||
+                        value.mode === "session_delta",
+                    scope: value.scope,
+                    mode: value.mode,
+                    reason: value.reason,
+                    previousMessageCount: value.previousMessageCount,
+                    appendedMessageCount: value.appendedMessageCount,
+                    hasPreviousTokens: value.hasPreviousTokens,
+                    hasPreviousMessageCount: value.hasPreviousMessageCount,
+                    hasToolsSignature: value.hasToolsSignature,
+                    hasParametersSignature: value.hasParametersSignature,
+                    previousParametersSignatureDigest: value.previousParametersSignatureDigest,
+                    currentParametersSignatureDigest: value.currentParametersSignatureDigest,
+                }),
+            });
+            const estimatedTokens = typeof sessionEstimate.tokens === "number" &&
+                Number.isFinite(sessionEstimate.tokens) &&
+                sessionEstimate.tokens > 0
+                ? sessionEstimate.tokens
+                : await measureHubStage(normalized.id, "request_stage.req_process.token_estimate.full_count", () => computeRequestTokens(workingRequest, ""));
             if (typeof estimatedTokens === "number" &&
                 Number.isFinite(estimatedTokens) &&
                 estimatedTokens > 0) {
                 normalized.metadata = normalized.metadata || {};
                 normalized.metadata.estimatedInputTokens =
                     estimatedTokens;
+                saveChatProcessSessionInputEstimate({
+                    sessionId: sessionIdentifiers.sessionId,
+                    conversationId: sessionIdentifiers.conversationId,
+                }, workingRequest, estimatedTokens);
             }
         }
         catch {
@@ -501,48 +606,11 @@ export class HubPipeline {
         const normalizedMeta = normalized.metadata;
         // responsesResume is a client-protocol semantic (/v1/responses tool loop) and must live in chat.semantics.
         // Do not read it from metadata once entering chat_process.
-        const responsesResume = (() => {
-            try {
-                const semantics = workingRequest?.semantics;
-                const node = semantics &&
-                    typeof semantics === "object" &&
-                    !Array.isArray(semantics)
-                    ? semantics.responses
-                    : undefined;
-                const resume = node && typeof node === "object" && !Array.isArray(node)
-                    ? node.resume
-                    : undefined;
-                return resume && typeof resume === "object" && !Array.isArray(resume)
-                    ? resume
-                    : undefined;
-            }
-            catch {
-                return undefined;
-            }
-        })();
+        const responsesResume = readResponsesResumeFromRequestSemantics(workingRequest);
         const stdMetadata = workingRequest?.metadata;
-        const hasImageAttachment = stdMetadata?.hasImageAttachment === true ||
-            stdMetadata?.hasImageAttachment === "true" ||
-            normalizedMeta?.hasImageAttachment === true ||
-            normalizedMeta?.hasImageAttachment === "true";
+        const hasImageAttachment = containsImageAttachment((workingRequest.messages ?? []));
         const serverToolRequired = stdMetadata?.webSearchEnabled === true ||
             stdMetadata?.serverToolRequired === true;
-        const sessionIdentifiers = extractSessionIdentifiersFromMetadata(normalized.metadata);
-        // 将从 metadata / clientHeaders 中解析出的会话标识同步回 normalized.metadata，
-        // 便于后续 AdapterContext（响应侧 servertool）也能访问到相同的 sessionId /
-        // conversationId，用于 sticky-session 相关逻辑（例如 stopMessage）。
-        if (sessionIdentifiers.sessionId &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            normalized.metadata.sessionId =
-                sessionIdentifiers.sessionId;
-        }
-        if (sessionIdentifiers.conversationId &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            normalized.metadata.conversationId =
-                sessionIdentifiers.conversationId;
-        }
         const disableStickyRoutes = readRuntimeMetadata(normalized.metadata)?.disableStickyRoutes === true;
         const stopMessageRouterMetadata = resolveStopMessageRouterMetadata(normalized.metadata);
         const estimatedInputTokens = (() => {
@@ -573,28 +641,15 @@ export class HubPipeline {
                 : {}),
             ...stopMessageRouterMetadata,
         };
-        const routing = runReqProcessStage2RouteSelect({
+        const routing = await measureHubStage(normalized.id, "request_stage.req_process.route_select", () => runReqProcessStage2RouteSelect({
             routerEngine: this.routerEngine,
             request: workingRequest,
             metadataInput,
             normalizedMetadata: normalized.metadata,
             stageRecorder: inboundRecorder,
-        });
-        const stopMessageState = this.routerEngine.getStopMessageState(metadataInput);
-        const preCommandState = this.routerEngine.getPreCommandState(metadataInput);
-        if ((stopMessageState || preCommandState) &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            const rt = ensureRuntimeMetadata(normalized.metadata);
-            if (stopMessageState) {
-                rt.stopMessageState =
-                    stopMessageState;
-            }
-            if (preCommandState) {
-                rt.preCommandState =
-                    preCommandState;
-            }
-        }
+        }));
+        this.routerEngine.getStopMessageState(metadataInput);
+        this.routerEngine.getPreCommandState(metadataInput);
         // Emit virtual router hit log for debugging (orange [virtual-router] ...)
         try {
             const routeName = routing.decision?.routeName;
@@ -660,23 +715,23 @@ export class HubPipeline {
             const outboundContextSnapshot = protocolSwitch
                 ? undefined
                 : contextSnapshot;
-            const outboundStage1 = await runReqOutboundStage1SemanticMap({
+            const outboundStage1 = await measureHubStage(normalized.id, "request_stage.req_outbound.semantic_map", () => runReqOutboundStage1SemanticMap({
                 request: workingRequest,
                 adapterContext: outboundAdapterContext,
                 semanticMapper: outboundSemanticMapper,
                 contextSnapshot: outboundContextSnapshot,
                 contextMetadataKey: outboundContextMetadataKey,
                 stageRecorder: outboundRecorder,
-            });
-            let formattedPayload = await runReqOutboundStage2FormatBuild({
+            }));
+            let formattedPayload = await measureHubStage(normalized.id, "request_stage.req_outbound.format_build", () => runReqOutboundStage2FormatBuild({
                 formatEnvelope: outboundStage1.formatEnvelope,
                 stageRecorder: outboundRecorder,
-            });
-            formattedPayload = await runReqOutboundStage3Compat({
+            }));
+            formattedPayload = await measureHubStage(normalized.id, "request_stage.req_outbound.compat", () => runReqOutboundStage3Compat({
                 payload: formattedPayload,
                 adapterContext: outboundAdapterContext,
                 stageRecorder: outboundRecorder,
-            });
+            }));
             if (shadowCompareBaselineMode) {
                 const baselinePolicy = {
                     ...(effectivePolicy ?? {}),
@@ -719,7 +774,7 @@ export class HubPipeline {
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
             });
-            providerPayload = applyHubProviderOutboundPolicy({
+            providerPayload = (await measureHubStage(normalized.id, "request_stage.req_outbound.provider_policy", () => applyHubProviderOutboundPolicy({
                 policy: effectivePolicy,
                 providerProtocol: outboundProtocol,
                 compatibilityProfile: typeof outboundAdapterContext.compatibilityProfile === "string"
@@ -728,14 +783,14 @@ export class HubPipeline {
                 payload: formattedPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            });
-            providerPayload = applyProviderOutboundToolSurface({
+            })));
+            providerPayload = (await measureHubStage(normalized.id, "request_stage.req_outbound.tool_surface", () => applyProviderOutboundToolSurface({
                 config: this.config.toolSurface,
                 providerProtocol: outboundProtocol,
                 payload: providerPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            });
+            })));
             providerPayload = maybeApplyDirectBuiltinWebSearchTool(providerPayload, outboundAdapterContext, outboundProtocol);
             recordHubPolicyObservation({
                 policy: effectivePolicy,
@@ -771,7 +826,7 @@ export class HubPipeline {
         //
         // 注意：这里不再根据 processMode(passthrough/chat) 做分支判断——即使某些
         // route 将 processMode 标记为 passthrough，我们仍然需要保留一次规范化后的
-        // Chat 请求快照，供 stopMessage / empty_reply_continue 等被动触发型
+        // Chat 请求快照，供 stopMessage 等被动触发型
         // servertool 在响应阶段使用。
         //
         // 之前这里通过 JSON.stringify/parse 做深拷贝，但在部分 Responses/Gemini
@@ -796,7 +851,6 @@ export class HubPipeline {
         };
         const metadata = {
             ...normalized.metadata,
-            ...(hasImageAttachment ? { hasImageAttachment: true } : {}),
             capturedChatRequest,
             entryEndpoint: normalized.entryEndpoint,
             providerProtocol: outboundProtocol,
@@ -819,6 +873,12 @@ export class HubPipeline {
                 }
                 : {}),
         };
+        if (hasImageAttachment) {
+            metadata.hasImageAttachment = true;
+        }
+        else {
+            delete metadata.hasImageAttachment;
+        }
         return {
             requestId: normalized.id,
             providerPayload,
@@ -956,25 +1016,11 @@ export class HubPipeline {
             rtBase.clock = clockConfig;
         }
         normalized.metadata = metaBase;
-        const standardizedRequest = standardizedRequestBase;
-        // 全局唯一的历史图片清理：在 chat process 入口处，清理非最新 user 消息中的图片信息
-        let cleanedRequest = standardizedRequest;
-        try {
-            const { stripHistoricalImageAttachments } = await import("../process/chat-process-media.js");
-            cleanedRequest = {
-                ...cleanedRequest,
-                messages: stripHistoricalImageAttachments(cleanedRequest.messages),
-            };
-        }
-        catch {
-            // best-effort: don't block on media cleanup failures
-        }
+        const cleanedRequest = applyChatProcessEntryMediaCleanup(standardizedRequestBase);
+        let standardizedRequest = cleanedRequest;
         const activeProcessMode = resolveActiveProcessMode(normalized.processMode, cleanedRequest.messages);
         if (activeProcessMode !== normalized.processMode) {
             normalized.processMode = activeProcessMode;
-            normalized.metadata = normalized.metadata || {};
-            normalized.metadata.processMode =
-                activeProcessMode;
         }
         const passthroughAudit = activeProcessMode === "passthrough"
             ? buildPassthroughAudit(rawPayload, normalized.providerProtocol)
@@ -982,42 +1028,11 @@ export class HubPipeline {
         // Semantic Gate (chat_process entry): lift any mappable protocol semantics from metadata into request.semantics.
         // This is the last chance before entering chat_process; after this point we fail-fast on banned metadata keys.
         try {
-            const resumeMeta = metaBase &&
-                typeof metaBase.responsesResume === "object" &&
-                metaBase.responsesResume
-                ? metaBase.responsesResume
-                : undefined;
-            if (resumeMeta) {
-                standardizedRequest.semantics =
-                    standardizedRequest.semantics ?? {};
-                const semantics = standardizedRequest.semantics;
-                if (!semantics.responses ||
-                    typeof semantics.responses !== "object" ||
-                    Array.isArray(semantics.responses)) {
-                    semantics.responses = {};
-                }
-                const responsesNode = semantics.responses;
-                if (responsesNode.resume === undefined) {
-                    responsesNode.resume = jsonClone(resumeMeta);
-                }
-                delete metaBase.responsesResume;
-            }
+            standardizedRequest = liftResponsesResumeIntoSemantics(standardizedRequest, metaBase);
         }
         catch {
             // best-effort; validation happens below
         }
-        try {
-            const rt = readRuntimeMetadata(metaBase);
-            const mode = String(rt?.applyPatchToolMode || "")
-                .trim()
-                .toLowerCase();
-            if (mode === "freeform" || mode === "schema") {
-                standardizedRequest.metadata.applyPatchToolMode = mode;
-            }
-        }
-        catch {
-            // ignore
-        }
         const adapterContext = this.buildAdapterContext(normalized);
         const stageRecorder = this.maybeCreateStageRecorder(adapterContext, normalized.entryEndpoint, {
             disableSnapshots: normalized.disableSnapshots === true,
@@ -1025,14 +1040,15 @@ export class HubPipeline {
         let processedRequest;
         if (activeProcessMode !== "passthrough") {
             assertNoMappableSemanticsInMetadata(metaBase, "chat_process.request.entry");
-            const processResult = await runReqProcessStage1ToolGovernance({
+            const processResult = await measureHubStage(normalized.id, "chat_entry.req_process.tool_governance", () => runReqProcessStage1ToolGovernance({
                 request: standardizedRequest,
                 rawPayload,
                 metadata: metaBase,
                 entryEndpoint: normalized.entryEndpoint,
                 requestId: normalized.id,
+                applyPatchToolMode: normalized.applyPatchToolMode,
                 stageRecorder,
-            });
+            }));
             processedRequest = processResult.processedRequest;
             // Surface request-side clock reservation into pipeline metadata so response conversion
             // can commit delivery only after a successful response is produced.
@@ -1065,16 +1081,58 @@ export class HubPipeline {
                 annotatePassthroughGovernanceSkip(passthroughAudit);
             }
         }
-        let workingRequest = processedRequest ?? standardizedRequest;
+        let workingRequest = syncResponsesContextFromCanonicalMessages(processedRequest ?? standardizedRequest);
+        const sessionIdentifiers = extractSessionIdentifiersFromMetadata(normalized.metadata);
+        if (sessionIdentifiers.sessionId &&
+            normalized.metadata &&
+            typeof normalized.metadata === "object") {
+            normalized.metadata.sessionId =
+                sessionIdentifiers.sessionId;
+        }
+        if (sessionIdentifiers.conversationId &&
+            normalized.metadata &&
+            typeof normalized.metadata === "object") {
+            normalized.metadata.conversationId =
+                sessionIdentifiers.conversationId;
+        }
         // Token estimate for stats/diagnostics (best-effort).
         try {
-            const estimatedTokens = computeRequestTokens(workingRequest, "");
+            const sessionEstimate = await measureHubStage(normalized.id, "chat_entry.req_process.token_estimate.session_delta", () => estimateChatProcessSessionInputTokensDetailed({
+                sessionId: sessionIdentifiers.sessionId,
+                conversationId: sessionIdentifiers.conversationId,
+            }, workingRequest), {
+                mapCompletedDetails: (value) => ({
+                    forceLog: value.mode === "unavailable" ||
+                        value.mode === "session_reuse" ||
+                        value.mode === "session_delta",
+                    scope: value.scope,
+                    mode: value.mode,
+                    reason: value.reason,
+                    previousMessageCount: value.previousMessageCount,
+                    appendedMessageCount: value.appendedMessageCount,
+                    hasPreviousTokens: value.hasPreviousTokens,
+                    hasPreviousMessageCount: value.hasPreviousMessageCount,
+                    hasToolsSignature: value.hasToolsSignature,
+                    hasParametersSignature: value.hasParametersSignature,
+                    previousParametersSignatureDigest: value.previousParametersSignatureDigest,
+                    currentParametersSignatureDigest: value.currentParametersSignatureDigest,
+                }),
+            });
+            const estimatedTokens = typeof sessionEstimate.tokens === "number" &&
+                Number.isFinite(sessionEstimate.tokens) &&
+                sessionEstimate.tokens > 0
+                ? sessionEstimate.tokens
+                : await measureHubStage(normalized.id, "chat_entry.req_process.token_estimate.full_count", () => computeRequestTokens(workingRequest, ""));
             if (typeof estimatedTokens === "number" &&
                 Number.isFinite(estimatedTokens) &&
                 estimatedTokens > 0) {
                 normalized.metadata = normalized.metadata || {};
                 normalized.metadata.estimatedInputTokens =
                     estimatedTokens;
+                saveChatProcessSessionInputEstimate({
+                    sessionId: sessionIdentifiers.sessionId,
+                    conversationId: sessionIdentifiers.conversationId,
+                }, workingRequest, estimatedTokens);
             }
         }
         catch {
@@ -1083,45 +1141,11 @@ export class HubPipeline {
         const normalizedMeta = normalized.metadata;
         // responsesResume is a client-protocol semantic (/v1/responses tool loop) and must live in chat.semantics.
         // Do not read it from metadata once entering chat_process.
-        const responsesResume = (() => {
-            try {
-                const semantics = workingRequest?.semantics;
-                const node = semantics &&
-                    typeof semantics === "object" &&
-                    !Array.isArray(semantics)
-                    ? semantics.responses
-                    : undefined;
-                const resume = node && typeof node === "object" && !Array.isArray(node)
-                    ? node.resume
-                    : undefined;
-                return resume && typeof resume === "object" && !Array.isArray(resume)
-                    ? resume
-                    : undefined;
-            }
-            catch {
-                return undefined;
-            }
-        })();
+        const responsesResume = readResponsesResumeFromRequestSemantics(workingRequest);
         const stdMetadata = workingRequest?.metadata;
-        const hasImageAttachment = stdMetadata?.hasImageAttachment === true ||
-            stdMetadata?.hasImageAttachment === "true" ||
-            normalizedMeta?.hasImageAttachment === true ||
-            normalizedMeta?.hasImageAttachment === "true";
+        const hasImageAttachment = containsImageAttachment((workingRequest.messages ?? []));
         const serverToolRequired = stdMetadata?.webSearchEnabled === true ||
             stdMetadata?.serverToolRequired === true;
-        const sessionIdentifiers = extractSessionIdentifiersFromMetadata(normalized.metadata);
-        if (sessionIdentifiers.sessionId &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            normalized.metadata.sessionId =
-                sessionIdentifiers.sessionId;
-        }
-        if (sessionIdentifiers.conversationId &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            normalized.metadata.conversationId =
-                sessionIdentifiers.conversationId;
-        }
         const disableStickyRoutes = readRuntimeMetadata(normalized.metadata)?.disableStickyRoutes === true;
         const stopMessageRouterMetadata = resolveStopMessageRouterMetadata(normalized.metadata);
         const metadataInput = {
@@ -1144,28 +1168,15 @@ export class HubPipeline {
                 : {}),
             ...stopMessageRouterMetadata,
         };
-        const routing = runReqProcessStage2RouteSelect({
+        const routing = await measureHubStage(normalized.id, "chat_entry.req_process.route_select", () => runReqProcessStage2RouteSelect({
             routerEngine: this.routerEngine,
             request: workingRequest,
             metadataInput,
             normalizedMetadata: normalized.metadata,
             stageRecorder,
-        });
-        const stopMessageState = this.routerEngine.getStopMessageState(metadataInput);
-        const preCommandState = this.routerEngine.getPreCommandState(metadataInput);
-        if ((stopMessageState || preCommandState) &&
-            normalized.metadata &&
-            typeof normalized.metadata === "object") {
-            const rt = ensureRuntimeMetadata(normalized.metadata);
-            if (stopMessageState) {
-                rt.stopMessageState =
-                    stopMessageState;
-            }
-            if (preCommandState) {
-                rt.preCommandState =
-                    preCommandState;
-            }
-        }
+        }));
+        this.routerEngine.getStopMessageState(metadataInput);
+        this.routerEngine.getPreCommandState(metadataInput);
         // Emit virtual router hit log for debugging (same as inbound path).
         try {
             const routeName = routing.decision?.routeName;
@@ -1224,23 +1235,23 @@ export class HubPipeline {
                 ? outboundHooks.contextMetadataKey
                 : hooks.contextMetadataKey;
             const outboundContextSnapshot = undefined;
-            const outboundStage1 = await runReqOutboundStage1SemanticMap({
+            const outboundStage1 = await measureHubStage(normalized.id, "chat_entry.req_outbound.semantic_map", () => runReqOutboundStage1SemanticMap({
                 request: workingRequest,
                 adapterContext: outboundAdapterContext,
                 semanticMapper: outboundSemanticMapper,
                 contextSnapshot: outboundContextSnapshot,
                 contextMetadataKey: outboundContextMetadataKey,
                 stageRecorder: outboundRecorder,
-            });
-            let formattedPayload = await runReqOutboundStage2FormatBuild({
+            }));
+            let formattedPayload = await measureHubStage(normalized.id, "chat_entry.req_outbound.format_build", () => runReqOutboundStage2FormatBuild({
                 formatEnvelope: outboundStage1.formatEnvelope,
                 stageRecorder: outboundRecorder,
-            });
-            formattedPayload = await runReqOutboundStage3Compat({
+            }));
+            formattedPayload = await measureHubStage(normalized.id, "chat_entry.req_outbound.compat", () => runReqOutboundStage3Compat({
                 payload: formattedPayload,
                 adapterContext: outboundAdapterContext,
                 stageRecorder: outboundRecorder,
-            });
+            }));
             // Phase 0/1: observe + enforce provider outbound policy and tool surface (same as inbound path).
             const effectivePolicy = normalized.policyOverride ?? this.config.policy;
             recordHubPolicyObservation({
@@ -1253,7 +1264,7 @@ export class HubPipeline {
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
             });
-            providerPayload = applyHubProviderOutboundPolicy({
+            providerPayload = (await measureHubStage(normalized.id, "chat_entry.req_outbound.provider_policy", () => applyHubProviderOutboundPolicy({
                 policy: effectivePolicy,
                 providerProtocol: outboundProtocol,
                 compatibilityProfile: typeof outboundAdapterContext.compatibilityProfile === "string"
@@ -1262,14 +1273,14 @@ export class HubPipeline {
                 payload: formattedPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            });
-            providerPayload = applyProviderOutboundToolSurface({
+            })));
+            providerPayload = (await measureHubStage(normalized.id, "chat_entry.req_outbound.tool_surface", () => applyProviderOutboundToolSurface({
                 config: this.config.toolSurface,
                 providerProtocol: outboundProtocol,
                 payload: providerPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            });
+            })));
             providerPayload = maybeApplyDirectBuiltinWebSearchTool(providerPayload, outboundAdapterContext, outboundProtocol);
             recordHubPolicyObservation({
                 policy: effectivePolicy,
@@ -1312,7 +1323,6 @@ export class HubPipeline {
         };
         const metadata = {
             ...normalized.metadata,
-            ...(hasImageAttachment ? { hasImageAttachment: true } : {}),
             capturedChatRequest,
             entryEndpoint: normalized.entryEndpoint,
             providerProtocol: outboundProtocol,
@@ -1325,6 +1335,12 @@ export class HubPipeline {
                 ? { providerStream: outboundStream }
                 : {}),
         };
+        if (hasImageAttachment) {
+            metadata.hasImageAttachment = true;
+        }
+        else {
+            delete metadata.hasImageAttachment;
+        }
         return {
             requestId: normalized.id,
             providerPayload,
@@ -1338,16 +1354,27 @@ export class HubPipeline {
         };
     }
     async execute(request) {
-        const normalized = await this.normalizeRequest(request);
+        const requestId = request && typeof request === "object" && typeof request.id === "string" && request.id.trim()
+            ? request.id.trim()
+            : `req_${Date.now()}`;
+        const normalized = await measureHubStage(requestId, "execute.normalize_request", () => this.normalizeRequest(request), {
+            mapCompletedDetails: (value) => ({
+                providerProtocol: value.providerProtocol,
+                direction: value.direction,
+                stage: value.stage,
+                processMode: value.processMode,
+                hubEntryMode: value.hubEntryMode ?? null
+            })
+        });
         if (normalized.direction === "request" &&
             normalized.hubEntryMode === "chat_process") {
-            return await this.executeChatProcessEntryPipeline(normalized);
+            return await measureHubStage(normalized.id, "execute.chat_process_entry", () => this.executeChatProcessEntryPipeline(normalized));
         }
         const hooks = this.resolveProtocolHooks(normalized.providerProtocol);
         if (!hooks) {
             throw new Error(`Unsupported provider protocol for hub pipeline: ${normalized.providerProtocol}`);
         }
-        return await this.executeRequestStagePipeline(normalized, hooks);
+        return await measureHubStage(normalized.id, "execute.request_stage_pipeline", () => this.executeRequestStagePipeline(normalized, hooks));
     }
     captureAnthropicAliasMap(normalized, adapterContext, chatEnvelope) {
         if (!this.shouldCaptureAnthropicAlias(normalized.entryEndpoint)) {
@@ -1463,7 +1490,9 @@ export class HubPipeline {
             : normalized.stream === false
                 ? "disable"
                 : "auto";
-        const toolCallIdStyle = normalizeReqInboundToolCallIdStyleWithNative(metadata.toolCallIdStyle);
+        const targetToolCallIdStyle = normalizeReqInboundToolCallIdStyleWithNative(target?.responsesConfig
+            ?.toolCallIdStyle);
+        const toolCallIdStyle = targetToolCallIdStyle ?? normalized.toolCallIdStyle;
         const adapterContext = {
             requestId: normalized.id,
             entryEndpoint: normalized.entryEndpoint || "/v1/chat/completions",
@@ -1473,6 +1502,9 @@ export class HubPipeline {
             profileId,
             streamingHint,
             toolCallIdStyle,
+            ...(normalized.applyPatchToolMode
+                ? { applyPatchToolMode: normalized.applyPatchToolMode }
+                : {}),
             ...(compatibilityProfile ? { compatibilityProfile } : {}),
         };
         const targetDeepseek = isJsonObject(target?.deepseek)
@@ -1700,6 +1732,9 @@ export class HubPipeline {
             : endpoint;
         const providerProtocol = resolveProviderProtocol(metadataRecord.providerProtocol);
         const processMode = metadataRecord.processMode === "passthrough" ? "passthrough" : "chat";
+        if (Object.prototype.hasOwnProperty.call(metadataRecord, "processMode")) {
+            delete metadataRecord.processMode;
+        }
         const direction = metadataRecord.direction === "response" ? "response" : "request";
         const stage = metadataRecord.stage === "outbound" ? "outbound" : "inbound";
         const resolvedReadable = this.unwrapReadable(request.payload);
@@ -1708,16 +1743,36 @@ export class HubPipeline {
             (request.payload &&
                 typeof request.payload === "object" &&
                 request.payload.stream));
-        let payload = await this.materializePayload(request.payload, {
+        let payload = await measureHubStage(id, "normalize.materialize_payload", () => this.materializePayload(request.payload, {
             requestId: id,
             entryEndpoint,
             providerProtocol,
             metadata: metadataRecord,
-        }, resolvedReadable);
+        }, resolvedReadable), {
+            startDetails: {
+                hasReadable: Boolean(resolvedReadable),
+                providerProtocol,
+                entryEndpoint
+            }
+        });
         const routeHint = typeof metadataRecord.routeHint === "string"
             ? metadataRecord.routeHint
             : undefined;
-        const orchestrationResult = runHubPipelineOrchestrationWithNative({
+        if (Object.prototype.hasOwnProperty.call(metadataRecord, "routeHint")) {
+            delete metadataRecord.routeHint;
+        }
+        const toolCallIdStyle = normalizeReqInboundToolCallIdStyleWithNative(metadataRecord.toolCallIdStyle);
+        if (Object.prototype.hasOwnProperty.call(metadataRecord, "toolCallIdStyle")) {
+            delete metadataRecord.toolCallIdStyle;
+        }
+        const applyPatchToolMode = resolveApplyPatchToolModeFromEnv() ??
+            resolveApplyPatchToolModeFromTools(Array.isArray(payload.tools)
+                ? (payload.tools ?? null)
+                : null);
+        if (Object.prototype.hasOwnProperty.call(metadataRecord, "applyPatchToolMode")) {
+            delete metadataRecord.applyPatchToolMode;
+        }
+        const orchestrationResult = await measureHubStage(id, "normalize.native_orchestration", () => runHubPipelineOrchestrationWithNative({
             requestId: id,
             endpoint,
             entryEndpoint,
@@ -1736,6 +1791,20 @@ export class HubPipeline {
             processMode,
             direction,
             stage,
+        }), {
+            startDetails: {
+                providerProtocol,
+                processMode,
+                direction,
+                stage,
+                stream
+            },
+            mapCompletedDetails: (value) => ({
+                success: value.success,
+                hasPayload: Boolean(value.payload),
+                hasMetadata: Boolean(value.metadata),
+                errorCode: value.error?.code
+            })
         });
         if (!orchestrationResult.success) {
             const code = orchestrationResult.error &&
@@ -1751,19 +1820,24 @@ export class HubPipeline {
         if (orchestrationResult.payload) {
             payload = orchestrationResult.payload;
         }
+        const orchestrationMetadata = {
+            ...(orchestrationResult.metadata ?? {}),
+        };
+        if (Object.prototype.hasOwnProperty.call(orchestrationMetadata, "processMode")) {
+            delete orchestrationMetadata.processMode;
+        }
+        if (Object.prototype.hasOwnProperty.call(orchestrationMetadata, "routeHint")) {
+            delete orchestrationMetadata.routeHint;
+        }
         const normalizedMetadata = {
             ...metadataRecord,
             entryEndpoint,
             providerProtocol,
-            processMode,
             direction,
             stage,
             stream,
-            ...(orchestrationResult.metadata ?? {}),
+            ...orchestrationMetadata,
         };
-        if (routeHint) {
-            normalizedMetadata.routeHint = routeHint;
-        }
         return {
             id,
             endpoint,
@@ -1779,6 +1853,8 @@ export class HubPipeline {
             stage,
             stream,
             routeHint,
+            ...(toolCallIdStyle ? { toolCallIdStyle } : {}),
+            ...(applyPatchToolMode ? { applyPatchToolMode } : {}),
             ...(hubEntryMode ? { hubEntryMode } : {}),
         };
     }