@vybestack/llxprt-code-core 0.1.18-nightly.250808.f9b79d74 → 0.1.18-nightly.250811.b0db22c6

package/dist/src/providers/BaseProvider.d.ts

@@ -0,0 +1,98 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Base provider class with authentication precedence logic
+ */
+import { IProvider } from './IProvider.js';
+import { IModel } from './IModel.js';
+import { ITool } from './ITool.js';
+import { IMessage } from './IMessage.js';
+import { AuthPrecedenceResolver, OAuthManager } from '../auth/precedence.js';
+export interface BaseProviderConfig {
+    name: string;
+    apiKey?: string;
+    baseURL?: string;
+    commandKey?: string;
+    commandKeyfile?: string;
+    cliKey?: string;
+    cliKeyfile?: string;
+    envKeyNames?: string[];
+    isOAuthEnabled?: boolean;
+    oauthProvider?: string;
+    oauthManager?: OAuthManager;
+}
+/**
+ * Abstract base provider class that implements authentication precedence logic
+ * This class provides lazy OAuth triggering and proper authentication precedence
+ */
+export declare abstract class BaseProvider implements IProvider {
+    readonly name: string;
+    protected authResolver: AuthPrecedenceResolver;
+    protected baseProviderConfig: BaseProviderConfig;
+    private cachedAuthToken?;
+    private authCacheTimestamp?;
+    private readonly AUTH_CACHE_DURATION;
+    constructor(config: BaseProviderConfig);
+    /**
+     * Gets authentication token using the precedence chain
+     * This method implements lazy OAuth triggering - only triggers OAuth when actually making API calls
+     */
+    protected getAuthToken(): Promise<string>;
+    /**
+     * Checks if OAuth is enabled for this provider
+     */
+    protected isOAuthEnabled(): boolean;
+    /**
+     * Abstract method to determine if this provider supports OAuth
+     * Must be implemented by concrete providers
+     */
+    protected abstract supportsOAuth(): boolean;
+    /**
+     * Checks if authentication is available without triggering OAuth
+     */
+    hasNonOAuthAuthentication(): Promise<boolean>;
+    /**
+     * Checks if OAuth is the only available authentication method
+     */
+    isOAuthOnlyAvailable(): Promise<boolean>;
+    /**
+     * Gets the current authentication method name for debugging
+     */
+    getAuthMethodName(): Promise<string | null>;
+    /**
+     * Updates the API key (used for CLI --key argument)
+     */
+    setApiKey?(apiKey: string): void;
+    /**
+     * Updates the base URL
+     */
+    setBaseUrl?(baseUrl?: string): void;
+    /**
+     * Updates OAuth configuration
+     */
+    protected updateOAuthConfig(isEnabled: boolean, provider?: string, manager?: OAuthManager): void;
+    /**
+     * Clears the authentication token cache
+     */
+    protected clearAuthCache(): void;
+    /**
+     * Checks if the provider is authenticated using any available method
+     */
+    isAuthenticated(): Promise<boolean>;
+    abstract getModels(): Promise<IModel[]>;
+    abstract generateChatCompletion(messages: IMessage[], tools?: ITool[], toolFormat?: string): AsyncIterableIterator<unknown>;
+    setModel?(_modelId: string): void;
+    getCurrentModel?(): string;
+    getToolFormat?(): string;
+    setToolFormatOverride?(_format: string | null): void;
+    isPaidMode?(): boolean;
+    clearState?(): void;
+    setConfig?(_config: unknown): void;
+    getServerTools(): string[];
+    invokeServerTool(toolName: string, _params: unknown, _config?: unknown): Promise<unknown>;
+    setModelParams?(_params: Record<string, unknown> | undefined): void;
+    getModelParams?(): Record<string, unknown> | undefined;
+}

package/dist/src/providers/BaseProvider.js

