Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: record all tool call types #26855

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
dannykopping merged 2 commits into from
Jul 6, 2026
Merged

feat: record all tool call types #26855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74fee7f
feat(aibridge/intercept/responses): record all tool call types
dannykopping Jun 30, 2026
3c594fa
test(aibridge/intercept/responses): add web_search hosted-tool fixtures
dannykopping Jun 30, 2026
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
6 changes: 6 additions & 0 deletions aibridge/fixtures/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ var (
//go:embed openai/responses/blocking/custom_tool.txtar
OaiResponsesBlockingCustomTool []byte

//go:embed openai/responses/blocking/web_search.txtar
OaiResponsesBlockingWebSearch []byte

//go:embed openai/responses/blocking/conversation.txtar
OaiResponsesBlockingConversation []byte

Expand Down Expand Up @@ -123,6 +126,9 @@ var (
//go:embed openai/responses/streaming/builtin_tool.txtar
OaiResponsesStreamingBuiltinTool []byte

//go:embed openai/responses/streaming/web_search.txtar
OaiResponsesStreamingWebSearch []byte

//go:embed openai/responses/streaming/multi_reasoning_builtin_tool.txtar
OaiResponsesStreamingMultiReasoningBuiltinTool []byte

Expand Down
114 changes: 114 additions & 0 deletions aibridge/fixtures/openai/responses/blocking/web_search.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
-- request --
{
"input": [
{
"role": "user",
"content": "Search the web for the Example domain."
}
],
"model": "gpt-5.4",
"stream": false,
"tools": [
{
"type": "web_search"
}
]
}

-- non-streaming --
{
"id": "resp_0b8f5f61bf0dee5f016a43ac7294d8819ca794d13e1744ac2b",
"object": "response",
"created_at": 1782819954,
"status": "completed",
"background": false,
"completed_at": 1782819963,
"error": null,
"incomplete_details": null,
"instructions": null,
"max_output_tokens": null,
"max_tool_calls": null,
"model": "gpt-5.4",
"output": [
{
"id": "msg_0b8f5f61bf0dee5f016a43ac78e6c0819c9d1852c768844565",
"type": "message",
"status": "completed",
"content": [
{
"type": "output_text",
"annotations": [],
"logprobs": [],
"text": "I'm invoking the web search tool now."
}
],
"role": "assistant"
},
{
"id": "ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9",
"type": "web_search_call",
"status": "completed",
"action": {
"type": "search",
"queries": [
"example domain"
],
"query": "example domain"
}
},
{
"id": "msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed",
"type": "message",
"status": "completed",
"content": [
{
"type": "output_text",
"annotations": [],
"logprobs": [],
"text": "The search ran successfully and returned normal web results."
}
],
"role": "assistant"
}
],
"parallel_tool_calls": true,
"previous_response_id": null,
"prompt_cache_key": null,
"prompt_cache_retention": null,
"reasoning": {
"effort": null,
"summary": null
},
"safety_identifier": null,
"service_tier": "default",
"store": true,
"temperature": 1.0,
"text": {
"format": {
"type": "text"
},
"verbosity": "medium"
},
"tool_choice": "auto",
"tools": [
{
"type": "web_search"
}
],
"top_logprobs": 0,
"top_p": 1.0,
"truncation": "disabled",
"usage": {
"input_tokens": 50,
"input_tokens_details": {
"cached_tokens": 0
},
"output_tokens": 30,
"output_tokens_details": {
"reasoning_tokens": 0
},
"total_tokens": 80
},
"user": null,
"metadata": {}
}
60 changes: 60 additions & 0 deletions aibridge/fixtures/openai/responses/streaming/web_search.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
-- request --
{
"input": [
{
"role": "user",
"content": "Search the web for the Example domain."
}
],
"model": "gpt-5.4",
"stream": true,
"tools": [
{
"type": "web_search"
}
]
}

-- streaming --
event: response.created
data: {"type":"response.created","response":{"id":"resp_0b8f5f61bf0dee5f016a43ac7294d8819ca794d13e1744ac2b","object":"response","created_at":1782819954,"status":"in_progress","background":false,"error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"max_tool_calls":null,"model":"gpt-5.4","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"summary":null},"service_tier":"auto","store":true,"temperature":1.0,"text":{"format":{"type":"text"},"verbosity":"medium"},"tool_choice":"auto","tools":[{"type":"web_search"}],"top_logprobs":0,"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}},"sequence_number":0}

event: response.in_progress
data: {"type":"response.in_progress","response":{"id":"resp_0b8f5f61bf0dee5f016a43ac7294d8819ca794d13e1744ac2b","object":"response","created_at":1782819954,"status":"in_progress","background":false,"error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"max_tool_calls":null,"model":"gpt-5.4","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"summary":null},"service_tier":"auto","store":true,"temperature":1.0,"text":{"format":{"type":"text"},"verbosity":"medium"},"tool_choice":"auto","tools":[{"type":"web_search"}],"top_logprobs":0,"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}},"sequence_number":1}

event: response.output_item.added
data: {"type":"response.output_item.added","item":{"id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","type":"web_search_call","status":"in_progress"},"output_index":0,"sequence_number":2}

event: response.web_search_call.in_progress
data: {"type":"response.web_search_call.in_progress","item_id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","output_index":0,"sequence_number":3}

event: response.web_search_call.searching
data: {"type":"response.web_search_call.searching","item_id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","output_index":0,"sequence_number":4}

event: response.web_search_call.completed
data: {"type":"response.web_search_call.completed","item_id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","output_index":0,"sequence_number":5}

event: response.output_item.done
data: {"type":"response.output_item.done","item":{"id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","type":"web_search_call","status":"completed","action":{"type":"search","queries":["example domain"],"query":"example domain"}},"output_index":0,"sequence_number":6}

event: response.output_item.added
data: {"type":"response.output_item.added","item":{"id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","type":"message","status":"in_progress","content":[],"role":"assistant"},"output_index":1,"sequence_number":7}

event: response.content_part.added
data: {"type":"response.content_part.added","content_index":0,"item_id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","output_index":1,"part":{"type":"output_text","annotations":[],"logprobs":[],"text":""},"sequence_number":8}

event: response.output_text.delta
data: {"type":"response.output_text.delta","content_index":0,"delta":"The search ran successfully.","item_id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","logprobs":[],"output_index":1,"sequence_number":9}

event: response.output_text.done
data: {"type":"response.output_text.done","content_index":0,"item_id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","logprobs":[],"output_index":1,"sequence_number":10,"text":"The search ran successfully."}

event: response.content_part.done
data: {"type":"response.content_part.done","content_index":0,"item_id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","output_index":1,"part":{"type":"output_text","annotations":[],"logprobs":[],"text":"The search ran successfully."},"sequence_number":11}

event: response.output_item.done
data: {"type":"response.output_item.done","item":{"id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","type":"message","status":"completed","content":[{"type":"output_text","annotations":[],"logprobs":[],"text":"The search ran successfully."}],"role":"assistant"},"output_index":1,"sequence_number":12}

event: response.completed
data: {"type":"response.completed","response":{"id":"resp_0b8f5f61bf0dee5f016a43ac7294d8819ca794d13e1744ac2b","object":"response","created_at":1782819954,"status":"completed","background":false,"completed_at":1782819963,"error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"max_tool_calls":null,"model":"gpt-5.4","output":[{"id":"ws_0b8f5f61bf0dee5f016a43ac7947bc819c945bff3bf2bcdbc9","type":"web_search_call","status":"completed","action":{"type":"search","queries":["example domain"],"query":"example domain"}},{"id":"msg_0b8f5f61bf0dee5f016a43ac7ae384819c8495d9f565ea2eed","type":"message","status":"completed","content":[{"type":"output_text","annotations":[],"logprobs":[],"text":"The search ran successfully."}],"role":"assistant"}],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"summary":null},"service_tier":"default","store":true,"temperature":1.0,"text":{"format":{"type":"text"},"verbosity":"medium"},"tool_choice":"auto","tools":[{"type":"web_search"}],"top_logprobs":0,"top_p":1.0,"truncation":"disabled","usage":{"input_tokens":50,"input_tokens_details":{"cached_tokens":0},"output_tokens":30,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":80},"user":null,"metadata":{}},"sequence_number":13}

36 changes: 30 additions & 6 deletions aibridge/intercept/responses/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,25 +257,49 @@ func (i *responsesInterceptionBase) recordNonInjectedToolUsage(ctx context.Conte
for _, item := range response.Output {
var args recorder.ToolArgs

// recording other function types to be considered: https://github.com/coder/aibridge/issues/121
// Whitelist the output item types that represent tool calls. Every
// other output type (message, reasoning, *_output, etc.) is skipped.
// Only function_call and custom_tool_call carry arguments we parse;
// the remaining built-in tool calls are recorded for visibility but
// have no uniform argument representation.
switch item.Type {
case string(constant.ValueOf[constant.FunctionCall]()):
args = i.parseFunctionCallJSONArgs(ctx, item.Arguments)
case string(constant.ValueOf[constant.CustomToolCall]()):
args = item.Input
case string(constant.ValueOf[constant.WebSearchCall]()),
// computer_call has no SDK constant; only computer_call_output does.
"computer_call",
string(constant.ValueOf[constant.LocalShellCall]()),
string(constant.ValueOf[constant.ShellCall]()),
string(constant.ValueOf[constant.ApplyPatchCall]()),
string(constant.ValueOf[constant.CodeInterpreterCall]()),
string(constant.ValueOf[constant.McpCall]()),
string(constant.ValueOf[constant.FileSearchCall]()),
string(constant.ValueOf[constant.ImageGenerationCall]()):
// Built-in tool calls carry no uniform argument payload.
default:
continue
}

// Built-in tools usually have no name, so fall back to the type.
toolName := item.Name
if toolName == "" {
toolName = item.Type
}

if err := i.recorder.RecordToolUsage(ctx, &recorder.ToolUsageRecord{
InterceptionID: i.ID().String(),
MsgID: response.ID,
ToolCallID: item.CallID,
Tool: item.Name,
Args: args,
Injected: false,
// ItemID is always present; ToolCallID (call_id) is empty for
// hosted tools that the provider executes internally.
ItemID: item.ID,
ToolCallID: item.CallID,
Tool: toolName,
Args: args,
Injected: false,
}); err != nil {
i.logger.Warn(ctx, "failed to record tool usage", slog.Error(err), slog.F("tool", item.Name))
i.logger.Warn(ctx, "failed to record tool usage", slog.Error(err), slog.F("tool", toolName))
}
}
}
Expand Down
83 changes: 83 additions & 0 deletions aibridge/intercept/responses/base_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,89 @@ func TestRecordToolUsage(t *testing.T) {
},
},
},
{
// Function/agentic tools expose both id and call_id; both are captured.
name: "function_call_captures_both_ids",
response: &oairesponses.Response{
ID: "resp_both",
Output: []oairesponses.ResponseOutputItemUnion{
{
Type: "function_call",
ID: "fc_item_1",
CallID: "call_both",
Name: "get_weather",
Arguments: `{"location": "NYC"}`,
},
},
},
expected: []*recorder.ToolUsageRecord{
{
InterceptionID: id.String(),
MsgID: "resp_both",
ItemID: "fc_item_1",
ToolCallID: "call_both",
Tool: "get_weather",
Args: map[string]any{"location": "NYC"},
Injected: false,
},
},
},
{
// Hosted tools only have id (no call_id) and usually no name, so
// the type is recorded as the tool name and ToolCallID is empty.
name: "hosted_tool_uses_item_id_no_call_id",
response: &oairesponses.Response{
ID: "resp_ws",
Output: []oairesponses.ResponseOutputItemUnion{
{
Type: "web_search_call",
ID: "ws_abc",
},
},
},
expected: []*recorder.ToolUsageRecord{
{
InterceptionID: id.String(),
MsgID: "resp_ws",
ItemID: "ws_abc",
ToolCallID: "",
Tool: "web_search_call",
Injected: false,
},
},
},
{
// Exercises every newly recorded tool type, the name-falls-back-to
// -type behavior, an explicit name override (mcp_call), and that
// non-tool output items (reasoning) are still skipped.
name: "all_additional_tool_types",
response: &oairesponses.Response{
ID: "resp_all",
Output: []oairesponses.ResponseOutputItemUnion{
{Type: "reasoning", ID: "rs_skip"},
{Type: "web_search_call", ID: "ws_1"},
{Type: "computer_call", ID: "cu_1", CallID: "call_cu"},
{Type: "local_shell_call", ID: "ls_1", CallID: "call_ls"},
{Type: "shell_call", ID: "sh_1", CallID: "call_sh"},
{Type: "apply_patch_call", ID: "ap_1", CallID: "call_ap"},
{Type: "code_interpreter_call", ID: "ci_1"},
{Type: "mcp_call", ID: "mcp_1", Name: "fetch"},
{Type: "file_search_call", ID: "fs_1"},
{Type: "image_generation_call", ID: "ig_1"},
},
},
expected: []*recorder.ToolUsageRecord{
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "ws_1", Tool: "web_search_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "cu_1", ToolCallID: "call_cu", Tool: "computer_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "ls_1", ToolCallID: "call_ls", Tool: "local_shell_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "sh_1", ToolCallID: "call_sh", Tool: "shell_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "ap_1", ToolCallID: "call_ap", Tool: "apply_patch_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "ci_1", Tool: "code_interpreter_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "mcp_1", Tool: "fetch"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "fs_1", Tool: "file_search_call"},
{InterceptionID: id.String(), MsgID: "resp_all", ItemID: "ig_1", Tool: "image_generation_call"},
},
},
}

for _, tc := range tests {
Expand Down
Loading
Loading