@hibanacloud/core 0.3.15

package/dist/src/core/openaiContentGenerator/provider/modelscope.js

@@ -0,0 +1,25 @@
+import { DefaultOpenAICompatibleProvider } from './default.js';
+/**
+ * Provider for ModelScope API
+ */
+export class ModelScopeOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
+    /**
+     * Checks if the configuration is for ModelScope.
+     */
+    static isModelScopeProvider(config) {
+        return !!config.baseUrl?.includes('modelscope');
+    }
+    /**
+     * ModelScope does not support `stream_options` when `stream` is false.
+     * This method removes `stream_options` if `stream` is not true.
+     */
+    buildRequest(request, userPromptId) {
+        const newRequest = super.buildRequest(request, userPromptId);
+        if (!newRequest.stream) {
+            delete newRequest
+                .stream_options;
+        }
+        return newRequest;
+    }
+}
+//# sourceMappingURL=modelscope.js.map

package/dist/src/core/openaiContentGenerator/provider/modelscope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelscope.js","sourceRoot":"","sources":["../../../../../src/core/openaiContentGenerator/provider/modelscope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAG/D;;GAEG;AACH,MAAM,OAAO,kCAAmC,SAAQ,+BAA+B;IACrF;;OAEG;IACH,MAAM,CAAC,oBAAoB,CAAC,MAA8B;QACxD,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACM,YAAY,CACnB,OAA+C,EAC/C,YAAoB;QAEpB,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACvB,OAAQ,UAAiE;iBACtE,cAAc,CAAC;QACpB,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}

package/dist/src/core/openaiContentGenerator/provider/modelscope.test.d.ts

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

package/dist/src/core/openaiContentGenerator/provider/modelscope.test.js

@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { ModelScopeOpenAICompatibleProvider } from './modelscope.js';
+vi.mock('openai');
+describe('ModelScopeOpenAICompatibleProvider', () => {
+    let provider;
+    let mockContentGeneratorConfig;
+    let mockCliConfig;
+    beforeEach(() => {
+        mockContentGeneratorConfig = {
+            apiKey: 'test-api-key',
+            baseUrl: 'https://api.modelscope.cn/v1',
+            model: 'qwen-max',
+        };
+        mockCliConfig = {
+            getCliVersion: vi.fn().mockReturnValue('1.0.0'),
+        };
+        provider = new ModelScopeOpenAICompatibleProvider(mockContentGeneratorConfig, mockCliConfig);
+    });
+    describe('isModelScopeProvider', () => {
+        it('should return true if baseUrl includes "modelscope"', () => {
+            const config = { baseUrl: 'https://api.modelscope.cn/v1' };
+            expect(ModelScopeOpenAICompatibleProvider.isModelScopeProvider(config)).toBe(true);
+        });
+        it('should return false if baseUrl does not include "modelscope"', () => {
+            const config = { baseUrl: 'https://api.openai.com/v1' };
+            expect(ModelScopeOpenAICompatibleProvider.isModelScopeProvider(config)).toBe(false);
+        });
+    });
+    describe('buildRequest', () => {
+        it('should remove stream_options when stream is false', () => {
+            const originalRequest = {
+                model: 'qwen-max',
+                messages: [{ role: 'user', content: 'Hello!' }],
+                stream: false,
+                stream_options: { include_usage: true },
+            };
+            const result = provider.buildRequest(originalRequest, 'prompt-id');
+            expect(result).not.toHaveProperty('stream_options');
+        });
+        it('should keep stream_options when stream is true', () => {
+            const originalRequest = {
+                model: 'qwen-max',
+                messages: [{ role: 'user', content: 'Hello!' }],
+                stream: true,
+                stream_options: { include_usage: true },
+            };
+            const result = provider.buildRequest(originalRequest, 'prompt-id');
+            expect(result).toHaveProperty('stream_options');
+        });
+        it('should handle requests without stream_options', () => {
+            const originalRequest = {
+                model: 'qwen-max',
+                messages: [{ role: 'user', content: 'Hello!' }],
+                stream: false,
+            };
+            const result = provider.buildRequest(originalRequest, 'prompt-id');
+            expect(result).not.toHaveProperty('stream_options');
+        });
+    });
+});
+//# sourceMappingURL=modelscope.test.js.map

package/dist/src/core/openaiContentGenerator/provider/modelscope.test.js.map

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

package/dist/src/core/openaiContentGenerator/provider/openrouter.d.ts

