@jsonstudio/rcc 0.89.1968 → 0.89.2202

package/dist/server/runtime/http-server/request-executor.js

@@ -1,247 +1,21 @@
-import { writeClientSnapshot } from '../../../providers/core/utils/snapshot-writer.js';
 import { asRecord } from './provider-utils.js';
 import { attachProviderRuntimeMetadata } from '../../../providers/core/runtime/provider-runtime-metadata.js';
-import { extractAnthropicToolAliasMap } from './anthropic-tool-alias.js';
-import { enhanceProviderRequestId } from '../../utils/request-id-manager.js';
 import { buildRequestMetadata, cloneClientHeaders, decorateMetadataForAttempt, ensureClientHeadersOnPayload, resolveClientRequestId } from './executor-metadata.js';
-import { describeRetryReason, shouldRetryProviderError, waitBeforeRetry } from './executor-provider.js';
-import { convertProviderResponse as bridgeConvertProviderResponse, createSnapshotRecorder as bridgeCreateSnapshotRecorder, } from '../../../modules/llmswitch/bridge.js';
-import { getClockClientRegistry, injectClockClientPrompt } from './clock-client-registry.js';
+import { convertProviderResponseIfNeeded as convertProviderResponseWithBridge } from './executor/provider-response-converter.js';
 import { ensureHubPipeline, runHubPipeline } from './executor-pipeline.js';
-import { buildInfo } from '../../../build-info.js';
+// Import from new executor submodules
+import { isUsageLoggingEnabled, isVerboseErrorLoggingEnabled } from './executor/env-config.js';
+import { resolveMaxProviderAttempts, describeRetryReason, shouldRetryProviderError, waitBeforeRetry } from './executor/retry-engine.js';
+import {} from './executor/sse-error-handler.js';
+import { extractUsageFromResult, mergeUsageMetrics } from './executor/usage-aggregator.js';
+import { bindClockConversationSession, extractRetryErrorSignature, extractStatusCodeFromError, injectAntigravityRetrySignal, isAntigravityProviderKey, isAntigravityReauthRequired403, isGoogleAccountVerificationRequiredError, isSseDecodeRateLimitError, resolveAntigravityMaxProviderAttempts, shouldRotateAntigravityAliasOnRetry } from './executor/request-retry-helpers.js';
+import { cloneRequestPayload, extractProviderModel, extractResponseStatus, normalizeProviderResponse, resolveRequestSemantics } from './executor/provider-response-utils.js';
+import { isPoolExhaustedPipelineError, writeInboundClientSnapshot } from './executor/request-executor-core-utils.js';
+import { resolveProviderRuntimeOrThrow } from './executor/provider-runtime-resolver.js';
+import { resolveProviderRequestContext } from './executor/provider-request-context.js';
+import { logUsageSummary } from './executor/usage-logger.js';
+import { isServerToolEnabled } from './servertool-admin-state.js';
 const DEFAULT_MAX_PROVIDER_ATTEMPTS = 6;
