@vybestack/llxprt-code-agents 0.10.0-nightly.260613.1adad3b34

package/dist/src/core/baseLlmClient.d.ts

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { GenerateContentResponse, Content, Part } from '@google/genai';
+import type { ContentGenerator } from '@vybestack/llxprt-code-core/core/contentGenerator.js';
+/**
+ * Options for generateJson method
+ */
+export interface GenerateJsonOptions {
+    prompt: string;
+    schema?: Record<string, unknown>;
+    model: string;
+    temperature?: number;
+    systemInstruction?: string;
+    promptId?: string;
+    /**
+     * The maximum number of attempts for the request.
+     */
+    maxAttempts?: number;
+}
+/**
+ * Options for generateEmbedding method
+ */
+export interface GenerateEmbeddingOptions {
+    text: string | string[];
+    model: string;
+}
+/**
+ * Options for countTokens method
+ */
+export interface CountTokensOptions {
+    text?: string;
+    contents?: Content[];
+    model: string;
+}
+/**
+ * Options for the generateContent utility function.
+ */
+export interface GenerateContentOptions {
+    /** The input prompt or history. */
+    contents: Content[];
+    /** The model to use. */
+    model: string;
+    /**
+     * Task-specific system instructions.
+     * If omitted, no system instruction is sent.
+     */
+    systemInstruction?: string | Part | Part[] | Content;
+    /** Signal for cancellation. */
+    abortSignal: AbortSignal;
+    /**
+     * A unique ID for the prompt, used for logging/telemetry correlation.
+     */
+    promptId: string;
+    /**
+     * The maximum number of attempts for the request.
+     */
+    maxAttempts?: number;
+}
+/**
+ * BaseLLMClient extracts stateless utility methods for LLM operations.
+ * Unlike the main Client class, this handles utility calls without conversation state.
+ *
+ * This implements the baseLlmClient pattern from upstream gemini-cli but adapted
+ * for llxprt's multi-provider architecture.
+ *
+ * Key features:
+ * - Multi-provider support (Anthropic, OpenAI, Gemini, Vertex AI)
+ * - Stateless operations (no conversation history)
+ * - Clean separation from AgentClient
+ * - Dependency injection for testing
+ */
+export declare class BaseLLMClient {
+    private readonly contentGenerator;
+    constructor(contentGenerator: ContentGenerator | null);
+    /**
+     * Generate structured JSON from a prompt with optional schema validation.
+     * Supports all providers through the ContentGenerator abstraction.
+     *
+     * @param options - Generation options including prompt, schema, model, etc.
+     * @returns Parsed JSON object
+     * @throws Error if generation fails or response cannot be parsed
+     */
+    generateJson<T = unknown>(options: GenerateJsonOptions): Promise<T>;
+    /**
+     * Generate embeddings for text input.
+     * Supports single text string or array of strings.
+     *
+     * @param options - Embedding options including text and model
+     * @returns Embedding vector(s) as number array(s)
+     * @throws Error if generation fails or response is invalid
+     */
+    generateEmbedding(options: GenerateEmbeddingOptions): Promise<number[] | number[][]>;
+    /**
+     * Count tokens in text or contents without making an API call to generate.
+     * Useful for checking context limits before generation.
+     *
+     * @param options - Options including text/contents and model
+     * @returns Token count
+     * @throws Error if counting fails
+     */
+    countTokens(options: CountTokensOptions): Promise<number>;
+    /**
+     * Generate content from a prompt.
+     * This is a general-purpose content generation method that doesn't enforce JSON output.
+     *
+     * @param options - Generation options
+     * @returns Raw GenerateContentResponse
+     * @throws Error if generation fails
+     */
+    generateContent(options: GenerateContentOptions): Promise<GenerateContentResponse>;
+    private _generateWithRetry;
+}

package/dist/src/core/baseLlmClient.js

