swarph-cli 0.69.6__tar.gz → 0.69.7__tar.gz

{swarph_cli-0.69.6/src/swarph_cli.egg-info → swarph_cli-0.69.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.69.6
+Version: 0.69.7
 Summary: The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`.
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.69.6 → swarph_cli-0.69.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.69.6"
+version = "0.69.7"
 description = "The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`."
 readme = "README.md"
 license = { text = "MIT" }

{swarph_cli-0.69.6 → swarph_cli-0.69.7}/src/swarph_cli/__init__.py

@@ -16,6 +16,6 @@ The architecture splits CLI from substrate so:
 
 from __future__ import annotations
 
-__version__ = "0.69.6"
+__version__ = "0.69.7"
 
 __all__ = ["__version__"]

{swarph_cli-0.69.6 → swarph_cli-0.69.7}/src/swarph_cli/commands/mesh.py

@@ -2306,23 +2306,39 @@ def _grok_input(lines: list[str]) -> Optional[str]:
     return after.strip()
 
 
-def _grok_block_reason(lines: list[str]) -> Optional[str]:
-    """A rate or usage limit is not an idle composer and not a dead pane.
+# One grok screen, measured on the live 0.2.51 pane (52 rows). Lines above
+# this window are scrollback. A transcript that merely quotes the limit
+# strings is not the limit screen.
+_GROK_SCREEN_ROWS = 52
+
 
-    0.2.51 draws ``Retry failed: You've hit the rate limit for your plan``
-    under an empty ``│ ❯`` box, with no spinner. 1.0.44 draws a ``┃`` modal
-    ``You hit your free usage limit`` and drops the Grok footer entirely.
-    Either screen used to look clear (inject again) or unreadable
-    (DELIVERY FAILED). Return a stable reason token, or None.
+def _grok_block_reason(lines: list[str]) -> Optional[str]:
+    """A rate or usage limit screen is not an idle composer and not a dead pane.
+
+    Match the screen by where it is drawn, not by a quote anywhere in the
+    capture. 1.0.44 draws a ``┃`` modal ``You hit your free usage limit``
+    (no Grok footer). 0.2.51 draws a status line that starts ``Retry failed:``
+    on the current screen, under the composer. A cursor transcript that
+    quotes those sentences, and a grok scrollback that still contains them
+    above an idle screen, are not that screen.
     """
-    blob = "\n".join(lines).lower()
-    if "you hit your free usage limit" in blob:
+    screen = lines[-_GROK_SCREEN_ROWS:]
+    # Opencode draws its transcript in ┃ rows, so a quoted sentence there is
+    # not the grok modal. The modal identifies itself (Upgrade to SuperGrok)
+    # or the pane is already grok.
+    modal = "\n".join(ln for ln in screen if "┃" in ln).lower()
+    if ("you hit your free usage limit" in modal
+            and (_is_grok_pane(screen) or "upgrade to supergrok" in modal)):
         return "grok-usage-limit"
-    if "rate limit" in blob:
-        return "grok-rate-limit"
-    if "usage limit" in blob:
-        return "grok-usage-limit"
-    if "retry failed" in blob:
+    if not _is_grok_pane(screen):
+        return None
+    for ln in screen:
+        stripped = ln.strip()
+        low = stripped.lower()
+        if not stripped.startswith("Retry failed:"):
+            continue
+        if "rate limit" in low:
+            return "grok-rate-limit"
         return "grok-retry-failed"
     return None
 

{swarph_cli-0.69.6 → swarph_cli-0.69.7/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.69.6
+Version: 0.69.7
 Summary: The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`.
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.69.6 → swarph_cli-0.69.7}/src/swarph_cli.egg-info/SOURCES.txt

@@ -224,6 +224,7 @@ tests/test_716_timeline_one_path.py
 tests/test_723_grok_0251.py
 tests/test_724_ps1_ascii_or_bom.py
 tests/test_725_stdio_reconfigure.py
+tests/test_726_grok_limit_screen.py
 tests/test_729_dm_once.py
 tests/test_729_wake_watchdog.py
 tests/test_734_dreaming_enrich_degrade.py

swarph_cli-0.69.7/tests/test_726_grok_limit_screen.py

@@ -0,0 +1,60 @@
+"""card #961 — the limit check must be the limit screen, not a quote.
+
+These assertions fail on 1d55233: that head treats any line containing the
+limit sentences as a grok block, including a cursor transcript and grok
+scrollback above an idle screen.
+"""
+from pathlib import Path
+
+from swarph_cli.commands import mesh
+
+FIX723 = Path(__file__).resolve().parents[1] / "tests" / "fixtures" / "grok-723"
+FIX726 = Path(__file__).resolve().parents[1] / "tests" / "fixtures" / "grok-726"
+
+
+def lines(root, name):
+    return (root / name).read_text(encoding="utf-8").splitlines()
+
+
+def test_cursor_transcript_quoting_both_limits_is_not_blocked():
+    pane = lines(FIX726, "cursor-transcript.txt")
+    text = "\n".join(pane)
+    assert "rate limit" in text
+    assert "You hit your free usage limit" in text
+    assert "Models matching" in text
+    assert mesh._is_grok_pane(pane) is False
+    assert mesh._grok_block_reason(pane) is None
+
+
+def test_opencode_transcript_quoting_the_usage_limit_is_not_blocked():
+    src = Path(__file__).resolve().parents[1] / "tests" / "fixtures" / "opencode-pane-idle-footer-0710.txt"
+    pane = src.read_text(encoding="utf-8").splitlines()
+    # Inside the current screen, on a ┃ transcript row, not a grok modal.
+    pane.insert(len(pane) - 8, "  ┃  You hit your free usage limit")
+    assert mesh._is_opencode_pane(pane) is True
+    assert mesh._is_grok_pane(pane) is False
+    assert mesh._grok_block_reason(pane) is None
+
+
+def test_grok_rate_limit_and_usage_modal_still_defer():
+    rate = lines(FIX723, "rate-limit.txt")
+    usage = lines(FIX723, "usage-limit.txt")
+    assert mesh._grok_block_reason(rate) == "grok-rate-limit"
+    assert mesh._grok_turn_finished(rate) is False
+    assert mesh._is_grok_pane(usage) is False
+    assert mesh._grok_block_reason(usage) == "grok-usage-limit"
+
+
+def test_old_scrollback_limit_on_an_idle_grok_screen_reads_idle():
+    idle = lines(FIX723, "idle.txt")
+    scroll = [
+        "     ❯ an earlier turn",
+        "     Retry failed: You’ve hit the rate limit for your plan.",
+        "     You hit your free usage limit",
+    ]
+    # Push the quote above one screen. The idle composer stays.
+    pane = (scroll * 20) + idle
+    assert mesh._is_grok_pane(pane)
+    assert mesh._grok_block_reason(pane) is None
+    assert mesh._grok_composer_state(pane) == "clear"
+    assert mesh._grok_running(pane) is False