@@ -0,0 +1,10 @@
+import type OpenAI from 'openai';
+import type { Config } from '../../../config/config.js';
+import type { ContentGeneratorConfig } from '../../contentGenerator.js';
+import { DefaultOpenAICompatibleProvider } from './default.js';
+export declare class OpenRouterOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
+    constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config);
+    static isOpenRouterProvider(contentGeneratorConfig: ContentGeneratorConfig): boolean;
+    buildHeaders(): Record<string, string | undefined>;
+    buildRequest(request: OpenAI.Chat.ChatCompletionCreateParams, userPromptId: string): OpenAI.Chat.ChatCompletionCreateParams;
+}

package/dist/src/core/openaiContentGenerator/provider/openrouter.js

@@ -0,0 +1,33 @@
+import { DefaultOpenAICompatibleProvider } from './default.js';
+import { AnthropicOpenAICompatibleProvider } from './anthropic.js';
+export class OpenRouterOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
+    constructor(contentGeneratorConfig, cliConfig) {
+        super(contentGeneratorConfig, cliConfig);
+    }
+    static isOpenRouterProvider(contentGeneratorConfig) {
+        const baseURL = contentGeneratorConfig.baseUrl || '';
+        return baseURL.includes('openrouter.ai');
+    }
+    buildHeaders() {
+        // Get base headers from parent class
+        const baseHeaders = super.buildHeaders();
+        // Add OpenRouter-specific headers
+        return {
+            ...baseHeaders,
+            'HTTP-Referer': 'https://github.com/QwenLM/qwen-code.git',
+            'X-Title': 'Qwen Code',
+        };
+    }
+    buildRequest(request, userPromptId) {
+        const result = { ...request };
+        // Claude models accessed via OpenRouter don't support both temperature and top_p
+        // If both are present and it's a Claude model, keep temperature and remove top_p
+        if (result.temperature !== undefined &&
+            result.top_p !== undefined &&
+            AnthropicOpenAICompatibleProvider.isClaudeModel(result.model)) {
+            delete result.top_p;
+        }
+        return result;
+    }
+}
+//# sourceMappingURL=openrouter.js.map

package/dist/src/core/openaiContentGenerator/provider/openrouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../../../../src/core/openaiContentGenerator/provider/openrouter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AAEnE,MAAM,OAAO,kCAAmC,SAAQ,+BAA+B;IACrF,YACE,sBAA8C,EAC9C,SAAiB;QAEjB,KAAK,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,sBAA8C;QAE9C,MAAM,OAAO,GAAG,sBAAsB,CAAC,OAAO,IAAI,EAAE,CAAC;QACrD,OAAO,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC;IAEQ,YAAY;QACnB,qCAAqC;QACrC,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QAEzC,kCAAkC;QAClC,OAAO;YACL,GAAG,WAAW;YACd,cAAc,EAAE,yCAAyC;YACzD,SAAS,EAAE,WAAW;SACvB,CAAC;IACJ,CAAC;IAEQ,YAAY,CACnB,OAA+C,EAC/C,YAAoB;QAEpB,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAE9B,iFAAiF;QACjF,iFAAiF;QACjF,IACE,MAAM,CAAC,WAAW,KAAK,SAAS;YAChC,MAAM,CAAC,KAAK,KAAK,SAAS;YAC1B,iCAAiC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAC7D,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/dist/src/core/openaiContentGenerator/provider/openrouter.test.d.ts

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

package/dist/src/core/openaiContentGenerator/provider/openrouter.test.js