@@ -0,0 +1,231 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getResponseText } from '@vybestack/llxprt-code-core/utils/generateContentResponseUtilities.js';
+import { getErrorMessage } from '@vybestack/llxprt-code-core/utils/errors.js';
+import { retryWithBackoff } from '@vybestack/llxprt-code-core/utils/retry.js';
+const DEFAULT_MAX_ATTEMPTS = 3;
+/**
+ * Extracts JSON from a string that might be wrapped in markdown code blocks
+ * @param text - The raw text that might contain markdown-wrapped JSON
+ * @returns The extracted JSON string or the original text if no markdown found
+ */
+function extractJsonFromMarkdown(text) {
+    // Try to match ```json ... ``` or ``` ... ```
+    // eslint-disable-next-line sonarjs/regular-expr, sonarjs/slow-regex -- Static regex reviewed for lint hardening; bounded inputs preserve behavior.
+    const markdownMatch = text.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+    if (markdownMatch?.[1]) {
+        return markdownMatch[1].trim();
+    }
+    // If no markdown found, return trimmed original text
+    return text.trim();
+}
+/**
+ * BaseLLMClient extracts stateless utility methods for LLM operations.
+ * Unlike the main Client class, this handles utility calls without conversation state.
+ *
+ * This implements the baseLlmClient pattern from upstream gemini-cli but adapted
+ * for llxprt's multi-provider architecture.
+ *
+ * Key features:
+ * - Multi-provider support (Anthropic, OpenAI, Gemini, Vertex AI)
+ * - Stateless operations (no conversation history)
+ * - Clean separation from AgentClient
+ * - Dependency injection for testing
+ */
+export class BaseLLMClient {
+    contentGenerator;
+    constructor(contentGenerator) {
+        this.contentGenerator = contentGenerator;
+        if (!contentGenerator) {
+            throw new Error('ContentGenerator is required');
+        }
+    }
+    /**
+     * Generate structured JSON from a prompt with optional schema validation.
+     * Supports all providers through the ContentGenerator abstraction.
+     *
+     * @param options - Generation options including prompt, schema, model, etc.
+     * @returns Parsed JSON object
+     * @throws Error if generation fails or response cannot be parsed
+     */
+    async generateJson(options) {
+        const { prompt, schema, model, temperature = 0, systemInstruction, promptId = 'baseLlmClient-generateJson', } = options;
+        const contents = [
+            {
+                role: 'user',
+                parts: [{ text: prompt }],
+            },
+        ];
+        const config = {
+            temperature,
+            topP: 1,
+        };
+        if (systemInstruction) {
+            config.systemInstruction = { text: systemInstruction };
+        }
+        if (schema) {
+            config.responseJsonSchema = schema;
+            config.responseMimeType = 'application/json';
+        }
+        const shouldRetryOnContent = (response) => {
+            const text = getResponseText(response)?.trim();
+            if (!text) {
+                return true; // Retry on empty response
+            }
+            try {
+                // Extract JSON from potential markdown wrapper
+                const cleanedText = extractJsonFromMarkdown(text);
+                JSON.parse(cleanedText);
+                return false; // Valid JSON, don't retry
+            }
+            catch {
+                // Invalid JSON - trigger retry
+                return true;
+            }
+        };
+        const result = await this._generateWithRetry({
+            model,
+            contents,
+            config,
+        }, promptId, options.maxAttempts, shouldRetryOnContent, 'generateJson');
+        let text = getResponseText(result);
+        if (!text) {
+            throw new Error('API returned an empty response for generateJson.');
+        }
+        // Handle markdown wrapping
+        const prefix = '```json';
+        const suffix = '```';
+        if (text.startsWith(prefix) && text.endsWith(suffix)) {
+            text = text.substring(prefix.length, text.length - suffix.length).trim();
+        }
+        try {
+            // Extract JSON from potential markdown wrapper
+            const cleanedText = extractJsonFromMarkdown(text);
+            return JSON.parse(cleanedText);
+        }
+        catch (parseError) {
+            throw new Error(`Failed to parse API response as JSON: ${getErrorMessage(parseError)}`);
+        }
+    }
+    /**
+     * Generate embeddings for text input.
+     * Supports single text string or array of strings.
+     *
+     * @param options - Embedding options including text and model
+     * @returns Embedding vector(s) as number array(s)
+     * @throws Error if generation fails or response is invalid
+     */
+    async generateEmbedding(options) {
+        const { text, model } = options;
+        try {
+            const texts = Array.isArray(text) ? text : [text];
+            const embedContentResponse = await this.contentGenerator.embedContent({
+                model,
+                contents: texts,
+            });
+            if (!embedContentResponse.embeddings ||
+                embedContentResponse.embeddings.length === 0) {
+                throw new Error('No embeddings found in API response.');
+            }
+            if (embedContentResponse.embeddings.length !== texts.length) {
+                throw new Error(`API returned a mismatched number of embeddings. Expected ${texts.length}, got ${embedContentResponse.embeddings.length}.`);
+            }
+            const embeddings = embedContentResponse.embeddings.map((embedding, index) => {
+                const values = embedding.values;
+                if (!values || values.length === 0) {
+                    throw new Error(`API returned an empty embedding for input text at index ${index}: "${texts[index]}"`);
+                }
+                return values;
+            });
+            // Return single array if input was a single string
+            return Array.isArray(text) ? embeddings : embeddings[0];
+        }
+        catch (error) {
+            throw new Error(`Failed to generate embedding: ${getErrorMessage(error)}`);
+        }
+    }
+    /**
+     * Count tokens in text or contents without making an API call to generate.
+     * Useful for checking context limits before generation.
+     *
+     * @param options - Options including text/contents and model
+     * @returns Token count
+     * @throws Error if counting fails
+     */
+    async countTokens(options) {
+        const { text, contents, model } = options;
+        try {
+            let requestContents;
+            if (contents) {
+                requestContents = contents;
+            }
+            else if (text) {
+                requestContents = [
+                    {
+                        role: 'user',
+                        parts: [{ text }],
+                    },
+                ];
+            }
+            else {
+                throw new Error('Either text or contents must be provided');
+            }
+            const response = await this.contentGenerator.countTokens({
+                model,
+                contents: requestContents,
+            });
+            return response.totalTokens ?? 0;
+        }
+        catch (error) {
+            throw new Error(`Failed to count tokens: ${getErrorMessage(error)}`);
+        }
+    }
+    /**
+     * Generate content from a prompt.
+     * This is a general-purpose content generation method that doesn't enforce JSON output.
+     *
+     * @param options - Generation options
+     * @returns Raw GenerateContentResponse
+     * @throws Error if generation fails
+     */
+    async generateContent(options) {
+        const { contents, model, systemInstruction, abortSignal, promptId, maxAttempts, } = options;
+        const config = {
+            temperature: 0,
+            topP: 1,
+            abortSignal,
+        };
+        if (systemInstruction !== undefined && systemInstruction !== '') {
+            config.systemInstruction = systemInstruction;
+        }
+        const shouldRetryOnContent = (response) => {
+            const text = getResponseText(response)?.trim();
+            return !text; // Retry on empty response
+        };
+        return this._generateWithRetry({
+            model,
+            contents,
+            config,
+        }, promptId, maxAttempts, shouldRetryOnContent, 'generateContent');
+    }
+    async _generateWithRetry(requestParams, promptId, maxAttempts, shouldRetryOnContent, _errorContext) {
+        const abortSignal = requestParams.config?.abortSignal;
+        try {
+            const apiCall = () => this.contentGenerator.generateContent(requestParams, promptId);
+            return await retryWithBackoff(apiCall, {
+                shouldRetryOnContent,
+                maxAttempts: maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+            });
+        }
+        catch (error) {
+            if (abortSignal?.aborted === true) {
+                throw error;
+            }
+            throw new Error(`Failed to generate content: ${getErrorMessage(error)}`);
+        }
+    }
+}
+//# sourceMappingURL=baseLlmClient.js.map

