Merge master (exp-v0.52.361) into stage/7578-save-count

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -33,6 +33,11 @@
   loading the entire sidecar. On a real 203 MB / 266,940-message session that made every save
   expensive. The count is now taken without a full parse, and the shrink-backup behaviour is
   unchanged. (#7578 by @rodrigogs)
+- **A cancelled or recovered turn no longer duplicates an answer that was already saved (#6366).**
+  When a completed assistant turn had been persisted and a later cancel/recovery path ran for the
+  same pending turn, recovery could append a duplicate user turn plus a `_partial` clone of the
+  journal. Recovery now stops once the transcript has already advanced past the pending turn.
+  (#7682 by @happy5318)
 
 - **The live stream reports which model actually served the turn.** A new additive `runtime_model`
   SSE event carries the model (and provider, when known) that the Agent reported while producing