@@ -0,0 +1,175 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { OpenRouterOpenAICompatibleProvider } from './openrouter.js';
+import { DefaultOpenAICompatibleProvider } from './default.js';
+describe('OpenRouterOpenAICompatibleProvider', () => {
+    let provider;
+    let mockContentGeneratorConfig;
+    let mockCliConfig;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Mock ContentGeneratorConfig
+        mockContentGeneratorConfig = {
+            apiKey: 'test-api-key',
+            baseUrl: 'https://openrouter.ai/api/v1',
+            timeout: 60000,
+            maxRetries: 2,
+            model: 'openai/gpt-4',
+        };
+        // Mock Config
+        mockCliConfig = {
+            getCliVersion: vi.fn().mockReturnValue('1.0.0'),
+        };
+        provider = new OpenRouterOpenAICompatibleProvider(mockContentGeneratorConfig, mockCliConfig);
+    });
+    describe('constructor', () => {
+        it('should extend DefaultOpenAICompatibleProvider', () => {
+            expect(provider).toBeInstanceOf(DefaultOpenAICompatibleProvider);
+            expect(provider).toBeInstanceOf(OpenRouterOpenAICompatibleProvider);
+        });
+    });
+    describe('isOpenRouterProvider', () => {
+        it('should return true for openrouter.ai URLs', () => {
+            const configs = [
+                { baseUrl: 'https://openrouter.ai/api/v1' },
+                { baseUrl: 'https://api.openrouter.ai/v1' },
+                { baseUrl: 'https://openrouter.ai' },
+                { baseUrl: 'http://openrouter.ai/api/v1' },
+            ];
+            configs.forEach((config) => {
+                const result = OpenRouterOpenAICompatibleProvider.isOpenRouterProvider(config);
+                expect(result).toBe(true);
+            });
+        });
+        it('should return false for non-openrouter URLs', () => {
+            const configs = [
+                { baseUrl: 'https://api.openai.com/v1' },
+                { baseUrl: 'https://api.anthropic.com/v1' },
+                { baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1' },
+                { baseUrl: 'https://example.com/api/v1' }, // different domain
+                { baseUrl: '' },
+                { baseUrl: undefined },
+            ];
+            configs.forEach((config) => {
+                const result = OpenRouterOpenAICompatibleProvider.isOpenRouterProvider(config);
+                expect(result).toBe(false);
+            });
+        });
+        it('should handle missing baseUrl gracefully', () => {
+            const config = {};
+            const result = OpenRouterOpenAICompatibleProvider.isOpenRouterProvider(config);
+            expect(result).toBe(false);
+        });
+    });
+    describe('buildHeaders', () => {
+        it('should include base headers from parent class', () => {
+            const headers = provider.buildHeaders();
+            // Should include User-Agent from parent
+            expect(headers['User-Agent']).toBe(`QwenCode/1.0.0 (${process.platform}; ${process.arch})`);
+        });
+        it('should add OpenRouter-specific headers', () => {
+            const headers = provider.buildHeaders();
+            expect(headers).toEqual({
+                'User-Agent': `QwenCode/1.0.0 (${process.platform}; ${process.arch})`,
+                'HTTP-Referer': 'https://github.com/QwenLM/qwen-code.git',
+                'X-Title': 'Qwen Code',
+            });
+        });
+        it('should override parent headers if there are conflicts', () => {
+            // Mock parent to return conflicting headers
+            const parentBuildHeaders = vi.spyOn(DefaultOpenAICompatibleProvider.prototype, 'buildHeaders');
+            parentBuildHeaders.mockReturnValue({
+                'User-Agent': 'ParentAgent/1.0.0',
+                'HTTP-Referer': 'https://parent.com',
+            });
+            const headers = provider.buildHeaders();
+            expect(headers).toEqual({
+                'User-Agent': 'ParentAgent/1.0.0',
+                'HTTP-Referer': 'https://github.com/QwenLM/qwen-code.git', // OpenRouter-specific value should override
+                'X-Title': 'Qwen Code',
+            });
+            parentBuildHeaders.mockRestore();
+        });
+        it('should handle unknown CLI version from parent', () => {
+            vi.mocked(mockCliConfig.getCliVersion).mockReturnValue(undefined);
+            const headers = provider.buildHeaders();
+            expect(headers['User-Agent']).toBe(`QwenCode/unknown (${process.platform}; ${process.arch})`);
+            expect(headers['HTTP-Referer']).toBe('https://github.com/QwenLM/qwen-code.git');
+            expect(headers['X-Title']).toBe('Qwen Code');
+        });
+    });
+    describe('buildClient', () => {
+        it('should inherit buildClient behavior from parent', () => {
+            // Mock the parent's buildClient method
+            const mockClient = { test: 'client' };
+            const parentBuildClient = vi.spyOn(DefaultOpenAICompatibleProvider.prototype, 'buildClient');
+            parentBuildClient.mockReturnValue(mockClient);
+            const result = provider.buildClient();
+            expect(parentBuildClient).toHaveBeenCalled();
+            expect(result).toBe(mockClient);
+            parentBuildClient.mockRestore();
+        });
+    });
+    describe('buildRequest', () => {
+        it('should pass through request for non-Claude models', () => {
+            const mockRequest = {
+                model: 'openai/gpt-4',
+                messages: [{ role: 'user', content: 'Hello' }],
+                temperature: 0.7,
+                top_p: 0.9,
+            };
+            const mockUserPromptId = 'test-prompt-id';
+            const result = provider.buildRequest(mockRequest, mockUserPromptId);
+            // Non-Claude models should keep both temperature and top_p
+            expect(result.temperature).toBe(0.7);
+            expect(result.top_p).toBe(0.9);
+        });
+        it('should remove top_p for Claude models when both temperature and top_p are set', () => {
+            const mockRequest = {
+                model: 'anthropic/claude-3.5-sonnet',
+                messages: [{ role: 'user', content: 'Hello' }],
+                temperature: 0.7,
+                top_p: 0.9,
+            };
+            const mockUserPromptId = 'test-prompt-id';
+            const result = provider.buildRequest(mockRequest, mockUserPromptId);
+            // Claude models should have top_p removed when both are present
+            expect(result.temperature).toBe(0.7);
+            expect(result.top_p).toBeUndefined();
+        });
+        it('should keep top_p for Claude models when temperature is not set', () => {
+            const mockRequest = {
+                model: 'anthropic/claude-3.5-sonnet',
+                messages: [{ role: 'user', content: 'Hello' }],
+                top_p: 0.9,
+            };
+            const mockUserPromptId = 'test-prompt-id';
+            const result = provider.buildRequest(mockRequest, mockUserPromptId);
+            // Only top_p is set, so it should be kept
+            expect(result.temperature).toBeUndefined();
+            expect(result.top_p).toBe(0.9);
+        });
+    });
+    describe('integration with parent class', () => {
+        it('should properly call parent constructor', () => {
+            const newProvider = new OpenRouterOpenAICompatibleProvider(mockContentGeneratorConfig, mockCliConfig);
+            // Verify that parent properties are accessible
+            expect(newProvider).toHaveProperty('buildHeaders');
+            expect(newProvider).toHaveProperty('buildClient');
+            expect(newProvider).toHaveProperty('buildRequest');
+        });
+        it('should maintain parent functionality while adding OpenRouter specifics', () => {
+            // Test that the provider can perform all parent operations
+            const headers = provider.buildHeaders();
+            // Should have both parent and OpenRouter-specific headers
+            expect(headers['User-Agent']).toBeDefined(); // From parent
+            expect(headers['HTTP-Referer']).toBe('https://github.com/QwenLM/qwen-code.git'); // OpenRouter-specific
+            expect(headers['X-Title']).toBe('Qwen Code'); // OpenRouter-specific
+        });
+    });
+});
+//# sourceMappingURL=openrouter.test.js.map

