@jsonstudio/llms 0.6.3685 → 0.6.3686

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

@@ -15,7 +15,6 @@ 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";
@@ -28,14 +27,15 @@ import { runReqOutboundStage2FormatBuild } from "./stages/req_outbound/req_outbo
 import { runReqOutboundStage3Compat } from "./stages/req_outbound/req_outbound_stage3_compat/index.js";
 import { extractSessionIdentifiersFromMetadata } from "./session-identifiers.js";
 import { computeRequestTokens } from "../../../router/virtual-router/token-estimator.js";
+import { estimateSessionBoundTokens } from "../process/chat-process-session-usage.js";
 import { annotatePassthroughGovernanceSkipWithNative, attachPassthroughProviderInputAuditWithNative, buildPassthroughAuditWithNative, applyOutboundStreamPreferenceWithNative, normalizeHubEndpointWithNative, extractAdapterContextMetadataFieldsWithNative, resolveApplyPatchToolModeFromToolsWithNative, resolveHubClientProtocolWithNative, resolveHubPolicyOverrideFromMetadataWithNative, resolveHubProviderProtocolWithNative, resolveOutboundStreamIntentWithNative, resolveHubShadowCompareConfigWithNative, resolveActiveProcessModeWithNative, findMappableSemanticsKeysWithNative, resolveHubSseProtocolFromMetadataWithNative, resolveStopMessageRouterMetadataWithNative, runHubPipelineOrchestrationWithNative, } from "../../../router/virtual-router/engine-selection/native-hub-pipeline-orchestration-semantics.js";
 import { normalizeAliasMapWithNative, resolveAliasMapFromRespSemanticsWithNative, } from "../../../router/virtual-router/engine-selection/native-hub-pipeline-resp-semantics.js";
 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";