-const DEFAULT_ANTIGRAVITY_MAX_PROVIDER_ATTEMPTS = 20;
-const RETRYABLE_SSE_ERROR_CODE_HINTS = [
-    'internal_network_failure',
-    'network_error',
-    'api_connection_error',
-    'service_unavailable',
-    'internal_server_error',
-    'overloaded_error',
-    'rate_limit_error',
-    'request_timeout',
-    'timeout'
-];
-const RETRYABLE_SSE_MESSAGE_HINTS = [
-    'internal network failure',
-    'network failure',
-    'network error',
-    'temporarily unavailable',
-    'temporarily unreachable',
-    'upstream disconnected',
-    'connection reset',
-    'connection closed',
-    'timed out',
-    'timeout'
-];
-function firstNonEmptyString(candidates) {
-    for (const candidate of candidates) {
-        if (typeof candidate !== 'string') {
-            continue;
-        }
-        const trimmed = candidate.trim();
-        if (trimmed) {
-            return trimmed;
-        }
-    }
-    return undefined;
-}
-function firstFiniteNumber(candidates) {
-    for (const candidate of candidates) {
-        if (typeof candidate === 'number' && Number.isFinite(candidate)) {
-            return candidate;
-        }
-    }
-    return undefined;
-}
-function isRetryableSseWrapperError(message, errorCode, status) {
-    if (typeof status === 'number' && Number.isFinite(status)) {
-        if (status === 408 || status === 425 || status === 429 || status >= 500) {
-            return true;
-        }
-    }
-    const normalizedCode = typeof errorCode === 'string' ? errorCode.trim().toLowerCase() : '';
-    if (normalizedCode && RETRYABLE_SSE_ERROR_CODE_HINTS.some((hint) => normalizedCode.includes(hint))) {
-        return true;
-    }
-    const loweredMessage = message.toLowerCase();
-    return RETRYABLE_SSE_MESSAGE_HINTS.some((hint) => loweredMessage.includes(hint));
-}
-function resolveBoolFromEnv(value, fallback) {
-    if (!value) {
-        return fallback;
-    }
-    const normalized = value.trim().toLowerCase();
-    if (['1', 'true', 'yes', 'on'].includes(normalized)) {
-        return true;
-    }
-    if (['0', 'false', 'no', 'off'].includes(normalized)) {
-        return false;
-    }
-    return fallback;
-}
-function isUsageLoggingEnabled() {
-    return resolveBoolFromEnv(process.env.ROUTECODEX_USAGE_LOG ?? process.env.RCC_USAGE_LOG, buildInfo.mode !== 'release');
-}
-function resolveMaxProviderAttempts() {
-    const raw = String(process.env.ROUTECODEX_MAX_PROVIDER_ATTEMPTS || process.env.RCC_MAX_PROVIDER_ATTEMPTS || '')
-        .trim()
-        .toLowerCase();
-    const parsed = raw ? Number.parseInt(raw, 10) : NaN;
-    const candidate = Number.isFinite(parsed) ? parsed : DEFAULT_MAX_PROVIDER_ATTEMPTS;
-    return Math.max(1, Math.min(20, candidate));
-}
-function resolveAntigravityMaxProviderAttempts() {
-    const raw = String(process.env.ROUTECODEX_ANTIGRAVITY_MAX_PROVIDER_ATTEMPTS || process.env.RCC_ANTIGRAVITY_MAX_PROVIDER_ATTEMPTS || '')
-        .trim()
-        .toLowerCase();
-    const parsed = raw ? Number.parseInt(raw, 10) : NaN;
-    const candidate = Number.isFinite(parsed) ? parsed : DEFAULT_ANTIGRAVITY_MAX_PROVIDER_ATTEMPTS;
-    return Math.max(1, Math.min(60, candidate));
-}
-function isAntigravityProviderKey(providerKey) {
-    return typeof providerKey === 'string' && providerKey.startsWith('antigravity.');
-}
-function isGoogleAccountVerificationRequiredError(err) {
-    if (!err || typeof err !== 'object') {
-        return false;
-    }
-    const messageRaw = err.message;
-    const message = typeof messageRaw === 'string' ? messageRaw : '';
-    if (!message) {
-        return false;
-    }
-    const lowered = message.toLowerCase();
-    return (lowered.includes('verify your account') ||
-        // Antigravity-Manager alignment: 403 validation gating keywords.
-        lowered.includes('validation_required') ||
-        lowered.includes('validation required') ||
-        lowered.includes('validation_url') ||
-        lowered.includes('validation url') ||
-        lowered.includes('accounts.google.com/signin/continue') ||
-        lowered.includes('support.google.com/accounts?p=al_alert'));
-}
-function isAntigravityReauthRequired403(err) {
-    if (!err || typeof err !== 'object') {
-        return false;
-    }
-    const status = extractStatusCodeFromError(err);
-    if (status !== 403) {
-        return false;
-    }
-    if (isGoogleAccountVerificationRequiredError(err)) {
-        return false;
-    }
-    const messageRaw = err.message;
-    const message = typeof messageRaw === 'string' ? messageRaw : '';
-    if (!message) {
-        return false;
-    }
-    const lowered = message.toLowerCase();
-    return (lowered.includes('please authenticate with google oauth first') ||
-        lowered.includes('authenticate with google oauth') ||
-        lowered.includes('missing required authentication credential') ||
-        lowered.includes('request is missing required authentication') ||
-        lowered.includes('unauthenticated') ||
-        lowered.includes('invalid token') ||
-        lowered.includes('invalid_grant') ||
-        lowered.includes('unauthorized') ||
-        lowered.includes('token expired') ||
-        lowered.includes('expired token'));
-}
-function shouldRotateAntigravityAliasOnRetry(error) {
-    // Antigravity safety: do not rotate between Antigravity aliases within a single request.
-    // Multi-account switching (especially during 4xx/429 states) can cascade into cross-account reauth (403 verify) events.
-    return false;
-}
-function extractStatusCodeFromError(err) {
-    if (!err || typeof err !== 'object')
-        return undefined;
-    const direct = err.statusCode;
-    if (typeof direct === 'number')
-        return direct;
-    const nested = err.status;
-    if (typeof nested === 'number')
-        return nested;
-    return undefined;
-}
-function extractRetryErrorSignature(err) {
-    if (!err || typeof err !== 'object') {
-        return 'unknown';
-    }
-    const status = extractStatusCodeFromError(err);
-    if (status === 403 && isGoogleAccountVerificationRequiredError(err)) {
-        return '403:GOOGLE_VERIFY';
-    }
-    if (status === 403 && isAntigravityReauthRequired403(err)) {
-        return '403:OAUTH_REAUTH';
-    }
-    const codeRaw = err.code;
-    const upstreamCodeRaw = err.upstreamCode;
-    const upstreamCode = typeof upstreamCodeRaw === 'string' && upstreamCodeRaw.trim() ? upstreamCodeRaw.trim() : undefined;
-    const code = typeof codeRaw === 'string' && codeRaw.trim() ? codeRaw.trim() : undefined;
-    const parts = [
-        typeof status === 'number' && Number.isFinite(status) ? String(status) : '',
-        upstreamCode || '',
-        code || ''
-    ].filter((p) => p.length > 0);
-    return parts.length ? parts.join(':') : 'unknown';
-}
-function injectAntigravityRetrySignal(metadata, signal) {
-    if (!signal || !signal.signature || signal.consecutive <= 0) {
-        return;
-    }
-    const carrier = metadata;
-    const existing = carrier.__rt && typeof carrier.__rt === 'object' && !Array.isArray(carrier.__rt) ? carrier.__rt : {};
-    carrier.__rt = {
-        ...existing,
-        antigravityRetryErrorSignature: signal.signature,
-        antigravityRetryErrorConsecutive: signal.consecutive,
-        ...(signal.avoidAllOnRetry === true ? { antigravityAvoidAllOnRetry: true } : {})
-    };
-}
-function normalizeSessionToken(value) {
-    if (typeof value !== 'string') {
-        return undefined;
-    }
-    const trimmed = value.trim();
-    return trimmed || undefined;
-}
-function inferClockClientTypeFromMetadata(metadata) {
-    const direct = normalizeSessionToken(metadata.clockClientType) ?? normalizeSessionToken(metadata.clientType);
-    if (direct) {
-        return direct;
-    }
-    const userAgent = normalizeSessionToken(metadata.userAgent)?.toLowerCase() ?? '';
-    if (userAgent.includes('codex')) {
-        return 'codex';
-    }
-    if (userAgent.includes('claude')) {
-        return 'claude';
-    }
-    return undefined;
-}
-function bindClockConversationSession(metadata) {
-    const conversationSessionId = normalizeSessionToken(metadata.sessionId);
-    if (!conversationSessionId) {
-        return;
-    }
-    const tmuxSessionId = normalizeSessionToken(metadata.tmuxSessionId);
-    const daemonId = normalizeSessionToken(metadata.clockDaemonId)
-        ?? normalizeSessionToken(metadata.clockClientDaemonId);
-    const clientType = inferClockClientTypeFromMetadata(metadata);
-    try {
-        getClockClientRegistry().bindConversationSession({
-            conversationSessionId,
-            ...(tmuxSessionId ? { tmuxSessionId } : {}),
-            ...(daemonId ? { daemonId } : {}),
-            ...(clientType ? { clientType } : {})
-        });
-    }
-    catch {
-        // best-effort only
-    }
-}
 export class HubRequestExecutor {
     deps;
     constructor(deps) {
@@ -268,32 +42,12 @@ export class HubRequestExecutor {
                 endpoint: input.entryEndpoint,
                 stream: initialMetadata.stream === true
             });
-            try {
-                const headerUa = (typeof input.headers?.['user-agent'] === 'string' && input.headers['user-agent']) ||
-                    (typeof input.headers?.['User-Agent'] === 'string' && input.headers['User-Agent']);
-                const headerOriginator = (typeof input.headers?.['originator'] === 'string' && input.headers['originator']) ||
-                    (typeof input.headers?.['Originator'] === 'string' && input.headers['Originator']);
-                await writeClientSnapshot({
-                    entryEndpoint: input.entryEndpoint,
-                    requestId: input.requestId,
-                    headers: asRecord(input.headers),
-                    body: input.body,
-                    metadata: {
-                        ...initialMetadata,
-                        clientRequestId,
-                        userAgent: headerUa,
-                        clientOriginator: headerOriginator
-                    }
-                });
-            }
-            catch {
-                /* snapshot failure should not block request path */
-            }
+            await writeInboundClientSnapshot({ input, initialMetadata, clientRequestId });
             const pipelineLabel = 'hub';
             let aggregatedUsage;
             const excludedProviderKeys = new Set();
             let maxAttempts = resolveMaxProviderAttempts();
-            const originalRequestSnapshot = this.cloneRequestPayload(input.body);
+            const originalRequestSnapshot = cloneRequestPayload(input.body);
             let attempt = 0;
             let lastError;
             let initialRoutePool = null;
@@ -301,7 +55,7 @@ export class HubRequestExecutor {
             while (attempt < maxAttempts) {
                 attempt += 1;
                 if (originalRequestSnapshot && typeof originalRequestSnapshot === 'object') {
-                    const cloned = this.cloneRequestPayload(originalRequestSnapshot) ??
+                    const cloned = cloneRequestPayload(originalRequestSnapshot) ??
                         { ...originalRequestSnapshot };
                     input.body = cloned;
                 }
@@ -322,17 +76,7 @@ export class HubRequestExecutor {
                     pipelineResult = await runHubPipeline(hubPipeline, input, metadataForAttempt);
                 }
                 catch (pipelineError) {
-                    const pipelineErrorCode = typeof pipelineError.code === 'string'
-                        ? String(pipelineError.code).trim()
-                        : '';
-                    const pipelineErrorMessage = pipelineError instanceof Error
-                        ? pipelineError.message
-                        : String(pipelineError ?? 'Unknown error');
-                    const isPoolExhaustedError = pipelineErrorCode === 'PROVIDER_NOT_AVAILABLE' ||
-                        pipelineErrorCode === 'ERR_NO_PROVIDER_TARGET' ||
-                        /all providers unavailable/i.test(pipelineErrorMessage) ||
-                        /virtual router did not produce a provider target/i.test(pipelineErrorMessage);
-                    if (lastError && isPoolExhaustedError) {
+                    if (lastError && isPoolExhaustedPipelineError(pipelineError)) {
                         throw lastError;
                     }
                     throw pipelineError;
@@ -360,120 +104,44 @@ export class HubRequestExecutor {
                         requestId: input.requestId
                     });
                 }
-                // Ensure response-side conversion has access to route-selected target metadata (compat profiles, etc.).
-                // This is an execution metadata carrier only; tool/routing semantics still live in llmswitch-core.
-                if (!mergedMetadata.target) {
-                    mergedMetadata.target = target;
-                }
-                if (!mergedMetadata.compatibilityProfile && typeof target.compatibilityProfile === 'string' && target.compatibilityProfile.trim()) {
+                // Ensure response-side conversion always uses the route-selected target metadata.
+                // ServerTool followups may carry stale metadata from the previous hop; response compat
+                // must follow the current target/provider, not the inherited request profile.
+                mergedMetadata.target = target;
+                if (typeof target.compatibilityProfile === 'string' && target.compatibilityProfile.trim()) {
                     mergedMetadata.compatibilityProfile = target.compatibilityProfile.trim();
                 }
-                const runtimeKey = target.runtimeKey || this.deps.runtimeManager.resolveRuntimeKey(target.providerKey);
-                if (!runtimeKey) {
-                    const runtimeResolveError = Object.assign(new Error(`Runtime for provider ${target.providerKey} not initialized`), {
-                        code: 'ERR_RUNTIME_NOT_FOUND',
-                        requestId: input.requestId,
-                        retryable: true
-                    });
-                    try {
-                        const { emitProviderError } = await import('../../../providers/core/utils/provider-error-reporter.js');
-                        emitProviderError({
-                            error: runtimeResolveError,
-                            stage: 'provider.runtime.resolve',
-                            runtime: {
-                                requestId: input.requestId,
-                                providerKey: target.providerKey,
-                                providerId: target.providerKey.split('.')[0],
-                                providerType: String(target.providerType || 'unknown'),
-                                providerProtocol: String(target.outboundProfile || ''),
-                                routeName: pipelineResult.routingDecision?.routeName,
-                                pipelineId: target.providerKey,
-                                target
-                            },
-                            dependencies: this.deps.getModuleDependencies(),
-                            recoverable: false,
-                            affectsHealth: true,
-                            details: {
-                                reason: 'runtime_not_initialized',
-                                providerKey: target.providerKey
-                            }
-                        });
-                    }
-                    catch {
-                        // best-effort
-                    }
-                    throw Object.assign(new Error(`Runtime for provider ${target.providerKey} not initialized`), {
-                        code: 'ERR_RUNTIME_NOT_FOUND',
-                        requestId: input.requestId
-                    });
-                }
-                const handle = this.deps.runtimeManager.getHandleByRuntimeKey(runtimeKey);
-                if (!handle) {
-                    const runtimeMissingError = Object.assign(new Error(`Provider runtime ${runtimeKey} not found`), {
-                        code: 'ERR_PROVIDER_NOT_FOUND',
-                        requestId: input.requestId,
-                        retryable: true
-                    });
-                    try {
-                        const { emitProviderError } = await import('../../../providers/core/utils/provider-error-reporter.js');
-                        emitProviderError({
-                            error: runtimeMissingError,
-                            stage: 'provider.runtime.resolve',
-                            runtime: {
-                                requestId: input.requestId,
-                                providerKey: target.providerKey,
-                                providerId: target.providerKey.split('.')[0],
-                                providerType: String(target.providerType || 'unknown'),
-                                providerProtocol: String(target.outboundProfile || ''),
-                                routeName: pipelineResult.routingDecision?.routeName,
-                                pipelineId: target.providerKey,
-                                runtimeKey,
-                                target
-                            },
-                            dependencies: this.deps.getModuleDependencies(),
-                            recoverable: false,
-                            affectsHealth: true,
-                            details: {
-                                reason: 'runtime_handle_missing',
-                                providerKey: target.providerKey,
-                                runtimeKey
-                            }
-                        });
-                    }
-                    catch {
-                        // best-effort
-                    }
-                    throw Object.assign(new Error(`Provider runtime ${runtimeKey} not found`), {
-                        code: 'ERR_PROVIDER_NOT_FOUND',
-                        requestId: input.requestId
-                    });
-                }
-                const providerProtocol = target.outboundProfile || handle.providerProtocol;
-                const metadataModel = mergedMetadata?.target && typeof mergedMetadata.target === 'object'
-                    ? mergedMetadata.target.clientModelId
-                    : undefined;
-                const rawModel = this.extractProviderModel(providerPayload) ||
-                    (typeof metadataModel === 'string' ? metadataModel : undefined);
-                const providerAlias = typeof target.providerKey === 'string' && target.providerKey.includes('.')
-                    ? target.providerKey.split('.').slice(0, 2).join('.')
-                    : target.providerKey;
-                const providerIdToken = providerAlias || handle.providerId || runtimeKey;
-                if (!providerIdToken) {
-                    throw Object.assign(new Error('Provider identifier missing for request'), {
-                        code: 'ERR_PROVIDER_ID_MISSING',
-                        requestId: providerRequestId
-                    });
+                else if (Object.prototype.hasOwnProperty.call(mergedMetadata, 'compatibilityProfile')) {
+                    delete mergedMetadata.compatibilityProfile;
                 }
-                const enhancedRequestId = enhanceProviderRequestId(providerRequestId, {
+                const { runtimeKey, handle } = await resolveProviderRuntimeOrThrow({
+                    requestId: input.requestId,
+                    target: {
+                        providerKey: target.providerKey,
+                        outboundProfile: String(target.outboundProfile || ''),
+                        providerType: String(target.providerType || '')
+                    },
+                    routeName: pipelineResult.routingDecision?.routeName,
+                    runtimeKeyHint: target.runtimeKey,
+                    runtimeManager: this.deps.runtimeManager,
+                    dependencies: this.deps.getModuleDependencies()
+                });
+                const providerContext = resolveProviderRequestContext({
+                    providerRequestId,
                     entryEndpoint: input.entryEndpoint,
-                    providerId: providerIdToken,
-                    model: rawModel
+                    target: {
+                        providerKey: target.providerKey,
+                        outboundProfile: target.outboundProfile
+                    },
+                    handle,
+                    runtimeKey,
+                    providerPayload,
+                    mergedMetadata
                 });
-                if (enhancedRequestId !== input.requestId) {
-                    input.requestId = enhancedRequestId;
+                if (providerContext.requestId !== input.requestId) {
+                    input.requestId = providerContext.requestId;
                 }
-                const providerModel = rawModel;
-                const providerLabel = this.buildProviderLabel(target.providerKey, providerModel);
+                const { providerProtocol, providerModel, providerLabel } = providerContext;
                 if (clientHeadersForAttempt) {
                     ensureClientHeadersOnPayload(providerPayload, clientHeadersForAttempt);
                 }
@@ -518,7 +186,7 @@ export class HubRequestExecutor {
                 });
                 try {
                     const providerResponse = await handle.instance.processIncoming(providerPayload);
-                    const responseStatus = this.extractResponseStatus(providerResponse);
+                    const responseStatus = extractResponseStatus(providerResponse);
                     this.logStage('provider.send.completed', input.requestId, {
                         providerKey: target.providerKey,
                         status: responseStatus,
@@ -529,19 +197,14 @@ export class HubRequestExecutor {
                         attempt
                     });
                     const wantsStreamBase = Boolean(input.metadata?.inboundStream ?? input.metadata?.stream);
-                    const normalized = this.normalizeProviderResponse(providerResponse);
-                    const pipelineProcessed = pipelineResult.processedRequest;
-                    const pipelineStandardized = pipelineResult.standardizedRequest;
-                    const requestSemantics = pipelineProcessed && typeof pipelineProcessed === 'object' && typeof pipelineProcessed.semantics === 'object'
-                        ? pipelineProcessed.semantics
-                        : pipelineStandardized && typeof pipelineStandardized === 'object' && typeof pipelineStandardized.semantics === 'object'
-                            ? pipelineStandardized.semantics
-                            : undefined;
+                    const normalized = normalizeProviderResponse(providerResponse);
+                    const requestSemantics = resolveRequestSemantics(pipelineResult.processedRequest, pipelineResult.standardizedRequest);
                     const converted = await this.convertProviderResponseIfNeeded({
                         entryEndpoint: input.entryEndpoint,
                         providerProtocol,
                         providerType: handle.providerType,
                         requestId: input.requestId,
+                        serverToolsEnabled: isServerToolEnabled(),
                         wantsStream: wantsStreamBase,
                         originalRequest: originalRequestSnapshot,
                         requestSemantics,
@@ -602,8 +265,8 @@ export class HubRequestExecutor {
                         }
                         throw errorToThrow;
                     }
-                    const usage = this.extractUsageFromResult(converted, mergedMetadata);
-                    aggregatedUsage = this.mergeUsageMetrics(aggregatedUsage, usage);
+                    const usage = extractUsageFromResult(converted, mergedMetadata);
+                    aggregatedUsage = mergeUsageMetrics(aggregatedUsage, usage);
                     if (converted.body && typeof converted.body === 'object') {
                         const body = converted.body;
                         if (!('__sse_responses' in body)) {
@@ -611,7 +274,7 @@ export class HubRequestExecutor {
                         }
                     }
                     recordAttempt({ usage: aggregatedUsage, error: false });
-                    this.logUsageSummary(input.requestId, {
+                    logUsageSummary(input.requestId, {
                         providerKey: target.providerKey,
                         model: providerModel,
                         usage: aggregatedUsage,
@@ -620,9 +283,10 @@ export class HubRequestExecutor {
                     return converted;
                 }
                 catch (error) {
+                    const errorMessage = error instanceof Error ? error.message : String(error ?? 'Unknown error');
                     this.logStage('provider.send.error', input.requestId, {
                         providerKey: target.providerKey,
-                        message: error instanceof Error ? error.message : String(error ?? 'Unknown error'),
+                        message: errorMessage,
                         providerType: handle.providerType,
                         providerFamily: handle.providerFamily,
                         model: providerModel,
@@ -641,6 +305,40 @@ export class HubRequestExecutor {
                         antigravityRetrySignal = null;
                     }
                     const status = extractStatusCodeFromError(error);
+                    if (isSseDecodeRateLimitError(error, status)) {
+                        try {
+                            const { emitProviderError } = await import('../../../providers/core/utils/provider-error-reporter.js');
+                            emitProviderError({
+                                error,
+                                stage: 'provider.sse_decode',
+                                runtime: {
+                                    requestId: input.requestId,
+                                    providerKey: target.providerKey,
+                                    providerId: handle.providerId,
+                                    providerType: handle.providerType,
+                                    providerFamily: handle.providerFamily,
+                                    providerProtocol,
+                                    routeName: pipelineResult.routingDecision?.routeName,
+                                    pipelineId: target.providerKey,
+                                    target,
+                                    runtimeKey
+                                },
+                                dependencies: this.deps.getModuleDependencies(),
+                                statusCode: 429,
+                                recoverable: true,
+                                affectsHealth: true,
+                                details: {
+                                    source: 'sse_decode_rate_limit',
+                                    errorCode: typeof error?.code === 'string' ? String(error.code) : undefined,
+                                    upstreamCode: typeof error?.upstreamCode === 'string' ? String(error.upstreamCode) : undefined,
+                                    message: errorMessage
+                                }
+                            });
+                        }
+                        catch {
+                            // best-effort; never block retry/failover path
+                        }
+                    }
                     const isVerify = status === 403 && isGoogleAccountVerificationRequiredError(error);
                     const isReauth = status === 403 && isAntigravityReauthRequired403(error);
                     const shouldRetry = attempt < maxAttempts &&
@@ -701,571 +399,11 @@ export class HubRequestExecutor {
             throw error;
         }
     }
-    extractResponseStatus(response) {
-        if (!response || typeof response !== 'object') {
-            return undefined;
-        }
-        const candidate = response.status;
-        return typeof candidate === 'number' ? candidate : undefined;
-    }
-    normalizeProviderResponse(response) {
-        const status = this.extractResponseStatus(response);
-        const headers = this.normalizeProviderResponseHeaders(response && typeof response === 'object' ? response.headers : undefined);
-        const body = response && typeof response === 'object' && 'data' in response
-            ? response.data
-            : response;
-        return { status, headers, body };
-    }
-    normalizeProviderResponseHeaders(headers) {
-        if (!headers || typeof headers !== 'object') {
-            return undefined;
-        }
-        const normalized = {};
-        for (const [key, value] of Object.entries(headers)) {
-            if (typeof value === 'string') {
-                normalized[key.toLowerCase()] = value;
-            }
-        }
-        return Object.keys(normalized).length ? normalized : undefined;
-    }
-    async convertProviderResponseIfNeeded(options) {
-        const body = options.response.body;
-        if (body && typeof body === 'object') {
-            const wrapperError = this.extractSseWrapperError(body);
-            if (wrapperError) {
-                const codeSuffix = wrapperError.errorCode ? ` [${wrapperError.errorCode}]` : '';
-                const error = new Error(`Upstream SSE error event${codeSuffix}: ${wrapperError.message}`);
-                error.code = 'SSE_DECODE_ERROR';
-                if (wrapperError.errorCode) {
-                    error.upstreamCode = wrapperError.errorCode;
-                }
-                error.retryable = wrapperError.retryable;
-                if (wrapperError.retryable) {
-                    error.status = 503;
-                    error.statusCode = 503;
-                }
-                throw error;
-            }
-        }
-        if (options.processMode === 'passthrough' && !options.wantsStream) {
-            return options.response;
-        }
-        const entry = (options.entryEndpoint || '').toLowerCase();
-        const needsAnthropicConversion = entry.includes('/v1/messages');
-        const needsResponsesConversion = entry.includes('/v1/responses');
-        const needsChatConversion = entry.includes('/v1/chat/completions');
-        if (!needsAnthropicConversion && !needsResponsesConversion && !needsChatConversion) {
-            return options.response;
-        }
-        if (!body || typeof body !== 'object') {
-            return options.response;
-        }
-        try {
-            const metadataBag = asRecord(options.pipelineMetadata);
-            const originalModelId = this.extractClientModelId(metadataBag, options.originalRequest);
-            const assignedModelId = typeof metadataBag?.assignedModelId === 'string'
-                ? String(metadataBag.assignedModelId)
-                : metadataBag &&
-                    typeof metadataBag === 'object' &&
-                    metadataBag.target &&
-                    typeof metadataBag.target === 'object' &&
-                    typeof metadataBag.target.modelId === 'string'
-                    ? metadataBag.target.modelId
-                    : typeof metadataBag?.modelId === 'string'
-                        ? String(metadataBag.modelId)
-                        : undefined;
-            const baseContext = {
-                ...(metadataBag ?? {})
-            };
-            if (baseContext.capturedChatRequest === undefined &&
-                options.originalRequest &&
-                typeof options.originalRequest === 'object' &&
-                !Array.isArray(options.originalRequest)) {
-                baseContext.capturedChatRequest = options.originalRequest;
-            }
-            if (typeof metadataBag?.routeName === 'string') {
-                baseContext.routeId = metadataBag.routeName;
-            }
-            baseContext.requestId = options.requestId;
-            baseContext.entryEndpoint = options.entryEndpoint || entry;
-            baseContext.providerProtocol = options.providerProtocol;
-            baseContext.originalModelId = originalModelId;
-            if (assignedModelId && assignedModelId.trim()) {
-                baseContext.modelId = assignedModelId.trim();
-            }
-            const adapterContext = baseContext;
-            const compatProfile = typeof metadataBag?.compatibilityProfile === 'string'
-                ? String(metadataBag.compatibilityProfile)
-                : metadataBag &&
-                    typeof metadataBag === 'object' &&
-                    metadataBag.target &&
-                    typeof metadataBag.target === 'object' &&
-                    typeof metadataBag.target.compatibilityProfile === 'string'
-                    ? metadataBag.target.compatibilityProfile
-                    : undefined;
-            if (compatProfile && compatProfile.trim()) {
-                adapterContext.compatibilityProfile = compatProfile.trim();
-            }
-            const stageRecorder = await bridgeCreateSnapshotRecorder(adapterContext, typeof adapterContext.entryEndpoint === 'string'
-                ? adapterContext.entryEndpoint
-                : options.entryEndpoint || entry);
-            const providerInvoker = async (invokeOptions) => {
-                // 将 server-side 工具的 routeHint 注入到内部 payload 的 metadata，
-                // 以便后续在标准 HubPipeline 中保持路由上下文一致（例如强制 web_search）。
-                if (invokeOptions.routeHint) {
-                    const carrier = invokeOptions.payload;
-                    const existingMeta = carrier.metadata && typeof carrier.metadata === 'object'
-                        ? carrier.metadata
-                        : {};
-                    carrier.metadata = {
-                        ...existingMeta,
-                        routeHint: existingMeta.routeHint ?? invokeOptions.routeHint
-                    };
-                }
-                // Delegate to existing runtimeManager / Provider V2 stack.
-                const runtimeKey = this.deps.runtimeManager.resolveRuntimeKey(invokeOptions.providerKey);
-                if (!runtimeKey) {
-                    throw new Error(`Runtime for provider ${invokeOptions.providerKey} not initialized`);
-                }
-                const handle = this.deps.runtimeManager.getHandleByRuntimeKey(runtimeKey);
-                if (!handle) {
-                    throw new Error(`Provider runtime ${runtimeKey} not found`);
-                }
-                const providerResponse = await handle.instance.processIncoming(invokeOptions.payload);
-                const normalized = this.normalizeProviderResponse(providerResponse);
-                const bodyPayload = normalized.body && typeof normalized.body === 'object'
-                    ? normalized.body
-                    : normalized;
-                return { providerResponse: bodyPayload };
-            };
-            const reenterPipeline = async (reenterOpts) => {
-                const nestedEntry = reenterOpts.entryEndpoint || options.entryEndpoint || entry;
-                const nestedExtra = asRecord(reenterOpts.metadata) ?? {};
-                // 基于首次 HubPipeline metadata + 调用方注入的 metadata 构建新的请求 metadata。
-                // 不在 Host 层编码 servertool/web_search 等语义，由 llmswitch-core 负责。
-                const nestedMetadata = {
-                    ...(metadataBag ?? {}),
-                    ...nestedExtra,
-                    entryEndpoint: nestedEntry,
-                    direction: 'request',
-                    stage: 'inbound'
-                };
-                // E1: merge internal runtime metadata carrier (`__rt`) instead of clobbering it.
-                // ServerTool followup metadata always adds fields under __rt, while the base pipeline
-                // metadata may already contain runtime configs (webSearch/clock/etc).
-                try {
-                    const baseRt = asRecord(metadataBag?.__rt) ?? {};
-                    const extraRt = asRecord(nestedExtra?.__rt) ?? {};
-                    if (Object.keys(baseRt).length || Object.keys(extraRt).length) {
-                        nestedMetadata.__rt = { ...baseRt, ...extraRt };
-                    }
-                }
-                catch {
-                    // best-effort
-                }
-                // servertool followup 是内部二跳请求：不应继承客户端 headers 偏好（尤其是 Accept），
-                // 否则会导致上游返回非 SSE 响应而被当作 SSE 解析，出现“空回复”。
-                if (asRecord(nestedMetadata.__rt)?.serverToolFollowup === true) {
-                    delete nestedMetadata.clientHeaders;
-                    delete nestedMetadata.clientRequestId;
-                }
-                bindClockConversationSession(nestedMetadata);
-                const nestedInput = {
-                    entryEndpoint: nestedEntry,
-                    method: 'POST',
-                    requestId: reenterOpts.requestId,
-                    headers: {},
-                    query: {},
-                    body: reenterOpts.body,
-                    metadata: nestedMetadata
-                };
-                try {
-                    const requestBody = reenterOpts.body;
-                    const messages = Array.isArray(requestBody.messages) ? requestBody.messages : [];
-                    const lastUser = [...messages]
-                        .reverse()
-                        .find((entry) => entry && typeof entry === 'object' && entry.role === 'user');
-                    const text = typeof lastUser?.content === 'string' ? String(lastUser.content) : '';
-                    if (text.includes('<**clock:{') && text.includes('}**>')) {
-                        await injectClockClientPrompt({
-                            tmuxSessionId: typeof nestedMetadata.tmuxSessionId === 'string' ? nestedMetadata.tmuxSessionId : undefined,
-                            sessionId: typeof nestedMetadata.sessionId === 'string' ? nestedMetadata.sessionId : undefined,
-                            text,
-                            requestId: reenterOpts.requestId,
-                            source: 'servertool.reenter'
-                        });
-                    }
-                }
-                catch {
-                    // best-effort only
-                }
-                const nestedResult = await this.execute(nestedInput);
-                const nestedBody = nestedResult.body && typeof nestedResult.body === 'object'
-                    ? nestedResult.body
-                    : undefined;
-                return { body: nestedBody };
-            };
-            const converted = await bridgeConvertProviderResponse({
-                providerProtocol: options.providerProtocol,
-                providerResponse: body,
-                context: adapterContext,
-                entryEndpoint: options.entryEndpoint || entry,
-                wantsStream: options.wantsStream,
-                requestSemantics: options.requestSemantics,
-                providerInvoker,
-                stageRecorder,
-                reenterPipeline
-            });
-            if (converted.__sse_responses) {
-                return {
-                    ...options.response,
-                    body: { __sse_responses: converted.__sse_responses }
-                };
-            }
-            return {
-                ...options.response,
-                body: converted.body ?? body
-            };
-        }
-        catch (error) {
-            const err = error;
-            const message = err instanceof Error ? err.message : String(err ?? 'Unknown error');
-            // 对于 SSE 解码失败（含上游终止），直接抛出错误并透传到 HTTP 层。
-            // 否则回退到原始 payload 会让客户端挂起，无法感知失败。
-            const errRecord = err;
-            const errCode = typeof errRecord.code === 'string' ? errRecord.code : undefined;
-            const errName = typeof errRecord.name === 'string' ? errRecord.name : undefined;
-            const isSseDecodeError = errCode === 'SSE_DECODE_ERROR' ||
-                (errName === 'ProviderProtocolError' && message.toLowerCase().includes('sse'));
-            const isServerToolFollowupError = errCode === 'SERVERTOOL_FOLLOWUP_FAILED' ||
-                errCode === 'SERVERTOOL_EMPTY_FOLLOWUP' ||
-                (typeof errCode === 'string' && errCode.startsWith('SERVERTOOL_'));
-            if (isSseDecodeError || isServerToolFollowupError) {
-                console.error('[RequestExecutor] Fatal conversion error, bubbling as HTTP error', error);
-                throw error;
-            }
-            console.error('[RequestExecutor] Failed to convert provider response via llmswitch-core', error);
-            return options.response;
-        }
-    }
-    extractSseWrapperError(payload) {
-        return this.findSseWrapperError(payload, 2);
-    }
-    findSseWrapperError(record, depth) {
-        if (!record || typeof record !== 'object' || depth < 0) {
-            return undefined;
-        }
-        if (record.mode === 'sse') {
-            const normalized = this.normalizeSseWrapperErrorValue(record.error, depth);
-            if (normalized) {
-                return normalized;
-            }
-        }
-        const nestedKeys = ['body', 'data', 'payload', 'response'];
-        for (const key of nestedKeys) {
-            const nested = record[key];
-            if (!nested || typeof nested !== 'object' || Array.isArray(nested)) {
-                continue;
-            }
-            const found = this.findSseWrapperError(nested, depth - 1);
-            if (found) {
-                return found;
-            }
-        }
-        return undefined;
-    }
-    normalizeSseWrapperErrorValue(value, depth) {
-        if (value === undefined || value === null || depth < 0) {
-            return undefined;
-        }
-        if (typeof value === 'string') {
-            const trimmed = value.trim();
-            if (!trimmed) {
-                return undefined;
-            }
-            if (depth > 0 && (trimmed.startsWith('{') || trimmed.startsWith('['))) {
-                try {
-                    const parsed = JSON.parse(trimmed);
-                    const parsedInfo = this.normalizeSseWrapperErrorValue(parsed, depth - 1);
-                    if (parsedInfo) {
-                        return parsedInfo;
-                    }
-                }
-                catch {
-                    // fallback to raw string
-                }
-            }
-            return {
-                message: trimmed,
-                retryable: isRetryableSseWrapperError(trimmed)
-            };
-        }
-        if (typeof value !== 'object' || Array.isArray(value)) {
-            return undefined;
-        }
-        const record = value;
-        const directMessage = firstNonEmptyString([
-            record.message,
-            record.error_message,
-            record.errorMessage
-        ]);
-        const directCode = firstNonEmptyString([
-            record.code,
-            record.error_code,
-            record.errorCode,
-            record.type
-        ]);
-        const directStatus = firstFiniteNumber([
-            record.status,
-            record.statusCode,
-            record.status_code,
-            record.http_status
-        ]);
-        if (depth > 0) {
-            for (const key of ['error', 'data', 'payload', 'details', 'body', 'response']) {
-                const nestedInfo = this.normalizeSseWrapperErrorValue(record[key], depth - 1);
-                if (nestedInfo) {
-                    const mergedCode = nestedInfo.errorCode ?? directCode;
-                    const retryable = nestedInfo.retryable || isRetryableSseWrapperError(nestedInfo.message, mergedCode, directStatus);
-                    return {
-                        message: nestedInfo.message,
-                        ...(mergedCode ? { errorCode: mergedCode } : {}),
-                        retryable
-                    };
-                }
-            }
-        }
-        if (directMessage) {
-            return {
-                message: directMessage,
-                ...(directCode ? { errorCode: directCode } : {}),
-                retryable: isRetryableSseWrapperError(directMessage, directCode, directStatus)
-            };
-        }
-        try {
-            const serialized = JSON.stringify(record);
-            if (serialized && serialized !== '{}') {
-                return {
-                    message: serialized,
-                    ...(directCode ? { errorCode: directCode } : {}),
-                    retryable: isRetryableSseWrapperError(serialized, directCode, directStatus)
-                };
-            }
-        }
-        catch {
-            // ignore stringify failures
-        }
-        return undefined;
-    }
-    extractClientModelId(metadata, originalRequest) {
-        const candidates = [
-            metadata.clientModelId,
-            metadata.originalModelId,
-            (metadata.target && typeof metadata.target === 'object'
-                ? metadata.target.clientModelId
-                : undefined),
-            originalRequest && typeof originalRequest === 'object'
-                ? originalRequest.model
-                : undefined,
-            originalRequest && typeof originalRequest === 'object'
-                ? originalRequest.originalModelId
-                : undefined
-        ];
-        for (const candidate of candidates) {
-            if (typeof candidate === 'string' && candidate.trim()) {
-                return candidate.trim();
-            }
-        }
-        return undefined;
-    }
-    cloneRequestPayload(payload) {
-        if (!payload || typeof payload !== 'object') {
-            return undefined;
-        }
-        try {
-            return JSON.parse(JSON.stringify(payload));
-        }
-        catch {
-            return undefined;
-        }
-    }
-    extractProviderModel(payload) {
-        if (!payload) {
-            return undefined;
-        }
-        const source = payload.data && typeof payload.data === 'object'
-            ? payload.data
-            : payload;
-        const raw = source.model;
-        if (typeof raw === 'string' && raw.trim()) {
-            return raw.trim();
-        }
-        return undefined;
-    }
-    buildProviderLabel(providerKey, model) {
-        const key = typeof providerKey === 'string' && providerKey.trim() ? providerKey.trim() : undefined;
-        const modelId = typeof model === 'string' && model.trim() ? model.trim() : undefined;
-        if (!key && !modelId) {
-            return undefined;
-        }
-        if (key && modelId) {
-            return `${key}.${modelId}`;
-        }
-        return key || modelId;
-    }
     logStage(stage, requestId, details) {
         this.deps.logStage(stage, requestId, details);
     }
-    logUsageSummary(requestId, info) {
-        if (!isUsageLoggingEnabled()) {
-            return;
-        }
-        const providerLabel = this.buildProviderLabel(info.providerKey, info.model) ?? '-';
-        const prompt = info.usage?.prompt_tokens;
-        const completion = info.usage?.completion_tokens;
-        const total = info.usage?.total_tokens ?? (prompt !== undefined && completion !== undefined ? prompt + completion : undefined);
-        const usageText = `prompt=${prompt ?? 'n/a'} completion=${completion ?? 'n/a'} total=${total ?? 'n/a'}`;
-        const latency = info.latencyMs.toFixed(1);
-        console.log(`[usage] request ${requestId} provider=${providerLabel} latency=${latency}ms (${usageText})`);
-    }
-    extractUsageFromResult(result, metadata) {
-        const estimatedInput = this.extractEstimatedInputTokens(metadata);
-        const candidates = [];
-        if (metadata && typeof metadata === 'object') {
-            const bag = metadata;
-            if (bag.usage) {
-                candidates.push(bag.usage);
-            }
-        }
-        if (result.body && typeof result.body === 'object') {
-            const body = result.body;
-            if (body.usage) {
-                candidates.push(body.usage);
-            }
-            if (body.response && typeof body.response === 'object') {
-                const responseNode = body.response;
-                if (responseNode.usage) {
-                    candidates.push(responseNode.usage);
-                }
-            }
-        }
-        for (const candidate of candidates) {
-            const normalized = this.normalizeUsage(candidate);
-            if (normalized) {
-                const reconciled = this.reconcileUsageWithEstimate(normalized, estimatedInput, candidate);
-                return reconciled;
-            }
-        }
-        return undefined;
-    }
-    normalizeUsage(value) {
-        if (!value || typeof value !== 'object') {
-            return undefined;
-        }
-        const record = value;
-        const basePrompt = typeof record.prompt_tokens === 'number'
-            ? record.prompt_tokens
-            : typeof record.input_tokens === 'number'
-                ? record.input_tokens
-                : undefined;
-        let cacheRead = typeof record.cache_read_input_tokens === 'number' ? record.cache_read_input_tokens : undefined;
-        if (cacheRead === undefined && record.input_tokens_details && typeof record.input_tokens_details === 'object') {
-            const details = record.input_tokens_details;
-            if (typeof details.cached_tokens === 'number') {
-                cacheRead = details.cached_tokens;
-            }
-        }
-        const prompt = basePrompt !== undefined || cacheRead !== undefined
-            ? (basePrompt ?? 0) + (cacheRead ?? 0)
-            : undefined;
-        const completion = typeof record.completion_tokens === 'number'
-            ? record.completion_tokens
-            : typeof record.output_tokens === 'number'
-                ? record.output_tokens
-                : undefined;
-        let total = typeof record.total_tokens === 'number'
-            ? record.total_tokens
-            : undefined;
-        if (total === undefined && prompt !== undefined && completion !== undefined) {
-            total = prompt + completion;
-        }
-        if (prompt === undefined && completion === undefined && total === undefined) {
-            return undefined;
-        }
-        return {
-            prompt_tokens: prompt,
-            completion_tokens: completion,
-            total_tokens: total
-        };
-    }
-    extractEstimatedInputTokens(metadata) {
-        if (!metadata || typeof metadata !== 'object') {
-            return undefined;
-        }
-        const bag = metadata;
-        const raw = bag.estimatedInputTokens ??
-            bag.estimated_tokens ??
-            bag.estimatedTokens;
-        const value = typeof raw === 'number' ? raw : Number(raw);
-        if (!Number.isFinite(value) || value <= 0) {
-            return undefined;
-        }
-        return value;
-    }
-    reconcileUsageWithEstimate(usage, estimatedInput, candidate) {
-        if (!estimatedInput || !Number.isFinite(estimatedInput) || estimatedInput <= 0) {
-            return usage;
-        }
-        const upstreamPrompt = usage.prompt_tokens ?? usage.total_tokens ?? undefined;
-        const completion = usage.completion_tokens ?? 0;
-        // 若上游缺失 prompt/total，直接使用我们估算的输入 token。
-        if (upstreamPrompt === undefined || upstreamPrompt <= 0) {
-            const total = estimatedInput + completion;
-            this.patchUsageCandidate(candidate, estimatedInput, completion, total);
-            return {
-                prompt_tokens: estimatedInput,
-                completion_tokens: completion,
-                total_tokens: total
-            };
-        }
-        const ratio = upstreamPrompt > 0 ? upstreamPrompt / estimatedInput : 1;
-        // 差异过大（数量级不一致）时，优先采用本地估算值。
-        if (ratio > 5 || ratio < 0.2) {
-            const total = estimatedInput + completion;
-            this.patchUsageCandidate(candidate, estimatedInput, completion, total);
-            return {
-                prompt_tokens: estimatedInput,
-                completion_tokens: completion,
-                total_tokens: total
-            };
-        }
-        return usage;
-    }
-    patchUsageCandidate(candidate, prompt, completion, total) {
-        if (!candidate || typeof candidate !== 'object') {
-            return;
-        }
-        const record = candidate;
-        record.prompt_tokens = prompt;
-        record.input_tokens = prompt;
-        record.completion_tokens = completion;
-        record.output_tokens = completion;
-        record.total_tokens = total;
-    }
-    mergeUsageMetrics(base, delta) {
-        if (!delta) {
-            return base;
-        }
-        if (!base) {
-            return { ...delta };
-        }
-        const merged = {
-            prompt_tokens: (base.prompt_tokens ?? 0) + (delta.prompt_tokens ?? 0),
-            completion_tokens: (base.completion_tokens ?? 0) + (delta.completion_tokens ?? 0)
-        };
-        const total = (base.total_tokens ?? 0) + (delta.total_tokens ?? 0);
-        merged.total_tokens = total || undefined;
-        return merged;
+    async convertProviderResponseIfNeeded(options) {
+        return convertProviderResponseWithBridge(options, { runtimeManager: this.deps.runtimeManager, executeNested: (nestedInput) => this.execute(nestedInput) });
     }
 }
 export function createRequestExecutor(deps) {