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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ring-cli
-Version: 0.15.0
+Version: 0.16.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
@@ -50,7 +50,7 @@ When several Claude Code, Codex, or local-model sessions are running, RiNG shows
 - **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.
+- **Returns you to the right terminal**: focuses tmux, iTerm2, Terminal.app, kitty, 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.
 - **Fits existing workflows**: status-bar output, JSON, a provider-neutral hook, and plugin extension points.
 

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

@@ -24,7 +24,7 @@ When several Claude Code, Codex, or local-model sessions are running, RiNG shows
 - **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.
+- **Returns you to the right terminal**: focuses tmux, iTerm2, Terminal.app, kitty, 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.
 - **Fits existing workflows**: status-bar output, JSON, a provider-neutral hook, and plugin extension points.
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "ring-cli"
-version = "0.15.0"
+version = "0.16.0"
 description = "RiNG — Realtime Instance Notification Grid for active agent CLI sessions."
 readme = "README.en.md"
 requires-python = ">=3.13"
@@ -106,13 +106,23 @@ select = [
     "I",
     "UP",
     "RUF",
+    "B",
+    "C4",
+    "SIM",
+    "PTH",
+    "ARG",
+    "TRY",
 ]
 ignore = [
     "RUF001",
     "RUF002",
     "RUF003",
+    "TRY003",
 ]
 
+[tool.ruff.lint.per-file-ignores]
+"tests/**" = ["ARG"]
+
 [tool.codespell]
 skip = ".git*,*.lock"
 check-hidden = true
@@ -152,16 +162,20 @@ sequence = [
     "cover",
 ]
 
+[tool.poe.tasks.hooks]
+help = "Run every pre-commit hook against all files"
+cmd = "prek run --all-files"
+
+[tool.poe.tasks.hooks.env]
+SKIP = "no-commit-to-branch"
+
 [tool.poe.tasks.ci]
 help = "Run all tasks in CI"
 sequence = [
-    { cmd = "prek run --all-files" },
+    "hooks",
     "cover",
 ]
 
-[tool.poe.tasks.ci.env]
-SKIP = "no-commit-to-branch"
-
 [tool.poe.tasks.setup-pre-commit]
 help = "Install pre-commit hooks"
 cmd = "prek install"
