@jsonstudio/rcc 0.89.168 → 0.89.333

package/dist/providers/core/runtime/http-transport-provider.js

@@ -8,6 +8,8 @@
  *
  * 各协议具体行为（OpenAI Chat、Responses、Anthropic、Gemini 等）通过子类覆写钩子实现。
  */
+import { createHash } from 'node:crypto';
+import fs from 'node:fs/promises';
 import { BaseProvider } from './base-provider.js';
 import { HttpClient } from '../utils/http-client.js';
 import { DynamicProfileLoader, ServiceProfileValidator } from '../config/service-profiles.js';
@@ -16,13 +18,14 @@ import { OAuthAuthProvider } from '../../auth/oauth-auth.js';
 import { logOAuthDebug } from '../../auth/oauth-logger.js';
 import { TokenFileAuthProvider } from '../../auth/tokenfile-auth.js';
 import { ensureValidOAuthToken, handleUpstreamInvalidOAuthToken } from '../../auth/oauth-lifecycle.js';
+import { fetchAntigravityProjectId } from '../../auth/antigravity-userinfo-helper.js';
 import { attachProviderSseSnapshotStream, writeProviderSnapshot } from '../utils/snapshot-writer.js';
-import { attachProviderRuntimeMetadata } from './provider-runtime-metadata.js';
+import { attachProviderRuntimeMetadata, extractProviderRuntimeMetadata } from './provider-runtime-metadata.js';
 import { OpenAIChatProtocolClient } from '../../../client/openai/chat-protocol-client.js';
 import { HttpRequestExecutor } from './http-request-executor.js';
 import { extractStatusCodeFromError } from './provider-error-classifier.js';
 const isRecord = (value) => typeof value === 'object' && value !== null;
