@jsonstudio/rcc 0.89.1968 → 0.89.2195

package/dist/providers/core/config/provider-oauth-configs.js

@@ -57,13 +57,16 @@ function registerProviderOAuthConfigs() {
             requestOfflineAccess: true
         }
     });
-    // iFlow OAuth配置 - 对齐CLIProxyAPI和官方CLI，使用标准OAuth端点
+    // iFlow OAuth默认配置：优先授权码流程（回调链路）
+    // 说明：
+    // - /oauth/device/code 当前会返回 HTML 页面而非 device-code JSON，导致手动 OAuth 在首步即失败。
+    // - 默认改为授权码流程，走 /oauth + localhost 回调，保留 iflow-device 作为显式设备码备用。
     OAuthFlowConfigManager.registerDefaultConfig('iflow', {
-        flowType: OAuthFlowType.DEVICE_CODE,
+        flowType: OAuthFlowType.AUTHORIZATION_CODE,
         activationType: OAuthActivationType.AUTO_BROWSER,
         endpoints: {
-            // 对齐CLIProxyAPI：使用标准OAuth端点，移除/api/oauth2/前缀
-            deviceCodeUrl: 'https://iflow.cn/oauth/device/code',
+            // 授权码主链路
+            deviceCodeUrl: 'https://iflow.cn/api/oauth2/device/code',
             tokenUrl: 'https://iflow.cn/oauth/token',
             authorizationUrl: 'https://iflow.cn/oauth',
             userInfoUrl: 'https://iflow.cn/api/oauth/getUserInfo'
@@ -73,7 +76,8 @@ function registerProviderOAuthConfigs() {
             clientId: '10009311001',
             clientSecret: '4Z3YjXycVsQvyGF1etiNlIBB4RsqSDtW',
             scopes: ['openid', 'profile', 'email', 'api'],
-            redirectUri: `${HTTP_PROTOCOLS.HTTP}${LOCAL_HOSTS.LOCALHOST}:${DEFAULT_CONFIG.OAUTH_CALLBACK_PORT}${API_PATHS.OAUTH_CALLBACK}`
+            // 对齐 CLIProxyAPI：iflow OAuth callback 默认使用 11451，避免与主服务端口冲突
+            redirectUri: `${HTTP_PROTOCOLS.HTTP}${LOCAL_HOSTS.LOCALHOST}:11451${API_PATHS.OAUTH_CALLBACK}`
         },
         headers: {
             'User-Agent': 'iflow-cli/2.0',
@@ -100,14 +104,14 @@ function registerProviderOAuthConfigs() {
             requestOfflineAccess: true
         }
     });
-    // iFlow OAuth设备码配置（备用）- 对齐CLIProxyAPI
+    // iFlow OAuth设备码配置（备用）
     OAuthFlowConfigManager.registerDefaultConfig('iflow-device', {
         flowType: OAuthFlowType.DEVICE_CODE,
         activationType: OAuthActivationType.AUTO_BROWSER,
         endpoints: {
-            // 使用标准OAuth端点，与CLIProxyAPI一致
-            deviceCodeUrl: 'https://iflow.cn/oauth/device/code',
-            tokenUrl: 'https://iflow.cn/oauth/token',
+            // 兼容历史 CLI 链路：设备码端点仍使用 /api/oauth2 前缀
+            deviceCodeUrl: 'https://iflow.cn/api/oauth2/device/code',
+            tokenUrl: 'https://iflow.cn/api/oauth2/token',
             userInfoUrl: 'https://iflow.cn/api/oauth/getUserInfo'
         },
         client: {

package/dist/providers/core/config/provider-oauth-configs.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-oauth-configs.js","sourceRoot":"","sources":["../../../../src/providers/core/config/provider-oauth-configs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider-oauth-configs.js","sourceRoot":"","sources":["../../../../src/providers/core/config/provider-oauth-configs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,mBAAmB,EAAwB,MAAM,kBAAkB,CAAC;AAGpH,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AAEpF;;GAEG;AACH,SAAS,0BAA0B;IACjC,sBAAsB,CAAC,mBAAmB,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,8BAA8B,EAAE,CAAC,CAAC;IAC5G,sBAAsB,CAAC,mBAAmB,CAAC,aAAa,CAAC,kBAAkB,EAAE,IAAI,gCAAgC,EAAE,CAAC,CAAC;IACrH,sBAAsB,CAAC,mBAAmB,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,8BAA8B,EAAE,CAAC,CAAC;AACzG,CAAC;AAED;;GAEG;AACH,SAAS,4BAA4B;IACnC,eAAe;IACf,sBAAsB,CAAC,qBAAqB,CAAC,MAAM,EAAE;QACnD,QAAQ,EAAE,aAAa,CAAC,WAAW;QACnC,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,SAAS,EAAE;YACT,aAAa,EAAE,gDAAgD;YAC/D,QAAQ,EAAE,0CAA0C;YACpD,WAAW,EAAE,uCAAuC;SACrD;QACD,MAAM,EAAE;YACN,QAAQ,EAAE,kCAAkC;YAC5C,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,kBAAkB,CAAC;SAC3D;QACD,OAAO,EAAE;YACP,YAAY,EAAE,iCAAiC;YAC/C,mBAAmB,EAAE,iBAAiB;YACtC,iBAAiB,EAAE,yEAAyE;YAC5F,QAAQ,EAAE,kBAAkB;SAC7B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,KAAK;YAClB,wCAAwC;YACxC,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;IAEH,gCAAgC;IAChC,MAAM;IACN,2EAA2E;IAC3E,iEAAiE;IACjE,sBAAsB,CAAC,qBAAqB,CAAC,OAAO,EAAE;QACpD,QAAQ,EAAE,aAAa,CAAC,kBAAkB;QAC1C,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,SAAS,EAAE;YACT,SAAS;YACT,aAAa,EAAE,yCAAyC;YACxD,QAAQ,EAAE,8BAA8B;YACxC,gBAAgB,EAAE,wBAAwB;YAC1C,WAAW,EAAE,wCAAwC;SACtD;QACD,MAAM,EAAE;YACN,6BAA6B;YAC7B,QAAQ,EAAE,aAAa;YACvB,YAAY,EAAE,kCAAkC;YAChD,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC;YAC7C,4DAA4D;YAC5D,WAAW,EAAE,GAAG,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,SAAS,SAAS,CAAC,cAAc,EAAE;SAC/F;QACD,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,kBAAkB,EAAE,gBAAgB;YACpC,QAAQ,EAAE,kBAAkB;YAC5B,SAAS,EAAE,wBAAwB;YACnC,QAAQ,EAAE,kBAAkB;SAC7B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,IAAI;YAC5B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;YACjB,kDAAkD;YAClD,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;IAEH,uBAAuB;IACvB,sBAAsB,CAAC,qBAAqB,CAAC,cAAc,EAAE;QAC3D,QAAQ,EAAE,aAAa,CAAC,WAAW;QACnC,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,SAAS,EAAE;YACT,sCAAsC;YACtC,aAAa,EAAE,yCAAyC;YACxD,QAAQ,EAAE,mCAAmC;YAC7C,WAAW,EAAE,wCAAwC;SACtD;QACD,MAAM,EAAE;YACN,iBAAiB;YACjB,QAAQ,EAAE,aAAa;YACvB,YAAY,EAAE,kCAAkC;YAChD,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC;SAC9C;QACD,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,kBAAkB,EAAE,gBAAgB;YACpC,QAAQ,EAAE,kBAAkB;YAC5B,SAAS,EAAE,wBAAwB;YACnC,QAAQ,EAAE,kBAAkB;SAC7B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,IAAI;YAC5B,oBAAoB,EAAE,KAAK;YAC3B,WAAW,EAAE,KAAK;SACnB;KACF,CAAC,CAAC;IAEH,yDAAyD;IACzD,sEAAsE;IACtE,sBAAsB,CAAC,qBAAqB,CAAC,YAAY,EAAE;QACzD,QAAQ,EAAE,aAAa,CAAC,kBAAkB;QAC1C,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,SAAS,EAAE;YACT,gBAAgB,EAAE,8CAA8C;YAChE,QAAQ,EAAE,qCAAqC;YAC/C,WAAW,EAAE,+CAA+C;YAC5D,iCAAiC;YACjC,aAAa,EAAE,2CAA2C;SAC3D;QACD,MAAM,EAAE;YACN,2BAA2B;YAC3B,QAAQ,EAAE,0EAA0E;YACpF,YAAY,EAAE,qCAAqC;YACnD,MAAM,EAAE;gBACN,gDAAgD;gBAChD,gDAAgD;gBAChD,kDAAkD;aACnD;YACD,WAAW,EAAE,GAAG,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,IAAI,cAAc,CAAC,mBAAmB,GAAG,SAAS,CAAC,cAAc,EAAE;SAC/H;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,kBAAkB;SAC7B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;YACjB,yCAAyC;YACzC,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;IAEH,0DAA0D;IAC1D,4DAA4D;IAC5D,sBAAsB,CAAC,qBAAqB,CAAC,aAAa,EAAE;QAC1D,QAAQ,EAAE,aAAa,CAAC,kBAAkB;QAC1C,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,SAAS,EAAE;YACT,gBAAgB,EAAE,8CAA8C;YAChE,QAAQ,EAAE,qCAAqC;YAC/C,WAAW,EAAE,+CAA+C;YAC5D,aAAa,EAAE,2CAA2C;SAC3D;QACD,MAAM,EAAE;YACN,QAAQ,EAAE,2EAA2E;YACrF,YAAY,EAAE,qCAAqC;YACnD,MAAM,EAAE;gBACN,gDAAgD;gBAChD,gDAAgD;gBAChD,kDAAkD;gBAClD,uCAAuC;gBACvC,uDAAuD;aACxD;YACD,WAAW,EAAE,GAAG,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,IAAI,cAAc,CAAC,mBAAmB,GAAG,SAAS,CAAC,cAAc,EAAE;SAC/H;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,kBAAkB;SAC7B;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB;IACpC,SAAS;IACT,0BAA0B,EAAE,CAAC;IAE7B,eAAe;IACf,4BAA4B,EAAE,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAAkB,EAClB,YAAqC,EAAE;IAEvC,OAAO,sBAAsB,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AACpE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CAAC,UAAkB,EAAE,YAAqC,EAAE,EAAE,SAAkB;IACzH,MAAM,MAAM,GAAG,sBAAsB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC7D,OAAO,sBAAsB,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAC3C,UAAkB,EAClB,QAA+C;IAE/C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAgC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC;IACjD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,uBAAuB;IACvB,oBAAoB,EAAE;QACpB,QAAQ,EAAE,aAAa,CAAC,WAAW;QACnC,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,KAAK;SACnB;KAC0B;IAE7B,uBAAuB;IACvB,kBAAkB,EAAE;QAClB,QAAQ,EAAE,aAAa,CAAC,kBAAkB;QAC1C,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;SAClB;KAC0B;IAE7B,wBAAwB;IACxB,yBAAyB,EAAE;QACzB,QAAQ,EAAE,aAAa,CAAC,WAAW;QACnC,cAAc,EAAE,mBAAmB,CAAC,YAAY;QAChD,OAAO,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,MAAM;SAChB;QACD,KAAK,EAAE;YACL,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,IAAI;YAC5B,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;SAClB;KAC0B;CAC9B,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAC3C,QAA6C,EAC7C,mBAA6C,EAAE;IAE/C,MAAM,UAAU,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACpD,OAAO,sBAAsB,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,GAAG,UAAU,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC;AAC/F,CAAC;AAED,QAAQ;AACR,sBAAsB,EAAE,CAAC;AAEzB,eAAe;IACb,sBAAsB;IACtB,sBAAsB;IACtB,2BAA2B;IAC3B,sBAAsB;IACtB,6BAA6B;CAC9B,CAAC"}

package/dist/providers/core/runtime/antigravity-request-type.d.ts

@@ -0,0 +1,2 @@
+import type { UnknownObject } from '../../../types/common-types.js';
+export declare function resolveAntigravityRequestTypeFromPayload(request: UnknownObject | Record<string, unknown> | unknown): 'agent' | 'web_search' | 'image_gen';

package/dist/providers/core/runtime/antigravity-request-type.js

@@ -0,0 +1,126 @@
+const NETWORKING_TOOL_KEYWORDS = new Set([
+    'web_search',
+    'web_search_20250305',
+    'websearch',
+    'google_search',
+    'google_search_retrieval'
+]);
+function isRecord(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function readNonEmptyString(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed.length ? trimmed : undefined;
+}
+function readExplicitRequestType(record) {
+    const raw = readNonEmptyString(record.requestType);
+    if (!raw) {
+        return undefined;
+    }
+    const normalized = raw.toLowerCase();
+    if (normalized === 'agent' || normalized === 'web_search' || normalized === 'image_gen') {
+        return normalized;
+    }
+    return undefined;
+}
+function readMetadataHasImageAttachment(record) {
+    const metadata = isRecord(record.metadata) ? record.metadata : undefined;
+    if (!metadata) {
+        return false;
+    }
+    return metadata.hasImageAttachment === true || metadata.hasImageAttachment === 'true';
+}
+function readModel(record) {
+    const direct = readNonEmptyString(record.model);
+    if (direct) {
+        return direct;
+    }
+    const nestedRequest = isRecord(record.request) ? record.request : undefined;
+    if (!nestedRequest) {
+        return undefined;
+    }
+    return readNonEmptyString(nestedRequest.model);
+}
+function collectTools(record) {
+    const collected = [];
+    if (Array.isArray(record.tools)) {
+        collected.push(...record.tools);
+    }
+    const nestedRequest = isRecord(record.request) ? record.request : undefined;
+    if (nestedRequest && Array.isArray(nestedRequest.tools)) {
+        collected.push(...nestedRequest.tools);
+    }
+    return collected;
+}
+function isNetworkingToolName(raw) {
+    const normalized = readNonEmptyString(raw)?.toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    return NETWORKING_TOOL_KEYWORDS.has(normalized);
+}
+function hasNetworkingTool(tools) {
+    for (const tool of tools) {
+        if (!isRecord(tool)) {
+            continue;
+        }
+        if (isNetworkingToolName(tool.name) || isNetworkingToolName(tool.type)) {
+            return true;
+        }
+        const fn = isRecord(tool.function) ? tool.function : undefined;
+        if (fn && isNetworkingToolName(fn.name)) {
+            return true;
+        }
+        const declarations = Array.isArray(tool.functionDeclarations) ? tool.functionDeclarations : undefined;
+        if (declarations) {
+            for (const declaration of declarations) {
+                if (isRecord(declaration) && isNetworkingToolName(declaration.name)) {
+                    return true;
+                }
+            }
+        }
+        if (isRecord(tool.googleSearch) || isRecord(tool.googleSearchRetrieval)) {
+            return true;
+        }
+    }
+    return false;
+}
+function isImageModel(model) {
+    const normalized = readNonEmptyString(model)?.toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    return normalized.startsWith('gemini-3-pro-image') || normalized.includes('gemini-3-pro-image');
+}
+function hasOnlineSuffix(model) {
+    const normalized = readNonEmptyString(model)?.toLowerCase();
+    return !!normalized && normalized.endsWith('-online');
+}
+export function resolveAntigravityRequestTypeFromPayload(request) {
+    if (!isRecord(request)) {
+        return 'agent';
+    }
+    const root = request;
+    const envelope = isRecord(root.data) ? root.data : root;
+    const explicit = readExplicitRequestType(envelope) || readExplicitRequestType(root);
+    if (explicit === 'agent' || explicit === 'web_search' || explicit === 'image_gen') {
+        return explicit;
+    }
+    const model = readModel(envelope) || readModel(root);
+    if (isImageModel(model)) {
+        return 'image_gen';
+    }
+    const tools = [...collectTools(envelope), ...collectTools(root)];
+    if (hasOnlineSuffix(model) || hasNetworkingTool(tools)) {
+        return 'web_search';
+    }
+    const hasImageAttachment = readMetadataHasImageAttachment(envelope) || readMetadataHasImageAttachment(root);
+    if (hasImageAttachment) {
+        return 'image_gen';
+    }
+    return 'agent';
+}
+//# sourceMappingURL=antigravity-request-type.js.map

package/dist/providers/core/runtime/antigravity-request-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"antigravity-request-type.js","sourceRoot":"","sources":["../../../../src/providers/core/runtime/antigravity-request-type.ts"],"names":[],"mappings":"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"}

package/dist/providers/core/runtime/base-provider-runtime-helpers.d.ts

@@ -0,0 +1,27 @@
+import type { ProviderContext, ProviderRuntimeProfile } from '../api/provider-types.js';
+import type { UnknownObject } from '../../../types/common-types.js';
+import { type ProviderRuntimeMetadata } from './provider-runtime-metadata.js';
+type RequestEnvelope = UnknownObject & {
+    data?: UnknownObject;
+};
+export declare function hasDataEnvelope(value: UnknownObject): value is RequestEnvelope;
+export declare function unwrapRequestPayload(request: UnknownObject): Record<string, unknown>;
+export declare function hasTools(payload: Record<string, unknown>): boolean;
+export declare function createProviderContext(options: {
+    request: UnknownObject;
+    providerType: string;
+    runtimeProfile?: ProviderRuntimeProfile;
+    configProviderId?: string;
+    configProviderType?: string;
+}): {
+    context: ProviderContext;
+    runtimeMetadata?: ProviderRuntimeMetadata;
+};
+export declare function reattachRuntimeMetadata(payload: UnknownObject, metadata?: ProviderRuntimeMetadata): void;
+export declare function extractUsageTokensFromResponse(finalResponse: UnknownObject): {
+    promptTokens?: number;
+    completionTokens?: number;
+    totalTokens?: number;
+};
+export declare function truncateLogMessage(value: string, maxLength?: number): string;
+export {};

package/dist/providers/core/runtime/base-provider-runtime-helpers.js

@@ -0,0 +1,105 @@
+import { attachProviderRuntimeMetadata, extractProviderRuntimeMetadata } from './provider-runtime-metadata.js';
+import { normalizeProviderFamily, normalizeProviderType, providerTypeToProtocol } from '../utils/provider-type-utils.js';
+export function hasDataEnvelope(value) {
+    return Boolean(value && typeof value === 'object' && 'data' in value);
+}
+export function unwrapRequestPayload(request) {
+    if (hasDataEnvelope(request) && request.data && typeof request.data === 'object') {
+        return request.data;
+    }
+    return request;
+}
+export function hasTools(payload) {
+    const tools = payload.tools;
+    if (Array.isArray(tools)) {
+        return tools.length > 0;
+    }
+    return Boolean(tools);
+}
+export function createProviderContext(options) {
+    const runtimeMetadata = extractProviderRuntimeMetadata(options.request);
+    const payload = unwrapRequestPayload(options.request);
+    const runtimeModel = typeof runtimeMetadata?.target?.model === 'string'
+        ? runtimeMetadata.target.model
+        : undefined;
+    const payloadModel = typeof payload.model === 'string' ? payload.model : undefined;
+    const providerType = normalizeProviderType(runtimeMetadata?.providerType ||
+        options.runtimeProfile?.providerType ||
+        options.providerType);
+    const providerFamily = normalizeProviderFamily(runtimeMetadata?.providerFamily, runtimeMetadata?.providerId, runtimeMetadata?.providerKey, options.runtimeProfile?.providerFamily, options.runtimeProfile?.providerId, options.configProviderId, options.configProviderType);
+    const providerProtocol = runtimeMetadata?.providerProtocol ||
+        providerTypeToProtocol(providerType);
+    const context = {
+        requestId: runtimeMetadata?.requestId || `req-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+        providerType,
+        providerFamily,
+        startTime: Date.now(),
+        model: payloadModel ?? runtimeModel,
+        hasTools: hasTools(payload),
+        metadata: runtimeMetadata?.metadata || {},
+        providerId: runtimeMetadata?.providerId || runtimeMetadata?.providerKey || options.runtimeProfile?.providerId,
+        providerKey: runtimeMetadata?.providerKey || options.runtimeProfile?.providerKey,
+        providerProtocol,
+        routeName: runtimeMetadata?.routeName,
+        target: runtimeMetadata?.target,
+        runtimeMetadata,
+        pipelineId: runtimeMetadata?.pipelineId
+    };
+    return { context, runtimeMetadata };
+}
+export function reattachRuntimeMetadata(payload, metadata) {
+    if (!metadata || !payload || typeof payload !== 'object') {
+        return;
+    }
+    const target = hasDataEnvelope(payload) && payload.data && typeof payload.data === 'object'
+        ? payload.data
+        : payload;
+    attachProviderRuntimeMetadata(target, metadata);
+}
+export function extractUsageTokensFromResponse(finalResponse) {
+    if (!finalResponse || typeof finalResponse !== 'object') {
+        return {};
+    }
+    const container = finalResponse;
+    const meta = (container.metadata && typeof container.metadata === 'object')
+        ? container.metadata
+        : undefined;
+    const usageNode = meta && meta.usage && typeof meta.usage === 'object'
+        ? meta.usage
+        : (container.usage && typeof container.usage === 'object'
+            ? container.usage
+            : undefined);
+    if (!usageNode) {
+        return {};
+    }
+    const readNumber = (value) => {
+        if (typeof value !== 'number') {
+            return undefined;
+        }
+        if (!Number.isFinite(value)) {
+            return undefined;
+        }
+        return value;
+    };
+    const promptTokens = readNumber(usageNode.prompt_tokens) ??
+        readNumber(usageNode.promptTokens) ??
+        readNumber(usageNode.input_tokens) ??
+        readNumber(usageNode.inputTokens);
+    const completionTokens = readNumber(usageNode.completion_tokens) ??
+        readNumber(usageNode.completionTokens) ??
+        readNumber(usageNode.output_tokens) ??
+        readNumber(usageNode.outputTokens);
+    let totalTokens = readNumber(usageNode.total_tokens) ??
+        readNumber(usageNode.totalTokens);
+    if (totalTokens === undefined && (promptTokens !== undefined || completionTokens !== undefined)) {
+        totalTokens = (promptTokens ?? 0) + (completionTokens ?? 0);
+    }
+    return { promptTokens, completionTokens, totalTokens };
+}
+export function truncateLogMessage(value, maxLength = 400) {
+    if (!value || value.length <= maxLength) {
+        return value;
+    }
+    return `${value.slice(0, maxLength - 3)}...`;
+}
+//# sourceMappingURL=base-provider-runtime-helpers.js.map

package/dist/providers/core/runtime/base-provider-runtime-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-provider-runtime-helpers.js","sourceRoot":"","sources":["../../../../src/providers/core/runtime/base-provider-runtime-helpers.ts"],"names":[],"mappings":"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"}

package/dist/providers/core/runtime/base-provider-series-cooldown.d.ts

@@ -0,0 +1,19 @@
+import type { ProviderContext, ProviderRuntimeProfile } from '../api/provider-types.js';
+import type { ProviderErrorAugmented } from './provider-error-types.js';
+type ModelSeriesName = 'claude' | 'gemini-pro' | 'gemini-flash' | 'default';
+export declare const SERIES_COOLDOWN_DETAIL_KEY: "virtualRouterSeriesCooldown";
+export type SeriesCooldownDetail = {
+    scope: 'model-series';
+    providerId: string;
+    providerKey?: string;
+    model?: string;
+    series: Exclude<ModelSeriesName, 'default'>;
+    cooldownMs: number;
+    quotaResetDelay?: string;
+    source?: string;
+    expiresAt?: number;
+};
+export declare function isDailyLimitRateLimitMessage(messageLower: string, upstreamLower?: string): boolean;
+export declare function buildSeriesCooldownDetail(error: ProviderErrorAugmented, context: ProviderContext, runtimeProfile?: ProviderRuntimeProfile, providerKey?: string): SeriesCooldownDetail | null;
+export declare function parseDurationToMs(value?: string): number | null;
+export {};