@@ -6,6 +6,7 @@
66 // some providers (OpenAI) emit alongside tool calls, preventing duplicate output.
77 import type { FlexibleSchema, StepResult } from "ai";
88 import { dynamicTool, jsonSchema, type streamText } from "ai";
9+import { logApiEvent } from "../logging/context.ts";
910 import { normalizeUnknownError } from "./error-utils.ts";
1011 import { isRecord } from "./history/shared.ts";
1112 import { isAnthropicModelFamily } from "./model-routing.ts";
@@ -51,9 +52,16 @@ function toCoreTool(def: ToolDef): ReturnType<typeof dynamicTool> {
5152 description: def.description,
5253 inputSchema: schema,
5354 execute: async (input: unknown) => {
55+ logApiEvent("tool execute start", { tool: def.name });
5456 try {
55- return await def.execute(input);
57+ const result = await def.execute(input);
58+ logApiEvent("tool execute end", { tool: def.name });
59+ return result;
5660 } catch (err) {
61+ logApiEvent("tool execute error", {
62+ tool: def.name,
63+ error: String(err),
64+ });
5765 throw normalizeUnknownError(err);
5866 }
5967 },
@@ -102,6 +110,7 @@ export function annotateToolCaching(
102110
103111 export function createTurnStateTracker(opts: {
104112 onStepLog: (entry: {
113+ stepNumber: number;
105114 finishReason: string | null | undefined;
106115 usage: unknown;
107116 }) => void;
@@ -110,10 +119,13 @@ export function createTurnStateTracker(opts: {
110119 let outputTokens = 0;
111120 let contextTokens = 0;
112121 let partialMessages: CoreMessage[] = [];
122+ let stepCount = 0;
113123
114124 return {
115125 onStepFinish: (step: StepResult<ToolSet>) => {
126+ stepCount++;
116127 opts.onStepLog({
128+ stepNumber: stepCount,
117129 finishReason: step.finishReason,
118130 usage: step.usage,
119131 });