package/dist/src/core/openaiContentGenerator/provider/openrouter.test.js.map

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

package/dist/src/core/openaiContentGenerator/provider/types.d.ts

@@ -0,0 +1,23 @@
+import type OpenAI from 'openai';
+export interface ChatCompletionContentPartTextWithCache extends OpenAI.Chat.ChatCompletionContentPartText {
+    cache_control?: {
+        type: 'ephemeral';
+    };
+}
+export type ChatCompletionContentPartWithCache = ChatCompletionContentPartTextWithCache | OpenAI.Chat.ChatCompletionContentPartImage | OpenAI.Chat.ChatCompletionContentPartRefusal;
+export type ChatCompletionToolWithCache = OpenAI.Chat.ChatCompletionTool & {
+    cache_control?: {
+        type: 'ephemeral';
+    };
+};
+export interface OpenAICompatibleProvider {
+    buildHeaders(): Record<string, string | undefined>;
+    buildClient(): OpenAI;
+    buildRequest(request: OpenAI.Chat.ChatCompletionCreateParams, userPromptId: string): OpenAI.Chat.ChatCompletionCreateParams;
+}
+export type DashScopeRequestMetadata = {
+    metadata: {
+        sessionId?: string;
+        promptId: string;
+    };
+};

package/dist/src/core/openaiContentGenerator/provider/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/core/openaiContentGenerator/provider/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/core/openaiContentGenerator/provider/types.ts"],"names":[],"mappings":""}

package/dist/src/core/openaiContentGenerator/streamingToolCallParser.d.ts

