comodor 0.8.3__tar.gz → 0.8.4__tar.gz

{comodor-0.8.3 → comodor-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: comodor
-Version: 0.8.3
+Version: 0.8.4
 Summary: Comodor — a self-improving terminal coding agent with a Rich TUI
 Project-URL: Homepage, https://comodor.ai
 Project-URL: Repository, https://github.com/ifekri/Comodor

{comodor-0.8.3 → comodor-0.8.4}/src/comodor/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.8.3'
-__version_tuple__ = version_tuple = (0, 8, 3)
+__version__ = version = '0.8.4'
+__version_tuple__ = version_tuple = (0, 8, 4)
 
 __commit_id__ = commit_id = None

{comodor-0.8.3 → comodor-0.8.4}/src/comodor/browser/launch.py

@@ -96,32 +96,47 @@ def free_port() -> int:
 
 
 #: What Chromium says when it will not run unprotected and cannot protect
-#: itself. Matched on the specifics, so a browser that failed for some other
-#: reason is not silently restarted with a weaker configuration.
+#: itself. Matched against everything it printed rather than the first line:
+#: it does not put the useful part first, and which line comes first depends on
+#: how the container was started.
 _NO_SANDBOX_SIGNS = (
     "no usable sandbox",
     "failed to move to new namespace",
-    "operation not permitted",
+    "setuid sandbox",
     "sandboxhelper",
     "chrome-sandbox",
+    "zygote_host",
 )
 
 
-def _refused_for_want_of_a_sandbox(message: str) -> bool:
-    text = message.lower()
-    return any(sign in text for sign in _NO_SANDBOX_SIGNS)
+class SandboxUnavailable(BrowserError):
+    """It will not start because it cannot isolate its renderers here.
 
+    Its own class rather than a string match at the call site, because the
+    decision belongs where the full output is: by the time this reaches a
+    caller the message has been trimmed to the one line worth showing.
+    """
 
-def _said(handle) -> str:
-    """Whatever the browser printed before giving up, trimmed to one line."""
+
+def _looks_like_a_sandbox_problem(output: str) -> bool:
+    lowered = output.lower()
+    return any(sign in lowered for sign in _NO_SANDBOX_SIGNS)
+
+
+def _read_all(handle) -> str:
     try:
         handle.seek(0)
-        raw = handle.read(4000).decode("utf-8", "replace").strip()
+        return handle.read(20_000).decode("utf-8", "replace").strip()
     except (OSError, ValueError):
         return ""
-    if not raw:
+
+
+def _first_line(output: str) -> str:
+    """One line for a person. Forty lines of Chromium logging is not an error
+    message, it is a haystack."""
+    if not output:
         return ""
-    first = next((line for line in raw.splitlines() if line.strip()), "")
+    first = next((line for line in output.splitlines() if line.strip()), "")
     return f" It said: {first.strip()[:300]}"
 
 
@@ -155,9 +170,8 @@ class Browser:
         try:
             return cls._spawn(binary, profile, chosen, headless, window,
                               sandboxed=True)
-        except BrowserError as error:
-            if not _refused_for_want_of_a_sandbox(str(error)):
-                raise
+        except SandboxUnavailable:
+            pass
         # It will not run its renderers in a user namespace here — almost
         # always a container, whose own confinement is the stronger boundary
         # anyway. Give up the inner one rather than weaken the outer one, and
@@ -205,7 +219,12 @@ class Browser:
         try:
             browser._await_port()
         except BrowserError as error:
-            raise BrowserError(f"{error}{_said(complaints)}") from None
+            printed = _read_all(complaints)
+            message = f"{error}{_first_line(printed)}"
+            # Judged on everything it printed; reported as one line.
+            if sandboxed and _looks_like_a_sandbox_problem(printed):
+                raise SandboxUnavailable(message) from None
+            raise BrowserError(message) from None
         finally:
             complaints.close()
         return browser

{comodor-0.8.3 → comodor-0.8.4}/tests/test_real_browser.py

@@ -480,14 +480,33 @@ def test_a_screenshot_is_a_real_png(tmp_path):
 def test_only_a_missing_sandbox_causes_a_retry():
     """Restarting a browser that failed for some other reason — with a weaker
     configuration, silently — would be a bad way to hide a real problem."""
-    from comodor.browser.launch import _refused_for_want_of_a_sandbox
+    from comodor.browser.launch import _looks_like_a_sandbox_problem
 
-    assert _refused_for_want_of_a_sandbox(
-        "No usable sandbox! If this is a Debian system…")
-    assert _refused_for_want_of_a_sandbox(
+    assert _looks_like_a_sandbox_problem(
+        "No usable sandbox! If this is a Debian system...")
+    assert _looks_like_a_sandbox_problem(
         "Failed to move to new namespace: Operation not permitted")
-    assert not _refused_for_want_of_a_sandbox("could not start: file not found")
-    assert not _refused_for_want_of_a_sandbox("the browser did not open a port")
+    assert not _looks_like_a_sandbox_problem("could not start: file not found")
+    assert not _looks_like_a_sandbox_problem("the browser did not open a port")
+
+
+def test_the_useful_line_is_not_always_the_first_one():
+    """Chromium under compose says the setuid helper failed, and only mentions
+    the namespace four lines later. Matching the first line alone made the same
+    bug appear or not depending on how the container was started."""
+    from comodor.browser.launch import _first_line, _looks_like_a_sandbox_problem
+
+    printed = "\n".join([
+        "The setuid sandbox is not running as root. Common causes:",
+        "  * An unprivileged process using ptrace on it, like a debugger.",
+        "  * A parent process set prctl(PR_SET_NO_NEW_PRIVS, ...)",
+        "Failed to move to new namespace: ... errno = Operation not permitted",
+    ])
+
+    assert _looks_like_a_sandbox_problem(printed)
+    # And what a person is shown stays one line.
+    assert "\n" not in _first_line(printed)
+    assert "setuid sandbox is not running as root" in _first_line(printed)
 
 
 def test_a_browser_that_fails_for_another_reason_is_not_restarted(tmp_path,
@@ -517,9 +536,11 @@ def test_a_missing_sandbox_is_retried_once_without_one(tmp_path, monkeypatch):
     attempts = []
 
     def once(cls, binary, profile, port, headless, window, sandboxed):
+        from comodor.browser.launch import SandboxUnavailable
+
         attempts.append(sandboxed)
         if sandboxed:
-            raise BrowserError("it exited. It said: No usable sandbox!")
+            raise SandboxUnavailable("it exited. It said: No usable sandbox!")
         return Browser("/bin/true", profile, port, sandboxed=False)
 
     monkeypatch.setattr(Browser, "_spawn", classmethod(once))