webbee 0.3.30__tar.gz → 0.3.32__tar.gz

{webbee-0.3.30 → webbee-0.3.32}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.3.32
+
+- Fixed the screen getting scrambled by stray output from background helper
+  programs (a git credential helper on macOS, a browser on Linux, and the
+  like). Their output is now fully redirected to a log for the whole session,
+  so nothing but Webbee Code can draw on your terminal.
+
+## 0.3.31
+
+- Fixed a Linux bug where "Top up credits" / "Read our security" could dump a
+  browser's startup logs into the terminal and scramble the screen. The
+  browser now launches fully detached and silent; on a headless/SSH session
+  we simply show the link to copy.
+
 ## 0.3.30
 
 - Removed the stray "◆ Home" title from the top of the Home screen — Home now

{webbee-0.3.30 → webbee-0.3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webbee
-Version: 0.3.30
+Version: 0.3.32
 Summary: Webbee 🐝 — the Imperal Cloud coding agent in your terminal
 Project-URL: Homepage, https://imperal.io
 Project-URL: Documentation, https://docs.imperal.io

{webbee-0.3.30 → webbee-0.3.32}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webbee"
-version = "0.3.30"
+version = "0.3.32"
 description = "Webbee 🐝 — the Imperal Cloud coding agent in your terminal"
 readme = "README.md"
 license = "MIT"

webbee-0.3.32/src/webbee/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.32"

{webbee-0.3.30 → webbee-0.3.32}/src/webbee/repl.py

@@ -1221,6 +1221,20 @@ async def run_repl(cfg, mode: str = "default", *, once: bool = False, sink=None,
         # renderer. Restored the instant the dock exits (the transcript dump
         # below writes to the REAL stdout).
         _errlog = boot._open_dock_stderr_log()
+        # OS-LEVEL redirect of fd 2, not just Python's sys.stderr object:
+        # SUBPROCESSES inherit the real fd 2, so a `contextlib.redirect_stderr`
+        # alone (Python-level) does NOT stop a child's stderr from hitting the
+        # terminal and scrambling the diff-based renderer — a Linux browser's
+        # MESA/GCM logs, a macOS `Python … MallocStackLogging` git-helper, etc.
+        # dup2 sends ALL of it (children + C libs + fd-2 writes) to the same
+        # log; the contextlib redirect below additionally covers Python-level
+        # sys.stderr writers. Fail-soft: on any failure leave fd 2 untouched.
+        _saved_stderr_fd = None
+        try:
+            _saved_stderr_fd = os.dup(2)
+            os.dup2(_errlog.fileno(), 2)
+        except (OSError, ValueError, AttributeError):
+            _saved_stderr_fd = None
         try:
             with contextlib.redirect_stderr(_errlog):
                 from webbee import tui
@@ -1363,6 +1377,14 @@ async def run_repl(cfg, mode: str = "default", *, once: bool = False, sink=None,
         except Exception:
             ok = False
         finally:
+            # Restore the real fd 2 BEFORE the transcript dump / any later
+            # console output, then close the log.
+            if _saved_stderr_fd is not None:
+                try:
+                    os.dup2(_saved_stderr_fd, 2)
+                    os.close(_saved_stderr_fd)
+                except OSError:
+                    pass
             try:
                 _errlog.close()
             except Exception:

webbee-0.3.32/src/webbee/urlopen.py

@@ -0,0 +1,37 @@
+"""Best-effort URL opener (W5 Home: Top-up credits, Read security docs).
+
+The browser is launched FULLY DETACHED and SILENCED — its own session, with
+stdin/stdout/stderr all routed to /dev/null — so a chatty browser can NEVER
+spew into and corrupt the full-screen terminal. (A real Ubuntu user clicked
+"Top up credits" and Chrome's `MESA-LOADER` / GCM / lens-overlay JS logs
+poured straight into the TUI, scrambling it — that inherited-fd path is what
+this guards against.) On a pure SSH / headless Linux session there is no
+browser to open, so we don't even try — the caller ALWAYS shows the URL as
+copyable text, which is the reliable path there. Returns the URL unchanged so
+the caller can display it; never raises, never blocks."""
+from __future__ import annotations
+
+import os
+import subprocess
+import sys
+
+
+def open_url(url: str) -> str:
+    try:
+        if sys.platform == "darwin":
+            argv = ["open", url]
+        elif os.name == "nt":
+            argv = ["cmd", "/c", "start", "", url]
+        else:
+            # Linux / BSD: only attempt a launch when a graphical session is
+            # actually present. No DISPLAY/WAYLAND == SSH/headless == nothing
+            # to open (and nothing that could pollute the terminal).
+            if not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
+                return url
+            argv = ["xdg-open", url]
+        devnull = subprocess.DEVNULL
+        subprocess.Popen(argv, stdin=devnull, stdout=devnull, stderr=devnull,
+                         start_new_session=True)
+    except Exception:
+        pass
+    return url

webbee-0.3.32/tests/test_urlopen.py

@@ -0,0 +1,50 @@
+import os
+import subprocess
+import sys
+
+import webbee.urlopen as urlopen
+
+
+def test_open_url_launches_detached_and_silenced(monkeypatch):
+    # Force the darwin path so a launch is always attempted regardless of the
+    # test host, then assert the child's std streams are ALL silenced (so a
+    # chatty browser can't corrupt the TUI) and it's detached.
+    monkeypatch.setattr(sys, "platform", "darwin")
+    calls = {}
+
+    def fake_popen(argv, **kw):
+        calls["argv"] = argv
+        calls["kw"] = kw
+        return object()
+
+    monkeypatch.setattr(subprocess, "Popen", fake_popen)
+    out = urlopen.open_url("https://panel.imperal.io/ext/billing")
+    assert out == "https://panel.imperal.io/ext/billing"
+    assert "https://panel.imperal.io/ext/billing" in calls["argv"]
+    assert calls["kw"]["stdin"] == subprocess.DEVNULL
+    assert calls["kw"]["stdout"] == subprocess.DEVNULL
+    assert calls["kw"]["stderr"] == subprocess.DEVNULL
+    assert calls["kw"].get("start_new_session") is True
+
+
+def test_open_url_skips_launch_on_headless_linux(monkeypatch):
+    # No DISPLAY/WAYLAND on Linux == SSH/headless: don't spawn anything, just
+    # return the URL for the caller to show as copyable text.
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setattr(os, "name", "posix")
+    monkeypatch.delenv("DISPLAY", raising=False)
+    monkeypatch.delenv("WAYLAND_DISPLAY", raising=False)
+    called = []
+    monkeypatch.setattr(subprocess, "Popen", lambda *a, **k: called.append(1))
+    assert urlopen.open_url("https://x") == "https://x"
+    assert called == []
+
+
+def test_open_url_never_raises(monkeypatch):
+    monkeypatch.setattr(sys, "platform", "darwin")
+
+    def boom(*a, **k):
+        raise RuntimeError("no opener")
+
+    monkeypatch.setattr(subprocess, "Popen", boom)
+    assert urlopen.open_url("https://x") == "https://x"

webbee-0.3.30/src/webbee/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.30"

webbee-0.3.30/src/webbee/urlopen.py

@@ -1,16 +0,0 @@
-"""Best-effort URL opener (W5 Home: Top-up credits, Read security docs).
-There is no existing opener in the client -- this is the minimal one. On a
-LOCAL machine `webbrowser.open` launches the default browser; over SSH (the
-common Webbee Code case) it no-ops or fails, so the caller ALSO surfaces the
-URL as copyable text. Returns the URL unchanged so the caller can show it;
-never raises."""
-from __future__ import annotations
-
-
-def open_url(url: str) -> str:
-    try:
-        import webbrowser
-        webbrowser.open(url, new=2)
-    except Exception:
-        pass
-    return url

webbee-0.3.30/tests/test_urlopen.py

@@ -1,18 +0,0 @@
-import webbee.urlopen as urlopen
-
-
-def test_open_url_returns_url_and_calls_webbrowser(monkeypatch):
-    calls = []
-    import webbrowser
-    monkeypatch.setattr(webbrowser, "open", lambda u, new=2: calls.append(u))
-    out = urlopen.open_url("https://panel.imperal.io/billing")
-    assert out == "https://panel.imperal.io/billing"
-    assert calls == ["https://panel.imperal.io/billing"]
-
-
-def test_open_url_never_raises(monkeypatch):
-    import webbrowser
-    def boom(*a, **k):
-        raise RuntimeError("no display")
-    monkeypatch.setattr(webbrowser, "open", boom)
-    assert urlopen.open_url("https://x") == "https://x"