fixed conflicted

ygbingo · ygbingo · commit 5b0bf3fded81 · 2025-07-29T09:49:15.000+08:00
diff --git a/src/agents/models/chatcmpl_converter.py b/src/agents/models/chatcmpl_converter.py
@@ -460,7 +460,7 @@ def ensure_assistant_message() -> ChatCompletionAssistantMessageParam:
                 }
                 result.append(msg)
 
-            # 6) item reference => handle or raise
+            # 7) item reference => handle or raise
             elif item_ref := cls.maybe_item_reference(item):
                 raise UserError(
                     f"Encountered an item_reference, which is not supported: {item_ref}"

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ def ensure_assistant_message() -> ChatCompletionAssistantMessageParam:`
`460`	`460`	`}`
`461`	`461`	`result.append(msg)`
`462`	`462`
`463`		`- # 6) item reference => handle or raise`
	`463`	`+ # 7) item reference => handle or raise`
`464`	`464`	`elif item_ref := cls.maybe_item_reference(item):`
`465`	`465`	`raise UserError(`
`466`	`466`	`f"Encountered an item_reference, which is not supported: {item_ref}"`