swarph-cli 0.13.4__tar.gz → 0.13.6__tar.gz

{swarph_cli-0.13.4/src/swarph_cli.egg-info → swarph_cli-0.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.13.4
+Version: 0.13.6
 Summary: The `swarph` binary — multi-LLM CLI + mesh-gateway integration: multi-provider `swarph spawn` (claude/codex/antigravity per cell.provider via a ProviderMembrane + subprocess billing-scrub), interactive `swarph init`, `swarph mesh` (send/inbox/register) + inbox sidecar, `assisted_memory` (git-backed durable memory), session import, watchdog. v0.9.5: foolproof Windows auto-relaunch (genuine-WT detection via process ancestry, not WT_SESSION).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.13.4"
+version = "0.13.6"
 description = "The `swarph` binary — multi-LLM CLI + mesh-gateway integration: multi-provider `swarph spawn` (claude/codex/antigravity per cell.provider via a ProviderMembrane + subprocess billing-scrub), interactive `swarph init`, `swarph mesh` (send/inbox/register) + inbox sidecar, `assisted_memory` (git-backed durable memory), session import, watchdog. v0.9.5: foolproof Windows auto-relaunch (genuine-WT detection via process ancestry, not WT_SESSION)."
 readme = "README.md"
 license = { text = "MIT" }

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/src/swarph_cli/__init__.py

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

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/src/swarph_cli/commands/spawn.py

@@ -418,6 +418,13 @@ def _claude_env() -> dict[str, str]:
     """
     env = scrub_env_for_subprocess()
     env["SWARPH_SPAWN"] = "1"
+    # Disable the Claude Code in-session rating survey ("How is Claude doing this
+    # session?"). On a headless/automated cell it pops up as a modal that the
+    # wake-injector refuses to type into, so it stalls scheduled wakes
+    # indefinitely (a survey deferred the weekly newsletter 2+ hours — see
+    # feedback_modal_stalls_cell_wake). Suppresses ONLY the survey; does NOT
+    # touch telemetry / auto-update / error reporting.
+    env["CLAUDE_CODE_DISABLE_FEEDBACK_SURVEY"] = "1"
     return env
 
 

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/src/swarph_cli/commands/watchdog.py

@@ -259,6 +259,31 @@ def _resolve_cursor_path(
     return Path("/tmp/lab-claude-cursor.json")
 
 
+def _resolve_activity_marker_path(
+    role: str,
+    explicit: Optional[str],
+    cell_yaml_value: Optional[str] = None,
+) -> Path:
+    """Resolve the turn-activity marker — the Stop-hook touches it every turn-end.
+
+    Precedence: ``--activity-marker`` > ``cell.yaml`` extra.activity_marker_path
+    > ``$TMPDIR/<role>-claude-active.txt``.
+
+    Unlike the cursor (often the inbox-DRAIN cursor, touched only on drain and so
+    STALE during active non-draining work → false-fire,
+    feedback_watchdog_liveness_proxy), this marker tracks real turn activity. The
+    watchdog uses the FRESHEST mtime of {cursor, marker} as the effective
+    last-activity, so a fresh marker rescues a stale drain-cursor and an absent
+    marker harmlessly falls back to the cursor.
+    """
+    if explicit:
+        return Path(explicit).expanduser()
+    if cell_yaml_value:
+        return Path(cell_yaml_value).expanduser()
+    tmpdir = os.environ.get("TMPDIR", "/tmp")
+    return Path(tmpdir) / f"{role}-claude-active.txt"
+
+
 def _resolve_tmux_session(
     role: str,
     explicit: Optional[str],
@@ -283,11 +308,14 @@ def _resolve_tmux_session(
     return role
 
 
-def _read_cell_yaml_pins(role: str) -> tuple[Optional[str], Optional[str]]:
-    """Best-effort read of cell.yaml extra.cursor_path + extra.tmux_session.
+def _read_cell_yaml_pins(
+    role: str,
+) -> tuple[Optional[str], Optional[str], Optional[str]]:
+    """Best-effort read of cell.yaml extra.cursor_path + extra.tmux_session +
+    extra.activity_marker_path.
 
     Tries the cwd-local ``./cell.yaml`` first (matches hook_output discovery),
-    falls back to ``<cells_dir>/<role>.yaml``. Returns (None, None) on any
+    falls back to ``<cells_dir>/<role>.yaml``. Returns (None, None, None) on any
     failure — F4 is additive non-breaking, malformed cell.yaml falls through
     to the legacy convention defaults.
 
@@ -311,19 +339,21 @@ def _read_cell_yaml_pins(role: str) -> tuple[Optional[str], Optional[str]]:
         if candidate.is_file():
             cell_path = candidate
     if cell_path is None:
-        return None, None
+        return None, None, None
 
     try:
         cell = load_cell(cell_path)
     except (CellError, OSError):
-        return None, None
+        return None, None, None
 
     extra = cell.extra or {}
     cursor_path = extra.get("cursor_path")
     tmux_session = extra.get("tmux_session")
+    activity_marker = extra.get("activity_marker_path")
     return (
         str(cursor_path) if cursor_path else None,
         str(tmux_session) if tmux_session else None,
+        str(activity_marker) if activity_marker else None,
     )
 
 
@@ -1158,7 +1188,7 @@ def _run_local_check(args: argparse.Namespace) -> int:
     # `extra.tmux_session` when --cell is provided; explicit CLI args still
     # win. Best-effort: malformed cell.yaml falls through to legacy
     # convention defaults (additive non-breaking).
-    cell_cursor, cell_tmux = _read_cell_yaml_pins(role)
+    cell_cursor, cell_tmux, cell_activity = _read_cell_yaml_pins(role)
     cursor = _resolve_cursor_path(role, args.cursor, cell_cursor)
     tmux_session = _resolve_tmux_session(role, args.tmux_session, cell_tmux)
     log_path = _resolve_log_path(args.log)
@@ -1180,10 +1210,22 @@ def _run_local_check(args: argparse.Namespace) -> int:
         "cell_yaml_pinned_tmux": cell_tmux is not None,
     }
 
-    # PRIMARY signal: cursor file mtime
-    cursor_mtime = _stat_mtime(cursor)
+    # PRIMARY signal: liveness = FRESHEST mtime of {drain-cursor, turn-activity
+    # marker}. The cursor is often the inbox-DRAIN cursor (touched only on drain)
+    # → it goes stale during active non-draining work and false-fires recovery
+    # (feedback_watchdog_liveness_proxy). The Stop-hook marker is touched every
+    # turn-end. A fresh marker rescues a stale cursor; an absent/unreadable marker
+    # harmlessly falls back to the cursor (no change for cells without it).
+    activity_marker = _resolve_activity_marker_path(
+        role, getattr(args, "activity_marker", None), cell_activity
+    )
+    diag["activity_marker"] = str(activity_marker)
+    _live_mtimes = [
+        m for m in (_stat_mtime(cursor), _stat_mtime(activity_marker)) if m is not None
+    ]
+    cursor_mtime = max(_live_mtimes) if _live_mtimes else None
     if cursor_mtime is None:
-        diag["error"] = f"cursor file unreadable: {cursor}"
+        diag["error"] = f"cursor file unreadable: {cursor} (and marker {activity_marker})"
         _log_event(log_path, "error", diag, verbose)
         return 3
     cursor_age = _now() - cursor_mtime
@@ -1660,6 +1702,14 @@ def _build_parser() -> argparse.ArgumentParser:
     )
     p.add_argument("--cell", default=os.environ.get("SWARPH_CELL", "lab"))
     p.add_argument("--cursor", default=None)
+    p.add_argument(
+        "--activity-marker", default=None,
+        help="Turn-activity marker path (the Stop-hook touches it every "
+             "turn-end). The freshest mtime of {cursor, marker} is the "
+             "effective liveness, so an actively-working-but-not-draining cell "
+             "isn't false-judged dark. Default $TMPDIR/<role>-claude-active.txt; "
+             "cell.yaml extra.activity_marker_path also honored.",
+    )
     p.add_argument("--threshold", type=int, default=_DEFAULT_THRESHOLD_SEC)
     p.add_argument(
         "--pane-activity-threshold",

{swarph_cli-0.13.4 → swarph_cli-0.13.6/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.13.4
+Version: 0.13.6
 Summary: The `swarph` binary — multi-LLM CLI + mesh-gateway integration: multi-provider `swarph spawn` (claude/codex/antigravity per cell.provider via a ProviderMembrane + subprocess billing-scrub), interactive `swarph init`, `swarph mesh` (send/inbox/register) + inbox sidecar, `assisted_memory` (git-backed durable memory), session import, watchdog. v0.9.5: foolproof Windows auto-relaunch (genuine-WT detection via process ancestry, not WT_SESSION).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/tests/test_spawn_command.py

@@ -1343,3 +1343,15 @@ def test_run_spawn_grok_assisted_memory_no_double_system_prompt(
     assert "you are grok-researcher." in argv[argv.index("--system-prompt-override") + 1]
     assert "--rules" in argv  # CURRENT_TASK injected here, not as a 2nd override
     assert "Active task body" in argv[argv.index("--rules") + 1]
+
+
+def test_claude_env_disables_feedback_survey(monkeypatch):
+    """The Claude Code session-rating survey ("How is Claude doing this
+    session?") is a modal that stalls a headless cell's scheduled wake — the
+    wake-injector refuses to type into a modal, so a survey deferred the weekly
+    newsletter 2+ hours (feedback_modal_stalls_cell_wake). Spawned claude cells
+    disable it at the source via env."""
+    monkeypatch.setenv("PATH", "/usr/bin:/bin")
+    from swarph_cli.commands.spawn import _claude_env
+    env = _claude_env()
+    assert env.get("CLAUDE_CODE_DISABLE_FEEDBACK_SURVEY") == "1"

{swarph_cli-0.13.4 → swarph_cli-0.13.6}/tests/test_watchdog.py

@@ -23,6 +23,7 @@ _POSIX_WATCHDOG_SKIP = pytest.mark.skipif(
 
 from swarph_cli.commands.watchdog import (
     _DEFAULT_THRESHOLD_SEC,
+    _resolve_activity_marker_path,
     _resolve_cursor_path,
     _resolve_log_path,
     run_watchdog,
@@ -871,3 +872,62 @@ def test_pane_activity_age_takes_most_recent(monkeypatch):
                         lambda cmd, **kw: _R(0, f"|{now - 500}|{now - 10}\n"))
     age = _wd._pane_activity_age_sec("lab")
     assert age is not None and age <= 20
+
+
+# ---------------------------------------------------------------------------
+# Liveness generalization — turn-activity marker as a second signal
+# (feedback_watchdog_liveness_proxy): the drain-cursor goes stale during active
+# non-draining work; the Stop-hook active.txt (touched every turn-end) rescues it.
+# ---------------------------------------------------------------------------
+
+
+def test_resolve_activity_marker_explicit_wins(isolated_state):
+    p = _resolve_activity_marker_path("lab", "/x/y.txt", "/cell/z.txt")
+    assert str(p) == "/x/y.txt"
+
+
+def test_resolve_activity_marker_cell_yaml_beats_default(isolated_state):
+    p = _resolve_activity_marker_path("lab", None, "/cell/z.txt")
+    assert str(p) == "/cell/z.txt"
+
+
+def test_resolve_activity_marker_default_is_role_active_in_tmpdir(isolated_state):
+    p = _resolve_activity_marker_path("lab", None, None)
+    assert p == isolated_state / "lab-claude-active.txt"
+
+
+def test_stale_cursor_but_fresh_activity_marker_returns_noop(isolated_state, stale_cursor):
+    # Drain-cursor is stale (1hr) BUT the Stop-hook turn-activity marker at the
+    # DEFAULT path is fresh → freshest-of-both is fresh → healthy noop, NO false A1.
+    marker = isolated_state / "lab-claude-active.txt"
+    marker.write_text("")  # current mtime
+    with patch("swarph_cli.commands.watchdog._process_alive", return_value=True), \
+         patch("swarph_cli.commands.watchdog._gateway_unread_count", return_value=3), \
+         patch("swarph_cli.commands.watchdog._tmux_session_exists", return_value=True), \
+         patch("swarph_cli.commands.watchdog._pane_activity_age_sec", return_value=None):
+        rc = run_watchdog(argv=[
+            "--check", "--cell", "lab",
+            "--cursor", str(stale_cursor),
+            "--threshold", "60",
+        ])
+    assert rc == 0  # marker freshness rescues the stale cursor
+
+
+def test_stale_cursor_and_stale_marker_still_fires_a1(isolated_state, stale_cursor):
+    # Both stale → unchanged legacy behavior (A1). Absent/stale marker is harmless.
+    import os as _os
+    marker = isolated_state / "lab-claude-active.txt"
+    marker.write_text("")
+    one_hour_ago = time.time() - 3600
+    _os.utime(marker, (one_hour_ago, one_hour_ago))
+    with patch("swarph_cli.commands.watchdog._process_alive", return_value=True), \
+         patch("swarph_cli.commands.watchdog._gateway_unread_count", return_value=3), \
+         patch("swarph_cli.commands.watchdog._tmux_session_exists", return_value=True), \
+         patch("swarph_cli.commands.watchdog._pane_activity_age_sec", return_value=None), \
+         patch("swarph_cli.commands.watchdog._tmux_send_keys", return_value=True):
+        rc = run_watchdog(argv=[
+            "--check", "--cell", "lab",
+            "--cursor", str(stale_cursor),
+            "--threshold", "60",
+        ])
+    assert rc == 1  # both signals dark → A1 (unchanged)