-const DEFAULT_USER_AGENT = 'RouteCodex/2.0';
+const DEFAULT_USER_AGENT = 'codex_cli_rs/0.73.0 (Mac OS 15.6.1; arm64) iTerm.app/3.6.5';
 export class HttpTransportProvider extends BaseProvider {
     type;
     authProvider = null;
@@ -56,9 +59,9 @@ export class HttpTransportProvider extends BaseProvider {
                 const extensions = this.getConfigExtensions();
                 const auth = providerConfig.auth;
                 const usesTokenFile = this.authProvider instanceof TokenFileAuthProvider;
-                if (this.normalizeAuthMode(auth.type) === 'oauth' && !usesTokenFile) {
+                if (this.normalizeAuthMode(auth.type) === 'oauth') {
                     const oauthAuth = auth;
-                    const oauthProviderId = this.ensureOAuthProviderId(oauthAuth, extensions);
+                    const oauthProviderId = this.oauthProviderId || this.ensureOAuthProviderId(oauthAuth, extensions);
                     const forceReauthorize = false;
                     const tokenFileHint = oauthAuth.tokenFile ?? '(default)';
                     logOAuthDebug(`[OAuth] [init] provider=${oauthProviderId} type=${auth.type} tokenFile=${tokenFileHint} forceReauth=${forceReauthorize}`);
@@ -73,9 +76,13 @@ export class HttpTransportProvider extends BaseProvider {
                             openBrowser: true,
                             forceReauthorize
                         });
+                        if (this.oauthProviderId === 'antigravity') {
+                            await this.ensureAntigravityProjectMetadata(oauthAuth);
+                        }
                         logOAuthDebug('[OAuth] [init] ensureValid OK');
                         try {
                             if (this.authProvider instanceof TokenFileAuthProvider) {
+                                // 令牌文件可能在 ensureValidOAuthToken 中被创建/更新，重新加载一次
                                 await this.authProvider.initialize();
                             }
                             else {
@@ -94,17 +101,11 @@ export class HttpTransportProvider extends BaseProvider {
                         const msg = err?.message ? String(err.message) : String(error);
                         console.error(`[OAuth] [init] ensureValid ERROR: ${msg}`);
                         this.dependencies.logger?.logModule?.(this.id, 'oauth-init-error', {
-                            providerType: this.providerType,
+                            providerType: oauthProviderId,
                             error: msg
                         });
                         throw error;
                     }
-                    try {
-                        this.authProvider.getOAuthClient?.()?.loadToken?.();
-                    }
-                    catch {
-                        // ignore
-                    }
                 }
                 else {
                     try {
@@ -238,18 +239,15 @@ export class HttpTransportProvider extends BaseProvider {
         const extensions = this.getConfigExtensions();
         const authMode = this.normalizeAuthMode(auth.type);
         this.authMode = authMode;
-        let providerIdForAuth = authMode === 'oauth'
+        const resolvedOAuthProviderId = authMode === 'oauth'
             ? this.ensureOAuthProviderId(auth, extensions)
-            : this.providerType;
-        if (this.type === 'gemini-cli-http-provider') {
-            providerIdForAuth = 'gemini-cli';
-        }
-        if (authMode === 'oauth') {
-            this.oauthProviderId = providerIdForAuth;
-        }
-        const validation = ServiceProfileValidator.validateServiceProfile(providerIdForAuth, authMode);
+            : undefined;
+        const serviceProfileKey = this.type === 'gemini-cli-http-provider'
+            ? 'gemini-cli'
+            : (resolvedOAuthProviderId ?? this.providerType);
+        const validation = ServiceProfileValidator.validateServiceProfile(serviceProfileKey, authMode);
         if (!validation.isValid) {
-            throw new Error(`Invalid auth configuration for ${providerIdForAuth}: ${validation.errors.join(', ')}`);
+            throw new Error(`Invalid auth configuration for ${serviceProfileKey}: ${validation.errors.join(', ')}`);
         }
         // 根据认证类型创建对应的认证提供者
         if (authMode === 'apikey') {
@@ -257,16 +255,20 @@ export class HttpTransportProvider extends BaseProvider {
         }
         else if (authMode === 'oauth') {
             const oauthAuth = auth;
+            const oauthProviderId = resolvedOAuthProviderId ?? serviceProfileKey;
+            this.oauthProviderId = oauthProviderId;
             // For providers like Qwen/iflow/Gemini CLI where public OAuth client may not be available,
             // allow reading tokens produced by external login tools (CLIProxyAPI) via token file.
-            const useTokenFile = (providerIdForAuth === 'qwen' || providerIdForAuth === 'iflow' || providerIdForAuth === 'gemini-cli') &&
+            const useTokenFile = (oauthProviderId === 'qwen' ||
+                oauthProviderId === 'iflow' ||
+                this.type === 'gemini-cli-http-provider') &&
                 !oauthAuth.clientId &&
                 !oauthAuth.tokenUrl &&
                 !oauthAuth.deviceCodeUrl;
             if (useTokenFile) {
                 return new TokenFileAuthProvider(oauthAuth);
             }
-            return new OAuthAuthProvider(oauthAuth, providerIdForAuth);
+            return new OAuthAuthProvider(oauthAuth, oauthProviderId);
         }
         else {
             throw new Error(`Unsupported auth type: ${auth.type}`);
@@ -321,6 +323,19 @@ export class HttpTransportProvider extends BaseProvider {
     async preprocessRequest(request) {
         const context = this.createProviderContext();
         const runtimeMetadata = context.runtimeMetadata;
+        const headersFromRequest = this.normalizeClientHeaders(request?.metadata?.clientHeaders);
+        const headersFromRuntime = this.normalizeClientHeaders(runtimeMetadata?.metadata && typeof runtimeMetadata.metadata === 'object'
+            ? runtimeMetadata.metadata.clientHeaders
+            : undefined);
+        const effectiveClientHeaders = headersFromRequest ?? headersFromRuntime;
+        if (effectiveClientHeaders) {
+            if (runtimeMetadata) {
+                if (!runtimeMetadata.metadata || typeof runtimeMetadata.metadata !== 'object') {
+                    runtimeMetadata.metadata = {};
+                }
+                runtimeMetadata.metadata.clientHeaders = effectiveClientHeaders;
+            }
+        }
         const ensureRuntimeMetadata = (payload) => {
             if (!runtimeMetadata || !payload || typeof payload !== 'object') {
                 return;
@@ -346,20 +361,11 @@ export class HttpTransportProvider extends BaseProvider {
                 ...processedMetadata,
                 ...(entryEndpoint ? { entryEndpoint } : {}),
                 ...(typeof streamFlag === 'boolean' ? { stream: !!streamFlag } : {}),
+                ...(effectiveClientHeaders ? { clientHeaders: effectiveClientHeaders } : {}),
                 __origModel: inboundModel
             };
         }
         catch { /* ignore */ }
-        // 流式开关：基础 Provider 统一移除入口层的 stream 标记，
-        // 具体协议（如 Responses/Anthropic）的真实流控由各自独立 Provider 处理
-        try {
-            // 统一：所有入口均移除 stream=true（Provider 始终走非流式），SSE 由上层合成
-            const requestBody = processedRequest;
-            if (requestBody.stream === true) {
-                delete requestBody.stream;
-            }
-        }
-        catch { /* ignore */ }
         return processedRequest;
     }
     async postprocessResponse(response, context) {
@@ -603,6 +609,8 @@ export class HttpTransportProvider extends BaseProvider {
         const inboundOriginator = typeof inboundMetadata?.clientOriginator === 'string' && inboundMetadata.clientOriginator.trim()
             ? inboundMetadata.clientOriginator.trim()
             : undefined;
+        const inboundClientHeaders = this.extractClientHeaders(runtimeMetadata);
+        const normalizedClientHeaders = this.normalizeCodexClientHeaders(inboundClientHeaders);
         // 服务特定头部
         const serviceHeaders = this.serviceProfile.headers || {};
         // 配置覆盖头部
@@ -613,7 +621,7 @@ export class HttpTransportProvider extends BaseProvider {
             const auth = this.config.config.auth;
             if (this.normalizeAuthMode(auth.type) === 'oauth') {
                 const oauthAuth = auth;
-                const oauthProviderId = this.ensureOAuthProviderId(oauthAuth);
+                const oauthProviderId = this.oauthProviderId || this.ensureOAuthProviderId(oauthAuth);
                 logOAuthDebug('[OAuth] [headers] ensureValid start (openBrowser=true, forceReauth=false)');
                 try {
                     await ensureValidOAuthToken(oauthProviderId, oauthAuth, {
@@ -658,48 +666,146 @@ export class HttpTransportProvider extends BaseProvider {
             ...runtimeHeaders,
             ...authHeaders
         };
-        // 禁用上游SSE：设置 Accept 为 application/json（若未被显式覆盖）
-        if (!('Accept' in finalHeaders) && !('accept' in finalHeaders)) {
-            finalHeaders['Accept'] = 'application/json';
-        }
-        const getHeader = (headers, target) => {
-            const lowered = target.toLowerCase();
-            for (const [key, value] of Object.entries(headers)) {
-                if (key.toLowerCase() === lowered && typeof value === 'string' && value.trim()) {
-                    return value.trim();
-                }
-            }
-            return undefined;
-        };
-        const setHeader = (headers, target, value) => {
-            if (!value || !value.trim())
-                return;
-            const lowered = target.toLowerCase();
-            for (const key of Object.keys(headers)) {
-                if (key.toLowerCase() === lowered) {
-                    headers[key] = value;
-                    return;
-                }
-            }
-            headers[target] = value;
-        };
+        // 保留客户端 Accept；无则默认为 application/json
+        const clientAccept = normalizedClientHeaders ? this.findHeaderValue(normalizedClientHeaders, 'Accept') : undefined;
+        if (clientAccept) {
+            this.assignHeader(finalHeaders, 'Accept', clientAccept);
+        }
+        else if (!this.findHeaderValue(finalHeaders, 'Accept')) {
+            this.assignHeader(finalHeaders, 'Accept', 'application/json');
+        }
         // Header priority:
         // - user/provider config (overrides/runtime) wins
         // - otherwise inherit from inbound client headers
         // - otherwise fall back to defaults
-        const uaFromConfig = getHeader({ ...overrideHeaders, ...runtimeHeaders }, 'User-Agent');
-        const uaFromService = getHeader(serviceHeaders, 'User-Agent');
+        const uaFromConfig = this.findHeaderValue({ ...overrideHeaders, ...runtimeHeaders }, 'User-Agent');
+        const uaFromService = this.findHeaderValue(serviceHeaders, 'User-Agent');
         const resolvedUa = uaFromConfig ?? inboundUserAgent ?? uaFromService ?? DEFAULT_USER_AGENT;
-        setHeader(finalHeaders, 'User-Agent', resolvedUa);
+        this.assignHeader(finalHeaders, 'User-Agent', resolvedUa);
         // originator: do not invent one; only forward from config or inbound client
-        const originatorFromConfig = getHeader({ ...overrideHeaders, ...runtimeHeaders }, 'originator');
-        const originatorFromService = getHeader(serviceHeaders, 'originator');
+        const originatorFromConfig = this.findHeaderValue({ ...overrideHeaders, ...runtimeHeaders }, 'originator');
+        const originatorFromService = this.findHeaderValue(serviceHeaders, 'originator');
         const resolvedOriginator = originatorFromConfig ?? inboundOriginator ?? originatorFromService;
         if (resolvedOriginator) {
-            setHeader(finalHeaders, 'originator', resolvedOriginator);
+            this.assignHeader(finalHeaders, 'originator', resolvedOriginator);
+        }
+        if (normalizedClientHeaders) {
+            const conversationId = this.findHeaderValue(normalizedClientHeaders, 'conversation_id');
+            if (conversationId) {
+                this.assignHeader(finalHeaders, 'conversation_id', conversationId);
+            }
+            const sessionId = this.findHeaderValue(normalizedClientHeaders, 'session_id');
+            if (sessionId) {
+                this.assignHeader(finalHeaders, 'session_id', sessionId);
+            }
+        }
+        if (this.isCodexUaMode()) {
+            this.ensureCodexSessionHeaders(finalHeaders, runtimeMetadata);
         }
         return finalHeaders;
     }
+    isCodexUaMode() {
+        const raw = process.env.ROUTECODEX_UA_MODE ??
+            process.env.RCC_UA_MODE ??
+            '';
+        const normalized = typeof raw === 'string' ? raw.trim().toLowerCase() : '';
+        const runtime = this.getCurrentRuntimeMetadata();
+        if (!runtime) {
+            return false;
+        }
+        const providerType = runtime.providerType || this.providerType;
+        const entryEndpoint = this.getEntryEndpointFromRuntime(runtime);
+        // 显式 UA 模式（--codex / --ua codex）：对所有 provider 激活
+        if (normalized === 'codex') {
+            return true;
+        }
+        // 隐式模式：未显式设置 UA 时，仅在 responses provider 且入口不是 /v1/responses 时激活
+        if (providerType === 'responses' && entryEndpoint) {
+            const lowered = entryEndpoint.trim().toLowerCase();
+            if (!lowered.includes('/responses')) {
+                return true;
+            }
+        }
+        return false;
+    }
+    normalizeCodexClientHeaders(headers) {
+        if (!headers) {
+            return undefined;
+        }
+        if (!this.isCodexUaMode()) {
+            return headers;
+        }
+        const normalizedHeaders = { ...headers };
+        this.copyHeaderValue(normalizedHeaders, headers, 'anthropic-session-id', 'session_id');
+        this.copyHeaderValue(normalizedHeaders, headers, 'anthropic-conversation-id', 'conversation_id');
+        this.copyHeaderValue(normalizedHeaders, headers, 'anthropic-user-agent', 'User-Agent');
+        this.copyHeaderValue(normalizedHeaders, headers, 'anthropic-originator', 'originator');
+        return normalizedHeaders;
+    }
+    copyHeaderValue(target, source, from, to) {
+        if (this.findHeaderValue(target, to)) {
+            return;
+        }
+        const value = this.findHeaderValue(source, from);
+        if (value) {
+            target[to] = value;
+        }
+    }
+    findHeaderValue(headers, target) {
+        const lowered = target.toLowerCase();
+        for (const [key, value] of Object.entries(headers)) {
+            if (key.toLowerCase() === lowered && typeof value === 'string' && value.trim()) {
+                return value.trim();
+            }
+        }
+        return undefined;
+    }
+    assignHeader(headers, target, value) {
+        if (!value || !value.trim()) {
+            return;
+        }
+        const lowered = target.toLowerCase();
+        for (const key of Object.keys(headers)) {
+            if (key.toLowerCase() === lowered) {
+                headers[key] = value;
+                return;
+            }
+        }
+        headers[target] = value;
+    }
+    ensureCodexSessionHeaders(headers, runtimeMetadata) {
+        this.setHeaderIfMissing(headers, 'session_id', this.buildCodexIdentifier('session', runtimeMetadata));
+        this.setHeaderIfMissing(headers, 'conversation_id', this.buildCodexIdentifier('conversation', runtimeMetadata));
+    }
+    setHeaderIfMissing(headers, target, value) {
+        if (this.findHeaderValue(headers, target)) {
+            return;
+        }
+        this.assignHeader(headers, target, value);
+    }
+    buildCodexIdentifier(kind, runtimeMetadata) {
+        const fallbackId = runtimeMetadata?.metadata && typeof runtimeMetadata.metadata === 'object'
+            ? runtimeMetadata.metadata.clientRequestId
+            : undefined;
+        const requestId = runtimeMetadata?.requestId ?? fallbackId;
+        const routeName = runtimeMetadata?.routeName;
+        const suffix = (requestId ?? `req-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`)
+            .toString()
+            .replace(/[^A-Za-z0-9_-]/g, '_');
+        const parts = ['codex_cli', kind, suffix];
+        if (routeName) {
+            parts.push(routeName.replace(/[^A-Za-z0-9_-]/g, '_'));
+        }
+        return this.enforceCodexIdentifierLength(parts.join('_'));
+    }
+    enforceCodexIdentifierLength(value) {
+        if (value.length <= CODEX_IDENTIFIER_MAX_LENGTH) {
+            return value;
+        }
+        const hash = createHash('sha256').update(value).digest('hex').slice(0, 10);
+        const keep = Math.max(1, CODEX_IDENTIFIER_MAX_LENGTH - hash.length - 1);
+        return `${value.slice(0, keep)}_${hash}`;
+    }
     getEffectiveBaseUrl() {
         const runtime = this.getRuntimeProfile();
         const runtimeEndpoint = this.pickRuntimeBaseUrl(runtime);
@@ -745,12 +851,23 @@ export class HttpTransportProvider extends BaseProvider {
             : {};
     }
     getEntryEndpointFromPayload(payload) {
-        const metadata = payload.metadata;
-        if (metadata && typeof metadata.entryEndpoint === 'string') {
+        const runtimeMeta = extractProviderRuntimeMetadata(payload);
+        const metadata = (runtimeMeta && typeof runtimeMeta.metadata === 'object')
+            ? runtimeMeta.metadata
+            : payload.metadata;
+        if (metadata && typeof metadata.entryEndpoint === 'string' && metadata.entryEndpoint.trim()) {
             return metadata.entryEndpoint;
         }
         return undefined;
     }
+    getEntryEndpointFromRuntime(runtime) {
+        if (!runtime || !runtime.metadata || typeof runtime.metadata !== 'object') {
+            return undefined;
+        }
+        const meta = runtime.metadata;
+        const value = meta.entryEndpoint;
+        return typeof value === 'string' && value.trim().length ? value : undefined;
+    }
     asResponseRecord(value) {
         if (isRecord(value)) {
             return value;
@@ -856,5 +973,126 @@ export class HttpTransportProvider extends BaseProvider {
         }
         return providerId;
     }
+    extractClientHeaders(source) {
+        const normalize = (value) => {
+            return this.normalizeClientHeaders(value);
+        };
+        if (!source || typeof source !== 'object') {
+            return undefined;
+        }
+        const candidates = [];
+        const metadataNode = source.metadata;
+        if (metadataNode && typeof metadataNode === 'object') {
+            const headersNode = metadataNode.clientHeaders;
+            if (headersNode) {
+                candidates.push(headersNode);
+            }
+        }
+        const directNode = source.clientHeaders;
+        if (directNode) {
+            candidates.push(directNode);
+        }
+        for (const candidate of candidates) {
+            const normalized = normalize(candidate);
+            if (normalized) {
+                return normalized;
+            }
+        }
+        return undefined;
+    }
+    normalizeClientHeaders(value) {
+        if (!value || typeof value !== 'object') {
+            return undefined;
+        }
+        const normalized = {};
+        for (const [key, raw] of Object.entries(value)) {
+            if (typeof raw === 'string' && raw.trim()) {
+                normalized[key] = raw;
+            }
+        }
+        return Object.keys(normalized).length ? normalized : undefined;
+    }
+    async ensureAntigravityProjectMetadata(oauthAuth) {
+        const tokenFile = typeof oauthAuth?.tokenFile === 'string' ? oauthAuth.tokenFile.trim() : '';
+        if (!tokenFile) {
+            return;
+        }
+        const tokenPath = tokenFile.startsWith('~/')
+            ? tokenFile.replace(/^~\//, `${process.env.HOME || ''}/`)
+            : tokenFile;
+        let raw;
+        try {
+            raw = await fs.readFile(tokenPath, 'utf-8');
+        }
+        catch {
+            return;
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            return;
+        }
+        if (this.extractProjectIdFromTokenSnapshot(parsed)) {
+            return;
+        }
+        const accessToken = this.extractAccessTokenFromSnapshot(parsed);
+        if (!accessToken) {
+            return;
+        }
+        const baseOverride = oauthAuth.antigravityApiBase;
+        const apiBaseHint = baseOverride || this.getEffectiveBaseUrl();
+        const projectId = await fetchAntigravityProjectId(accessToken, apiBaseHint);
+        if (!projectId) {
+            logOAuthDebug('[OAuth] Antigravity: unable to resolve project_id for token file');
+            return;
+        }
+        parsed.project_id = projectId;
+        parsed.projectId = projectId;
+        const projectsNode = parsed.projects;
+        if (!Array.isArray(projectsNode) || !projectsNode.length) {
+            parsed.projects = [{ projectId }];
+        }
+        await fs.writeFile(tokenPath, JSON.stringify(parsed, null, 2));
+        logOAuthDebug(`[OAuth] Antigravity: persisted project_id=${projectId} for ${tokenPath}`);
+    }
+    extractAccessTokenFromSnapshot(snapshot) {
+        const lower = snapshot.access_token;
+        const upper = snapshot.AccessToken;
+        const value = typeof lower === 'string'
+            ? lower
+            : typeof upper === 'string'
+                ? upper
+                : undefined;
+        if (value && value.trim()) {
+            return value.trim();
+        }
+        return undefined;
+    }
+    extractProjectIdFromTokenSnapshot(snapshot) {
+        const directNode = snapshot.project_id;
+        const direct = typeof directNode === 'string' ? directNode : undefined;
+        if (direct && direct.trim()) {
+            return direct.trim();
+        }
+        const camelNode = snapshot.projectId;
+        const camel = typeof camelNode === 'string' ? camelNode : undefined;
+        if (camel && camel.trim()) {
+            return camel.trim();
+        }
+        if (Array.isArray(snapshot.projects)) {
+            for (const entry of snapshot.projects ?? []) {
+                if (entry && typeof entry === 'object' && typeof entry.projectId === 'string') {
+                    const candidate = String(entry.projectId);
+                    if (candidate.trim()) {
+                        return candidate.trim();
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
 }
+const CODEX_IDENTIFIER_MAX_LENGTH = 64;
 //# sourceMappingURL=http-transport-provider.js.map