refactor: extract processToolCalls helper to reduce duplication

daniel-lxs · daniel-lxs · commit 4f9bc4922b4b · 2025-12-22T15:56:07.000-05:00
Consolidates the duplicated tool call processing logic from createMessage()
and handleStreamResponse() into a single private helper method. This improves
maintainability and ensures consistent behavior across both code paths.
diff --git a/src/api/providers/openai.ts b/src/api/providers/openai.ts
@@ -213,29 +213,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 					}
 				}
 
-				if (delta.tool_calls) {
-					for (const toolCall of delta.tool_calls) {
-						if (toolCall.id) {
-							activeToolCallIds.add(toolCall.id)
-						}
-						yield {
-							type: "tool_call_partial",
-							index: toolCall.index,
-							id: toolCall.id,
-							name: toolCall.function?.name,
-							arguments: toolCall.function?.arguments,
-						}
-					}
-				}
-
-				// Emit tool_call_end events when finish_reason is "tool_calls"
-				// This ensures tool calls are finalized even if the stream doesn't properly close
-				if (finishReason === "tool_calls" && activeToolCallIds.size > 0) {
-					for (const id of activeToolCallIds) {
-						yield { type: "tool_call_end", id }
-					}
-					activeToolCallIds.clear()
-				}
+				yield* this.processToolCalls(delta, finishReason, activeToolCallIds)
 
 				if (chunk.usage) {
 					lastUsage = chunk.usage
@@ -471,30 +449,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 					}
 				}
 
-				// Emit raw tool call chunks - NativeToolCallParser handles state management
-				if (delta.tool_calls) {
-					for (const toolCall of delta.tool_calls) {
-						if (toolCall.id) {
-							activeToolCallIds.add(toolCall.id)
-						}
-						yield {
-							type: "tool_call_partial",
-							index: toolCall.index,
-							id: toolCall.id,
-							name: toolCall.function?.name,
-							arguments: toolCall.function?.arguments,
-						}
-					}
-				}
-			}
-
-			// Emit tool_call_end events when finish_reason is "tool_calls"
-			// This ensures tool calls are finalized even if the stream doesn't properly close
-			if (finishReason === "tool_calls" && activeToolCallIds.size > 0) {
-				for (const id of activeToolCallIds) {
-					yield { type: "tool_call_end", id }
-				}
-				activeToolCallIds.clear()
+				yield* this.processToolCalls(delta, finishReason, activeToolCallIds)
 			}
 
 			if (chunk.usage) {
@@ -507,6 +462,46 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
 		}
 	}
 
+	/**
+	 * Helper generator to process tool calls from a stream chunk.
+	 * Tracks active tool call IDs and yields tool_call_partial and tool_call_end events.
+	 * @param delta - The delta object from the stream chunk
+	 * @param finishReason - The finish_reason from the stream chunk
+	 * @param activeToolCallIds - Set to track active tool call IDs (mutated in place)
+	 */
+	private *processToolCalls(
+		delta: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta | undefined,
+		finishReason: string | null | undefined,
+		activeToolCallIds: Set<string>,
+	): Generator<
+		| { type: "tool_call_partial"; index: number; id?: string; name?: string; arguments?: string }
+		| { type: "tool_call_end"; id: string }
+	> {
+		if (delta?.tool_calls) {
+			for (const toolCall of delta.tool_calls) {
+				if (toolCall.id) {
+					activeToolCallIds.add(toolCall.id)
+				}
+				yield {
+					type: "tool_call_partial",
+					index: toolCall.index,
+					id: toolCall.id,
+					name: toolCall.function?.name,
+					arguments: toolCall.function?.arguments,
+				}
+			}
+		}
+
+		// Emit tool_call_end events when finish_reason is "tool_calls"
+		// This ensures tool calls are finalized even if the stream doesn't properly close
+		if (finishReason === "tool_calls" && activeToolCallIds.size > 0) {
+			for (const id of activeToolCallIds) {
+				yield { type: "tool_call_end", id }
+			}
+			activeToolCallIds.clear()
+		}
+	}
+
 	protected _getUrlHost(baseUrl?: string): string {
 		try {
 			return new URL(baseUrl ?? "").host
