From e4e0090b54dcdf996137dfb3ecbbc29f4f8a6dcb Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Tue, 5 May 2026 08:35:37 -0700 Subject: [PATCH] =?UTF-8?q?test(acp):=20regression=20for=20#13675=20?= =?UTF-8?q?=E2=80=94=20save=5Fsession=20preserves=20existing=20messages=20?= =?UTF-8?q?on=20encode=20failure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/acp/test_session.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/acp/test_session.py b/tests/acp/test_session.py index 03d5f3f658..60a006b2a8 100644 --- a/tests/acp/test_session.py +++ b/tests/acp/test_session.py @@ -188,6 +188,31 @@ class TestListAndCleanup: manager.create_session(cwd="/empty") assert manager.list_sessions() == [] + def test_save_session_preserves_existing_messages_on_encode_failure(self, manager): + """Regression for #13675: a bad message in state.history must not + clobber the previously-persisted transcript. replace_messages() + wraps DELETE + INSERT in a single rolled-back-on-exception txn. + """ + state = manager.create_session() + state.history.append({"role": "user", "content": "original"}) + manager.save_session(state.session_id) + + # Now swap history with a message whose tool_calls is non-JSON-serializable. + # _execute_write rolls back; the previously persisted "original" stays. + state.history = [ + {"role": "user", "content": "replacement"}, + { + "role": "assistant", + "content": None, + "tool_calls": [{"bad": object()}], + }, + ] + manager.save_session(state.session_id) + + db = manager._get_db() + messages = db.get_messages_as_conversation(state.session_id) + assert messages == [{"role": "user", "content": "original"}] + def test_cleanup_clears_all(self, manager): s1 = manager.create_session() s2 = manager.create_session()