From c04490e4d40d72d6b2df201513de3dd740dcf7d2 Mon Sep 17 00:00:00 2001
From: Hadley Wickham <h.wickham@gmail.com>
Date: Wed, 16 Jul 2025 14:25:54 -0500
Subject: [PATCH] Fix for dev version of ellmer

---
 R/backend-ellmer.R | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/R/backend-ellmer.R b/R/backend-ellmer.R
index 1c81fea..27697b7 100644
--- a/R/backend-ellmer.R
+++ b/R/backend-ellmer.R
@@ -78,16 +78,13 @@ ch_ellmer_history <- function(x) {
   if (defaults$mode %||% "" == "ellmer" &&
     inherits(x, c("list", "ch_history"))
   ) {
-    new_history <- map(
-      x,
-      ~ {
-        ellmer::Turn(
-          role = .x$role,
-          contents = list(ellmer::ContentText(.x$content)),
-          tokens = .x$tokens %||% c(0, 0)
-        )
-      }
-    )
+    new_history <- map(x, ~ {
+      ellmer::Turn(
+        role = .x$role,
+        contents = list(ellmer::ContentText(.x$contents)),
+        tokens = .x$tokens %||% c(0, 0, if (packageVersion("ellmer") > "0.2.1") 0)
+      )
+    })
     ch_env$ellmer_obj$set_turns(new_history)
   }
   invisible()