Skip to content

Commit f995615

Browse files
charlesliencharleslien
committed
native tool calls
1 parent 00a19a8 commit f995615

10 files changed

Lines changed: 274 additions & 181 deletions

File tree

‎common/src/types/contracts/llm.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import type { TrackEventFn } from './analytics'
22
import type { SendActionFn } from './client'
33
import type { CheckLiveUserInputFn } from './live-user-input'
4+
import type { OpenRouterProviderRoutingOptions } from '../agent-template'
45
import type { ParamsExcluding } from '../function-params'
56
import type { Logger } from './logger'
67
import type { Model } from '../../old-constants'
78
import type { Message } from '../messages/codebuff-message'
8-
import type { OpenRouterProviderRoutingOptions } from '../agent-template'
99
import type { generateText, streamText } from 'ai'
1010
import type z from 'zod/v4'
1111

@@ -19,6 +19,12 @@ export type StreamChunk =
1919
type: 'reasoning'
2020
text: string
2121
}
22+
| {
23+
type: 'tool-call'
24+
toolCallId: string
25+
toolName: string
26+
input: unknown
27+
}
2228
| { type: 'error'; message: string }
2329

2430
export type PromptAiSdkStreamFn = (

‎common/src/util/messages.ts‎

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { cloneDeep, has, isEqual } from 'lodash'
22

3-
import { getToolCallString } from '../tools/utils'
4-
53
import type { JSONValue } from '../types/json'
64
import type {
75
AssistantMessage,
@@ -100,21 +98,21 @@ function assistantToCodebuffMessage(
10098
content: Exclude<AssistantMessage['content'], string>[number]
10199
},
102100
): AssistantMessage {
103-
if (message.content.type === 'tool-call') {
104-
return cloneDeep({
105-
...message,
106-
content: [
107-
{
108-
type: 'text',
109-
text: getToolCallString(
110-
message.content.toolName,
111-
message.content.input,
112-
false,
113-
),
114-
},
115-
],
116-
})
117-
}
101+
// if (message.content.type === 'tool-call') {
102+
// return cloneDeep({
103+
// ...message,
104+
// content: [
105+
// {
106+
// type: 'text',
107+
// text: getToolCallString(
108+
// message.content.toolName,
109+
// message.content.input,
110+
// false,
111+
// ),
112+
// },
113+
// ],
114+
// })
115+
// }
118116
return cloneDeep({ ...message, content: [message.content] })
119117
}
120118

@@ -123,20 +121,10 @@ function convertToolResultMessage(
123121
): ModelMessageWithAuxiliaryData[] {
124122
return message.content.map((c) => {
125123
if (c.type === 'json') {
126-
const toolResult = {
127-
toolName: message.toolName,
128-
toolCallId: message.toolCallId,
129-
output: c.value,
130-
}
131-
return cloneDeep<UserMessage>({
124+
return cloneDeep<ToolModelMessage>({
132125
...message,
133-
role: 'user',
134-
content: [
135-
{
136-
type: 'text',
137-
text: `<tool_result>\n${JSON.stringify(toolResult, null, 2)}\n</tool_result>`,
138-
},
139-
],
126+
role: 'tool',
127+
content: [{ ...message, output: c, type: 'tool-result' }],
140128
})
141129
}
142130
if (c.type === 'media') {
@@ -147,12 +135,12 @@ function convertToolResultMessage(
147135
})
148136
}
149137
c satisfies never
150-
const oAny = c as any
151-
throw new Error(`Invalid tool output type: ${oAny.type}`)
138+
const cAny = c as any
139+
throw new Error(`Invalid tool output type: ${cAny.type}`)
152140
})
153141
}
154142

155-
function convertToolMessage(message: Message): ModelMessageWithAuxiliaryData[] {
143+
function convertMessage(message: Message): ModelMessageWithAuxiliaryData[] {
156144
if (message.role === 'system') {
157145
return [
158146
{
@@ -188,12 +176,10 @@ function convertToolMessage(message: Message): ModelMessageWithAuxiliaryData[] {
188176
throw new Error(`Invalid message role: ${messageAny.role}`)
189177
}
190178

191-
function convertToolMessages(
192-
messages: Message[],
193-
): ModelMessageWithAuxiliaryData[] {
179+
function convertMessages(messages: Message[]): ModelMessageWithAuxiliaryData[] {
194180
const withoutToolMessages: ModelMessageWithAuxiliaryData[] = []
195181
for (const message of messages) {
196-
withoutToolMessages.push(...convertToolMessage(message))
182+
withoutToolMessages.push(...convertMessage(message))
197183
}
198184
return withoutToolMessages
199185
}
@@ -206,7 +192,7 @@ export function convertCbToModelMessages({
206192
includeCacheControl?: boolean
207193
}): ModelMessage[] {
208194
const toolMessagesConverted: ModelMessageWithAuxiliaryData[] =
209-
convertToolMessages(messages)
195+
convertMessages(messages)
210196

211197
const aggregated: ModelMessageWithAuxiliaryData[] = []
212198
for (const message of toolMessagesConverted) {

‎packages/agent-runtime/src/prompt-agent-stream.ts‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type { Logger } from '@codebuff/common/types/contracts/logger'
1212
import type { ParamsOf } from '@codebuff/common/types/function-params'
1313
import type { Message } from '@codebuff/common/types/messages/codebuff-message'
1414
import type { OpenRouterProviderOptions } from '@codebuff/internal/openrouter-ai-sdk'
15+
import type { ToolSet } from 'ai'
1516

1617
export const getAgentStreamFromTemplate = (params: {
1718
apiKey: string
@@ -32,7 +33,9 @@ export const getAgentStreamFromTemplate = (params: {
3233
liveUserInputRecord: UserInputRecord
3334
sessionConnections: SessionRecord
3435
trackEvent: TrackEventFn
35-
}): { getStream: (messages: Message[]) => ReturnType<PromptAiSdkStreamFn> } => {
36+
messages: Message[]
37+
tools: ToolSet | undefined
38+
}): ReturnType<PromptAiSdkStreamFn> => {
3639
const {
3740
apiKey,
3841
runId,
@@ -51,15 +54,16 @@ export const getAgentStreamFromTemplate = (params: {
5154
liveUserInputRecord,
5255
sessionConnections,
5356
trackEvent,
57+
messages,
58+
tools,
5459
} = params
5560

5661
if (textOverride !== null) {
57-
return {
58-
getStream: async function* stream(): ReturnType<PromptAiSdkStreamFn> {
59-
yield { type: 'text', text: textOverride!, agentId }
60-
return crypto.randomUUID()
61-
},
62+
async function* stream(): ReturnType<PromptAiSdkStreamFn> {
63+
yield { type: 'text', text: textOverride!, agentId }
64+
return crypto.randomUUID()
6265
}
66+
return stream()
6367
}
6468

6569
if (!template) {
@@ -68,46 +72,43 @@ export const getAgentStreamFromTemplate = (params: {
6872

6973
const { model } = template
7074

71-
const getStream = (messages: Message[]): ReturnType<PromptAiSdkStreamFn> => {
72-
const aiSdkStreamParams: ParamsOf<PromptAiSdkStreamFn> = {
73-
apiKey,
74-
runId,
75-
messages,
76-
model,
77-
stopSequences: [globalStopSequence],
78-
clientSessionId,
79-
fingerprintId,
80-
userInputId,
81-
userId,
82-
maxOutputTokens: 32_000,
83-
onCostCalculated,
84-
includeCacheControl,
85-
agentId,
86-
maxRetries: 3,
87-
sendAction,
88-
liveUserInputRecord,
89-
sessionConnections,
90-
logger,
91-
trackEvent,
92-
}
75+
const aiSdkStreamParams: ParamsOf<PromptAiSdkStreamFn> = {
76+
apiKey,
77+
runId,
78+
messages,
79+
model,
80+
stopSequences: [globalStopSequence],
81+
clientSessionId,
82+
fingerprintId,
83+
userInputId,
84+
userId,
85+
maxOutputTokens: 32_000,
86+
onCostCalculated,
87+
includeCacheControl,
88+
agentId,
89+
maxRetries: 3,
90+
sendAction,
91+
liveUserInputRecord,
92+
sessionConnections,
93+
logger,
94+
trackEvent,
95+
tools,
96+
}
9397

94-
if (!aiSdkStreamParams.providerOptions) {
95-
aiSdkStreamParams.providerOptions = {}
96-
}
97-
for (const provider of ['openrouter', 'codebuff'] as const) {
98-
if (!aiSdkStreamParams.providerOptions[provider]) {
99-
aiSdkStreamParams.providerOptions[provider] = {}
100-
}
101-
;(
102-
aiSdkStreamParams.providerOptions[provider] as OpenRouterProviderOptions
103-
).reasoning = template.reasoningOptions
98+
if (!aiSdkStreamParams.providerOptions) {
99+
aiSdkStreamParams.providerOptions = {}
100+
}
101+
for (const provider of ['openrouter', 'codebuff'] as const) {
102+
if (!aiSdkStreamParams.providerOptions[provider]) {
103+
aiSdkStreamParams.providerOptions[provider] = {}
104104
}
105-
106-
// Pass agent's provider routing options to SDK
107-
aiSdkStreamParams.agentProviderOptions = template.providerOptions
108-
109-
return promptAiSdkStream(aiSdkStreamParams)
105+
;(
106+
aiSdkStreamParams.providerOptions[provider] as OpenRouterProviderOptions
107+
).reasoning = template.reasoningOptions
110108
}
111109

112-
return { getStream }
110+
// Pass agent's provider routing options to SDK
111+
aiSdkStreamParams.agentProviderOptions = template.providerOptions
112+
113+
return promptAiSdkStream(aiSdkStreamParams)
113114
}

0 commit comments

Comments
 (0)