+import { containsImageAttachment, stripHistoricalImageAttachments, stripHistoricalVisualToolOutputs, repairIncompleteToolCalls, } from "../process/chat-process-media.js";
+import { measureHubStage, logHubStageTiming } from "./hub-stage-timing.js";
 function isTruthyEnv(value) {
     const v = typeof value === "string" ? value.trim().toLowerCase() : "";
     return v === "1" || v === "true" || v === "yes" || v === "on";
@@ -59,7 +59,7 @@ function resolveApplyPatchToolModeFromEnv() {
 function applyChatProcessEntryMediaCleanup(request) {
     return {
         ...request,
-        messages: stripHistoricalVisualToolOutputs(stripHistoricalImageAttachments(request.messages)),
+        messages: repairIncompleteToolCalls(stripHistoricalVisualToolOutputs(stripHistoricalImageAttachments(request.messages))),
     };
 }
 function readResponsesResumeFromMetadata(metadata) {
@@ -410,6 +410,23 @@ 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);
@@ -431,13 +448,13 @@ export class HubPipeline {
             stageRecorder: inboundRecorder,
             requestId: normalized.id,
         });
-        const formatEnvelope = await measureHubStage(normalized.id, "request_stage.req_inbound.format_parse", () => runReqInboundStage1FormatParse({
+        const formatEnvelope = await measureHubStage(normalized.id, "req_inbound.stage1_format_parse", () => runReqInboundStage1FormatParse({
             rawRequest,
             adapterContext: inboundAdapterContext,
             stageRecorder: inboundRecorder,
         }));
         const responsesResumeFromMetadata = readResponsesResumeFromMetadata(normalized.metadata);
-        const inboundStage2 = await measureHubStage(normalized.id, "request_stage.req_inbound.semantic_map", () => runReqInboundStage2SemanticMap({
+        const inboundStage2 = await measureHubStage(normalized.id, "req_inbound.stage2_semantic_map", () => runReqInboundStage2SemanticMap({
             adapterContext: inboundAdapterContext,
             formatEnvelope,
             semanticMapper,
@@ -452,13 +469,29 @@ export class HubPipeline {
             Object.prototype.hasOwnProperty.call(normalized.metadata, "responsesResume")) {
             delete normalized.metadata.responsesResume;
         }
-        const contextSnapshot = await measureHubStage(normalized.id, "request_stage.req_inbound.context_capture", () => hooks.captureContext({
-            rawRequest,
-            adapterContext: inboundAdapterContext,
-            chatEnvelope: inboundStage2.chatEnvelope,
-            stageRecorder: inboundRecorder,
-        }));
+        const contextSnapshot = await measureHubStage(normalized.id, "req_inbound.stage3_context_capture", () => {
+            if (inboundStage2.responsesContext) {
+                return inboundStage2.responsesContext;
+            }
+            return hooks.captureContext({
+                rawRequest,
+                adapterContext: inboundAdapterContext,
+                stageRecorder: inboundRecorder,
+            });
+        });
         let standardizedRequest = applyChatProcessEntryMediaCleanup(inboundStage2.standardizedRequest);
+        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
+        }
         const activeProcessMode = resolveActiveProcessMode(normalized.processMode, standardizedRequest.messages);
         if (activeProcessMode !== normalized.processMode) {
             normalized.processMode = activeProcessMode;
@@ -504,13 +537,12 @@ export class HubPipeline {
         let processedRequest;
         if (activeProcessMode !== "passthrough") {
             assertNoMappableSemanticsInMetadata(metaBase, "chat_process.request.entry");
-            const processResult = await measureHubStage(normalized.id, "request_stage.req_process.tool_governance", () => runReqProcessStage1ToolGovernance({
+            const processResult = await measureHubStage(normalized.id, "req_process.stage1_tool_governance", () => runReqProcessStage1ToolGovernance({
                 request: standardizedRequest,
                 rawPayload: rawRequest,
                 metadata: metaBase,
                 entryEndpoint: normalized.entryEndpoint,
                 requestId: normalized.id,
-                applyPatchToolMode: normalized.applyPatchToolMode,
                 stageRecorder: inboundRecorder,
             }));
             processedRequest = processResult.processedRequest;
@@ -546,58 +578,16 @@ export class HubPipeline {
             }
         }
         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 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, ""));
+            const estimatedTokens = estimateSessionBoundTokens(workingRequest, normalized.metadata) ?? 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 {
@@ -611,6 +601,22 @@ export class HubPipeline {
         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 = (() => {
@@ -641,15 +647,15 @@ export class HubPipeline {
                 : {}),
             ...stopMessageRouterMetadata,
         };
-        const routing = await measureHubStage(normalized.id, "request_stage.req_process.route_select", () => runReqProcessStage2RouteSelect({
+        logHubStageTiming(normalized.id, "req_process.stage2_route_select", "start");
+        const routing = runReqProcessStage2RouteSelect({
             routerEngine: this.routerEngine,
             request: workingRequest,
             metadataInput,
             normalizedMetadata: normalized.metadata,
             stageRecorder: inboundRecorder,
-        }));
-        this.routerEngine.getStopMessageState(metadataInput);
-        this.routerEngine.getPreCommandState(metadataInput);
+        });
+        logHubStageTiming(normalized.id, "req_process.stage2_route_select", "completed");
         // Emit virtual router hit log for debugging (orange [virtual-router] ...)
         try {
             const routeName = routing.decision?.routeName;
@@ -715,7 +721,7 @@ export class HubPipeline {
             const outboundContextSnapshot = protocolSwitch
                 ? undefined
                 : contextSnapshot;
-            const outboundStage1 = await measureHubStage(normalized.id, "request_stage.req_outbound.semantic_map", () => runReqOutboundStage1SemanticMap({
+            const outboundStage1 = await measureHubStage(normalized.id, "req_outbound.stage1_semantic_map", () => runReqOutboundStage1SemanticMap({
                 request: workingRequest,
                 adapterContext: outboundAdapterContext,
                 semanticMapper: outboundSemanticMapper,
@@ -723,11 +729,11 @@ export class HubPipeline {
                 contextMetadataKey: outboundContextMetadataKey,
                 stageRecorder: outboundRecorder,
             }));
-            let formattedPayload = await measureHubStage(normalized.id, "request_stage.req_outbound.format_build", () => runReqOutboundStage2FormatBuild({
+            let formattedPayload = await measureHubStage(normalized.id, "req_outbound.stage2_format_build", () => runReqOutboundStage2FormatBuild({
                 formatEnvelope: outboundStage1.formatEnvelope,
                 stageRecorder: outboundRecorder,
             }));
-            formattedPayload = await measureHubStage(normalized.id, "request_stage.req_outbound.compat", () => runReqOutboundStage3Compat({
+            formattedPayload = await measureHubStage(normalized.id, "req_outbound.stage3_compat", () => runReqOutboundStage3Compat({
                 payload: formattedPayload,
                 adapterContext: outboundAdapterContext,
                 stageRecorder: outboundRecorder,
@@ -774,7 +780,7 @@ export class HubPipeline {
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
             });
-            providerPayload = (await measureHubStage(normalized.id, "request_stage.req_outbound.provider_policy", () => applyHubProviderOutboundPolicy({
+            providerPayload = applyHubProviderOutboundPolicy({
                 policy: effectivePolicy,
                 providerProtocol: outboundProtocol,
                 compatibilityProfile: typeof outboundAdapterContext.compatibilityProfile === "string"
@@ -783,14 +789,14 @@ export class HubPipeline {
                 payload: formattedPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            })));
-            providerPayload = (await measureHubStage(normalized.id, "request_stage.req_outbound.tool_surface", () => applyProviderOutboundToolSurface({
+            });
+            providerPayload = applyProviderOutboundToolSurface({
                 config: this.config.toolSurface,
                 providerProtocol: outboundProtocol,
                 payload: providerPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            })));
+            });
             providerPayload = maybeApplyDirectBuiltinWebSearchTool(providerPayload, outboundAdapterContext, outboundProtocol);
             recordHubPolicyObservation({
                 policy: effectivePolicy,
@@ -1033,6 +1039,18 @@ export class HubPipeline {
         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,
@@ -1040,15 +1058,14 @@ export class HubPipeline {
         let processedRequest;
         if (activeProcessMode !== "passthrough") {
             assertNoMappableSemanticsInMetadata(metaBase, "chat_process.request.entry");
-            const processResult = await measureHubStage(normalized.id, "chat_entry.req_process.tool_governance", () => runReqProcessStage1ToolGovernance({
+            const processResult = await 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.
@@ -1082,57 +1099,15 @@ export class HubPipeline {
             }
         }
         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 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, ""));
+            const estimatedTokens = estimateSessionBoundTokens(workingRequest, normalized.metadata) ?? 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 {
@@ -1146,6 +1121,19 @@ export class HubPipeline {
         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 = {
@@ -1168,15 +1156,13 @@ export class HubPipeline {
                 : {}),
             ...stopMessageRouterMetadata,
         };
-        const routing = await measureHubStage(normalized.id, "chat_entry.req_process.route_select", () => runReqProcessStage2RouteSelect({
+        const routing = runReqProcessStage2RouteSelect({
             routerEngine: this.routerEngine,
             request: workingRequest,
             metadataInput,
             normalizedMetadata: normalized.metadata,
             stageRecorder,
-        }));
-        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;
@@ -1235,7 +1221,7 @@ export class HubPipeline {
                 ? outboundHooks.contextMetadataKey
                 : hooks.contextMetadataKey;
             const outboundContextSnapshot = undefined;
-            const outboundStage1 = await measureHubStage(normalized.id, "chat_entry.req_outbound.semantic_map", () => runReqOutboundStage1SemanticMap({
+            const outboundStage1 = await measureHubStage(normalized.id, "req_outbound.stage1_semantic_map", () => runReqOutboundStage1SemanticMap({
                 request: workingRequest,
                 adapterContext: outboundAdapterContext,
                 semanticMapper: outboundSemanticMapper,
@@ -1243,11 +1229,11 @@ export class HubPipeline {
                 contextMetadataKey: outboundContextMetadataKey,
                 stageRecorder: outboundRecorder,
             }));
-            let formattedPayload = await measureHubStage(normalized.id, "chat_entry.req_outbound.format_build", () => runReqOutboundStage2FormatBuild({
+            let formattedPayload = await measureHubStage(normalized.id, "req_outbound.stage2_format_build", () => runReqOutboundStage2FormatBuild({
                 formatEnvelope: outboundStage1.formatEnvelope,
                 stageRecorder: outboundRecorder,
             }));
-            formattedPayload = await measureHubStage(normalized.id, "chat_entry.req_outbound.compat", () => runReqOutboundStage3Compat({
+            formattedPayload = await measureHubStage(normalized.id, "req_outbound.stage3_compat", () => runReqOutboundStage3Compat({
                 payload: formattedPayload,
                 adapterContext: outboundAdapterContext,
                 stageRecorder: outboundRecorder,
@@ -1264,7 +1250,7 @@ export class HubPipeline {
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
             });
-            providerPayload = (await measureHubStage(normalized.id, "chat_entry.req_outbound.provider_policy", () => applyHubProviderOutboundPolicy({
+            providerPayload = applyHubProviderOutboundPolicy({
                 policy: effectivePolicy,
                 providerProtocol: outboundProtocol,
                 compatibilityProfile: typeof outboundAdapterContext.compatibilityProfile === "string"
@@ -1273,14 +1259,14 @@ export class HubPipeline {
                 payload: formattedPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            })));
-            providerPayload = (await measureHubStage(normalized.id, "chat_entry.req_outbound.tool_surface", () => applyProviderOutboundToolSurface({
+            });
+            providerPayload = applyProviderOutboundToolSurface({
                 config: this.config.toolSurface,
                 providerProtocol: outboundProtocol,
                 payload: providerPayload,
                 stageRecorder: outboundRecorder,
                 requestId: normalized.id,
-            })));
+            });
             providerPayload = maybeApplyDirectBuiltinWebSearchTool(providerPayload, outboundAdapterContext, outboundProtocol);
             recordHubPolicyObservation({
                 policy: effectivePolicy,
@@ -1354,27 +1340,16 @@ export class HubPipeline {
         };
     }
     async execute(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
-            })
-        });
+        const normalized = await this.normalizeRequest(request);
         if (normalized.direction === "request" &&
             normalized.hubEntryMode === "chat_process") {
-            return await measureHubStage(normalized.id, "execute.chat_process_entry", () => this.executeChatProcessEntryPipeline(normalized));
+            return await this.executeChatProcessEntryPipeline(normalized);
         }
         const hooks = this.resolveProtocolHooks(normalized.providerProtocol);
         if (!hooks) {
             throw new Error(`Unsupported provider protocol for hub pipeline: ${normalized.providerProtocol}`);
         }
-        return await measureHubStage(normalized.id, "execute.request_stage_pipeline", () => this.executeRequestStagePipeline(normalized, hooks));
+        return await this.executeRequestStagePipeline(normalized, hooks);
     }
     captureAnthropicAliasMap(normalized, adapterContext, chatEnvelope) {
         if (!this.shouldCaptureAnthropicAlias(normalized.entryEndpoint)) {
@@ -1490,9 +1465,7 @@ export class HubPipeline {
             : normalized.stream === false
                 ? "disable"
                 : "auto";
-        const targetToolCallIdStyle = normalizeReqInboundToolCallIdStyleWithNative(target?.responsesConfig
-            ?.toolCallIdStyle);
-        const toolCallIdStyle = targetToolCallIdStyle ?? normalized.toolCallIdStyle;
+        const toolCallIdStyle = normalizeReqInboundToolCallIdStyleWithNative(metadata.toolCallIdStyle);
         const adapterContext = {
             requestId: normalized.id,
             entryEndpoint: normalized.entryEndpoint || "/v1/chat/completions",
@@ -1502,9 +1475,6 @@ export class HubPipeline {
             profileId,
             streamingHint,
             toolCallIdStyle,
-            ...(normalized.applyPatchToolMode
-                ? { applyPatchToolMode: normalized.applyPatchToolMode }
-                : {}),
             ...(compatibilityProfile ? { compatibilityProfile } : {}),
         };
         const targetDeepseek = isJsonObject(target?.deepseek)
@@ -1732,9 +1702,6 @@ 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);
@@ -1743,36 +1710,16 @@ export class HubPipeline {
             (request.payload &&
                 typeof request.payload === "object" &&
                 request.payload.stream));
-        let payload = await measureHubStage(id, "normalize.materialize_payload", () => this.materializePayload(request.payload, {
+        let payload = await this.materializePayload(request.payload, {
             requestId: id,
             entryEndpoint,
             providerProtocol,
             metadata: metadataRecord,
-        }, resolvedReadable), {
-            startDetails: {
-                hasReadable: Boolean(resolvedReadable),
-                providerProtocol,
-                entryEndpoint
-            }
-        });
+        }, resolvedReadable);
         const routeHint = typeof metadataRecord.routeHint === "string"
             ? metadataRecord.routeHint
             : undefined;
-        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({
+        const orchestrationResult = runHubPipelineOrchestrationWithNative({
             requestId: id,
             endpoint,
             entryEndpoint,
@@ -1791,20 +1738,6 @@ 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 &&
@@ -1820,23 +1753,16 @@ 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,
-            ...orchestrationMetadata,
+            ...(routeHint ? { routeHint } : {}),
+            ...(orchestrationResult.metadata ?? {}),
         };
         return {
             id,
@@ -1853,8 +1779,6 @@ export class HubPipeline {
             stage,
             stream,
             routeHint,
-            ...(toolCallIdStyle ? { toolCallIdStyle } : {}),
-            ...(applyPatchToolMode ? { applyPatchToolMode } : {}),
             ...(hubEntryMode ? { hubEntryMode } : {}),
         };
     }

package/dist/conversion/hub/pipeline/stages/req_inbound/req_inbound_stage1_format_parse/index.d.ts

@@ -1,7 +1,7 @@
-import type { AdapterContext } from '../../../../types/chat-envelope.js';
-import type { FormatEnvelope } from '../../../../types/format-envelope.js';
-import type { JsonObject } from '../../../../types/json.js';
-import type { StageRecorder } from '../../../../format-adapters/index.js';
+import type { AdapterContext } from "../../../../types/chat-envelope.js";
+import type { FormatEnvelope } from "../../../../types/format-envelope.js";
+import type { JsonObject } from "../../../../types/json.js";
+import type { StageRecorder } from "../../../../format-adapters/index.js";
 export interface ReqInboundStage1FormatParseOptions {
     rawRequest: JsonObject;
     adapterContext: AdapterContext;