ring-cli 0.14.2__tar.gz → 0.15.0__tar.gz

{ring_cli-0.14.2 → ring_cli-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ring-cli
-Version: 0.14.2
+Version: 0.15.0
 Summary: RiNG — Realtime Instance Notification Grid for active agent CLI sessions.
 Keywords: claude-code,codex,ollama,llama-cpp,tui,dashboard,session,monitor,rich
 Author: Wei Lee
@@ -47,7 +47,8 @@ When several Claude Code, Codex, or local-model sessions are running, RiNG shows
 
 ## What It Does
 
-- **One board for session state**: built-in sources for Claude Code, Codex, Ollama, and llama.cpp.
+- **One board for session state**: built-in sources for Claude Code and Codex, plus process-liveness
+  detection for interactive Ollama and llama.cpp CLIs.
 - **Puts waiting sessions first**: shows what 🔴 sessions need and sends desktop or phone notifications.
 - **Returns you to the right terminal**: focuses tmux, iTerm2, Terminal.app, Neovim terminals, or Linux X11 windows from the TUI.
 - **Avoids an extra context switch**: reply to permission requests in supported terminals and assign session names from the board.

{ring_cli-0.14.2 → ring_cli-0.15.0}/README.en.md

@@ -21,7 +21,8 @@ When several Claude Code, Codex, or local-model sessions are running, RiNG shows
 
 ## What It Does
 
-- **One board for session state**: built-in sources for Claude Code, Codex, Ollama, and llama.cpp.
+- **One board for session state**: built-in sources for Claude Code and Codex, plus process-liveness
+  detection for interactive Ollama and llama.cpp CLIs.
 - **Puts waiting sessions first**: shows what 🔴 sessions need and sends desktop or phone notifications.
 - **Returns you to the right terminal**: focuses tmux, iTerm2, Terminal.app, Neovim terminals, or Linux X11 windows from the TUI.
 - **Avoids an extra context switch**: reply to permission requests in supported terminals and assign session names from the board.

{ring_cli-0.14.2 → ring_cli-0.15.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ring-cli"
-version = "0.14.2"
+version = "0.15.0"
 description = "RiNG — Realtime Instance Notification Grid for active agent CLI sessions."
 readme = "README.en.md"
 requires-python = ">=3.13"

{ring_cli-0.14.2 → ring_cli-0.15.0}/pyproject.toml.orig

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

{ring_cli-0.14.2 → ring_cli-0.15.0}/src/ring/commands/doctor.py

@@ -37,6 +37,11 @@ def run_doctor(args: list[str]) -> int:
     for src in src_list:
         try:
             found = src.discover()
+            diagnostic = getattr(src, "diagnostic_issue", None)
+            issue = diagnostic() if callable(diagnostic) else ""
+            if issue:
+                print(f"  {src.name:<{width_src}}  {_('偵測失敗')} ({issue})")
+                continue
             n = len(found)
             status_str = _("活著")
             count_str = _("偵測到 {n} 個 session", n=n)

{ring_cli-0.14.2 → ring_cli-0.15.0}/src/ring/permission.py

@@ -42,8 +42,9 @@ _SEPARATOR_RE = re.compile(r"^\s*─{10,}\s*$")
 # 聊天輸入框的提示列：「❯ <內容>」。誤送時數字會出現在這裡。
 _INPUT_LINE_RE = re.compile(r"^\s*❯\s*(.+?)\s*$")
 
-# 送出數字後等 UI 反應的秒數，之後再抓一次畫面驗證。
+# 送出數字後驗證 UI 反應的最長秒數；期間短輪詢，對話框一消失就提早完成。
 _VERIFY_DELAY = 0.4
+_VERIFY_POLL_INTERVAL = 0.05
 
 
 @dataclass(frozen=True)
@@ -304,8 +305,9 @@ def send_permission_reply(
     1. 再 capture 一次：對話框不在 → ``NO_DIALOG``；跟 ``expected`` 不同 → ``CHANGED``。
        兩者都**不送鍵**（使用者在浮層裡想的期間，對話框可能已被本人回掉或換內容）。
     2. 送單一數字（不帶 Enter）。
-    3. 等 ``delay`` 秒再 capture 驗證：對話框消失 → ``OK``；數字落進輸入框 → 補
-       Backspace、``MISFIRE``；同一個對話框還在 → ``STILL_PRESENT``。
+    3. 最多用 ``delay`` 秒短輪詢 capture：對話框一消失就提早回 ``OK``；數字落進
+       輸入框 → 補 Backspace、``MISFIRE``；期限到仍是同一個對話框 →
+       ``STILL_PRESENT``。
     """
     if not any(number == n for n, _text in expected.options):
         return ReplyOutcome.CHANGED  # 編號不在選項裡，視同對話框對不上，不送
@@ -319,16 +321,20 @@ def send_permission_reply(
         return ReplyOutcome.CHANGED
     if not backend.send_digit(str(number)):
         return ReplyOutcome.SEND_FAILED
-    time.sleep(delay)
-    after = backend.capture()
-    if after is None:
-        return ReplyOutcome.UNVERIFIED
-    after_dialog = parse_permission_dialog(after)
-    if after_dialog is None:
-        if digit_in_input_line(after, str(number)):
-            backend.send_backspace()
-            return ReplyOutcome.MISFIRE
-        return ReplyOutcome.OK
-    if after_dialog == expected:
-        return ReplyOutcome.STILL_PRESENT
-    return ReplyOutcome.OK  # 對話框換成下一個請求 → 原請求已被回覆
+    deadline = time.monotonic() + max(0.0, delay)
+    while True:
+        after = backend.capture()
+        if after is not None:
+            after_dialog = parse_permission_dialog(after)
+            if after_dialog is None:
+                if digit_in_input_line(after, str(number)):
+                    backend.send_backspace()
+                    return ReplyOutcome.MISFIRE
+                return ReplyOutcome.OK
+            if after_dialog != expected:
+                return ReplyOutcome.OK  # 對話框換成下一個請求 → 原請求已被回覆
+
+        remaining = deadline - time.monotonic()
+        if remaining <= 0:
+            return ReplyOutcome.UNVERIFIED if after is None else ReplyOutcome.STILL_PRESENT
+        time.sleep(min(_VERIFY_POLL_INTERVAL, remaining))

{ring_cli-0.14.2 → ring_cli-0.15.0}/src/ring/registry.py

@@ -455,6 +455,7 @@ def _is_bare_session_start_row(
 
 _tmux_cache: tuple[float, dict[str, str]] = (-1.0, {})
 _tmux_panes_cache: tuple[float, list[TmuxPane]] = (-1.0, [])
+_process_rows_cache: tuple[float, dict[int, tuple[int, str]]] = (-1.0, {})
 
 
 @dataclass(frozen=True)
@@ -530,7 +531,11 @@ def _tmux_pane_targets() -> dict[str, str]:
 
 
 def _process_rows() -> dict[int, tuple[int, str]]:
-    """pid → (ppid, args)。給 scan-only tmux pane process-tree 消歧用。"""
+    """pid → (ppid, args)。給 scan-only tmux pane process-tree 消歧用；同輪共用短快取。"""
+    global _process_rows_cache
+    now = time.monotonic()
+    if 0.0 <= now - _process_rows_cache[0] <= _SUBPROCESS_CACHE_TTL:
+        return _process_rows_cache[1]
     try:
         out = subprocess.run(["ps", "-Ao", "pid=,ppid=,args="], capture_output=True, text=True, timeout=3).stdout
     except (OSError, subprocess.SubprocessError):
@@ -546,6 +551,7 @@ def _process_rows() -> dict[int, tuple[int, str]]:
         except ValueError:
             continue
         rows[pid] = (ppid, parts[2] if len(parts) == 3 else "")
+    _process_rows_cache = (now, rows)
     return rows
 
 
@@ -584,6 +590,20 @@ def _tmux_process_tree_targets(sessions: list[Session]) -> dict[str, str]:
         pids = _descendant_pids(pane.pane_pid, rows)
         if not pids:
             continue
+        # local AI 沒有 transcript session id 可放進 argv，但 session id 自帶真實 pid。
+        # 直接用 pane process tree 對 pid，比同 cwd 依序猜 pane 精準。
+        for s in candidates:
+            if s.session_id in result:
+                continue
+            prefix = f"{s.provider}:pid-"
+            if not s.session_id.startswith(prefix):
+                continue
+            try:
+                process_pid = int(s.session_id[len(prefix) :])
+            except ValueError:
+                continue
+            if process_pid in pids:
+                result[s.session_id] = pane.target
         args_text = "\n".join(rows[pid][1] for pid in pids if pid in rows)
         if not args_text:
             continue
@@ -602,6 +622,8 @@ _codex_pids_cache: tuple[float, list[int]] = (-1.0, [])
 _ps_claude_snapshot_cache: tuple[float, str] = (-1.0, "")
 _ps_codex_snapshot_cache: tuple[float, str] = (-1.0, "")
 _bg_agent_session_ids_cache: tuple[float, frozenset[str]] = (-1.0, frozenset())
+_claude_procs_cache: tuple[float, list[tuple[str, str]]] = (-1.0, [])
+_codex_procs_cache: tuple[float, list[tuple[str, str]]] = (-1.0, [])
 
 # args 內任一出現即可判定「這是 claude 安裝二進位在跑」的路徑標記。ps comm 對
 # daemon-exec 的二進位常被截斷（如 `/Users/weilee/.l`），單看 comm 不可靠。
@@ -1061,6 +1083,10 @@ def _claude_procs() -> list[tuple[str, str]] | None:
     「沒有任何 claude process」處理。批次呼叫成功但個別 pid 沒查到 cwd/tty（剛死）
     不算未知，那個 pid 直接不貢獻一列，語意與逐 pid 版本一致。
     """
+    global _claude_procs_cache
+    now = time.monotonic()
+    if 0.0 <= now - _claude_procs_cache[0] <= _SUBPROCESS_CACHE_TTL:
+        return _claude_procs_cache[1]
     pids = running_foreground_claude_pids()
     if pids is None:
         return None
@@ -1075,6 +1101,7 @@ def _claude_procs() -> list[tuple[str, str]] | None:
         cwd = cwd_by_pid.get(pid, "")
         if cwd:
             procs.append((cwd, tty_by_pid.get(pid, "")))
+    _claude_procs_cache = (now, procs)
     return procs
 
 
@@ -1083,6 +1110,10 @@ def _codex_procs() -> list[tuple[str, str]] | None:
 
     cwd／tty 各只批次查一次，理由與 ``_claude_procs`` 相同。
     """
+    global _codex_procs_cache
+    now = time.monotonic()
+    if 0.0 <= now - _codex_procs_cache[0] <= _SUBPROCESS_CACHE_TTL:
+        return _codex_procs_cache[1]
     pids = running_codex_pids()
     if pids is None:
         return None
@@ -1097,6 +1128,7 @@ def _codex_procs() -> list[tuple[str, str]] | None:
         cwd = cwd_by_pid.get(pid, "")
         if cwd:
             procs.append((cwd, tty_by_pid.get(pid, "")))
+    _codex_procs_cache = (now, procs)
     return procs
 
 

{ring_cli-0.14.2 → ring_cli-0.15.0}/src/ring/sources/local_llm.py

@@ -1,13 +1,15 @@
 """Ollama 與 llama.cpp 互動式 CLI 的 zero-config 行程來源。
 
 兩者都沒有可供 RiNG 讀取的 session transcript；這個來源因此只承諾行程層級的
-存活資訊。只收有控制終端的 ``ollama run`` / ``llama-cli``，刻意排除長駐 API
-server，避免把基礎設施誤當成「需要使用者回去處理」的 session。
+存活資訊。只收有控制終端的 ``ollama run`` / ``llama-cli`` / ``llama cli``，
+刻意排除長駐 API server，避免把基礎設施誤當成「需要使用者回去處理」的 session。
 """
 
 from __future__ import annotations
 
 import os
+import shlex
+import shutil
 import subprocess
 import time
 from dataclasses import dataclass
@@ -29,6 +31,7 @@ class LocalLLMProcess:
 
 
 _process_cache: tuple[float, list[LocalLLMProcess] | None] = (-1.0, [])
+_last_scan_error = ""
 
 
 def _elapsed_seconds(value: str) -> int | None:
@@ -48,8 +51,13 @@ def _elapsed_seconds(value: str) -> int | None:
 
 
 def _command_tokens(comm: str, args: str) -> tuple[str, list[str]]:
-    """找出實際 executable 與其後參數；ps args 不保證保留 shell quoting。"""
-    tokens = args.split()
+    """找出實際 executable 與其後參數；有 quoting 時盡量保留含空格的參數。"""
+    try:
+        tokens = shlex.split(args)
+    except ValueError:
+        # ``ps args`` 不保證保留完整 shell quoting；遇到截斷引號時仍退回原本的
+        # whitespace split，至少不要讓整輪 process discovery 失敗。
+        tokens = args.split()
     executable = os.path.basename(comm.strip())
     for index, token in enumerate(tokens):
         if os.path.basename(token) == executable:
@@ -57,28 +65,84 @@ def _command_tokens(comm: str, args: str) -> tuple[str, list[str]]:
     return executable, tokens[1:] if tokens else []
 
 
+def _ollama_model(argv: list[str]) -> str | None:
+    """從 ``ollama run`` argv 找模型；容忍 Cobra 把 flags 放在 MODEL 前面。"""
+    value_flags = {
+        "--dimensions",
+        "--format",
+        "--keepalive",
+        "--width",
+        "--height",
+        "--steps",
+        "--seed",
+        "--negative",
+    }
+    index = 1  # argv[0] == "run"
+    while index < len(argv):
+        token = argv[index]
+        if token == "--":
+            return argv[index + 1] if index + 1 < len(argv) else None
+        if token in value_flags:
+            index += 2
+            continue
+        if token == "--think":
+            index += 2 if index + 1 < len(argv) and argv[index + 1] in {"true", "false", "high", "medium", "low"} else 1
+            continue
+        if token.startswith("-"):
+            # ``--flag=value`` 與無值 boolean flag 都只佔一格；``--think`` 的值可省略，
+            # 不可無條件吞掉下一格的模型名稱。
+            index += 1
+            continue
+        return token
+    return None
+
+
+def _llama_model(argv: list[str], *, fallback: str = "llama-cli") -> str:
+    """從 llama.cpp argv 找模型來源；找不到時保留可辨識的 CLI 名稱。"""
+    model_flags = {
+        "-m",
+        "--model",
+        "-hf",
+        "-hfr",
+        "--hf-repo",
+        "-mu",
+        "--model-url",
+        "-dr",
+        "--docker-repo",
+    }
+    for index, token in enumerate(argv):
+        if token in model_flags and index + 1 < len(argv):
+            return argv[index + 1]
+        for flag in model_flags:
+            prefix = f"{flag}="
+            if token.startswith(prefix):
+                return token[len(prefix) :]
+    return fallback
+
+
 def _classify(comm: str, args: str) -> tuple[str, str] | None:
     executable, argv = _command_tokens(comm, args)
     if executable == "ollama":
-        if len(argv) < 2 or argv[0] != "run":
+        if not argv or argv[0] != "run" or (model := _ollama_model(argv)) is None:
             return None
-        return "ollama", argv[1]
+        return "ollama", model
     if executable == "llama-cli":
-        model_flags = {"-m", "--model", "-hf", "-hfr", "--hf-repo", "-mu", "--model-url"}
-        for index, token in enumerate(argv[:-1]):
-            if token in model_flags:
-                return "llama.cpp", argv[index + 1]
-        return "llama.cpp", "llama-cli"
+        return "llama.cpp", _llama_model(argv)
+    if executable == "llama" and argv and argv[0] in {"cli", "client"}:
+        return "llama.cpp", _llama_model(argv[1:], fallback=f"llama {argv[0]}")
     return None
 
 
 def _scan_processes() -> list[LocalLLMProcess] | None:
     """一次 ps + 一次批次 lsof 找出兩種本機互動 CLI；失敗以 ``None`` 表示未知。"""
-    global _process_cache
+    global _last_scan_error, _process_cache
     monotonic_now = time.monotonic()
     if 0 <= monotonic_now - _process_cache[0] <= _CACHE_TTL:
         return _process_cache[1]
 
+    if shutil.which("ps") is None:
+        _last_scan_error = "ps not found"
+        return None
     try:
         result = subprocess.run(
             ["ps", "-Ao", "pid=,tty=,etime=,comm=,args="],
@@ -86,9 +150,11 @@ def _scan_processes() -> list[LocalLLMProcess] | None:
             text=True,
             timeout=3,
         )
-    except (OSError, subprocess.SubprocessError):
+    except (OSError, subprocess.SubprocessError) as exc:
+        _last_scan_error = f"ps: {exc}"
         return None
     if result.returncode != 0:
+        _last_scan_error = f"ps exit {result.returncode}"
         return None
 
     now = time.time()
@@ -111,14 +177,19 @@ def _scan_processes() -> list[LocalLLMProcess] | None:
         provider, model = classified
         candidates.append((pid, tty, now - elapsed, provider, model))
 
+    if candidates and shutil.which("lsof") is None:
+        _last_scan_error = "lsof not found"
+        return None
     cwd_by_pid = registry._pids_cwd([pid for pid, *_rest in candidates])
     if cwd_by_pid is None:
+        _last_scan_error = "lsof scan failed"
         return None
     processes = [
         LocalLLMProcess(pid, provider, cwd, tty, started_at, model)
         for pid, tty, started_at, provider, model in candidates
         if (cwd := cwd_by_pid.get(pid, ""))
     ]
+    _last_scan_error = ""
     _process_cache = (monotonic_now, processes)
     return processes
 
@@ -152,6 +223,14 @@ class LocalLLMSource:
             if process.provider == self.name
         ]
 
+    def diagnostic_issue(self) -> str:
+        """最近一次掃描失敗原因；doctor 用，正常或尚無候選行程時為空。"""
+        if shutil.which("ps") is None:
+            return "ps not found"
+        if shutil.which("lsof") is None:
+            return "lsof not found"
+        return _last_scan_error
+
 
 ollama_source = LocalLLMSource("ollama")
 llama_cpp_source = LocalLLMSource("llama.cpp")

{ring_cli-0.14.2 → ring_cli-0.15.0}/src/ring/tui.py

@@ -9,6 +9,7 @@ p 就地回覆權限請求（tmux 內的 session）、a 切換是否顯示已離
 
 from __future__ import annotations
 
+import asyncio
 import os
 import time
 from typing import ClassVar
@@ -18,6 +19,7 @@ from textual import events
 from textual.app import App, ComposeResult
 from textual.binding import Binding, BindingType
 from textual.containers import Vertical
+from textual.coordinate import Coordinate
 from textual.screen import ModalScreen
 from textual.widgets import DataTable, Footer, Header, Input, OptionList, Static
 
@@ -201,6 +203,8 @@ class RingApp(App[None]):
         # p 已確認終端對話框消失，但 provider 尚未送後續 hook 時，別讓同一筆舊
         # PermissionRequest 又把列拉回 WAITING。value 是已回覆那筆 row 的 last_active revision。
         self._permission_acks: dict[str, float] = {}
+        # send/capture 會碰 subprocess / AppleScript，放背景執行；同一個 session 同時只送一次。
+        self._permission_replies_inflight: set[str] = set()
 
     @staticmethod
     def _detect_own_tty() -> str:
@@ -390,6 +394,18 @@ class RingApp(App[None]):
             parts.append(_("queue: {n}", n=count))
         return "  ｜  " + "  ".join(parts) if parts else ""
 
+    def _status_cell(self, s: Session) -> Text:
+        """建立狀態欄 cell；完整刷新與權限回覆後的局部更新共用。"""
+        focused = s.session_id == self._focused_sid
+        marker = "👉 " if focused else ""
+        style = f"reverse {_STATUS_STYLE[s.status]}" if focused else _STATUS_STYLE[s.status]
+        suffix = f" {s.waiting_icon}" if s.status is Status.WAITING and s.waiting_icon else ""
+        if s.hook_stale:
+            suffix += " ⚠"
+        if s.kind == "agent":
+            suffix += " ⚙"
+        return Text(f"{marker}{s.status.marker} {status_label(s.status)}{suffix}", style=style)
+
     def _reload(self) -> None:
         # 每次刷新都續寫 presence，避免 TUI 開超過 TTL 後 `ring focus` 誤判 TUI 沒在跑、
         # 退回去跳 session 自己的終端（scan 模式常沒 tty → 跳轉失敗）。
@@ -424,19 +440,10 @@ class RingApp(App[None]):
         labels = load_labels()
         table.clear()
         for s in self._sessions:
-            focused = s.session_id == self._focused_sid
-            marker = "👉 " if focused else ""
-            style = f"reverse {_STATUS_STYLE[s.status]}" if focused else _STATUS_STYLE[s.status]
-            suffix = f" {s.waiting_icon}" if s.status is Status.WAITING and s.waiting_icon else ""
-            if s.hook_stale:
-                suffix += " ⚠"
-            if s.kind == "agent":
-                suffix += " ⚙"
-            status_cell = Text(f"{marker}{s.status.marker} {status_label(s.status)}{suffix}", style=style)
             progress = f"{s.todo[0]}/{s.todo[1]}" if s.todo else "·"
             loc_cell = f"📍{_middle_truncate(s.location, _LOC_MAX)}"
             project_cell = labeled_project(s.project, labels.get(s.session_id, ""))
-            cells: list[object] = [status_cell]
+            cells: list[object] = [self._status_cell(s)]
             if self._show_tool:
                 cells.append(provider_label(s.provider))
             cells += [project_cell, progress, _rel(s.idle_for), loc_cell, s.last_action]
@@ -599,7 +606,14 @@ class RingApp(App[None]):
         def _submit(number: int | None) -> None:
             if number is None:
                 return  # Esc 取消，不送
-            self._finish_permission_reply(s, name, backend, dialog, number)
+            if s.session_id in self._permission_replies_inflight:
+                return
+            self._permission_replies_inflight.add(s.session_id)
+            self._set_status(_("… {project}：正在回覆權限", project=name))
+            self.run_worker(
+                self._finish_permission_reply(s, name, backend, dialog, number),
+                group="permission-reply",
+            )
 
         self.push_screen(_PermissionModal(name, dialog), _submit)
 
@@ -608,7 +622,7 @@ class RingApp(App[None]):
         self._set_status(text)
         self.notify(text, severity="information" if ok else "warning", timeout=8)
 
-    def _finish_permission_reply(
+    async def _finish_permission_reply(
         self,
         s: Session,
         name: str,
@@ -616,15 +630,30 @@ class RingApp(App[None]):
         dialog: permission.PermissionDialog,
         number: int,
     ) -> None:
-        """浮層選定後：再驗證一次、送鍵、依結果回報（見 permission.send_permission_reply）。"""
-        outcome = permission.send_permission_reply(backend, dialog, number)
+        """在背景驗證／送鍵，避免 subprocess 與等待時間凍結 Textual 事件迴圈。"""
+        try:
+            outcome = await asyncio.to_thread(permission.send_permission_reply, backend, dialog, number)
+        finally:
+            self._permission_replies_inflight.discard(s.session_id)
         option = next((f"{n}. {text}" for n, text in dialog.options if n == number), str(number))
         if outcome is permission.ReplyOutcome.OK:
             if s.session_id == self._focused_sid:
                 self._focused_sid = None  # 已就地回覆，解除通知標記
             self._permission_acks[s.session_id] = s.last_active
+            # 先直接更新現有資料，別為了一筆 acknowledgment 同步重掃所有 process。
+            # 下一次既有輪詢仍會正常全量同步、重排表格。
+            row = next(
+                ((idx, current) for idx, current in enumerate(self._sessions) if current.session_id == s.session_id),
+                None,
+            )
+            if row is not None and row[1].last_active <= s.last_active:
+                idx, current = row
+                current.status = Status.WORKING
+                current.waiting_kind = ""
+                current.waiting_detail = ""
+                self.query_one(DataTable).update_cell_at(Coordinate(idx, 0), self._status_cell(current))
             self._toast(_("→ {project}：已回覆權限（{option}）", project=name, option=option), ok=True)
-            self._reload()
+            self._update_detail()
             return
         messages = {
             permission.ReplyOutcome.NO_DIALOG: _("{project}：權限對話框已不在，未送出任何按鍵", project=name),