axon-code 2.4.0 → 2.5.1

package/dist/web/server/web-auth.d.ts

@@ -18,11 +18,25 @@
  * 不读：环境变量、.credentials.json、config.json、Keychain、内置代理。
  * CLI 模式不受影响（CLI 继续用 src/auth/index.ts 的 initAuth/getAuth）。
  */
+import { type CodexAuthConfig } from './codex-auth-manager.js';
 import type { AuthStatus } from '../shared/types.js';
+import { type WebRuntimeBackend, type WebRuntimeProvider } from '../shared/model-catalog.js';
 export interface WebAuthCredentials {
     apiKey?: string;
     authToken?: string;
     baseUrl?: string;
+    accountId?: string;
+}
+interface WebUiSettings {
+    apiKey?: string;
+    authPriority: 'apiKey' | 'oauth' | 'auto';
+    apiBaseUrl?: string;
+    apiProvider?: string;
+    customModelName?: string;
+    runtimeBackend?: WebRuntimeBackend;
+    runtimeProvider?: 'anthropic' | 'codex';
+    defaultModelByBackend?: Partial<Record<WebRuntimeBackend, string>>;
+    customModelCatalogByBackend?: Partial<Record<WebRuntimeBackend, string[]>>;
 }
 declare class WebAuthProvider {
     /**
@@ -31,6 +45,9 @@ declare class WebAuthProvider {
      * 这样 Railway/Docker 等容器化部署只需设置环境变量，无需持久化 settings.json。
      */
     private readSettings;
+    private inferRuntimeBackend;
+    private getStoredModelForBackend;
+    private getNormalizedModelMap;
     /** 防止并发刷新 */
     private refreshPromise;
     /**
@@ -43,16 +60,16 @@ declare class WebAuthProvider {
      *
      * 返回 true 表示 token 有效或已刷新成功
      */
-    ensureValidToken(): Promise<boolean>;
+    ensureValidToken(runtimeBackend?: WebRuntimeBackend): Promise<boolean>;
     /**
      * 获取当前应使用的认证凭证（同步版本）
      * 注意：此方法不做 token 过期检查，调用方应先 await ensureValidToken()
      */
-    getCredentials(): WebAuthCredentials;
+    getCredentials(runtimeBackend?: WebRuntimeBackend): WebAuthCredentials;
     /**
      * 是否已认证
      */
-    isAuthenticated(): boolean;
+    isAuthenticated(runtimeBackend?: WebRuntimeBackend): boolean;
     /**
      * 判断当前用户是否通过 Axon Cloud 认证（apiBaseUrl 包含 chatbi.site）
      */
@@ -96,6 +113,7 @@ declare class WebAuthProvider {
      * 清除所有认证（API Key + OAuth）
      */
     clearAll(): void;
+    activateCodexLogin(config?: Partial<CodexAuthConfig>): Promise<void>;
     /**
      * 验证 API Key 是否有效
      */
@@ -108,6 +126,12 @@ declare class WebAuthProvider {
      * 获取 WebUI 的自定义模型名
      */
     getCustomModelName(): string | undefined;
+    getCodexModelName(): string | undefined;
+    getCodexBaseUrl(settings?: WebUiSettings): string;
+    getRuntimeBackend(): WebRuntimeBackend;
+    getRuntimeProvider(): WebRuntimeProvider;
+    getDefaultModelByBackend(): Partial<Record<WebRuntimeBackend, string>>;
+    getCustomModelCatalogByBackend(): Partial<Record<WebRuntimeBackend, string[]>>;
     /**
      * 获取认证提供商
      */
@@ -119,6 +143,14 @@ declare class WebAuthProvider {
      * - 否则降级为 authToken（让 API 返回真实错误）
      */
     private getOAuthCredentials;
+    private getCodexCredentials;
+    getCodexStatus(): {
+        authenticated: boolean;
+        displayName?: string;
+        email?: string;
+        accountId?: string;
+        expiresAt?: number;
+    };
 }
 export declare const webAuth: WebAuthProvider;
 export {};

package/dist/web/server/web-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-auth.d.ts","sourceRoot":"","sources":["../../../src/web/server/web-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,oBAAoB,CAAC;AAKlE,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAWD,cAAM,eAAe;IAInB;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA8CpB,aAAa;IACb,OAAO,CAAC,cAAc,CAAiC;IAEvD;;;;;;;;;OASG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAyC1C;;;OAGG;IACH,cAAc,IAAI,kBAAkB;IA4BpC;;OAEG;IACH,eAAe,IAAI,OAAO;IAO1B;;OAEG;IACH,eAAe,IAAI,OAAO;IAK1B;;OAEG;IACH,SAAS,IAAI,UAAU;IAsBvB;;OAEG;IACH,cAAc,IAAI;QAChB,aAAa,EAAE,OAAO,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;IAeD;;OAEG;IACH,cAAc,IAAI;QAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;IA8B9G;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAW/B;;OAEG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAYrC;;OAEG;IACH,WAAW,IAAI,IAAI;IAQnB;;OAEG;IACH,QAAQ,IAAI,IAAI;IAOhB;;OAEG;IACG,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBnD;;OAEG;IACH,eAAe,IAAI,MAAM,GAAG,SAAS;IAUrC;;OAEG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAIxC;;OAEG;IACH,WAAW,IAAI,MAAM;IAUrB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;CAiB5B;AAGD,eAAO,MAAM,OAAO,iBAAwB,CAAC"}
+{"version":3,"file":"web-auth.d.ts","sourceRoot":"","sources":["../../../src/web/server/web-auth.ts"],"names":[],"mappings":"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"}

package/dist/web/server/web-auth.js

@@ -21,7 +21,45 @@
 import * as fs from 'fs';
 import { configManager } from '../../config/index.js';
 import { oauthManager } from './oauth-manager.js';
+import { codexAuthManager } from './codex-auth-manager.js';
 import Anthropic from '@anthropic-ai/sdk';
+import { getProviderForRuntimeBackend, } from '../shared/model-catalog.js';
+const DEFAULT_CODEX_BASE_URL = 'https://chatgpt.com/backend-api/codex';
+const DEFAULT_CODEX_API_KEY_BASE_URL = 'https://api.openai.com/v1';
+function isCodexCompatibleModel(model) {
+    if (!model)
+        return false;
+    const normalized = model.trim();
+    if (!normalized)
+        return false;
+    return /^(gpt-|o\d(?:$|[-_])|codex)/i.test(normalized) || normalized.toLowerCase().includes('codex');
+}
+function isCodexChatGptBaseUrlCandidate(baseUrl) {
+    try {
+        const parsed = new URL(baseUrl);
+        const normalizedPath = parsed.pathname.replace(/\/+$/, '');
+        if (parsed.hostname === 'chatgpt.com' && normalizedPath === '/backend-api/codex') {
+            return true;
+        }
+        return /\/backend-api\/codex$/i.test(normalizedPath);
+    }
+    catch {
+        return false;
+    }
+}
+function isCodexApiKeyBaseUrlCandidate(baseUrl) {
+    try {
+        const parsed = new URL(baseUrl);
+        const normalizedPath = parsed.pathname.replace(/\/+$/, '');
+        if (normalizedPath === '/v1') {
+            return true;
+        }
+        return isCodexChatGptBaseUrlCandidate(baseUrl);
+    }
+    catch {
+        return false;
+    }
+}
 // ============ WebAuthProvider ============
 class WebAuthProvider {
     // ---------- 读取 settings.json ----------
@@ -39,7 +77,12 @@ class WebAuthProvider {
                     apiKey: raw.apiKey,
                     authPriority: raw.authPriority || 'auto',
                     apiBaseUrl: raw.apiBaseUrl,
+                    apiProvider: raw.apiProvider,
                     customModelName: raw.customModelName,
+                    runtimeBackend: raw.runtimeBackend,
+                    runtimeProvider: raw.runtimeProvider || 'anthropic',
+                    defaultModelByBackend: raw.defaultModelByBackend,
+                    customModelCatalogByBackend: raw.customModelCatalogByBackend,
                 };
                 // settings.json 没有 apiKey 时，回退到环境变量
                 if (!result.apiKey) {
@@ -68,7 +111,68 @@ class WebAuthProvider {
             apiKey: envKey,
             authPriority: 'auto',
             apiBaseUrl: envBaseUrl,
+            apiProvider: undefined,
+            runtimeBackend: undefined,
+            runtimeProvider: 'anthropic',
+            defaultModelByBackend: undefined,
+            customModelCatalogByBackend: undefined,
+        };
+    }
+    inferRuntimeBackend(settings) {
+        const oauthConfig = oauthManager.getOAuthConfig();
+        if (settings.authPriority === 'oauth'
+            && oauthConfig?.subscriptionType === 'console'
+            && settings.runtimeBackend === 'claude-subscription') {
+            return 'claude-compatible-api';
+        }
+        if (settings.runtimeBackend) {
+            return settings.runtimeBackend;
+        }
+        if (settings.apiBaseUrl?.includes('chatbi.site')) {
+            return 'axon-cloud';
+        }
+        if (settings.runtimeProvider === 'codex') {
+            return 'codex-subscription';
+        }
+        if (settings.authPriority === 'oauth') {
+            if (oauthConfig?.subscriptionType === 'console') {
+                return 'claude-compatible-api';
+            }
+            return 'claude-subscription';
+        }
+        if (settings.apiProvider === 'openai-compatible') {
+            return 'openai-compatible-api';
+        }
+        return 'claude-compatible-api';
+    }
+    getStoredModelForBackend(backend, settings = this.readSettings()) {
+        const mapped = settings.defaultModelByBackend?.[backend]?.trim();
+        if (mapped) {
+            return mapped;
+        }
+        const legacyModel = settings.customModelName?.trim();
+        if (!legacyModel) {
+            return undefined;
+        }
+        if (backend === 'axon-cloud' || backend === 'openai-compatible-api') {
+            return legacyModel;
+        }
+        const provider = getProviderForRuntimeBackend(backend);
+        if (provider === 'codex') {
+            return isCodexCompatibleModel(legacyModel) ? legacyModel : undefined;
+        }
+        return !isCodexCompatibleModel(legacyModel) ? legacyModel : undefined;
+    }
+    getNormalizedModelMap(settings = this.readSettings()) {
+        const runtimeBackend = this.inferRuntimeBackend(settings);
+        const models = {
+            ...(settings.defaultModelByBackend || {}),
         };
+        const currentModel = this.getStoredModelForBackend(runtimeBackend, settings);
+        if (currentModel) {
+            models[runtimeBackend] = currentModel;
+        }
+        return models;
     }
     // ---------- Token 有效性保障（对齐官方 NM() 语义） ----------
     /** 防止并发刷新 */
@@ -83,12 +187,38 @@ class WebAuthProvider {
      *
      * 返回 true 表示 token 有效或已刷新成功
      */
-    async ensureValidToken() {
+    async ensureValidToken(runtimeBackend = this.inferRuntimeBackend(this.readSettings())) {
         const settings = this.readSettings();
-        // 非 OAuth 模式，不需要刷新
-        if (settings.authPriority === 'apiKey')
-            return true;
-        if (settings.authPriority === 'auto' && settings.apiKey)
+        if (runtimeBackend === 'codex-subscription') {
+            const codexConfig = codexAuthManager.getAuthConfig();
+            if (!codexConfig?.accessToken)
+                return true;
+            if (!codexAuthManager.isTokenExpired())
+                return true;
+            if (this.refreshPromise) {
+                return this.refreshPromise;
+            }
+            this.refreshPromise = (async () => {
+                try {
+                    console.log('[WebAuth] Codex token expiring soon, auto-refreshing...');
+                    await codexAuthManager.refreshToken();
+                    console.log('[WebAuth] Codex token refreshed successfully');
+                    return true;
+                }
+                catch (err) {
+                    console.error('[WebAuth] Codex token refresh failed:', err.message);
+                    return false;
+                }
+                finally {
+                    this.refreshPromise = null;
+                }
+            })();
+            return this.refreshPromise;
+        }
+        const isAnthropicOAuthBackend = runtimeBackend === 'claude-subscription'
+            || (runtimeBackend === 'claude-compatible-api' && settings.authPriority === 'oauth');
+        // 非 Claude OAuth 模式，不需要刷新
+        if (!isAnthropicOAuthBackend)
             return true;
         // 检查是否有 OAuth 配置
         const config = oauthManager.getOAuthConfig();
@@ -125,38 +255,40 @@ class WebAuthProvider {
      * 获取当前应使用的认证凭证（同步版本）
      * 注意：此方法不做 token 过期检查，调用方应先 await ensureValidToken()
      */
-    getCredentials() {
+    getCredentials(runtimeBackend = this.inferRuntimeBackend(this.readSettings())) {
         const settings = this.readSettings();
-        const result = {};
-        if (settings.apiBaseUrl) {
-            result.baseUrl = settings.apiBaseUrl;
-        }
-        if (settings.authPriority === 'apiKey') {
-            result.apiKey = settings.apiKey;
+        if (runtimeBackend === 'codex-subscription') {
+            const codexCreds = this.getCodexCredentials();
+            return {
+                apiKey: codexCreds.apiKey,
+                authToken: codexCreds.authToken,
+                accountId: codexCreds.accountId,
+                baseUrl: this.getCodexBaseUrl(settings),
+            };
         }
-        else if (settings.authPriority === 'oauth') {
+        const result = {};
+        const isAnthropicOAuthMode = settings.authPriority === 'oauth'
+            && (runtimeBackend === 'claude-subscription' || runtimeBackend === 'claude-compatible-api');
+        if (isAnthropicOAuthMode) {
+            // OAuth 凭据由 Anthropic 官方颁发，必须发到 api.anthropic.com
+            // 不能使用用户之前配置的自定义 apiBaseUrl（可能是代理，不认 OAuth key）
             const oauthCreds = this.getOAuthCredentials();
             result.apiKey = oauthCreds.apiKey;
             result.authToken = oauthCreds.authToken;
         }
         else {
-            // auto
-            if (settings.apiKey) {
-                result.apiKey = settings.apiKey;
-            }
-            else {
-                const oauthCreds = this.getOAuthCredentials();
-                result.apiKey = oauthCreds.apiKey;
-                result.authToken = oauthCreds.authToken;
+            if (settings.apiBaseUrl) {
+                result.baseUrl = settings.apiBaseUrl;
             }
+            result.apiKey = settings.apiKey;
         }
         return result;
     }
     /**
      * 是否已认证
      */
-    isAuthenticated() {
-        const creds = this.getCredentials();
+    isAuthenticated(runtimeBackend) {
+        const creds = this.getCredentials(runtimeBackend);
         return !!(creds.apiKey || creds.authToken);
     }
     // ---------- 状态查询（给前端显示用） ----------
@@ -165,32 +297,53 @@ class WebAuthProvider {
      */
     isAxonCloudUser() {
         const settings = this.readSettings();
-        return !!settings.apiBaseUrl && settings.apiBaseUrl.includes('chatbi.site');
+        return this.inferRuntimeBackend(settings) === 'axon-cloud'
+            || (!!settings.apiBaseUrl && settings.apiBaseUrl.includes('chatbi.site'));
     }
     /**
      * 获取认证状态（给 /api/auth/status 和 websocket 用）
      */
     getStatus() {
         const settings = this.readSettings();
+        const runtimeBackend = this.inferRuntimeBackend(settings);
+        if (runtimeBackend === 'codex-subscription') {
+            const codexConfig = codexAuthManager.getAuthConfig();
+            if (codexConfig?.accessToken || codexConfig?.apiKey || codexConfig?.authMethod === 'api_key') {
+                return { authenticated: true, type: 'oauth', provider: 'codex', runtimeBackend };
+            }
+        }
         // apiKey 优先检查
         if (settings.apiKey && settings.authPriority !== 'oauth') {
-            return { authenticated: true, type: 'api_key', provider: this.getProvider() };
+            return { authenticated: true, type: 'api_key', provider: this.getProvider(), runtimeBackend };
         }
         // OAuth 检查
         const oauthConfig = oauthManager.getOAuthConfig();
         if (oauthConfig?.accessToken) {
-            return { authenticated: true, type: 'oauth', provider: this.getProvider() };
+            return { authenticated: true, type: 'oauth', provider: this.getProvider(), runtimeBackend };
         }
         // auto 模式回退到 apiKey
         if (settings.apiKey) {
-            return { authenticated: true, type: 'api_key', provider: this.getProvider() };
+            return { authenticated: true, type: 'api_key', provider: this.getProvider(), runtimeBackend };
         }
-        return { authenticated: false, type: 'none', provider: 'anthropic' };
+        return { authenticated: false, type: 'none', provider: 'anthropic', runtimeBackend };
     }
     /**
      * 获取 OAuth 详细状态（给前端认证状态接口用）
      */
     getOAuthStatus() {
+        if (this.getRuntimeBackend() === 'codex-subscription') {
+            const codexStatus = this.getCodexStatus();
+            if (!codexStatus.authenticated) {
+                return { authenticated: false };
+            }
+            return {
+                authenticated: true,
+                displayName: codexStatus.displayName,
+                subscriptionType: 'chatgpt',
+                expiresAt: codexStatus.expiresAt,
+                scopes: ['openid', 'profile', 'email', 'offline_access'],
+            };
+        }
         const oauthConfig = oauthManager.getOAuthConfig();
         if (!oauthConfig?.accessToken) {
             return { authenticated: false };
@@ -208,6 +361,26 @@ class WebAuthProvider {
      */
     getTokenStatus() {
         const settings = this.readSettings();
+        const runtimeBackend = this.inferRuntimeBackend(settings);
+        if (runtimeBackend === 'codex-subscription') {
+            const codexConfig = codexAuthManager.getAuthConfig();
+            if (codexConfig?.accessToken) {
+                const isExpired = codexConfig.expiresAt ? Date.now() > codexConfig.expiresAt : false;
+                return {
+                    type: 'oauth',
+                    valid: !isExpired,
+                    expiresAt: codexConfig.expiresAt,
+                    scope: ['openid', 'profile', 'email', 'offline_access'],
+                };
+            }
+            if (codexConfig?.apiKey || codexConfig?.authMethod === 'api_key') {
+                return {
+                    type: 'api_key',
+                    valid: true,
+                };
+            }
+            return { type: 'none', valid: false };
+        }
         // API Key
         if (settings.apiKey && settings.authPriority !== 'oauth') {
             return { type: 'api_key', valid: true };
@@ -254,6 +427,8 @@ class WebAuthProvider {
         try {
             configManager.set('apiKey', key);
             configManager.set('authPriority', 'apiKey');
+            configManager.set('runtimeBackend', 'claude-compatible-api');
+            configManager.set('runtimeProvider', 'anthropic');
             return true;
         }
         catch (error) {
@@ -278,6 +453,17 @@ class WebAuthProvider {
     clearAll() {
         this.clearApiKey();
         oauthManager.clearOAuthConfig();
+        codexAuthManager.clearAuthConfig();
+        configManager.set('runtimeBackend', 'claude-subscription');
+        configManager.set('runtimeProvider', 'anthropic');
+    }
+    async activateCodexLogin(config) {
+        if (config) {
+            await codexAuthManager.saveAuthConfig(config);
+        }
+        configManager.set('runtimeBackend', 'codex-subscription');
+        configManager.set('runtimeProvider', 'codex');
+        configManager.set('authPriority', 'oauth');
     }
     // ---------- 验证 ----------
     /**
@@ -319,12 +505,65 @@ class WebAuthProvider {
      * 获取 WebUI 的自定义模型名
      */
     getCustomModelName() {
-        return this.readSettings().customModelName;
+        return this.getStoredModelForBackend(this.getRuntimeBackend());
+    }
+    getCodexModelName() {
+        const customModel = this.getStoredModelForBackend(this.getRuntimeBackend());
+        return isCodexCompatibleModel(customModel) ? customModel : undefined;
+    }
+    getCodexBaseUrl(settings = this.readSettings()) {
+        const envBaseUrl = process.env.OPENAI_CODEX_BASE_URL?.trim();
+        if (envBaseUrl) {
+            return envBaseUrl.replace(/\/+$/, '');
+        }
+        const codexConfig = codexAuthManager.getAuthConfig();
+        const usesApiKey = !codexConfig?.accessToken && !!(codexConfig?.apiKey || codexConfig?.authMethod === 'api_key');
+        const configuredBaseUrl = settings.apiBaseUrl?.trim();
+        const isSupportedConfiguredBaseUrl = configuredBaseUrl
+            && (usesApiKey
+                ? isCodexApiKeyBaseUrlCandidate(configuredBaseUrl)
+                : isCodexChatGptBaseUrlCandidate(configuredBaseUrl));
+        if (configuredBaseUrl && isSupportedConfiguredBaseUrl) {
+            return configuredBaseUrl.replace(/\/+$/, '');
+        }
+        return usesApiKey ? DEFAULT_CODEX_API_KEY_BASE_URL : DEFAULT_CODEX_BASE_URL;
+    }
+    getRuntimeBackend() {
+        return this.inferRuntimeBackend(this.readSettings());
+    }
+    getRuntimeProvider() {
+        return getProviderForRuntimeBackend(this.getRuntimeBackend());
+    }
+    getDefaultModelByBackend() {
+        return this.getNormalizedModelMap();
+    }
+    getCustomModelCatalogByBackend() {
+        return this.readSettings().customModelCatalogByBackend || {};
     }
     /**
      * 获取认证提供商
      */
     getProvider() {
+        const runtimeBackend = this.getRuntimeBackend();
+        if (runtimeBackend === 'codex-subscription') {
+            return 'codex';
+        }
+        if (runtimeBackend === 'axon-cloud') {
+            return 'axon-cloud';
+        }
+        if (runtimeBackend === 'claude-subscription') {
+            return 'anthropic';
+        }
+        if (runtimeBackend === 'claude-compatible-api') {
+            const apiProvider = configManager.get('apiProvider');
+            if (apiProvider === 'bedrock' || apiProvider === 'vertex' || apiProvider === 'anthropic') {
+                return apiProvider;
+            }
+            return 'anthropic';
+        }
+        if (runtimeBackend === 'openai-compatible-api') {
+            return 'openai-compatible';
+        }
         const apiProvider = configManager.get('apiProvider');
         if (apiProvider)
             return apiProvider;
@@ -358,6 +597,36 @@ class WebAuthProvider {
         // fallback：token 没推理权限也没 API key，原样返回让 API 报错
         return { authToken: oauthConfig.accessToken };
     }
+    getCodexCredentials() {
+        const codexConfig = codexAuthManager.getAuthConfig();
+        if (!codexConfig)
+            return {};
+        if (codexConfig.accessToken) {
+            return {
+                authToken: codexConfig.accessToken,
+                accountId: codexConfig.accountId,
+            };
+        }
+        if (codexConfig.apiKey) {
+            return {
+                apiKey: codexConfig.apiKey,
+            };
+        }
+        return {};
+    }
+    getCodexStatus() {
+        const config = codexAuthManager.getAuthConfig();
+        if (!config?.accessToken && !config?.apiKey) {
+            return { authenticated: false };
+        }
+        return {
+            authenticated: true,
+            displayName: config.displayName || config.email || (config.apiKey ? 'API Key' : undefined),
+            email: config.email,
+            accountId: config.accountId,
+            expiresAt: config.expiresAt,
+        };
+    }
 }
 // 导出单例
 export const webAuth = new WebAuthProvider();

package/dist/web/server/web-auth.js.map

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

package/dist/web/server/web-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-scheduler.d.ts","sourceRoot":"","sources":["../../../src/web/server/web-scheduler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAEtE,OAAO,KAAK,EAAE,mBAAmB,EAAmB,MAAM,mBAAmB,CAAC;AA+B9E,wBAAgB,eAAe,IAAI,YAAY,GAAG,IAAI,CAErD;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,aAAa,CAA2C;gBAEpD,OAAO,EAAE;QACnB,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;QACrC,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;KACb;IASD;;OAEG;IACH,QAAQ,IAAI,SAAS;IAQrB;;OAEG;IACH,KAAK,IAAI,IAAI;IAwBb;;OAEG;IACH,IAAI,IAAI,IAAI;IAYZ;;OAEG;IACH,aAAa,IAAI,IAAI;IAMrB;;;OAGG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAsBtC,OAAO,CAAC,QAAQ;YAsBF,OAAO;IAoCrB;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;YAqBpB,WAAW;IAwCzB;;OAEG;YACW,gBAAgB;IA4F9B;;OAEG;YACW,mBAAmB;IA2EjC,OAAO,CAAC,gBAAgB;IAyBxB;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAclC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAuG/B;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IA+F5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiEvB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,iBAAiB;IAuCzB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;CAqBtB"}
+{"version":3,"file":"web-scheduler.d.ts","sourceRoot":"","sources":["../../../src/web/server/web-scheduler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAEtE,OAAO,KAAK,EAAE,mBAAmB,EAAmB,MAAM,mBAAmB,CAAC;AA+B9E,wBAAgB,eAAe,IAAI,YAAY,GAAG,IAAI,CAErD;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,aAAa,CAA2C;gBAEpD,OAAO,EAAE;QACnB,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;QACrC,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;KACb;IASD;;OAEG;IACH,QAAQ,IAAI,SAAS;IAQrB;;OAEG;IACH,KAAK,IAAI,IAAI;IAwBb;;OAEG;IACH,IAAI,IAAI,IAAI;IAYZ;;OAEG;IACH,aAAa,IAAI,IAAI;IAMrB;;;OAGG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAsBtC,OAAO,CAAC,QAAQ;YAsBF,OAAO;IAoCrB;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;YAqBpB,WAAW;IAwCzB;;OAEG;YACW,gBAAgB;IA4F9B;;OAEG;YACW,mBAAmB;IA2EjC,OAAO,CAAC,gBAAgB;IAyBxB;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAclC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA6G/B;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAkG5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiEvB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,iBAAiB;IAuCzB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;CAqBtB"}

package/dist/web/server/web-scheduler.js

@@ -451,6 +451,12 @@ export class WebScheduler {
                     payload: { status: 'tool_executing', message: `Executing ${toolName}...`, sessionId },
                 });
             },
+            onToolUseInputReady: (toolUseId, input) => {
+                this.broadcastFn({
+                    type: 'tool_use_input_ready',
+                    payload: { toolUseId, input, sessionId },
+                });
+            },
             onToolUseDelta: (toolUseId, partialJson) => {
                 this.broadcastFn({
                     type: 'tool_use_delta',
@@ -543,6 +549,9 @@ export class WebScheduler {
             onToolUseStart: (toolUseId, toolName, input) => {
                 bufferedEvents.push({ type: 'tool_use_start', payload: { messageId, toolUseId, toolName, input, sessionId } });
             },
+            onToolUseInputReady: (toolUseId, input) => {
+                bufferedEvents.push({ type: 'tool_use_input_ready', payload: { toolUseId, input, sessionId } });
+            },
             onToolUseDelta: (toolUseId, partialJson) => {
                 bufferedEvents.push({ type: 'tool_use_delta', payload: { toolUseId, partialJson, sessionId } });
             },