@@ -0,0 +1,145 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Type definition for the result of parsing a JSON chunk in tool calls
+ */
+export interface ToolCallParseResult {
+    /** Whether the JSON parsing is complete */
+    complete: boolean;
+    /** The parsed JSON value (only present when complete is true) */
+    value?: Record<string, unknown>;
+    /** Error information if parsing failed */
+    error?: Error;
+    /** Whether the JSON was repaired (e.g., auto-closed unclosed strings) */
+    repaired?: boolean;
+}
+/**
+ * StreamingToolCallParser - Handles streaming tool call objects with inconsistent chunk formats
+ *
+ * Problems this parser addresses:
+ * - Tool calls arrive with varying chunk shapes (empty strings, partial JSON, complete objects)
+ * - Tool calls may lack IDs, names, or have inconsistent indices
+ * - Multiple tool calls can be processed simultaneously with interleaved chunks
+ * - Index collisions occur when the same index is reused for different tool calls
+ * - JSON arguments are fragmented across multiple chunks and need reconstruction
+ */
+export declare class StreamingToolCallParser {
+    /** Accumulated buffer containing all received chunks for each tool call index */
+    private buffers;
+    /** Current nesting depth in JSON structure for each tool call index */
+    private depths;
+    /** Whether we're currently inside a string literal for each tool call index */
+    private inStrings;
+    /** Whether the next character should be treated as escaped for each tool call index */
+    private escapes;
+    /** Metadata for each tool call index */
+    private toolCallMeta;
+    /** Track parse errors encountered for each tool call index */
+    private parseErrors;
+    /** Map from tool call ID to actual index used for storage */
+    private idToIndexMap;
+    /** Counter for generating new indices when collisions occur */
+    private nextAvailableIndex;
+    /**
+     * Processes a new chunk of tool call data and attempts to parse complete JSON objects
+     *
+     * Handles the core problems of streaming tool call parsing:
+     * - Resolves index collisions when the same index is reused for different tool calls
+     * - Routes chunks without IDs to the correct incomplete tool call
+     * - Tracks JSON parsing state (depth, string boundaries, escapes) per tool call
+     * - Attempts parsing only when JSON structure is complete (depth = 0)
+     * - Repairs common issues like unclosed strings
+     *
+     * @param index - Tool call index from streaming response (may collide with existing calls)
+     * @param chunk - String chunk that may be empty, partial JSON, or complete data
+     * @param id - Optional tool call ID for collision detection and chunk routing
+     * @param name - Optional function name stored as metadata
+     * @returns ToolCallParseResult with completion status, parsed value, and repair info
+     */
+    addChunk(index: number, chunk: string, id?: string, name?: string): ToolCallParseResult;
+    /**
+     * Gets the current tool call metadata for a specific index
+     *
+     * @param index - The tool call index
+     * @returns Object containing id and name if available
+     */
+    getToolCallMeta(index: number): {
+        id?: string;
+        name?: string;
+    };
+    /**
+     * Gets all completed tool calls that are ready to be emitted
+     *
+     * Attempts to parse accumulated buffers using multiple strategies:
+     * 1. Standard JSON.parse()
+     * 2. Auto-close unclosed strings and retry
+     * 3. Fallback to safeJsonParse for malformed data
+     *
+     * Only returns tool calls with both name metadata and non-empty buffers.
+     * Should be called when streaming is complete (finish_reason is present).
+     *
+     * @returns Array of completed tool calls with their metadata and parsed arguments
+     */
+    getCompletedToolCalls(): Array<{
+        id?: string;
+        name?: string;
+        args: Record<string, unknown>;
+        index: number;
+        parseError?: string;
+    }>;
+    /**
+     * Finds the next available index for a new tool call
+     *
+     * Scans indices starting from nextAvailableIndex to find one that's safe to use.
+     * Reuses indices with empty buffers or incomplete parsing states.
+     * Skips indices with complete, parseable tool call data to prevent overwriting.
+     *
+     * @returns The next available index safe for storing a new tool call
+     */
+    private findNextAvailableIndex;
+    /**
+     * Finds the most recent incomplete tool call index
+     *
+     * Used when continuation chunks arrive without IDs. Scans existing tool calls
+     * to find the highest index with incomplete parsing state (depth > 0, empty buffer,
+     * or unparseable JSON). Falls back to creating a new index if none found.
+     *
+     * @returns The index of the most recent incomplete tool call, or a new available index
+     */
+    private findMostRecentIncompleteIndex;
+    /**
+     * Resets the parser state for a specific tool call index
+     *
+     * @param index - The tool call index to reset
+     */
+    resetIndex(index: number): void;
+    /**
+     * Resets the entire parser state for processing a new stream
+     *
+     * Clears all accumulated buffers, parsing states, metadata, and counters.
+     * Allows the parser to be reused for multiple independent streams without
+     * data leakage between sessions.
+     */
+    reset(): void;
+    /**
+     * Gets the current accumulated buffer content for a specific index
+     *
+     * @param index - The tool call index to retrieve buffer for
+     * @returns The current buffer content for the specified index (empty string if not found)
+     */
+    getBuffer(index: number): string;
+    /**
+     * Gets the current parsing state information for a specific index
+     *
+     * @param index - The tool call index to get state information for
+     * @returns Object containing current parsing state (depth, inString, escape)
+     */
+    getState(index: number): {
+        depth: number;
+        inString: boolean;
+        escape: boolean;
+    };
+}