Skip to content

Fix duplictate tool call processing in Chutes, DeepInfra, LiteLLM and xAI providers #4620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrarnoldus merged 1 commit into from
Dec 22, 2025
Merged

Fix duplictate tool call processing in Chutes, DeepInfra, LiteLLM and xAI providers #4620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/petite-moose-wish.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"kilo-code": patch
---

Fix duplictate tool call processing in Chutes, DeepInfra, LiteLLM and xAI providers.
1 change: 0 additions & 1 deletion src/api/providers/base-openai-compatible-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { BaseProvider } from "./base-provider"
import { verifyFinishReason } from "./kilocode/verifyFinishReason"
import { handleOpenAIError } from "./utils/openai-error-handler"
import { fetchWithTimeout } from "./kilocode/fetchWithTimeout" // kilocode_change
import { ToolCallAccumulator } from "./kilocode/nativeToolCallHelpers" // kilocode_change
import { calculateApiCostOpenAI } from "../../shared/cost"
import { getApiRequestTimeout } from "./utils/timeout-config"

Expand Down
9 changes: 0 additions & 9 deletions src/api/providers/chutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { ApiStream } from "../transform/stream"
import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"

import { RouterProvider } from "./router-provider"
import { addNativeToolCallsToParams, ToolCallAccumulator } from "./kilocode/nativeToolCallHelpers"

export class ChutesHandler extends RouterProvider implements SingleCompletionHandler {
constructor(options: ApiHandlerOptions) {
Expand Down Expand Up @@ -57,8 +56,6 @@ export class ChutesHandler extends RouterProvider implements SingleCompletionHan
params.temperature = this.options.modelTemperature ?? info.temperature
}

addNativeToolCallsToParams(params, this.options, metadata) // kilocode_change

return params
}

Expand All @@ -69,8 +66,6 @@ export class ChutesHandler extends RouterProvider implements SingleCompletionHan
): ApiStream {
const model = await this.fetchModel()

const toolCallAccumulator = new ToolCallAccumulator() // kilocode_change

if (model.id.includes("DeepSeek-R1")) {
const stream = await this.client.chat.completions.create({
...this.getCompletionParams(systemPrompt, messages, metadata),
Expand All @@ -89,8 +84,6 @@ export class ChutesHandler extends RouterProvider implements SingleCompletionHan
for await (const chunk of stream) {
const delta = chunk.choices[0]?.delta

yield* toolCallAccumulator.processChunk(chunk) // kilocode_change

if (delta?.content) {
for (const processedChunk of matcher.update(delta.content)) {
yield processedChunk
Expand Down Expand Up @@ -132,8 +125,6 @@ export class ChutesHandler extends RouterProvider implements SingleCompletionHan
for await (const chunk of stream) {
const delta = chunk.choices[0]?.delta

yield* toolCallAccumulator.processChunk(chunk) // kilocode_change

if (delta?.content) {
yield { type: "text", text: delta.content }
}
Expand Down
4 changes: 0 additions & 4 deletions src/api/providers/deepinfra.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from ".
import { RouterProvider } from "./router-provider"
import { getModelParams } from "../transform/model-params"
import { getModels } from "./fetchers/modelCache"
import { addNativeToolCallsToParams, ToolCallAccumulator } from "./kilocode/nativeToolCallHelpers"

export class DeepInfraHandler extends RouterProvider implements SingleCompletionHandler {
constructor(options: ApiHandlerOptions) {
Expand Down Expand Up @@ -94,12 +93,9 @@ export class DeepInfraHandler extends RouterProvider implements SingleCompletion
const { data: stream } = await this.client.chat.completions.create(requestOptions).withResponse()

let lastUsage: OpenAI.CompletionUsage | undefined
const toolCallAccumulator = new ToolCallAccumulator() // kilocode_change
for await (const chunk of stream) {
const delta = chunk.choices[0]?.delta

yield* toolCallAccumulator.processChunk(chunk) // kilocode_change

if (delta?.content) {
yield { type: "text", text: delta.content }
}
Expand Down
7 changes: 1 addition & 6 deletions src/api/providers/lite-llm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { convertToOpenAiMessages } from "../transform/openai-format"

import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
import { RouterProvider } from "./router-provider"
import { addNativeToolCallsToParams, ToolCallAccumulator } from "./kilocode/nativeToolCallHelpers"

/**
* LiteLLM provider handler
Expand Down Expand Up @@ -153,13 +152,10 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa

let lastUsage

const toolCallAccumulator = new ToolCallAccumulator() // kilocode_change
for await (const chunk of completion) {
const delta = chunk.choices[0]?.delta
const usage = chunk.usage as LiteLLMUsage

yield* toolCallAccumulator.processChunk(chunk) // kilocode_change

if (delta?.content) {
yield { type: "text", text: delta.content }
}
Expand Down Expand Up @@ -236,13 +232,12 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
requestOptions.temperature = this.options.modelTemperature ?? 0
}

// kilocode_change start
// GPT-5 models require max_completion_tokens instead of the deprecated max_tokens parameter

@marius-kilocode marius-kilocode Dec 22, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose comments should not have kilocode_change markers?

@chrarnoldus chrarnoldus Dec 22, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually how it is upstream

if (isGPT5Model && info.maxTokens) {
requestOptions.max_completion_tokens = info.maxTokens
} else if (info.maxTokens) {
requestOptions.max_tokens = info.maxTokens
}
// kilocode_change end

const response = await this.client.chat.completions.create(requestOptions)
return response.choices[0]?.message.content || ""
Expand Down
4 changes: 0 additions & 4 deletions src/api/providers/xai.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { BaseProvider } from "./base-provider"
import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
import { verifyFinishReason } from "./kilocode/verifyFinishReason" // kilocode_change
import { handleOpenAIError } from "./utils/openai-error-handler"
import { addNativeToolCallsToParams, ToolCallAccumulator } from "./kilocode/nativeToolCallHelpers"

const XAI_DEFAULT_TEMPERATURE = 0

Expand Down Expand Up @@ -84,14 +83,11 @@ export class XAIHandler extends BaseProvider implements SingleCompletionHandler
throw handleOpenAIError(error, this.providerName)
}

const toolCallAccumulator = new ToolCallAccumulator() // kilocode_change
for await (const chunk of stream) {
verifyFinishReason(chunk.choices[0]) // kilocode_change
const delta = chunk.choices[0]?.delta
const finishReason = chunk.choices[0]?.finish_reason

yield* toolCallAccumulator.processChunk(chunk) // kilocode_change

if (delta?.content) {
yield {
type: "text",
Expand Down