package/dist/src/core/baseLlmClient.js.map

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

package/dist/src/core/bucketFailoverIntegration.d.ts

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * @plan PLAN-20251213issue490
+ * Phase 7: Bucket Failover Integration
+ *
+ * Integrates bucket failover logic into ChatSession provider execution flow
+ */
+import type { IContent, ContentBlock } from '@vybestack/llxprt-code-core/services/history/IContent.js';
+import type { RuntimeProvider as IProvider } from '@vybestack/llxprt-code-core/runtime/contracts/RuntimeProvider.js';
+import type { RuntimeGenerateChatOptions as GenerateChatOptions } from '@vybestack/llxprt-code-core/runtime/contracts/RuntimeProviderChat.js';
+/**
+ * Configuration for bucket failover execution
+ */
+export interface BucketFailoverConfig {
+    buckets: string[];
+    provider: IProvider;
+    tokenRefreshCallback?: (bucket: string) => Promise<void>;
+    notificationCallback?: (fromBucket: string, toBucket: string) => void;
+}
+/**
+ * Result from bucket failover execution including which bucket succeeded
+ */
+export interface BucketFailoverResult {
+    content: IContent;
+    bucket: string;
+    attemptedBuckets: string[];
+}
+/**
+ * Wrapper for provider generateChatCompletion that handles bucket failover
+ *
+ * When multiple OAuth buckets are configured, this will automatically retry
+ * failed requests (429/quota/402 errors) with the next available bucket.
+ *
+ * @param options - Chat generation options to pass to provider
+ * @param config - Bucket failover configuration
+ * @returns The final IContent response and which bucket succeeded
+ * @throws Error if all buckets are exhausted
+ */
+export declare function executeProviderWithBucketFailover(options: GenerateChatOptions, config: BucketFailoverConfig): Promise<BucketFailoverResult>;
+/**
+ * Check if bucket failover should be enabled for the current configuration
+ *
+ * Bucket failover is enabled when:
+ * 1. Profile has auth configuration
+ * 2. Auth type is 'oauth'
+ * 3. Multiple buckets are configured
+ *
+ * @param authConfig - The profile's auth configuration
+ * @returns true if failover should be enabled
+ */
+export declare function shouldEnableBucketFailover(authConfig: {
+    type: string;
+    buckets?: string[];
+} | undefined): boolean;
+/**
+ * Aggregate text content from IContent blocks
+ * Helper to extract text from provider responses
+ */
+export declare function aggregateTextFromBlocks(blocks: ContentBlock[]): string;

