@simonyea/holysheep-cli 2.1.25 → 2.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.25",
+  "version": "2.1.26",
   "description": "Claude Code/Cursor/Cline API relay for China \u2014 \u00a51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "scripts": {
     "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js",

package/src/tools/pty-hermes-wrapper.py

@@ -0,0 +1,122 @@
+#!/usr/bin/env python3
+"""
+[HolySheep fork v2.1.25 / hs19] Hermes ACP PTY wrapper.
+
+Why: bun 1.3.9's subprocess.spawn with stdio:['pipe','pipe','pipe']
+passes sockets to the child. Python's asyncio.connect_write_pipe()
+silently drops the 2nd+ message written under bun's event loop routing.
+Reproduced: bun delivers id=1 response but not id=2+; node delivers both.
+
+Fix: allocate a PTY master/slave pair. Hand the SLAVE to hermes as its
+stdin+stdout, keep stderr on the wrapper's fd 2 so hs web log still
+captures Python tracebacks separately. Master side pumps bytes between
+our (bun-spawned) stdin/stdout and the PTY, so bun reads through kernel
+PTY buffer which hermes's asyncio transport drives correctly.
+
+Disable ECHO on slave so stdin bytes are not echoed back as stdout bytes
+(the old BSD `script -q /dev/null` wrapper had this bug).
+Disable ONLCR so '\\n' is not rewritten to '\\r\\n'.
+
+Usage: python3 pty-hermes-wrapper.py
+HERMES_BIN is auto-resolved from $PATH; override via $HOLYSHEEP_HERMES_BIN.
+"""
+import os, sys, pty, termios, select, signal
+
+
+def _resolve_hermes_bin() -> str:
+    override = os.environ.get('HOLYSHEEP_HERMES_BIN')
+    if override and os.access(override, os.X_OK):
+        return override
+    for d in os.environ.get('PATH', '').split(os.pathsep):
+        candidate = os.path.join(d, 'hermes')
+        if os.access(candidate, os.X_OK):
+            return candidate
+    sys.stderr.write('[pty-hermes-wrapper] hermes binary not found in $PATH\n')
+    sys.exit(127)
+
+
+def main() -> None:
+    hermes_bin = _resolve_hermes_bin()
+    master_fd, slave_fd = pty.openpty()
+    attrs = termios.tcgetattr(slave_fd)
+    attrs[3] &= ~termios.ECHO
+    attrs[1] &= ~termios.ONLCR
+    termios.tcsetattr(slave_fd, termios.TCSANOW, attrs)
+
+    pid = os.fork()
+    if pid == 0:
+        os.setsid()
+        os.dup2(slave_fd, 0)
+        os.dup2(slave_fd, 1)
+        os.close(master_fd)
+        os.close(slave_fd)
+        os.execvp(hermes_bin, [hermes_bin, 'acp'])
+        return
+
+    os.close(slave_fd)
+
+    def _forward(signum, _frame):
+        try:
+            os.kill(pid, signum)
+        except ProcessLookupError:
+            pass
+
+    signal.signal(signal.SIGTERM, _forward)
+    signal.signal(signal.SIGINT, _forward)
+
+    try:
+        while True:
+            try:
+                wpid, _ = os.waitpid(pid, os.WNOHANG)
+                if wpid != 0:
+                    break
+            except ChildProcessError:
+                break
+            try:
+                r, _, _ = select.select([master_fd, 0], [], [], 0.5)
+            except (InterruptedError, OSError):
+                continue
+            if master_fd in r:
+                try:
+                    data = os.read(master_fd, 65536)
+                except OSError:
+                    break
+                if not data:
+                    break
+                try:
+                    sys.stdout.buffer.write(data)
+                    sys.stdout.buffer.flush()
+                except (BrokenPipeError, OSError):
+                    try:
+                        os.kill(pid, signal.SIGTERM)
+                    except ProcessLookupError:
+                        pass
+                    break
+            if 0 in r:
+                try:
+                    data = os.read(0, 65536)
+                except OSError:
+                    break
+                if not data:
+                    try:
+                        os.kill(pid, signal.SIGTERM)
+                    except ProcessLookupError:
+                        pass
+                    break
+                try:
+                    os.write(master_fd, data)
+                except OSError:
+                    break
+    finally:
+        try:
+            os.close(master_fd)
+        except OSError:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except OSError:
+            pass
+
+
+if __name__ == '__main__':
+    main()