From 7db222d86fd5f63d59d3b98dabf52b8e74b1cc9e Mon Sep 17 00:00:00 2001
From: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com>
Date: Fri, 2 Oct 2026 12:47:27 -0400
Subject: [PATCH] fix(cli): decode redirected Windows input as UTF-8

Signed-off-by: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com>
---
 agent_reach/cli.py               | 10 +++-
 tests/test_windows_stdin_utf8.py | 85 ++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_windows_stdin_utf8.py

diff --git a/agent_reach/cli.py b/agent_reach/cli.py
index 358b21823..17c553ed3 100644
--- a/agent_reach/cli.py
+++ b/agent_reach/cli.py
@@ -52,6 +52,10 @@ def _ensure_utf8_console():
             sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
         if hasattr(sys.stderr, "buffer"):
             sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")
+        # Upstream tools emit UTF-8 JSON to pipes. The Windows console input
+        # already has its own Unicode handling, so only reconfigure redirects.
+        if not sys.stdin.isatty() and hasattr(sys.stdin, "reconfigure"):
+            sys.stdin.reconfigure(encoding="utf-8", errors="strict")
     except Exception:
         # Do not crash CLI just because encoding patch failed.
         pass
@@ -649,7 +653,11 @@ def _cmd_format(args):
     if args.platform == "xhs":
         from agent_reach.channels.xiaohongshu import format_xhs_result
 
-        raw = sys.stdin.read().strip()
+        try:
+            raw = sys.stdin.read().strip()
+        except UnicodeDecodeError:
+            print("Error: stdin is not valid UTF-8", file=sys.stderr)
+            sys.exit(1)
         if not raw:
             print("Error: no input on stdin", file=sys.stderr)
             sys.exit(1)
diff --git a/tests/test_windows_stdin_utf8.py b/tests/test_windows_stdin_utf8.py
new file mode 100644
index 000000000..feed10998
--- /dev/null
+++ b/tests/test_windows_stdin_utf8.py
@@ -0,0 +1,85 @@
+"""Native UTF-8 pipelines retain content with a simulated Windows code page."""
+
+import io
+import json
+import os
+import subprocess
+import sys
+from pathlib import Path
+from types import SimpleNamespace
+
+import pytest
+
+from agent_reach import cli
+
+
+def _format_pipeline(payload, stdio_encoding):
+    env = os.environ.copy()
+    env.pop("PYTEST_CURRENT_TEST", None)
+    env["PYTHONIOENCODING"] = stdio_encoding
+    env["PYTHONPATH"] = str(Path(cli.__file__).parent.parent)
+    # Import platform-sensitive dependencies before simulating Windows. The
+    # child then exercises the production console guard and format handler.
+    command = (
+        "import sys; from agent_reach import cli; "
+        "from agent_reach.channels import xiaohongshu; "
+        "sys.platform = 'win32'; "
+        "cli._ensure_utf8_console(); "
+        "cli._cmd_format(type('Args', (), {'platform': 'xhs'})())"
+    )
+    return subprocess.run(
+        [sys.executable, "-c", command],
+        input=payload,
+        capture_output=True,
+        env=env,
+        timeout=10,
+    )
+
+
+@pytest.mark.parametrize("stdio_encoding", ["cp1252", "utf-8"])
+def test_format_preserves_utf8_redirected_json(stdio_encoding):
+    data = {
+        "id": "fixture",
+        "title": "\u4e2d\u6587\u6807\u9898",
+        "desc": "\u771f\u5b9e\u5185\u5bb9",
+    }
+    result = _format_pipeline(json.dumps(data, ensure_ascii=False).encode("utf-8"), stdio_encoding)
+    assert result.returncode == 0, result.stderr.decode("utf-8", errors="replace")
+    assert json.loads(result.stdout.decode("utf-8")) == data
+
+
+def test_console_guard_preserves_text_only_captured_stdin(monkeypatch):
+    stdin = io.StringIO("\u4e2d\u6587\u8f93\u5165")
+    monkeypatch.setattr(cli.sys, "platform", "win32")
+    monkeypatch.delenv("PYTEST_CURRENT_TEST", raising=False)
+    monkeypatch.setattr(cli.sys, "stdin", stdin)
+    monkeypatch.setattr(cli.sys, "stdout", io.StringIO())
+    monkeypatch.setattr(cli.sys, "stderr", io.StringIO())
+    cli._ensure_utf8_console()
+    assert cli.sys.stdin is stdin
+    assert stdin.read() == "\u4e2d\u6587\u8f93\u5165"
+
+
+def test_console_guard_preserves_interactive_stdin(monkeypatch):
+    calls = []
+    stdin = SimpleNamespace(
+        buffer=io.BytesIO(),
+        isatty=lambda: True,
+        reconfigure=lambda **options: calls.append(options),
+    )
+    monkeypatch.setattr(cli.sys, "platform", "win32")
+    monkeypatch.delenv("PYTEST_CURRENT_TEST", raising=False)
+    monkeypatch.setattr(cli.sys, "stdin", stdin)
+    monkeypatch.setattr(cli.sys, "stdout", io.StringIO())
+    monkeypatch.setattr(cli.sys, "stderr", io.StringIO())
+    cli._ensure_utf8_console()
+    assert cli.sys.stdin is stdin
+    assert calls == []
+
+
+def test_format_rejects_invalid_utf8_without_corrupting_content():
+    result = _format_pipeline(b'{"id":"fixture","title":"\xff"}', "cp1252")
+    assert result.returncode == 1
+    assert "stdin is not valid UTF-8" in result.stderr.decode("utf-8")
+    assert "Traceback" not in result.stderr.decode("utf-8")
+    assert result.stdout == b""