@@ -204,9 +218,13 @@ addopts = [
 
 [tool.coverage.run]
 source = ["ring"]
+branch = true
 
 [tool.coverage.paths]
 source = [
     "src/ring",
     "*/ring",
 ]
+
+[tool.coverage.report]
+fail_under = 85

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

@@ -2,7 +2,7 @@
 # import 的 module（見 [tool.uv.build-backend] module-name）與 CLI 指令仍是 `ring`。
 [project]
 name = "ring-cli"
-version = "0.15.0"
+version = "0.16.0"
 description = "RiNG — Realtime Instance Notification Grid for active agent CLI sessions."
 readme = "README.en.md"
 requires-python = ">=3.13"
@@ -81,9 +81,33 @@ target-version = "py313"
 line-length = 120
 
 [tool.ruff.lint]
-select = ["E", "F", "W", "I", "UP", "RUF"]
-# 本專案刻意大量使用台灣漢語註解／字串，關掉「模糊 unicode 字元」誤報（全形標點等）。
-ignore = ["RUF001", "RUF002", "RUF003"]
+select = [
+  "E",
+  "F",
+  "W",
+  "I",
+  "UP",
+  "RUF",
+  "B",
+  "C4",
+  "SIM",
+  "PTH",
+  "ARG",
+  "TRY",
+]
+ignore = [
+  # 本專案刻意大量使用台灣漢語註解／字串，關掉「模糊 unicode 字元」誤報（全形標點等）。
+  "RUF001",
+  "RUF002",
+  "RUF003",
+  # raise-vanilla-args：ring 是 CLI，例外訊息就是給人看的字串，
+  # 為此替每個 raise 造一個自訂例外類別並不划算。
+  "TRY003",
+]
+
+[tool.ruff.lint.per-file-ignores]
+# monkeypatch 的替身要符合被替換函式的簽名，未使用的參數是刻意保留的。
+"tests/**" = ["ARG"]
 
 [tool.codespell]
 skip = '.git*,*.lock'
@@ -107,9 +131,13 @@ cover.cmd = "pytest --cov=ring --cov-report=term-missing --cov-report=xml:covera
 all.help = "Run all tasks"
 all.sequence = ["format", "lint", "cover"]
 
+hooks.help = "Run every pre-commit hook against all files"
+hooks.cmd = "prek run --all-files"
+# no-commit-to-branch 只對本機 commit 有意義；CI 是 detached HEAD，跑它只會誤擋。
+hooks.env = { SKIP = "no-commit-to-branch" }
+
 ci.help = "Run all tasks in CI"
-ci.sequence = [{ cmd = "prek run --all-files" }, "cover"]
-ci.env = { SKIP = "no-commit-to-branch" }
+ci.sequence = ["hooks", "cover"]
 
 setup-pre-commit.help = "Install pre-commit hooks"
 setup-pre-commit.cmd = "prek install"
@@ -143,6 +171,12 @@ addopts = ["-n", "auto", "--dist=loadfile"]
 
 [tool.coverage.run]
 source = ["ring"]
+branch = true
 
 [tool.coverage.paths]
 source = ["src/ring", "*/ring"]
+
+[tool.coverage.report]
+# 實測（開 branch coverage、補完 focus/neovim 測試後）總覆蓋率 89%，
+# 門檻壓在 85 留一點正常波動的空間。
+fail_under = 85

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/cli.py

@@ -10,6 +10,7 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import json
 import sys
 import time
@@ -408,10 +409,8 @@ def _watch_flush_if_due() -> None:
     ``test_run_hook_does_not_flush_while_quiet_active`` 同機制），這裡不需另外判斷。
     失敗安靜吞掉，不影響看板本身。
     """
-    try:
+    with contextlib.suppress(Exception):
         flush_if_due()
-    except Exception:
-        pass
 
 
 def watch(interval: float, count: int, show_all: bool, show_legend: bool) -> int:

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

@@ -7,6 +7,7 @@ import sys
 
 from ring.commands._args import strip_lang
 from ring.config import CONFIG_PATH, get_config
+from ring.focus.kitty import sockets as kitty_sockets
 from ring.gc import DEFAULT_OLDER_THAN_SECONDS
 from ring.gc import collect_candidates as gc_collect_candidates
 from ring.i18n import gettext as _
@@ -110,6 +111,20 @@ def run_doctor(args: list[str]) -> int:
         elif name_lower == "tmux":
             avail = shutil.which("tmux") is not None
             avail_str = _("可用") if avail else _("不可用（tmux 不在 PATH）")
+        elif name_lower == "kitty":
+            if shutil.which("kitty") is None:
+                avail_str = _("不可用（kitty 不在 PATH）")
+            elif not kitty_sockets():
+                avail_str = _("不可用（kitty remote control 沒開：kitty.conf 要設 allow_remote_control ＋ listen_on）")
+            else:
+                avail_str = _("可用")
+        elif name_lower == "linux-wm":
+            if not sys.platform.startswith("linux"):
+                avail_str = _("不可用（非 Linux）")
+            elif shutil.which("wmctrl") is None:
+                avail_str = _("不可用（wmctrl 不在 PATH）")
+            else:
+                avail_str = _("可用")
         elif shutil.which("osascript") is None:
             avail_str = _("不可用（osascript 不在 PATH）")
         else:

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/config.py

@@ -34,7 +34,7 @@
     notify_ntfy_url = "https://ntfy.sh/my-topic"   # 設了才啟用 ntfy 後端（推到手機）
     notify_webhook_url = "https://example.com/hook"  # 設了才啟用 webhook 後端（JSON POST）
     notify_also = ["ntfy"]            # 主後端之外「加發」的後端（例如桌面通知＋手機各一份）
-    focusers = ["Neovim", "tmux", "iTerm2", "Terminal", "linux-wm"]  # 跳轉嘗試順序；省略＝內建預設
+    focusers = ["Neovim", "tmux", "iTerm2", "Terminal", "kitty", "linux-wm"]  # 跳轉嘗試順序；省略＝內建預設
     plugins = ["my_ring_plugin"]      # 啟動時 import 的外部 plugin 模組（自行 register_*）
     debug_payload_log = false         # 診斷用：記錄 hook 收到的原始 payload
                                       #   （見 payload_log.py，寫到 ~/.config/ring/hook_payloads.jsonl）；

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/focus/__init__.py

@@ -3,7 +3,7 @@
 每個終端是一個 ``Focuser``（見 ``base.Focuser``）：core 不認識任何具體終端，
 只依序問每個 focuser「這個 session 歸不歸你管」。要支援新終端＝寫一個模組、
 ``register_focuser()`` 註冊，core 零改動。內建：Neovim terminal / tmux / iTerm2 /
-Terminal.app / Linux X11 視窗（wmctrl，best-effort fallback）。
+Terminal.app / kitty（remote control socket）/ Linux X11 視窗（wmctrl，best-effort fallback）。
 """
 
 from __future__ import annotations
@@ -11,6 +11,7 @@ from __future__ import annotations
 from ring.config import get_config
 from ring.focus.base import Focuser
 from ring.focus.iterm2 import focuser as _iterm2
+from ring.focus.kitty import focuser as _kitty
 from ring.focus.linux_wm import focuser as _linux_wm
 from ring.focus.neovim import focuser as _neovim
 from ring.focus.terminal import focuser as _terminal
@@ -20,12 +21,13 @@ from ring.i18n import gettext as _
 from ring.registry import Session, Status
 
 # 內建 focuser。順序可由 config 的 `focusers` 覆寫。Neovim 先切內層 terminal buffer，
-# 再由 tmux / macOS app / linux-wm 把外層帶到前景。
+# 再由 tmux / macOS app / kitty / linux-wm 把外層帶到前景。
 _BUILTIN: dict[str, Focuser] = {
     "Neovim": _neovim,
     "tmux": _tmux,
     "iTerm2": _iterm2,
     "Terminal": _terminal,
+    "kitty": _kitty,
     "linux-wm": _linux_wm,
 }
 
@@ -99,8 +101,17 @@ def jump(session: Session) -> tuple[bool, str]:
     if failures:
         return _done(False, "; ".join(failures))
     if session.tty:
-        return _done(False, _("找不到這個終端分頁（可能已關閉；刷新後若仍存在，請裝 hook 取得更精準狀態）"))
-    return _done(False, _("沒有 focuser 接得住（裝 hook，或一個專案只開一個 session 才測得到 tty）"))
+        return _done(
+            False,
+            _("找不到這個終端分頁（可能已關閉；刷新後若仍在，跑 `ring doctor` 檢查 focuser 與 hook 狀態）"),
+        )
+    return _done(
+        False,
+        _(
+            "沒有 focuser 接得住（跑 `ring doctor` 看哪些 focuser 可用；"
+            "裝 hook、或一個專案只開一個 session 才測得到 tty）"
+        ),
+    )
 
 
 __all__ = ["Focuser", "focusers", "jump", "register_focuser"]

ring_cli-0.16.0/src/ring/focus/kitty.py

@@ -0,0 +1,196 @@
+"""kitty 終端 focuser：透過 remote control socket 精準跳到分頁。
+
+定位：kitty 官方沒有 tmux 那種「切換 client」指令，也沒有 iTerm2 / Terminal.app 的 AppleScript
+可查詢；能精準定位到分頁的唯一途徑是它的 remote control 協定——連上 unix socket、列出視窗、
+比對 tty，再叫它 focus-window。
+
+機制與限制（誠實標明）：
+- **kitty 預設關閉 remote control**，要在 kitty.conf 設 ``allow_remote_control`` 為
+  ``yes`` / ``socket`` / ``socket-only``，並設 ``listen_on``（例：
+  ``listen_on unix:/tmp/kitty-{kitty_pid}``）才會建立 socket；沒設就會安靜地跳過（回 ``None``），
+  不會顯示錯誤。
+- 只掃 ``/tmp`` 底下的 ``kitty-*`` socket（外加 ``$KITTY_LISTEN_ON`` 這條環境變數，但 RiNG
+  通常跑在 kitty 之外，這個變數多半是空的）；``listen_on`` 指到別的目錄就配不到。
+- 逐個 socket 問一輪：多個 kitty 實例的 socket 互不可見，沒有統一查詢點。
+- 用 ``window["pid"]``／``window["foreground_processes"][]["pid"]`` 反查 tty 跟 session 比對，
+  找到後呼叫 ``focus-window``；macOS 上固定補一次 ``osascript activate``（視窗縮到 Dock 時
+  ``focus-window`` 只負責取消縮小、不負責把整個 app 帶到最前，已實測）。
+- **Linux 端未實測**：``focus-window`` 底層走同一套 remote-control 協定，理論上等同
+  ``wmctrl -i -a`` 的效果，但這只是推論。
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import shutil
+import stat
+import subprocess
+import sys
+from pathlib import Path
+from typing import Any
+
+from ring.osascript import osascript
+from ring.registry import Session
+
+_SOCKET_DIRS: tuple[Path, ...] = (Path("/tmp"),)  # 之後要支援自訂 listen_on 目錄就加在這裡
+_MAX_SOCKETS = 8
+
+
+def _run(cmd: list[str]) -> subprocess.CompletedProcess[str] | None:
+    """跑一個唯讀／聚焦指令，成功回 ``CompletedProcess``（不論 returncode），失敗回 ``None``。"""
+    try:
+        return subprocess.run(cmd, capture_output=True, text=True, timeout=3)
+    except (OSError, subprocess.SubprocessError):
+        return None
+
+
+def _is_socket(path: Path) -> bool:
+    try:
+        return stat.S_ISSOCK(path.lstat().st_mode)
+    except OSError:
+        return False
+
+
+def sockets() -> list[str]:
+    """候選 kitty remote-control socket 路徑，依 mtime 新到舊排序，上限 ``_MAX_SOCKETS``。
+
+    候選來源：``$KITTY_LISTEN_ON``（去掉 ``unix:`` 前綴、需為絕對路徑）＋ ``/tmp/kitty-*`` glob。
+    一律用 ``stat.S_ISSOCK`` 過濾——``/tmp`` 下可能有 ``kitty-iterm-migration``、
+    ``kitty-swift-module-cache`` 這種同前綴的普通目錄，不濾會誤連。呼叫時才做 I/O，
+    模組 import 時不碰檔案系統。
+    """
+    candidates: list[Path] = []
+    listen_on = os.environ.get("KITTY_LISTEN_ON", "")
+    if listen_on.startswith("unix:"):
+        listen_on = listen_on.removeprefix("unix:")
+    if listen_on and Path(listen_on).is_absolute():
+        candidates.append(Path(listen_on))
+    for socket_dir in _SOCKET_DIRS:
+        try:
+            candidates.extend(sorted(socket_dir.glob("kitty-*")))
+        except OSError:
+            continue
+
+    seen: set[Path] = set()
+    found: list[tuple[float, Path]] = []
+    for path in candidates:
+        if path in seen or not _is_socket(path):
+            continue
+        seen.add(path)
+        try:
+            mtime = path.stat().st_mtime
+        except OSError:
+            continue
+        found.append((mtime, path))
+    found.sort(key=lambda item: item[0], reverse=True)
+    return [str(path) for _mtime, path in found[:_MAX_SOCKETS]]
+
+
+def _pid_tty_map() -> dict[int, str]:
+    """一次性 ``ps -eo pid=,tty=`` 快照：pid → ``/dev/ttyXXX``（``?``/``??`` 視為無 tty）。"""
+    result = _run(["ps", "-eo", "pid=,tty="])
+    table: dict[int, str] = {}
+    if result is None or result.returncode != 0:
+        return table
+    for line in result.stdout.splitlines():
+        parts = line.split()
+        if len(parts) != 2:
+            continue
+        try:
+            pid = int(parts[0])
+        except ValueError:
+            continue
+        raw_tty = parts[1]
+        if not raw_tty or raw_tty in {"?", "??"}:
+            continue
+        table[pid] = raw_tty if raw_tty.startswith("/dev/") else f"/dev/{raw_tty}"
+    return table
+
+
+def _window_matches_tty(window: dict[str, Any], tty: str, pid_tty: dict[int, str]) -> bool:
+    pids: list[Any] = [window.get("pid")]
+    foreground = window.get("foreground_processes")
+    if isinstance(foreground, list):
+        for proc in foreground:
+            if isinstance(proc, dict):
+                pids.append(proc.get("pid"))
+    return any(isinstance(pid, int) and pid_tty.get(pid) == tty for pid in pids)
+
+
+def _match_window(os_windows: Any, tty: str, pid_tty: dict[int, str]) -> int | None:
+    """走訪 ``kitty @ ls`` 的 JSON（OS window → tabs[] → windows[]），回第一個比對到 tty 的 window id。"""
+    if not isinstance(os_windows, list):
+        return None
+    for os_window in os_windows:
+        if not isinstance(os_window, dict):
+            continue
+        tabs = os_window.get("tabs")
+        if not isinstance(tabs, list):
+            continue
+        for tab in tabs:
+            if not isinstance(tab, dict):
+                continue
+            windows = tab.get("windows")
+            if not isinstance(windows, list):
+                continue
+            for window in windows:
+                if not isinstance(window, dict):
+                    continue
+                if _window_matches_tty(window, tty, pid_tty):
+                    win_id = window.get("id")
+                    if isinstance(win_id, int):
+                        return win_id
+    return None
+
+
+def resolve_window(tty: str) -> tuple[str, int] | None:
+    """tty → ``(socket 路徑, kitty window id)``；沒裝 kitty／沒 socket／配不到 → ``None``。
+
+    這段定位邏輯同時給 ``focus``（聚焦分頁）與 ``permission``（抓畫面／送鍵）兩邊共用，
+    kitty ``ls`` 的 JSON 形狀知識只此一份，兩邊不重寫第二份。
+    """
+    if not tty or shutil.which("kitty") is None:
+        return None
+    socks = sockets()
+    if not socks:
+        return None
+
+    pid_tty = _pid_tty_map()
+
+    for sock in socks:
+        result = _run(["kitty", "@", "--to", f"unix:{sock}", "ls"])
+        if result is None or result.returncode != 0:
+            continue
+        try:
+            os_windows = json.loads(result.stdout)
+        except json.JSONDecodeError:
+            continue
+        win_id = _match_window(os_windows, tty, pid_tty)
+        if win_id is None:
+            continue
+        return sock, win_id
+    return None
+
+
+class KittyFocuser:
+    name = "kitty"
+
+    def try_focus(self, session: Session) -> tuple[bool, str] | None:
+        tty = session.tty
+        if not tty:
+            return None
+        resolved = resolve_window(tty)
+        if resolved is None:
+            return None
+        sock, win_id = resolved
+
+        focus_result = _run(["kitty", "@", "--to", f"unix:{sock}", "focus-window", "--match", f"id:{win_id}"])
+        if focus_result is None or focus_result.returncode != 0:
+            return False, f"kitty focus-window failed for id:{win_id}"
+        if sys.platform == "darwin" and shutil.which("osascript"):
+            osascript('tell application "kitty" to activate')
+        return True, f"{self.name} {win_id}"
+
+
+focuser = KittyFocuser()

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/focus/neovim.py

@@ -9,7 +9,6 @@ iTerm2 / Terminal.app 把外層 pane 或視窗帶到前景。
 from __future__ import annotations
 
 import json
-import os
 import re
 import subprocess
 import sys
@@ -57,7 +56,7 @@ def _process_table() -> tuple[dict[int, int], dict[int, str]]:
         except ValueError:
             continue
         parents[pid] = ppid
-        commands[pid] = os.path.basename(parts[2])
+        commands[pid] = Path(parts[2]).name
     return parents, commands
 
 

ring_cli-0.16.0/src/ring/focus/tmux.py

@@ -0,0 +1,74 @@
+"""tmux focuser：同一個 tmux server 直接 switch-client 切到那個 pane。
+
+成功後不中止 dispatcher（``continue_after_success``）：tmux 只能切 pane，換不了外層終端
+視窗本身有沒有浮到前景，所以讓 iTerm2 / Terminal.app / kitty / linux-wm 等外層 focuser
+接著跑，才有機會把視窗帶到前景（設計依據見 ``focus/base.py:8-9``）。
+"""
+
+from __future__ import annotations
+
+import shutil
+import subprocess
+
+from ring.registry import Session
+
+
+def _client_tty(tmux_session: str, target: str) -> str:
+    """查這個 tmux session 目前的 client tty，回填給外層 focuser 配對用。
+
+    多個 client attach 同一個 session 時取第一個非空值；查不到（沒有 client、指令失敗、
+    逾時）一律回空字串，呼叫端不得把這種情況當成 switch-client 失敗。
+    """
+    for cmd in (
+        ["tmux", "list-clients", "-t", tmux_session, "-F", "#{client_tty}"],
+        ["tmux", "display-message", "-p", "-t", target, "#{client_tty}"],
+    ):
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, timeout=3)
+        except (OSError, subprocess.SubprocessError):
+            continue
+        if result.returncode != 0:
+            continue
+        for line in result.stdout.splitlines():
+            line = line.strip()
+            if line:
+                return line
+    return ""
+
+
+class TmuxFocuser:
+    name = "tmux"
+    continue_after_success = True
+
+    def try_focus(self, session: Session) -> tuple[bool, str] | None:
+        target = session.tmux_target
+        if not target or not shutil.which("tmux"):
+            return None
+        tmux_session = target.split(":", 1)[0]
+        window = target.split(".", 1)[0]
+        ok = False
+        last_err = ""
+        for cmd in (
+            ["tmux", "switch-client", "-t", tmux_session],
+            ["tmux", "select-window", "-t", window],
+            ["tmux", "select-pane", "-t", target],
+        ):
+            try:
+                result = subprocess.run(cmd, capture_output=True, text=True, timeout=3)
+            except (OSError, subprocess.SubprocessError) as exc:
+                return False, str(exc)
+            if result.returncode == 0:
+                ok = True
+            else:
+                last_err = result.stderr.strip()
+        if not ok:
+            return False, last_err or "tmux switch failed"
+        # switch-client 之後，接上這個 tmux session 的 client 的 tty 就是那個終端視窗的 tty。
+        # 回填給後面的外層 focuser 配對用（同 neovim.py:176-179 的做法）。
+        client_tty = _client_tty(tmux_session, target)
+        if client_tty.startswith("/dev/"):
+            session.tty = client_tty
+        return True, f"tmux {target}"
+
+
+focuser = TmuxFocuser()

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/hook.py

@@ -120,7 +120,7 @@ def _ps_row(pid: int) -> tuple[int, str] | None:
 def _session_tty(process_names: tuple[str, ...]) -> str:
     """hook 是 agent CLI 的後代——往上找到 provider process，回它的控制終端 tty。
 
-    這是「session → 哪個終端」最精準的對應（不必靠 cwd 猜），給 iTerm2 跳轉用。
+    這是「session → 哪個終端」最精準的對應（不必靠 cwd 猜），給非-tmux 終端 focuser（iTerm2 等）跳轉用。
     """
     if not process_names:
         return ""
@@ -130,7 +130,7 @@ def _session_tty(process_names: tuple[str, ...]) -> str:
         if row is None:
             return ""
         ppid, comm = row
-        if os.path.basename(comm.strip()) in process_names:
+        if Path(comm.strip()).name in process_names:
             return _pid_tty(pid)
         if ppid <= 1:
             return ""
@@ -496,7 +496,7 @@ def _is_ring_hook_command(cmd: str) -> bool:
     tokens = cmd.split()
     if len(tokens) < 2:
         return False
-    return os.path.basename(tokens[0]) == "ring" and tokens[1] == "hook"
+    return Path(tokens[0]).name == "ring" and tokens[1] == "hook"
 
 
 # install-hooks 會就「使用者互動」事件警告：別的工具若也掛在這上面（彈自己的對話框 /

{ring_cli-0.15.0 → ring_cli-0.16.0}/src/ring/hook_protocol.py

@@ -309,10 +309,7 @@ def _action_detail(data: Mapping[str, Any]) -> str:
     if not detail:
         detail = _first_str(data, "message", "prompt", "question")
 
-    if tool and detail:
-        out = f"{tool}: {detail}"
-    else:
-        out = tool or detail
+    out = f"{tool}: {detail}" if tool and detail else tool or detail
     out = " ".join(out.split())  # 多行指令壓成單行
     return out if len(out) <= _DETAIL_MAX else out[: _DETAIL_MAX - 1] + "…"