package/dist/src/core/bucketFailoverIntegration.js

@@ -0,0 +1,186 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * @plan PLAN-20251213issue490
+ * Phase 7: Bucket Failover Integration
+ *
+ * Integrates bucket failover logic into ChatSession provider execution flow
+ */
+import { DebugLogger } from '@vybestack/llxprt-code-core/debug/index.js';
+/**
+ * Determines if an error should trigger failover to the next bucket
+ *
+ * Failover triggers:
+ * - 429 rate limit
+ * - Quota exceeded
+ * - 402 payment required
+ * - Token renewal failure
+ *
+ * Does NOT failover:
+ * - 400 bad request
+ * - Other API errors
+ */
+function shouldFailover(error) {
+    const message = error.message.toLowerCase();
+    // Check for status code on error object (common pattern)
+    const errorStatus = error.status;
+    if (errorStatus === 401 || errorStatus === 403) {
+        return true;
+    }
+    // Check for Anthropic body-level error types (rate_limit_error, overloaded_error)
+    const bodyError = error;
+    if (bodyError.error?.type === 'rate_limit_error' ||
+        bodyError.error?.type === 'overloaded_error') {
+        return true;
+    }
+    return (
+    // eslint-disable-next-line sonarjs/expression-complexity -- Existing structure is intentionally preserved; refactoring this boundary is outside the lint slice.
+    message.includes('429') ||
+        message.includes('401') ||
+        message.includes('403') ||
+        message.includes('rate limit') ||
+        message.includes('quota') ||
+        message.includes('402') ||
+        message.includes('payment') ||
+        message.includes('revoked') ||
+        message.includes('permission_error') ||
+        (message.includes('token') && message.includes('expired')));
+}
+const logger = new DebugLogger('llxprt:bucket:failover:integration');
+/**
+ * Wrapper for provider generateChatCompletion that handles bucket failover
+ *
+ * When multiple OAuth buckets are configured, this will automatically retry
+ * failed requests (429/quota/402 errors) with the next available bucket.
+ *
+ * @param options - Chat generation options to pass to provider
+ * @param config - Bucket failover configuration
+ * @returns The final IContent response and which bucket succeeded
+ * @throws Error if all buckets are exhausted
+ */
+export async function executeProviderWithBucketFailover(options, config) {
+    const { buckets, provider, tokenRefreshCallback, notificationCallback } = config;
+    if (buckets.length === 0) {
+        throw new Error('Bucket failover requires at least one bucket');
+    }
+    if (typeof provider.generateChatCompletion !== 'function') {
+        throw new Error('Provider does not support generateChatCompletion');
+    }
+    const attemptedBuckets = [];
+    let lastError = null;
+    for (let i = 0; i < buckets.length; i++) {
+        const bucket = buckets[i];
+        attemptedBuckets.push(bucket);
+        try {
+            // Refresh token for this bucket if callback provided
+            if (tokenRefreshCallback) {
+                logger.debug(() => `Refreshing OAuth token for bucket '${bucket}'`);
+                await tokenRefreshCallback(bucket);
+            }
+            logger.debug(() => `Attempting provider call with bucket '${bucket}' (${i + 1}/${buckets.length})`);
+            // Call provider with current bucket's auth
+            const stream = provider.generateChatCompletion(options);
+            // Consume the async generator to get the final result
+            let lastContent;
+            for await (const chunk of stream) {
+                lastContent = chunk;
+            }
+            if (!lastContent) {
+                throw new Error('Provider returned empty response');
+            }
+            logger.debug(() => `Successfully completed request with bucket '${bucket}'`);
+            return {
+                content: lastContent,
+                bucket,
+                attemptedBuckets,
+            };
+        }
+        catch (error) {
+            const err = error;
+            lastError = err;
+            logger.debug(() => `Bucket '${bucket}' failed with error: ${err.message}`);
+            // Check if this error should trigger failover
+            if (shouldFailover(err)) {
+                // eslint-disable-next-line sonarjs/nested-control-flow -- Existing structure is intentionally preserved; refactoring this boundary is outside the lint slice.
+                if (i < buckets.length - 1) {
+                    const nextBucket = buckets[i + 1];
+                    // Notify about bucket switch
+                    if (notificationCallback) {
+                        notificationCallback(bucket, nextBucket);
+                    }
+                    logger.debug(() => `Failing over from bucket '${bucket}' to '${nextBucket}'`);
+                    // Continue to next bucket
+                    continue;
+                }
+                else {
+                    // Last bucket also failed with failover error
+                    const exhaustedMessage = formatAllBucketsExhaustedError(provider.name, buckets, attemptedBuckets, lastError);
+                    throw new Error(exhaustedMessage);
+                }
+            }
+            // Non-failover error - throw immediately
+            throw err;
+        }
+    }
+    // Should never reach here, but handle the case
+    const exhaustedMessage = formatAllBucketsExhaustedError(provider.name, buckets, attemptedBuckets, lastError);
+    throw new Error(exhaustedMessage);
+}
+/**
+ * Format comprehensive error message when all buckets are exhausted
+ */
+function formatAllBucketsExhaustedError(providerName, allBuckets, attemptedBuckets, lastError) {
+    let message = `All buckets exhausted for provider '${providerName}':\n`;
+    for (const bucket of attemptedBuckets) {
+        message += `  - ${bucket}: failed\n`;
+    }
+    // Note any buckets that weren't tried
+    const unattempted = allBuckets.filter((b) => !attemptedBuckets.includes(b));
+    if (unattempted.length > 0) {
+        message += `\nUnattempted buckets: ${unattempted.join(', ')}\n`;
+    }
+    if (lastError) {
+        message += `\nLast error: ${lastError.message}`;
+    }
+    message += `\n\nTry again later or add more OAuth buckets to the profile.`;
+    return message;
+}
+/**
+ * Check if bucket failover should be enabled for the current configuration
+ *
+ * Bucket failover is enabled when:
+ * 1. Profile has auth configuration
+ * 2. Auth type is 'oauth'
+ * 3. Multiple buckets are configured
+ *
+ * @param authConfig - The profile's auth configuration
+ * @returns true if failover should be enabled
+ */
+export function shouldEnableBucketFailover(authConfig) {
+    if (!authConfig) {
+        return false;
+    }
+    if (authConfig.type !== 'oauth') {
+        return false;
+    }
+    if (!authConfig.buckets || authConfig.buckets.length <= 1) {
+        return false;
+    }
+    return true;
+}
+/**
+ * Aggregate text content from IContent blocks
+ * Helper to extract text from provider responses
+ */
+export function aggregateTextFromBlocks(blocks) {
+    let text = '';
+    for (const block of blocks) {
+        if (block.type === 'text') {
+            text += block.text;
+        }
+    }
+    return text;
+}
+//# sourceMappingURL=bucketFailoverIntegration.js.map

package/dist/src/core/bucketFailoverIntegration.js.map

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