deepy-cli 0.1.13__tar.gz → 0.1.14__tar.gz

{deepy_cli-0.1.13 → deepy_cli-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deepy-cli
-Version: 0.1.13
+Version: 0.1.14
 Summary: Deepy - Vibe coding for DeepSeek models in your terminal
 Keywords: deepseek,coding-agent,terminal,cli,agents
 Author: kirineko

{deepy_cli-0.1.13 → deepy_cli-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepy-cli"
-version = "0.1.13"
+version = "0.1.14"
 description = "Deepy - Vibe coding for DeepSeek models in your terminal"
 readme = "README.md"
 authors = [

{deepy_cli-0.1.13 → deepy_cli-0.1.14}/src/deepy/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.1.13"
+__version__ = "0.1.14"
 
 
 def main() -> None:

{deepy_cli-0.1.13 → deepy_cli-0.1.14}/src/deepy/tools/builtin.py

@@ -26,6 +26,7 @@ from deepy.utils import json as json_utils
 
 from .file_state import FileSnippet, FileState
 from .result import ToolResult
+from .shell_output import decode_shell_output
 from .shell_utils import RuntimeEnvironment
 from .shell_utils import build_disable_extglob_command
 from .shell_utils import build_shell_init_command
@@ -2159,54 +2160,10 @@ def _read_captured_output(stream, *, marker: str | None = None) -> tuple[str, st
     truncated = len(data) > MAX_BASH_CAPTURE_CHARS
     if truncated:
         data = data[:MAX_BASH_CAPTURE_CHARS]
-    text, encoding = _decode_shell_output(data, marker=marker)
+    text, encoding = decode_shell_output(data, marker=marker)
     return text, encoding, truncated
 
 
-def _decode_shell_output(data: bytes, *, marker: str | None = None) -> tuple[str, str]:
-    if not data:
-        return "", "empty"
-    if marker:
-        marker_bytes = marker.encode("ascii")
-        marker_index = data.find(marker_bytes)
-        if marker_index >= 0:
-            sentinel_start = marker_index
-            if sentinel_start > 0 and data[sentinel_start - 1 : sentinel_start] == b"\n":
-                sentinel_start -= 1
-                if sentinel_start > 0 and data[sentinel_start - 1 : sentinel_start] == b"\r":
-                    sentinel_start -= 1
-            visible, visible_encoding = _decode_shell_output_bytes(data[:sentinel_start])
-            sentinel = data[sentinel_start:].decode("utf-8", errors="replace")
-            return visible + sentinel, visible_encoding
-    return _decode_shell_output_bytes(data)
-
-
-def _decode_shell_output_bytes(data: bytes) -> tuple[str, str]:
-    if not data:
-        return "", "empty"
-    if data.startswith((b"\xff\xfe", b"\xfe\xff")):
-        return data.decode("utf-16", errors="replace"), "utf-16"
-    if _looks_like_utf16le(data):
-        return data.decode("utf-16le", errors="replace"), "utf-16le"
-    try:
-        return data.decode("utf-8-sig"), "utf-8-sig" if data.startswith(b"\xef\xbb\xbf") else "utf-8"
-    except UnicodeDecodeError:
-        pass
-    try:
-        return data.decode("gb18030"), "gb18030"
-    except UnicodeDecodeError:
-        return data.decode("utf-8", errors="replace"), "utf-8-replace"
-
-
-def _looks_like_utf16le(data: bytes) -> bool:
-    if len(data) < 4:
-        return False
-    sample = data[: min(len(data), 4096)]
-    odd_nuls = sample[1::2].count(0)
-    even_nuls = sample[0::2].count(0)
-    return odd_nuls >= max(2, len(sample) // 8) and odd_nuls > even_nuls * 2
-
-
 def _build_shell_command(
     command: str,
     marker: str,

deepy_cli-0.1.14/src/deepy/tools/shell_output.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+
+def decode_shell_output(data: bytes, *, marker: str | None = None) -> tuple[str, str]:
+    if not data:
+        return "", "empty"
+    if marker:
+        marker_bytes = marker.encode("ascii")
+        marker_index = data.find(marker_bytes)
+        if marker_index >= 0:
+            sentinel_start = marker_index
+            if sentinel_start > 0 and data[sentinel_start - 1 : sentinel_start] == b"\n":
+                sentinel_start -= 1
+                if sentinel_start > 0 and data[sentinel_start - 1 : sentinel_start] == b"\r":
+                    sentinel_start -= 1
+            visible, visible_encoding = decode_shell_output_bytes(data[:sentinel_start])
+            sentinel = data[sentinel_start:].decode("utf-8", errors="replace")
+            return visible + sentinel, visible_encoding
+    return decode_shell_output_bytes(data)
+
+
+def decode_shell_output_bytes(data: bytes) -> tuple[str, str]:
+    if not data:
+        return "", "empty"
+    if data.startswith((b"\xff\xfe", b"\xfe\xff")):
+        return data.decode("utf-16", errors="replace"), "utf-16"
+    if _looks_like_utf16le(data):
+        return data.decode("utf-16le", errors="replace"), "utf-16le"
+    try:
+        return data.decode("utf-8-sig"), "utf-8-sig" if data.startswith(b"\xef\xbb\xbf") else "utf-8"
+    except UnicodeDecodeError:
+        pass
+    try:
+        return data.decode("gb18030"), "gb18030"
+    except UnicodeDecodeError:
+        return data.decode("utf-8", errors="replace"), "utf-8-replace"
+
+
+def _looks_like_utf16le(data: bytes) -> bool:
+    if len(data) < 4:
+        return False
+    sample = data[: min(len(data), 4096)]
+    odd_nuls = sample[1::2].count(0)
+    even_nuls = sample[0::2].count(0)
+    return odd_nuls >= max(2, len(sample) // 8) and odd_nuls > even_nuls * 2

{deepy_cli-0.1.13 → deepy_cli-0.1.14}/src/deepy/ui/local_command.py

@@ -18,6 +18,7 @@ from pathlib import Path
 from typing import Any
 
 from deepy.tools.result import ToolResult
+from deepy.tools.shell_output import decode_shell_output_bytes
 from deepy.tools.shell_utils import RuntimeEnvironment, detect_runtime_environment
 from deepy.utils import json as json_utils
 
@@ -113,6 +114,7 @@ def run_local_command(
     capture_limit = max(display_limit, context_limit) + len(_TRUNCATED_MARKER)
 
     if runtime.os_family == "windows":
+        _prepare_windows_process_env(process_env)
         return _run_windows_pipes(
             command,
             cwd=cwd,
@@ -347,11 +349,11 @@ def _run_windows_pipes(
         if len(captured) >= capture_limit:
             capture_truncated = True
         exit_code = process.poll()
-        output = _sanitize_terminal_output(_decode_output(bytes(captured)))
+        output = _sanitize_terminal_output(_decode_output(bytes(captured), windows_compatible=True))
         error = _command_error(exit_code, timed_out=timed_out, interrupted=interrupted)
     except Exception as exc:
         exit_code = None
-        output = _sanitize_terminal_output(_decode_output(bytes(captured)))
+        output = _sanitize_terminal_output(_decode_output(bytes(captured), windows_compatible=True))
         error = str(exc)
 
     display_output, display_truncated = _limit_output(output, display_limit)
@@ -503,8 +505,17 @@ def _limit_output(output: str, limit: int) -> tuple[str, bool]:
     return output[:keep] + marker, True
 
 
-def _decode_output(output: bytes) -> str:
-    return _normalize_line_endings(output.decode("utf-8", errors="replace"))
+def _decode_output(output: bytes, *, windows_compatible: bool = False) -> str:
+    if windows_compatible:
+        text, _ = decode_shell_output_bytes(output)
+    else:
+        text = output.decode("utf-8", errors="replace")
+    return _normalize_line_endings(text)
+
+
+def _prepare_windows_process_env(env: dict[str, str]) -> None:
+    env.setdefault("PYTHONUTF8", "1")
+    env.setdefault("PYTHONIOENCODING", "utf-8")
 
 
 def _sanitize_terminal_output(output: str) -> str: