deepy-cli 0.1.7__tar.gz → 0.1.8__tar.gz

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deepy-cli
-Version: 0.1.7
+Version: 0.1.8
 Summary: Deepy - Vibe coding for DeepSeek models in your terminal
 Keywords: deepseek,coding-agent,terminal,cli,agents
 Author: kirineko
@@ -238,5 +238,5 @@ assets live outside the package directory and are not included in the wheel.
 
 ## Release Status
 
-Deepy `0.1.7` is released through GitHub and PyPI. Standalone binaries and npm
+Deepy `0.1.8` is released through GitHub and PyPI. Standalone binaries and npm
 wrappers can be added later, but the primary distribution is the Python CLI.

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/README.md

@@ -210,5 +210,5 @@ assets live outside the package directory and are not included in the wheel.
 
 ## Release Status
 
-Deepy `0.1.7` is released through GitHub and PyPI. Standalone binaries and npm
+Deepy `0.1.8` is released through GitHub and PyPI. Standalone binaries and npm
 wrappers can be added later, but the primary distribution is the Python CLI.

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/pyproject.toml

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

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/src/deepy/__init__.py

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

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/src/deepy/data/tools/shell.md

@@ -9,5 +9,9 @@ Use the runtime context's command dialect and path style: PowerShell uses
 PowerShell commands and Windows paths, `cmd` uses cmd syntax, and `posix` uses
 POSIX shell syntax.
 
+On Windows PowerShell, Python child processes run with UTF-8 I/O defaults for
+the command invocation; do not ask users to run `chcp` or change their
+PowerShell profile for Unicode output.
+
 Runs in the session cwd, preserves cwd between calls when supported, and returns
 stdout/stderr JSON with cwd, exit-code, and shell metadata.

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/src/deepy/tools/builtin.py

@@ -208,6 +208,7 @@ class ShellInvocation:
     shell_path: str
     args: list[str]
     runtime_environment: RuntimeEnvironment
+    env: dict[str, str] | None = None
 
 
 def _find_occurrences(text: str, needle: str, scope: tuple[int, int]) -> list[MatchOccurrence]:
@@ -1399,6 +1400,7 @@ class ToolRuntime:
                 process = subprocess.Popen(
                     [shell_invocation.shell_path, *shell_invocation.args],
                     cwd=self.cwd,
+                    env=shell_invocation.env,
                     text=True,
                     stdout=stdout_file,
                     stderr=stderr_file,
@@ -1750,8 +1752,7 @@ def _read_text_preserving_newlines(path: Path) -> str:
 def _read_text_metadata(path: Path) -> TextFileMetadata:
     data = path.read_bytes()
     encoding = _detect_text_encoding(data)
-    python_encoding = "utf-16" if encoding == "utf16le" else "utf-8"
-    text = data.decode(python_encoding, errors="replace")
+    text = data.decode(_python_text_encoding(encoding), errors="replace")
     return TextFileMetadata(
         content=text,
         encoding=encoding,
@@ -1762,12 +1763,32 @@ def _read_text_metadata(path: Path) -> TextFileMetadata:
 def _detect_text_encoding(data: bytes) -> str:
     if len(data) >= 2 and data[0] == 0xFF and data[1] == 0xFE:
         return "utf16le"
+    if data.startswith(b"\xef\xbb\xbf"):
+        return "utf8-sig"
+    try:
+        data.decode("utf-8", errors="strict")
+        return "utf8"
+    except UnicodeDecodeError:
+        pass
+    try:
+        data.decode("gb18030", errors="strict")
+        return "gb18030"
+    except UnicodeDecodeError:
+        return "utf8"
+
+
+def _python_text_encoding(encoding: str) -> str:
+    if encoding == "utf16le":
+        return "utf-16"
+    if encoding == "utf8-sig":
+        return "utf-8-sig"
+    if encoding == "gb18030":
+        return "gb18030"
     return "utf8"
 
 
 def _write_text_with_encoding(path: Path, content: str, encoding: str) -> None:
-    python_encoding = "utf-16" if encoding == "utf16le" else "utf-8"
-    path.write_text(content, encoding=python_encoding)
+    path.write_text(content, encoding=_python_text_encoding(encoding))
 
 
 def _coerce_write_content(path: Path, content: object) -> tuple[str, dict[str, object], str | None]:
@@ -2034,25 +2055,41 @@ def _build_shell_command(
         platform_name=platform_name,
         os_name=os_name,
     )
+    process_env = _build_shell_process_env(runtime_environment, env)
     if runtime_environment.command_dialect == "powershell":
         return ShellInvocation(
             shell_path=resolved_shell,
             args=_build_powershell_args(command, marker),
             runtime_environment=runtime_environment,
+            env=process_env,
         )
     if runtime_environment.command_dialect == "cmd":
         return ShellInvocation(
             shell_path=resolved_shell,
             args=_build_cmd_args(command, marker),
             runtime_environment=runtime_environment,
+            env=process_env,
         )
     return ShellInvocation(
         shell_path=resolved_shell,
         args=_build_posix_shell_args(command, marker, resolved_shell),
         runtime_environment=runtime_environment,
+        env=process_env,
     )
 
 
+def _build_shell_process_env(
+    runtime_environment: RuntimeEnvironment,
+    env: dict[str, str] | None = None,
+) -> dict[str, str] | None:
+    if runtime_environment.os_family != "windows":
+        return dict(env) if env is not None else None
+    process_env = dict(os.environ if env is None else env)
+    process_env.setdefault("PYTHONUTF8", "1")
+    process_env.setdefault("PYTHONIOENCODING", "utf-8")
+    return process_env
+
+
 def _build_posix_shell_args(command: str, marker: str, shell_path: str) -> list[str]:
     normalized_command = rewrite_windows_null_redirect(command)
     parts = [
@@ -2073,6 +2110,8 @@ def _build_posix_shell_args(command: str, marker: str, shell_path: str) -> list[
 def _build_powershell_args(command: str, marker: str) -> list[str]:
     script = "\n".join(
         [
+            "$OutputEncoding = [System.Text.UTF8Encoding]::new($false)",
+            "[Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false)",
             "$global:LASTEXITCODE = $null",
             "try {",
             command,

{deepy_cli-0.1.7 → deepy_cli-0.1.8}/src/deepy/ui/prompt_input.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from pathlib import Path
+import sys
 from typing import Callable
 from unicodedata import normalize
 
@@ -32,6 +33,7 @@ SHIFT_ENTER_SEQUENCES = (
     "\x1b[27;2;13~",  # xterm modified-key format.
     "\x1b[13;2u",  # Kitty/fixterms CSI-u format, used by modern terminals.
 )
+_WINDOWS_SHIFT_ENTER_PATCH_ATTR = "_deepy_shift_enter_patched"
 
 
 @dataclass(frozen=True)
@@ -102,6 +104,60 @@ def install_shift_enter_key_sequence_overrides() -> None:
     prefix_cache = getattr(vt100_parser, "_IS_PREFIX_OF_LONGER_MATCH_CACHE", None)
     if hasattr(prefix_cache, "clear"):
         prefix_cache.clear()
+    install_windows_shift_enter_key_sequence_override()
+
+
+def install_windows_shift_enter_key_sequence_override(
+    *,
+    platform_name: str | None = None,
+    console_input_reader_cls: type | None = None,
+) -> bool:
+    resolved_platform = platform_name or sys.platform
+    if not resolved_platform.startswith("win"):
+        return False
+    if console_input_reader_cls is None:
+        try:
+            from prompt_toolkit.input import win32
+        except (AssertionError, ImportError):
+            return False
+        console_input_reader_cls = win32.ConsoleInputReader
+    if getattr(console_input_reader_cls, _WINDOWS_SHIFT_ENTER_PATCH_ATTR, False):
+        return True
+
+    from prompt_toolkit.key_binding.key_processor import KeyPress
+
+    original_handler = console_input_reader_cls._event_to_key_presses
+    shift_pressed = getattr(console_input_reader_cls, "SHIFT_PRESSED", 0x0010)
+
+    def patched_event_to_key_presses(self, ev):
+        key_presses = original_handler(self, ev)
+        if _is_windows_shift_enter_key_press(ev, key_presses, shift_pressed=shift_pressed):
+            return [KeyPress(Keys.Escape, ""), key_presses[0]]
+        return key_presses
+
+    setattr(
+        console_input_reader_cls,
+        "_deepy_original_event_to_key_presses",
+        original_handler,
+    )
+    console_input_reader_cls._event_to_key_presses = patched_event_to_key_presses
+    setattr(console_input_reader_cls, _WINDOWS_SHIFT_ENTER_PATCH_ATTR, True)
+    return True
+
+
+def _is_windows_shift_enter_key_press(
+    ev,
+    key_presses: list,
+    *,
+    shift_pressed: int,
+) -> bool:
+    if not key_presses or len(key_presses) != 1:
+        return False
+    control_key_state = getattr(ev, "ControlKeyState", 0)
+    if not control_key_state & shift_pressed:
+        return False
+    key = getattr(key_presses[0], "key", None)
+    return key in {Keys.ControlM, Keys.ControlJ, Keys.Enter}
 
 
 def prompt_for_input(