swarph-cli 0.69.1__tar.gz → 0.69.3__tar.gz

{swarph_cli-0.69.1/src/swarph_cli.egg-info → swarph_cli-0.69.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.69.1
+Version: 0.69.3
 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
@@ -26,6 +26,7 @@ License-File: LICENSE
 Requires-Dist: swarph-mesh<0.10,>=0.5.0
 Requires-Dist: swarph-shared<0.9,>=0.7.0
 Requires-Dist: PyYAML>=6.0
+Requires-Dist: tomli>=1.1; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Provides-Extra: mcp

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.69.1"
+version = "0.69.3"
 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" }
@@ -73,6 +73,9 @@ dependencies = [
     # Stays a swarph-cli dep since file I/O is operator-tooling-layer
     # concern; swarph-shared cell module is pure-stdlib.
     "PyYAML>=6.0",
+    # tomllib is stdlib from 3.11. bench/providers.py (and the tests that read
+    # pyproject.toml) fall back to tomli on the declared 3.10 floor. card #1000.
+    "tomli>=1.1; python_version < \"3.11\"",
 ]
 
 [project.urls]

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/src/swarph_cli/__init__.py

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

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/src/swarph_cli/bench/providers.py

@@ -2,7 +2,10 @@
 from __future__ import annotations
 
 import os
-import tomllib
+try:
+    import tomllib
+except ModuleNotFoundError:  # py3.10
+    import tomli as tomllib
 from pathlib import Path
 from urllib.parse import urlparse
 

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/src/swarph_cli/commands/mesh.py

@@ -2000,10 +2000,14 @@ _WAKE_PROMPT = "check mesh"
 # not shown. Longer than _WAKE_PROMPT, so wake-text detection strips this
 # one first.
 _OPENCODE_WAKE_PROMPT = "check mesh: swarph_dm_unread"
-# A finished turn keeps its ▣ header and adds a trailing duration
-# (`· 3.3s`). An in-progress header has no such suffix. Measured by
-# drop-on-meta-edge on 1.18.33 (card #961, post 54557).
-_OPENCODE_DONE = re.compile(r"·\s*\d+(?:\.\d+)?s\s*$")
+# A finished turn keeps its ▣ header and adds a duration.
+# Short turns read `· 3.3s` (drop-on-meta-edge, 1.18.33, card #961 post
+# 54557). A longer idle turn reads `· 3m 4s` (opencode pane, 2026-09-29
+# 07:10Z). On a wide pane the same row continues into the sidebar, so the
+# duration is not the end of the line. An in-progress header has no duration.
+_OPENCODE_DONE = re.compile(
+    r"·\s*(?:\d+h\s*)?(?:\d+m\s*)?\d+(?:\.\d+)?s\b"
+)
 # Submit-verify bounds (#533): the settle pause lets the -l literal LAND in
 # the composer before Enter can submit it (the blind gesture raced this), and
 # the attempt bound keeps a never-submitting pane from being Enter-spammed
@@ -2189,13 +2193,29 @@ def _opencode_turn_finished_target(target: str) -> bool:
     return _opencode_turn_finished(lines)
 
 
+def _opencode_row_text(line: str) -> str:
+    """Text on one ``┃`` row, with a right-aligned footer cut off.
+
+    A long cwd:branch is drawn inside the box, right-aligned, and wraps
+    across as many rows as the path needs. The gap before that footer is
+    a run of 4 or more spaces. Composer text is the left side of the row.
+    Leading spaces stay in place for the split, then the left side is
+    stripped. Skipping a fixed number of rows cannot work: the row count
+    is the path length over the box width.
+    """
+    idx = line.find("┃")
+    if idx < 0:
+        return ""
+    return re.split(r" {4,}", line[idx + 1:], maxsplit=1)[0].strip()
+
+
 def _opencode_input(lines: list[str]) -> Optional[str]:
-    """The composer input row's text, '' when that row is empty, None if no box.
+    """Composer text inside the box, '' when that box is empty, None if no box.
 
-    Walk up from the mode row. Blank ``┃`` lines are the box padding. A
-    ``▣`` spinner sits between the transcript and the box, and the walk
-    stops there so a submitted prompt in the transcript is not read as
-    text still sitting in the composer.
+    Walk up from the mode row. Each ``┃`` row contributes only the text
+    before its footer gap. The walk stops at the first line that is not a
+    ``┃`` row — the top of the box — so a transcript ``┃`` row above the
+    box is never composer text.
     """
     mode_at = None
     for i, ln in enumerate(lines):
@@ -2204,14 +2224,11 @@ def _opencode_input(lines: list[str]) -> Optional[str]:
     if mode_at is None:
         return None
     for ln in reversed(lines[:mode_at]):
-        s = ln.strip()
-        if s.startswith("▣"):
+        if not ln.strip().startswith("┃"):
             return ""
-        if not s.startswith("┃"):
-            continue
-        body = s[1:].strip()
-        if body:
-            return body
+        text = _opencode_row_text(ln)
+        if text:
+            return text
     return ""
 
 

{swarph_cli-0.69.1 → swarph_cli-0.69.3/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.69.1
+Version: 0.69.3
 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
@@ -26,6 +26,7 @@ License-File: LICENSE
 Requires-Dist: swarph-mesh<0.10,>=0.5.0
 Requires-Dist: swarph-shared<0.9,>=0.7.0
 Requires-Dist: PyYAML>=6.0
+Requires-Dist: tomli>=1.1; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Provides-Extra: mcp

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/src/swarph_cli.egg-info/requires.txt

@@ -2,6 +2,9 @@ swarph-mesh<0.10,>=0.5.0
 swarph-shared<0.9,>=0.7.0
 PyYAML>=6.0
 
+[:python_version < "3.11"]
+tomli>=1.1
+
 [bench]
 google-genai>=0.3
 

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/tests/test_brain_ask_command.py

@@ -32,7 +32,10 @@ def test_version_matches_the_packaged_version():
     agree, which is what its name promised all along.
     """
     import pathlib
-    import tomllib
+    try:
+        import tomllib
+    except ModuleNotFoundError:  # py3.10
+        import tomli as tomllib
 
     import swarph_cli
 

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/tests/test_packaged_artifacts_exist.py

@@ -45,7 +45,10 @@ def test_file_exists_in_the_package_tree(rel, why):
 @pytest.mark.parametrize("rel,why", REQUIRED, ids=[r for r, _ in REQUIRED])
 def test_file_is_declared_as_package_data(rel, why):
     """Existing in src/ is NOT enough — it must be declared or the wheel omits it."""
-    import tomllib
+    try:
+        import tomllib
+    except ModuleNotFoundError:  # py3.10
+        import tomli as tomllib
     cfg = tomllib.loads((PKG.parent.parent / "pyproject.toml").read_text())
     patterns = cfg["tool"]["setuptools"]["package-data"]["swarph_cli"]
     suffix = pathlib.Path(rel).suffix

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/tests/test_tmux_wake_submit_verify.py

@@ -602,6 +602,86 @@ _OPENCODE_FINISHED = """\
 """
 
 
+def test_live_idle_footer_is_clear_and_not_running(tmux):
+    """The 07:10Z pane: composer empty, transcript full of ┃ rows, footer
+    cwd on the ┃ row above the mode row, finished header `· 3m 4s`.
+    0.69.1 returns that path as composer text and treats the header as
+    still running."""
+    from pathlib import Path
+    fixture = (Path(__file__).resolve().parent / "fixtures"
+               / "opencode-pane-idle-footer-0710.txt")
+    text = fixture.read_text(encoding="utf-8")
+    lines = text.splitlines()
+    assert any("Found the real blocker" in ln and ln.strip().startswith("┃")
+               for ln in lines)
+    _calls, state = tmux
+    state["captures"] = [text]
+    assert mesh._opencode_input(lines) == ""
+    assert mesh._composer_state("sac") == "clear"
+    assert mesh._agent_running("sac") is False
+
+
+def test_drop_six_captures_split_the_footer():
+    """A wrapped cwd is a run of spaces, not a fixed number of rows.
+    Measured by drop-on-meta-edge on sacW 220x55 (card #961, #612)."""
+    from pathlib import Path
+    fix = Path(__file__).resolve().parent / "fixtures"
+    wide = (fix / "opencode-961" / "W2_turn2.txt").read_text(encoding="utf-8")
+    narrow = (fix / "opencode-961" / "G3_turn2.txt").read_text(encoding="utf-8")
+    live = (fix / "opencode-pane-idle-footer-0710.txt").read_text(encoding="utf-8")
+    assert mesh._opencode_input(wide.splitlines()) == ""
+    assert mesh._opencode_input(live.splitlines()) == ""
+    assert mesh._opencode_input(narrow.splitlines()) == ""
+    typed_narrow = "\n".join([
+        "                       ┃",
+        "                       ┃  hello from a human",
+        "                       ┃",
+        "                       ┃  Build · DeepSeek V4 Pro (New) OpenCode Go",
+    ])
+    assert mesh._opencode_input(typed_narrow.splitlines()) == "hello from a human"
+    overlay = (
+        "  ┃  hello from a human" + (" " * 150)
+        + "meta-edge/d7cba227-9da7-4d92-92da-"
+    )
+    typed_wide = "\n".join([
+        "  ┃",
+        overlay,
+        "  ┃  Build · DeepSeek V4 Pro (New) OpenCode Go" + (" " * 40)
+        + "feat/sacrificial-612",
+    ])
+    assert mesh._opencode_input(typed_wide.splitlines()) == "hello from a human"
+    holding = "\n".join([
+        "┃",
+        "┃  check mesh: swarph_dm_unread",
+        "┃",
+        "┃  Build · DeepSeek V4 Pro (New) OpenCode Go",
+    ])
+    assert mesh._opencode_input(holding.splitlines()) == "check mesh: swarph_dm_unread"
+    # A wide pane keeps the sidebar on the ▣ row, past the duration.
+    sidebar = "▣  Build · DeepSeek V4.1 Flash · 5.1s" + (" " * 40) + "LSPs are disabled"
+    assert mesh._OPENCODE_DONE.search(sidebar)
+    assert mesh._opencode_running([sidebar]) is False
+    assert mesh._opencode_running(["▣  Build · DeepSeek V4 Pro (New)"]) is True
+
+
+def test_wide_empty_box_records_the_wake_outstanding(tmux):
+    """W-D1: the footer showed up after Enter and the old read called the
+    box busy, so the injected wake was reported as a human's line and
+    wake_outstanding stayed unset."""
+    from pathlib import Path
+    wide = (Path(__file__).resolve().parent / "fixtures" / "opencode-961"
+            / "W2_turn2.txt").read_text(encoding="utf-8")
+    calls, state = tmux
+    state["captures"] = [wide]
+    st = _State()
+    assert mesh.TmuxSink("sacW").deliver(st, [], 1) is True
+    assert st.ledger("x")["wake_outstanding"] is True
+    literals = [c for c in calls if "-l" in c]
+    assert literals == [[
+        "tmux", "send-keys", "-t", "sacW", "-l", mesh._OPENCODE_WAKE_PROMPT]]
+    assert enters(calls) == 1
+
+
 def test_opencode_idle_box_is_a_clear_composer(tmux):
     calls, state = tmux
     state["captures"] = [_OPENCODE_IDLE]

{swarph_cli-0.69.1 → swarph_cli-0.69.3}/tests/test_watchdog.py

@@ -1183,7 +1183,10 @@ def test_version_matches_the_packaged_version():
     agree, which is what its name promised all along.
     """
     import pathlib
-    import tomllib
+    try:
+        import tomllib
+    except ModuleNotFoundError:  # py3.10
+        import tomli as tomllib
 
     import swarph_cli