From 3b3751bf382ad6ca188434457067024b235bb345 Mon Sep 17 00:00:00 2001
From: Kairos Ops <186839917+KairosOps@users.noreply.github.com>
Date: Sun, 21 Jun 2026 15:14:25 +0800
Subject: [PATCH] fix: flush before stream item markers

---
 python/tests/test_binary_stream_writer.py     | 47 +++++++++++++++++++
 .../internal/python/static_files/_binary.py   |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 python/tests/test_binary_stream_writer.py

diff --git a/python/tests/test_binary_stream_writer.py b/python/tests/test_binary_stream_writer.py
new file mode 100644
index 00000000..a78f5007
--- /dev/null
+++ b/python/tests/test_binary_stream_writer.py
@@ -0,0 +1,47 @@
+import importlib.util
+import io
+import sys
+import types
+from pathlib import Path
+
+
+def load_binary_runtime():
+    static_dir = (
+        Path(__file__).resolve().parents[2]
+        / "tooling"
+        / "internal"
+        / "python"
+        / "static_files"
+    )
+    package_name = "_yardl_static_files_for_test"
+
+    if package_name not in sys.modules:
+        package = types.ModuleType(package_name)
+        package.__path__ = [str(static_dir)]
+        sys.modules[package_name] = package
+
+    spec = importlib.util.spec_from_file_location(
+        f"{package_name}._binary", static_dir / "_binary.py"
+    )
+    assert spec is not None
+    assert spec.loader is not None
+
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[spec.name] = module
+    spec.loader.exec_module(module)
+    return module
+
+
+def test_stream_serializer_flushes_before_item_marker_at_buffer_boundary():
+    binary = load_binary_runtime()
+
+    output = io.BytesIO()
+    stream = binary.CodedOutputStream(output, buffer_size=2)
+    serializer = binary.StreamSerializer(
+        binary.OptionalSerializer(binary.uint32_serializer)
+    )
+
+    serializer.write(stream, (None for _ in range(2)))
+    stream.close()
+
+    assert output.getvalue() == b"\x01\x00\x01\x00"
diff --git a/tooling/internal/python/static_files/_binary.py b/tooling/internal/python/static_files/_binary.py
index 72182920..8d789553 100644
--- a/tooling/internal/python/static_files/_binary.py
+++ b/tooling/internal/python/static_files/_binary.py
@@ -967,6 +967,7 @@ def write(self, stream: CodedOutputStream, value: Iterable[T]) -> None:
                 self._element_serializer.write(stream, element)
         else:
             for element in value:
+                stream.ensure_capacity(1)
                 stream.write_byte_no_check(1)
                 self._element_serializer.write(stream, element)