@@ -0,0 +1,180 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AuthPrecedenceResolver, } from '../auth/precedence.js';
+/**
+ * Abstract base provider class that implements authentication precedence logic
+ * This class provides lazy OAuth triggering and proper authentication precedence
+ */
+export class BaseProvider {
+    name;
+    authResolver;
+    baseProviderConfig;
+    cachedAuthToken;
+    authCacheTimestamp;
+    AUTH_CACHE_DURATION = 60000; // 1 minute in milliseconds
+    constructor(config) {
+        this.name = config.name;
+        this.baseProviderConfig = config;
+        // Initialize auth precedence resolver
+        // OAuth enablement will be checked dynamically through the manager
+        const precedenceConfig = {
+            commandKey: config.commandKey,
+            commandKeyfile: config.commandKeyfile,
+            cliKey: config.cliKey,
+            cliKeyfile: config.cliKeyfile,
+            envKeyNames: config.envKeyNames || [],
+            isOAuthEnabled: true, // Always true if manager exists, manager will check settings
+            supportsOAuth: this.supportsOAuth(),
+            oauthProvider: config.oauthProvider,
+        };
+        this.authResolver = new AuthPrecedenceResolver(precedenceConfig, config.oauthManager);
+    }
+    /**
+     * Gets authentication token using the precedence chain
+     * This method implements lazy OAuth triggering - only triggers OAuth when actually making API calls
+     */
+    async getAuthToken() {
+        // Check cache first (short-lived cache to avoid repeated OAuth calls)
+        if (this.cachedAuthToken &&
+            this.authCacheTimestamp &&
+            Date.now() - this.authCacheTimestamp < this.AUTH_CACHE_DURATION) {
+            return this.cachedAuthToken;
+        }
+        // Clear stale cache
+        this.cachedAuthToken = undefined;
+        this.authCacheTimestamp = undefined;
+        // Resolve authentication using precedence chain
+        const token = await this.authResolver.resolveAuthentication();
+        if (!token) {
+            const isOAuthOnly = await this.authResolver.isOAuthOnlyAvailable();
+            if (isOAuthOnly) {
+                // Special message for Qwen explaining the OAuth limitation
+                if (this.baseProviderConfig.oauthProvider === 'qwen') {
+                    throw new Error(`Qwen OAuth (chat.qwen.ai) doesn't provide API access to DashScope. ` +
+                        `You need a DashScope API key from https://dashscope.console.aliyun.com/ ` +
+                        `Use /key <your-api-key> to set it.`);
+                }
+                throw new Error(`No API key found and OAuth is available but not authenticated for ${this.name} provider. ` +
+                    `Please authenticate using OAuth or provide an API key.`);
+            }
+            else {
+                throw new Error(`No authentication method available for ${this.name} provider`);
+            }
+        }
+        // Cache the token briefly
+        this.cachedAuthToken = token;
+        this.authCacheTimestamp = Date.now();
+        if (process.env.DEBUG) {
+            const authMethod = await this.authResolver.getAuthMethodName();
+            console.log(`[${this.name}] Authentication resolved using: ${authMethod}`);
+        }
+        return token;
+    }
+    /**
+     * Checks if OAuth is enabled for this provider
+     */
+    isOAuthEnabled() {
+        // OAuth is enabled if we have a manager AND it's enabled in settings
+        return !!this.baseProviderConfig.oauthManager;
+    }
+    /**
+     * Checks if authentication is available without triggering OAuth
+     */
+    async hasNonOAuthAuthentication() {
+        return this.authResolver.hasNonOAuthAuthentication();
+    }
+    /**
+     * Checks if OAuth is the only available authentication method
+     */
+    async isOAuthOnlyAvailable() {
+        return this.authResolver.isOAuthOnlyAvailable();
+    }
+    /**
+     * Gets the current authentication method name for debugging
+     */
+    async getAuthMethodName() {
+        return this.authResolver.getAuthMethodName();
+    }
+    /**
+     * Updates the API key (used for CLI --key argument)
+     */
+    setApiKey(apiKey) {
+        this.baseProviderConfig.cliKey = apiKey;
+        this.authResolver.updateConfig({ cliKey: apiKey });
+        this.clearAuthCache();
+    }
+    /**
+     * Updates the base URL
+     */
+    setBaseUrl(baseUrl) {
+        this.baseProviderConfig.baseURL = baseUrl;
+        // Providers may override to implement endpoint-specific OAuth logic
+        this.clearAuthCache();
+    }
+    /**
+     * Updates OAuth configuration
+     */
+    updateOAuthConfig(isEnabled, provider, manager) {
+        this.baseProviderConfig.isOAuthEnabled = isEnabled;
+        this.baseProviderConfig.oauthProvider = provider;
+        this.baseProviderConfig.oauthManager = manager;
+        this.authResolver.updateConfig({
+            isOAuthEnabled: isEnabled,
+            supportsOAuth: this.supportsOAuth(),
+            oauthProvider: provider,
+        });
+        if (manager) {
+            this.authResolver.updateOAuthManager(manager);
+        }
+        this.clearAuthCache();
+    }
+    /**
+     * Clears the authentication token cache
+     */
+    clearAuthCache() {
+        this.cachedAuthToken = undefined;
+        this.authCacheTimestamp = undefined;
+    }
+    /**
+     * Checks if the provider is authenticated using any available method
+     */
+    async isAuthenticated() {
+        try {
+            const token = await this.authResolver.resolveAuthentication();
+            return token !== null;
+        }
+        catch {
+            return false;
+        }
+    }
+    // Optional methods with default implementations
+    setModel(_modelId) { }
+    getCurrentModel() {
+        return 'default';
+    }
+    getToolFormat() {
+        return 'default';
+    }
+    setToolFormatOverride(_format) { }
+    isPaidMode() {
+        return false;
+    }
+    clearState() {
+        this.clearAuthCache();
+    }
+    setConfig(_config) { }
+    getServerTools() {
+        return [];
+    }
+    async invokeServerTool(toolName, _params, _config) {
+        throw new Error(`Server tool '${toolName}' not supported by ${this.name} provider`);
+    }
+    setModelParams(_params) { }
+    getModelParams() {
+        return undefined;
+    }
+}
+//# sourceMappingURL=BaseProvider.js.map

package/dist/src/providers/BaseProvider.js.map

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

package/dist/src/providers/BaseProvider.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};