ring-cli 0.3.0__tar.gz → 0.4.0__tar.gz

{ring_cli-0.3.0 → ring_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ring-cli
-Version: 0.3.0
+Version: 0.4.0
 Summary: RiNG — Realtime Instance Notification Grid for active agent CLI sessions.
 Keywords: claude-code,codex,tui,dashboard,session,monitor,rich
 Author: Wei Lee
@@ -58,7 +58,7 @@ RiNG puts them on one board, with sessions waiting for you sorted first.
 - **One board for every session**: Claude Code / Codex are built in; other tools can feed `ring hook`.
 - **Waiting first**: sessions that need your response are highlighted and sorted above the rest.
 - **Jump back to the terminal**: in the TUI, select a session and press `Enter` / `Space` to focus tmux, iTerm2, or Terminal.app.
-- **System notifications**: hook mode can beep and notify when a session starts waiting; with `terminal-notifier`, clicking the notification jumps back.
+- **Notifies you without the board open**: with hooks installed, the moment a session turns 🔴 waiting it beeps and fires a system notification — even with no RiNG board running. With `terminal-notifier`, clicking the notification jumps back.
 - **Name your sessions**: press `n` in the TUI to add a local label such as `maigo · auth refactor`.
 - **Local and extensible**: RiNG only reads local Claude Code / Codex data and writes `~/.config/ring/`; session sources, focusers, and notifiers are pluggable.
 
@@ -139,8 +139,10 @@ one live Codex session per cwd can jump correctly; multiple live Codex sessions
 
 ### Notifications
 
-Default behavior: with hooks installed, when a session changes to 🔴 waiting, RiNG beeps and sends
-a system notification. If it keeps waiting, RiNG reminds you again at 30s / 120s / 300s by default.
+Default behavior: with hooks installed, the moment a session changes to 🔴 waiting, the hook beeps
+and sends a system notification right then — **no RiNG board needs to be open**, so it rings you even
+after you close the terminal (notifications are event-driven, not polled). While a TUI is open, it
+also nudges you again in-app at 30s / 120s / 300s if the session keeps waiting.
 
 For clickable notifications on macOS, install `terminal-notifier`:
 
@@ -266,7 +268,8 @@ send `requires_action = true/false` or `waiting_for = "permission" | "options" |
 
 ### agent-hooks
 
-Notification details: `--watch` and the TUI both send notifications. The default backend is `auto`:
+Notification details: system notifications are sent by `ring hook` at the event (both `--watch` and
+the TUI only render the board; they no longer send system notifications). The default backend is `auto`:
 RiNG prefers clickable `terminal-notifier`, then falls back to `osascript` on macOS or `notify-send`
 on Linux. If none are available, RiNG keeps the board running and skips notifications.
 

{ring_cli-0.3.0 → ring_cli-0.4.0}/README.en.md

@@ -33,7 +33,7 @@ RiNG puts them on one board, with sessions waiting for you sorted first.
 - **One board for every session**: Claude Code / Codex are built in; other tools can feed `ring hook`.
 - **Waiting first**: sessions that need your response are highlighted and sorted above the rest.
 - **Jump back to the terminal**: in the TUI, select a session and press `Enter` / `Space` to focus tmux, iTerm2, or Terminal.app.
-- **System notifications**: hook mode can beep and notify when a session starts waiting; with `terminal-notifier`, clicking the notification jumps back.
+- **Notifies you without the board open**: with hooks installed, the moment a session turns 🔴 waiting it beeps and fires a system notification — even with no RiNG board running. With `terminal-notifier`, clicking the notification jumps back.
 - **Name your sessions**: press `n` in the TUI to add a local label such as `maigo · auth refactor`.
 - **Local and extensible**: RiNG only reads local Claude Code / Codex data and writes `~/.config/ring/`; session sources, focusers, and notifiers are pluggable.
 
@@ -114,8 +114,10 @@ one live Codex session per cwd can jump correctly; multiple live Codex sessions
 
 ### Notifications
 
-Default behavior: with hooks installed, when a session changes to 🔴 waiting, RiNG beeps and sends
-a system notification. If it keeps waiting, RiNG reminds you again at 30s / 120s / 300s by default.
+Default behavior: with hooks installed, the moment a session changes to 🔴 waiting, the hook beeps
+and sends a system notification right then — **no RiNG board needs to be open**, so it rings you even
+after you close the terminal (notifications are event-driven, not polled). While a TUI is open, it
+also nudges you again in-app at 30s / 120s / 300s if the session keeps waiting.
 
 For clickable notifications on macOS, install `terminal-notifier`:
 
@@ -241,7 +243,8 @@ send `requires_action = true/false` or `waiting_for = "permission" | "options" |
 
 ### agent-hooks
 
-Notification details: `--watch` and the TUI both send notifications. The default backend is `auto`:
+Notification details: system notifications are sent by `ring hook` at the event (both `--watch` and
+the TUI only render the board; they no longer send system notifications). The default backend is `auto`:
 RiNG prefers clickable `terminal-notifier`, then falls back to `osascript` on macOS or `notify-send`
 on Linux. If none are available, RiNG keeps the board running and skips notifications.
 

{ring_cli-0.3.0 → ring_cli-0.4.0}/pyproject.toml

@@ -2,7 +2,7 @@
 # import 的 module（見 [tool.uv.build-backend] module-name）與 CLI 指令仍是 `ring`。
 [project]
 name = "ring-cli"
-version = "0.3.0"
+version = "0.4.0"
 description = "RiNG — Realtime Instance Notification Grid for active agent CLI sessions."
 readme = "README.en.md"
 requires-python = ">=3.13"

{ring_cli-0.3.0 → ring_cli-0.4.0}/src/ring/cli.py

@@ -331,25 +331,15 @@ def run_config(args: list[str]) -> int:
 
 
 def watch(interval: float, count: int, show_all: bool, show_legend: bool) -> int:
-    from ring.notify import notify_waiting
-    from ring.watcher import WaitingAlertScheduler
-
-    cfg = get_config()
+    # 系統通知由 ``ring hook`` 在 session 轉 🔴 等你的當下就地發出（見 hook._ring_waiting_now）；
+    # watch 只負責顯示看板，不再輪詢發通知——這樣關掉看板也照樣 ring 你。
     frames = 0
     footer_text = _("每 {interval}s 刷新 · Ctrl-C 離場", interval=int(interval))
     if not HAVE_RICH:
-        scheduler = WaitingAlertScheduler(cfg.notify_repeat_seconds, cfg.notify_repeat_max)
         try:
             while True:
                 sys.stdout.write("\033[2J\033[H")
                 sessions = board(show_all)
-                alerts = scheduler.feed(sessions)
-                try:
-                    hint = notify_waiting(alerts)
-                    if hint:
-                        print(hint)
-                except Exception:
-                    pass
                 print(_render_plain(sessions, show_legend, show_tool_column(sessions)))
                 print(f"\n{footer_text}")
                 sys.stdout.flush()
@@ -361,18 +351,10 @@ def watch(interval: float, count: int, show_all: bool, show_legend: bool) -> int
             return 0
 
     console = Console()
-    scheduler = WaitingAlertScheduler(cfg.notify_repeat_seconds, cfg.notify_repeat_max)
     try:
         with Live(console=console, screen=True, auto_refresh=False) as live:
             while True:
                 sessions = board(show_all)
-                alerts = scheduler.feed(sessions)
-                try:
-                    hint = notify_waiting(alerts)
-                    if hint:
-                        print(hint)
-                except Exception:
-                    pass
                 body = _rich_renderable(sessions, show_legend, show_tool_column(sessions))
                 live.update(Group(body, Text(f"\n{footer_text}", style=_MUTED)), refresh=True)
                 frames += 1

{ring_cli-0.3.0 → ring_cli-0.4.0}/src/ring/hook.py

@@ -33,6 +33,7 @@ from ring.i18n import gettext as _
 from ring.i18n import set_lang
 from ring.registry import (
     RING_REGISTRY,
+    Session,
     Status,
     _extract_todo,
     _latest_action,
@@ -127,11 +128,13 @@ def _session_tty(process_names: tuple[str, ...]) -> str:
 
 
 def run_hook(provider: str = "claude-code") -> int:
-    """讀一次 stdin → 寫 RiNG registry 狀態（看板）→（可選）把決策委派給 agent-hooks。
+    """讀一次 stdin → 寫 RiNG registry 狀態（看板）→ 轉等你時就地發通知 →（可選）委派 agent-hooks。
 
-    委派只在 ``notify_backend == "agent-hooks"`` 且 PATH 上有 ``agent-hooks`` 時發生：
-    把原始 payload 透傳給 ``agent-hooks callback``，由它同步出 modal、收按鈕、把決策
-    寫到 stdout 回給 Claude。其餘情況 RiNG 只記狀態、exit 0（你在終端自己回答）。
+    轉 🔴 等你的事件，會在當下直接發系統通知（見 ``_ring_waiting_now``）——不必開著看板，
+    關掉終端也照樣 ring 你。委派只在 ``notify_backend == "agent-hooks"`` 且 PATH 上有
+    ``agent-hooks`` 時發生：把原始 payload 透傳給 ``agent-hooks callback``，由它同步出 modal、
+    收按鈕、把決策寫到 stdout 回給 Claude（這條路下 ``_ring_waiting_now`` 自動短路、不重複發）。
+    其餘情況 RiNG 記狀態 + 發通知後 exit 0（你在終端自己回答）。
     """
     try:
         raw = sys.stdin.read()
@@ -191,6 +194,40 @@ def _record_session_state(data: dict[str, Any], selected_provider: str) -> None:
     tmp.write_text(json.dumps(payload))
     tmp.replace(path)  # atomic
 
+    if event.status is Status.WAITING:
+        _ring_waiting_now(event, payload, last_action)
+
+
+def _ring_waiting_now(event: Any, payload: dict[str, Any], last_action: str) -> None:
+    """session 轉 🔴 等你的當下，就地由 hook 發系統通知——不必等 RiNG 看板輪詢。
+
+    WAITING 只會從 hook 來（scan 模式永不標 WAITING），所以 hook 是第一手知道「等你」
+    的地方；在事件當下通知最即時，也不依賴看板有沒有開著（看板沒開時舊版根本不會 ring
+    你）。backend=none / agent-hooks 由 notify_waiting → _select_notifier 自動短路
+    （agent-hooks 改走 _delegate_to_agent_hooks 的 modal 委派），不會重複發。
+    失敗安靜吞掉，絕不擋住 session。
+    """
+    try:
+        from ring.notify import notify_waiting
+
+        notify_waiting(
+            [
+                Session(
+                    session_id=event.session_id,
+                    cwd=event.cwd,
+                    status=Status.WAITING,
+                    last_active=float(payload.get("last_active", time.time())),
+                    last_action=last_action,
+                    source="hook",
+                    tty=payload.get("tty"),
+                    provider=event.provider,
+                    origin_cwd=event.cwd,
+                )
+            ]
+        )
+    except Exception:
+        pass
+
 
 def _delegate_to_agent_hooks(raw: str, selected_provider: str) -> int:
     """notify_backend=="agent-hooks" 且 agent-hooks 在 PATH → 透傳 payload 給它出決策。

{ring_cli-0.3.0 → ring_cli-0.4.0}/src/ring/registry.py

@@ -590,7 +590,7 @@ def _codex_threads(procs: list[tuple[str, str]]) -> list[Session]:
             continue
         updated_ms = int(row["updated_at_ms"] or 0)
         last_active = updated_ms / 1000 if updated_ms else float(row["updated_at"] or 0)
-        if now - last_active > ACTIVE_WINDOW_SECONDS and counts.get(cwd, 0) == 0:
+        if now - last_active > ACTIVE_WINDOW_SECONDS and counts.get(_real(cwd), 0) == 0:
             continue
         rollout_path = Path(str(row["rollout_path"] or ""))
         records = _tail_records(rollout_path) if rollout_path else []

{ring_cli-0.3.0 → ring_cli-0.4.0}/src/ring/tui.py

@@ -36,7 +36,6 @@ from ring.i18n import gettext as _
 from ring.i18n import set_lang
 from ring.ipc import clear_tui_presence, read_focus_request, write_tui_presence
 from ring.labels import get_label, load_labels, set_label
-from ring.notify import notify_waiting
 from ring.registry import Session, Status, running_agent_pids
 from ring.watcher import WaitingAlertScheduler
 
@@ -280,14 +279,10 @@ class RingApp(App[None]):
             cur = next((s for s in self._sessions if s.session_id == self._focused_sid), None)
             if cur is None or cur.status is not Status.WAITING:
                 self._focused_sid = None
+        # 系統通知（toast）改由 ``ring hook`` 在事件當下發出（見 hook._ring_waiting_now）；
+        # 這裡只留 TUI 自己的 in-app 響鈴 / 訊息列與醒目標記，不重複發系統通知。
         alerts = self._alerts.feed(self._sessions)
         self._ring_on_waiting_alerts(alerts)
-        try:
-            hint = notify_waiting(alerts)
-            if hint:
-                self.notify(hint, timeout=10)
-        except Exception:
-            pass
         self.sub_title = _header(len(self._sessions), len(running_agent_pids()))
         labels = load_labels()
         table.clear()