@jsonstudio/rcc 0.89.683 → 0.89.912

package/dist/providers/auth/antigravity-userinfo-helper.js

@@ -2,6 +2,9 @@
  * Antigravity OAuth helper utilities.
  * Mirrors the logic implemented in gcli2api for resolving project metadata.
  */
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import os from 'node:os';
 import { logOAuthDebug } from './oauth-logger.js';
 const DEFAULT_ANTIGRAVITY_API_BASE = 'https://daily-cloudcode-pa.sandbox.googleapis.com';
 const DEFAULT_USER_AGENT = 'antigravity/1.11.3 windows/amd64';
@@ -11,6 +14,29 @@ const METADATA_PAYLOAD = {
     pluginType: 'GEMINI'
 };
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const expandHome = (p) => {
+    if (!p || typeof p !== 'string') {
+        return p;
+    }
+    if (p.startsWith('~/')) {
+        const home = process.env.HOME || os.homedir() || '';
+        return path.join(home, p.slice(2));
+    }
+    return p;
+};
+async function readJsonFile(filePath) {
+    try {
+        const raw = await fs.readFile(filePath, 'utf-8');
+        const parsed = raw.trim() ? JSON.parse(raw) : null;
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
 const extractProjectId = (value) => {
     if (typeof value === 'string' && value.trim()) {
         return value.trim();
@@ -35,6 +61,35 @@ const normalizedBase = (base) => {
     const candidate = (base && base.trim()) || envBase || DEFAULT_ANTIGRAVITY_API_BASE;
     return candidate.replace(/\/+$/, '');
 };
+function 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;
+}
+function hasProjectMetadata(snapshot) {
+    if (typeof snapshot.project_id === 'string' && snapshot.project_id) {
+        return true;
+    }
+    if (typeof snapshot.projectId === 'string' && snapshot.projectId) {
+        return true;
+    }
+    const projects = snapshot.projects;
+    if (Array.isArray(projects) && projects.length > 0) {
+        const hasProject = projects.some((proj) => proj && typeof proj === 'object' && typeof proj.projectId === 'string');
+        if (hasProject) {
+            return true;
+        }
+    }
+    return false;
+}
 async function tryLoadCodeAssist(apiBase, headers) {
     const requestUrl = `${apiBase}/v1internal:loadCodeAssist`;
     const response = await fetch(requestUrl, {
@@ -130,6 +185,9 @@ export async function fetchAntigravityProjectId(accessToken, apiBase) {
         return undefined;
     }
 }
+export function buildAntigravityHeaders(accessToken) {
+    return buildHeaders(accessToken);
+}
 export function resolveAntigravityApiBase(explicit) {
     return normalizedBase(explicit);
 }
@@ -137,4 +195,48 @@ export const ANTIGRAVITY_HELPER_DEFAULTS = {
     apiBase: DEFAULT_ANTIGRAVITY_API_BASE,
     userAgent: DEFAULT_USER_AGENT
 };
+export async function ensureAntigravityTokenProjectMetadata(tokenFilePath, apiBaseHint) {
+    const resolved = expandHome(tokenFilePath);
+    if (!resolved) {
+        return false;
+    }
+    const snapshot = await readJsonFile(resolved);
+    if (!snapshot) {
+        return false;
+    }
+    if (hasProjectMetadata(snapshot)) {
+        return true;
+    }
+    const accessToken = extractAccessTokenFromSnapshot(snapshot);
+    if (!accessToken) {
+        return false;
+    }
+    const projectId = await fetchAntigravityProjectId(accessToken, apiBaseHint);
+    if (!projectId) {
+        return false;
+    }
+    snapshot.project_id = projectId;
+    snapshot.projectId = projectId;
+    const projectsNode = snapshot.projects;
+    if (!Array.isArray(projectsNode) || projectsNode.length === 0) {
+        snapshot.projects = [{ projectId }];
+    }
+    else {
+        const exists = projectsNode.some((proj) => proj && typeof proj === 'object' && typeof proj.projectId === 'string'
+            ? proj.projectId === projectId
+            : false);
+        if (!exists) {
+            projectsNode.push({ projectId });
+        }
+    }
+    try {
+        await fs.writeFile(resolved, `${JSON.stringify(snapshot, null, 2)}\n`, 'utf-8');
+        logOAuthDebug(`[OAuth] Antigravity: ensured project_id=${projectId} for ${resolved}`);
+        return true;
+    }
+    catch (error) {
+        logOAuthDebug(`[OAuth] Antigravity: failed to persist project_id for ${resolved} - ${error instanceof Error ? error.message : String(error)}`);
+        return false;
+    }
+}
 //# sourceMappingURL=antigravity-userinfo-helper.js.map

package/dist/providers/auth/antigravity-userinfo-helper.js.map

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

package/dist/providers/auth/iflow-cookie-auth.d.ts

@@ -0,0 +1,27 @@
+/**
+ * iFlow Cookie-based Authentication Provider
+ *
+ * 使用浏览器导出的 iFlow Cookie（BXAuth）获取并维护 API Key，避免频繁走 OAuth 授权码流程。
+ * 请求阶段始终以 `Authorization: Bearer <apiKey>` 调用 https://apis.iflow.cn/v1/chat/completions。
+ */
+import type { IAuthProvider, AuthStatus } from './auth-interface.js';
+import type { UnknownObject } from '../../modules/pipeline/types/common-types.js';
+export declare class IflowCookieAuthProvider implements IAuthProvider {
+    readonly type: "apikey";
+    private readonly config;
+    private status;
+    private isInitialized;
+    private apiKey;
+    private expireTime;
+    private email;
+    constructor(config: UnknownObject);
+    initialize(): Promise<void>;
+    buildHeaders(): Record<string, string>;
+    validateCredentials(): Promise<boolean>;
+    cleanup(): Promise<void>;
+    getStatus(): AuthStatus;
+    private resolveCookie;
+    private fetchApiKeyInfo;
+    private refreshApiKey;
+    private updateStatus;
+}

package/dist/providers/auth/iflow-cookie-auth.js

@@ -0,0 +1,209 @@
+/**
+ * iFlow Cookie-based Authentication Provider
+ *
+ * 使用浏览器导出的 iFlow Cookie（BXAuth）获取并维护 API Key，避免频繁走 OAuth 授权码流程。
+ * 请求阶段始终以 `Authorization: Bearer <apiKey>` 调用 https://apis.iflow.cn/v1/chat/completions。
+ */
+import fs from 'fs';
+import fsPromises from 'fs/promises';
+import path from 'path';
+function asNonEmptyString(value) {
+    return typeof value === 'string' && value.trim().length > 0 ? value.trim() : '';
+}
+function expandHome(p) {
+    if (!p) {
+        return p;
+    }
+    if (p.startsWith('~/')) {
+        const home = process.env.HOME || '';
+        return p.replace(/^~\//, `${home}/`);
+    }
+    return p;
+}
+export class IflowCookieAuthProvider {
+    type = 'apikey';
+    config;
+    status;
+    isInitialized = false;
+    apiKey = null;
+    expireTime = null;
+    email = null;
+    constructor(config) {
+        this.config = (config || {});
+        this.status = {
+            isAuthenticated: false,
+            isValid: false,
+            lastValidated: 0
+        };
+    }
+    async initialize() {
+        try {
+            const cookie = await this.resolveCookie();
+            if (!cookie) {
+                this.updateStatus(false, false, 'cookie missing');
+                throw new Error('IflowCookieAuthProvider: cookie not provided');
+            }
+            // 对齐 CLIProxyAPI 的流程：先获取现有 API Key 信息，再刷新一次确保最新。
+            const initial = await this.fetchApiKeyInfo(cookie);
+            const name = asNonEmptyString(initial.name);
+            const keyData = await this.refreshApiKey(cookie, name || initial.name || '');
+            const apiKey = asNonEmptyString(keyData.apiKey);
+            if (!apiKey) {
+                this.updateStatus(false, false, 'api key missing from cookie flow');
+                throw new Error('IflowCookieAuthProvider: missing api key in response');
+            }
+            this.apiKey = apiKey;
+            this.expireTime = asNonEmptyString(keyData.expireTime);
+            this.email = asNonEmptyString(keyData.name);
+            this.updateStatus(true, true);
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error || '');
+            this.updateStatus(false, false, msg);
+            throw error;
+        }
+        finally {
+            this.isInitialized = true;
+        }
+    }
+    buildHeaders() {
+        if (!this.isInitialized || !this.apiKey) {
+            throw new Error('IflowCookieAuthProvider not initialized');
+        }
+        return {
+            Authorization: `Bearer ${this.apiKey}`
+        };
+    }
+    async validateCredentials() {
+        if (!this.isInitialized || !this.apiKey) {
+            return false;
+        }
+        // 简单校验：存在 apiKey 即视为有效；过期判断由服务端和上层重试/刷新策略负责。
+        this.updateStatus(true, true);
+        return true;
+    }
+    async cleanup() {
+        this.apiKey = null;
+        this.expireTime = null;
+        this.email = null;
+        this.isInitialized = false;
+        this.updateStatus(false, false, 'cleanup');
+    }
+    getStatus() {
+        return { ...this.status };
+    }
+    // ---- helpers ----
+    async resolveCookie() {
+        // 1) 显式 cookie 字段
+        const direct = asNonEmptyString(this.config.cookie);
+        if (direct) {
+            return direct;
+        }
+        // 2) cookieFile / tokenFile 指向的文件
+        const fileCandidates = [];
+        const cookieFile = asNonEmptyString(this.config.cookieFile);
+        if (cookieFile) {
+            fileCandidates.push(cookieFile);
+        }
+        const tokenFile = asNonEmptyString(this.config.tokenFile);
+        if (tokenFile) {
+            fileCandidates.push(tokenFile);
+        }
+        for (const candidate of fileCandidates) {
+            const filePath = expandHome(candidate);
+            try {
+                const txt = await fsPromises.readFile(filePath, 'utf8');
+                const content = txt.trim();
+                if (content) {
+                    return content;
+                }
+            }
+            catch {
+                // ignore and try next candidate
+            }
+        }
+        // 3) 环境变量 IFLOW_COOKIE
+        const envCookie = asNonEmptyString(process.env.IFLOW_COOKIE);
+        if (envCookie) {
+            return envCookie;
+        }
+        return '';
+    }
+    async fetchApiKeyInfo(cookie) {
+        const endpoint = 'https://platform.iflow.cn/api/openapi/apikey';
+        const headers = {
+            Cookie: cookie,
+            Accept: 'application/json, text/plain, */*',
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
+            'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
+            Connection: 'keep-alive'
+        };
+        const resp = await fetch(endpoint, {
+            method: 'GET',
+            headers
+        });
+        const bodyText = await resp.text();
+        if (!resp.ok) {
+            throw new Error(`iflow cookie GET request failed: status=${resp.status} body=${bodyText.slice(0, 200)}`);
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(bodyText);
+        }
+        catch (error) {
+            throw new Error(`iflow cookie GET decode failed: ${error.message || String(error)}`);
+        }
+        if (!parsed.success || !parsed.data) {
+            throw new Error(`iflow cookie GET not successful: ${asNonEmptyString(parsed.message)}`);
+        }
+        return parsed.data;
+    }
+    async refreshApiKey(cookie, name) {
+        const trimmedName = asNonEmptyString(name);
+        if (!trimmedName) {
+            // 若缺少 name，则直接重用 fetchApiKeyInfo 的结果
+            return await this.fetchApiKeyInfo(cookie);
+        }
+        const endpoint = 'https://platform.iflow.cn/api/openapi/apikey';
+        const headers = {
+            Cookie: cookie,
+            'Content-Type': 'application/json',
+            Accept: 'application/json, text/plain, */*',
+            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
+            'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
+            Connection: 'keep-alive',
+            Origin: 'https://platform.iflow.cn',
+            Referer: 'https://platform.iflow.cn/'
+        };
+        const body = JSON.stringify({ name: trimmedName });
+        const resp = await fetch(endpoint, {
+            method: 'POST',
+            headers,
+            body
+        });
+        const bodyText = await resp.text();
+        if (!resp.ok) {
+            throw new Error(`iflow cookie POST request failed: status=${resp.status} body=${bodyText.slice(0, 200)}`);
+        }
+        let parsed;
+        try {
+            parsed = JSON.parse(bodyText);
+        }
+        catch (error) {
+            throw new Error(`iflow cookie POST decode failed: ${error.message || String(error)}`);
+        }
+        if (!parsed.success || !parsed.data) {
+            throw new Error(`iflow cookie POST not successful: ${asNonEmptyString(parsed.message)}`);
+        }
+        return parsed.data;
+    }
+    updateStatus(isAuthenticated, isValid, message) {
+        this.status = {
+            isAuthenticated,
+            isValid,
+            lastValidated: Date.now(),
+            error: message
+        };
+    }
+}
+//# sourceMappingURL=iflow-cookie-auth.js.map

package/dist/providers/auth/iflow-cookie-auth.js.map

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

package/dist/providers/auth/oauth-lifecycle.js

@@ -1,4 +1,4 @@
-import { createProviderOAuthStrategy, getProviderOAuthConfig } from '../core/config/provider-oauth-configs.js';
+import { createProviderOAuthStrategy, getProviderOAuthConfig, resolveOAuthBrowserPreference } from '../core/config/provider-oauth-configs.js';
 import { OAuthFlowType } from '../core/config/oauth-flows.js';
 import fs from 'fs/promises';
 import fsSync from 'fs';
@@ -274,13 +274,6 @@ function evaluateTokenState(token, providerType) {
     else {
         validAccess = (hasApiKey || hasAccess) && !isExpiredOrNear;
     }
-    // 对 gemini-cli / antigravity，缺少 project 元数据视为无效凭证，
-    // 行为上等价于 gcli2api 要求凭证里必须有 project_id。
-    if (isGeminiCliFamily(providerType) && validAccess) {
-        if (!hasGeminiProjectMetadata(token)) {
-            validAccess = false;
-        }
-    }
     return { hasApiKey, hasAccess, expiresAt, isExpiredOrNear, validAccess };
 }
 function logTokenSnapshot(providerType, token, endpoints) {
@@ -599,19 +592,21 @@ function logOAuthSetup(providerType, defaults, overrides, endpoints, client, tok
 function createStrategy(providerType, overrides, tokenFilePath) {
     return createProviderOAuthStrategy(providerType, overrides, tokenFilePath);
 }
-async function runInteractiveAuthorizationFlow(providerType, overrides, tokenFilePath, openBrowser, forceTokenReset) {
+async function runInteractiveAuthorizationFlow(providerType, overrides, tokenFilePath, openBrowser, forceTokenReset, forceReauth) {
     const execute = async () => {
         let backupFile = null;
         if (forceTokenReset) {
+            // 仅做备份，不再删除原始 token 文件，避免在用户中断流程时造成不可恢复的丢失。
+            // 对于强制重新授权的场景，ensureValidOAuthToken 会忽略现有 token 状态并直接进入交互式流程。
             backupFile = await backupTokenFile(tokenFilePath);
         }
         try {
             if (providerType === 'iflow') {
-                await runIflowAuthorizationSequence(providerType, overrides, tokenFilePath);
+                await runIflowAuthorizationSequence(providerType, overrides, tokenFilePath, forceReauth);
             }
             else {
                 const strategy = createStrategy(providerType, overrides, tokenFilePath);
-                const authed = await strategy.authenticate?.({ openBrowser });
+                const authed = await strategy.authenticate?.({ openBrowser, forceReauthorize: forceReauth });
                 await finalizeTokenWrite(providerType, strategy, tokenFilePath, authed, 'acquired');
             }
             await discardBackupFile(backupFile);
@@ -642,21 +637,21 @@ async function runInteractiveAuthorizationFlow(providerType, overrides, tokenFil
     interactiveTail = queued.then(() => undefined, () => undefined);
     await queued;
 }
-async function runIflowAuthorizationSequence(providerType, overrides, tokenFilePath) {
+async function runIflowAuthorizationSequence(providerType, overrides, tokenFilePath, forceReauth) {
     const authCodeOverrides = { ...overrides, flowType: OAuthFlowType.AUTHORIZATION_CODE };
     try {
-        await executeAuthFlow(providerType, authCodeOverrides, tokenFilePath);
+        await executeAuthFlow(providerType, authCodeOverrides, tokenFilePath, forceReauth);
         return;
     }
     catch (firstError) {
         logOAuthDebug(`[OAuth] auth_code flow failed: ${firstError instanceof Error ? firstError.message : String(firstError || '')}`);
     }
     const deviceOverrides = { ...overrides, flowType: OAuthFlowType.DEVICE_CODE };
-    await executeAuthFlow(providerType, deviceOverrides, tokenFilePath);
+    await executeAuthFlow(providerType, deviceOverrides, tokenFilePath, forceReauth);
 }
-async function executeAuthFlow(providerType, overrides, tokenFilePath) {
+async function executeAuthFlow(providerType, overrides, tokenFilePath, forceReauth) {
     const strategy = createStrategy(providerType, overrides, tokenFilePath);
-    const authed = await strategy.authenticate?.({ openBrowser: true });
+    const authed = await strategy.authenticate?.({ openBrowser: true, forceReauthorize: forceReauth });
     await finalizeTokenWrite(providerType, strategy, tokenFilePath, authed, overrides.flowType ? `acquired (${String(overrides.flowType)})` : 'acquired');
 }
 export async function ensureValidOAuthToken(providerType, auth, opts = {}) {
@@ -685,7 +680,7 @@ export async function ensureValidOAuthToken(providerType, auth, opts = {}) {
     const openBrowser = opts.openBrowser ?? envAutoOpen;
     const forceReauth = opts.forceReauthorize === true || String(process.env.ROUTECODEX_OAUTH_FORCE_REAUTH || '0') === '1';
     const runPromise = (async () => {
-        const defaults = getProviderOAuthConfig(providerType);
+        const defaults = getProviderOAuthConfig(providerType, {});
         const { overrides, endpoints, client } = await buildOverrides(providerType, defaults, auth, openBrowser, tokenFilePath);
         logOAuthSetup(providerType, defaults, overrides, endpoints, client, tokenFilePath, openBrowser, forceReauth);
         const strategy = createStrategy(providerType, overrides, tokenFilePath);
@@ -747,8 +742,22 @@ export async function ensureValidOAuthToken(providerType, auth, opts = {}) {
                 logOAuthDebug('[OAuth] refresh failed, attempting interactive authorization...');
             }
         }
-        await runInteractiveAuthorizationFlow(providerType, overrides, tokenFilePath, openBrowser, forceReauth || hadExistingTokenFile);
-        updateThrottle(cacheKey);
+        try {
+            await runInteractiveAuthorizationFlow(providerType, overrides, tokenFilePath, openBrowser, forceReauth || hadExistingTokenFile, forceReauth);
+            updateThrottle(cacheKey);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error || '');
+            // 当本地回调端口已被占用（例如已有其他 OAuth 工具在监听同一端口）时，
+            // 将其视为“暂时无法进行交互式授权”，不再向上抛出致命错误，以免阻塞整个服务器启动。
+            // 保持现有 token 不变，让后续真实请求决定是否需要修复。
+            if (message.includes('Failed to start callback server')) {
+                console.error(`[OAuth] interactive authorization skipped (callback server error): ${message}`);
+                updateThrottle(cacheKey);
+                return;
+            }
+            throw error;
+        }
     })();
     inFlight.set(cacheKey, runPromise);
     try {
@@ -780,12 +789,10 @@ export async function handleUpstreamInvalidOAuthToken(providerType, auth, upstre
         }
         // 基本令牌失效判定：只看典型 OAuth 文案
         let looksInvalid = /invalid[_-]?token|invalid[_-]?grant|unauthenticated|unauthorized|token has expired|access token expired/.test(lower);
-        // 对于 iflow / qwen，保留基于 401/403 的宽松判定，避免破坏既有行为，
-        // 同时将部分上游使用的 406 也视作“认证失效”，与 401 统一处理。
+        // 对于 iflow / qwen，保留基于 401/403 的宽松判定，避免破坏既有行为。
         if (!looksInvalid && (pt === 'iflow' || pt === 'qwen')) {
             if (statusCode === 401 ||
                 statusCode === 403 ||
-                statusCode === 406 ||
                 /\b401\b|\b403\b|40308/.test(msg)) {
                 looksInvalid = true;
             }