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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ring-cli
-Version: 0.14.2
+Version: 0.15.1
 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.1}/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.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ring-cli"
-version = "0.14.2"
+version = "0.15.1"
 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.14.2 → ring_cli-0.15.1}/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.1"
 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.14.2 → ring_cli-0.15.1}/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.14.2 → ring_cli-0.15.1}/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.1}/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.14.2 → ring_cli-0.15.1}/src/ring/hook.py

@@ -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.14.2 → ring_cli-0.15.1}/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] + "…"
 

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/ipc.py

@@ -15,6 +15,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import json
 import os
 import sys
@@ -95,18 +96,14 @@ def read_focus_request(
         ts = float(data["ts"])
     except Exception:
         # 解析失敗：刪掉爛檔
-        try:
+        with contextlib.suppress(Exception):
             path.unlink()
-        except Exception:
-            pass
         return None
 
     age = time.time() - ts
     # 不論有效或過期，都刪掉（消費即焚；過期的也不留）
-    try:
+    with contextlib.suppress(Exception):
         path.unlink()
-    except Exception:
-        pass
 
     if age > ttl:
         return None
@@ -121,11 +118,12 @@ def _pid_alive(pid: int) -> bool:
     """檢查 pid 是否仍存活（送 signal 0）。"""
     try:
         os.kill(pid, 0)
-        return True
     except (ProcessLookupError, PermissionError):
         return False
     except Exception:
         return False
+    else:
+        return True
 
 
 def write_tui_presence(*, presence_path: Path | None = None) -> None:
@@ -192,17 +190,13 @@ def read_tui_presence(
 
     age = time.time() - ts
     if age > ttl:
-        try:
+        with contextlib.suppress(Exception):
             path.unlink()
-        except Exception:
-            pass
         return None
 
     if not _pid_alive(pid):
-        try:
+        with contextlib.suppress(Exception):
             path.unlink()
-        except Exception:
-            pass
         return None
 
     return _TuiPresence(tty=tty, pid=pid, ts=ts)
@@ -214,7 +208,5 @@ def clear_tui_presence(*, presence_path: Path | None = None) -> None:
     :param presence_path: 可注入路徑（測試用）。
     """
     path = presence_path or _PRESENCE_PATH
-    try:
+    with contextlib.suppress(Exception):
         path.unlink()
-    except Exception:
-        pass

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/__init__.py

@@ -15,6 +15,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import shutil
 import sys
 import time
@@ -164,10 +165,8 @@ def notify_summary(count: int, sample_session: Session) -> None:
         return
     text = ngettext("另有 {n} 個 session 在等你", "另有 {n} 個 session 在等你", count, n=count)
     summary_session = replace(sample_session, is_summary=True, waiting_detail=text)
-    try:
+    with contextlib.suppress(Exception):
         notifier.send([summary_session])
-    except Exception:
-        pass
 
 
 def _send_also(sessions: list[Session], also: tuple[str, ...], primary: Notifier | None) -> None:
@@ -181,10 +180,8 @@ def _send_also(sessions: list[Session], also: tuple[str, ...], primary: Notifier
             continue
         for n in _NOTIFIERS:
             if n.name == name and n.available():
-                try:
+                with contextlib.suppress(Exception):
                     n.send(sessions)
-                except Exception:
-                    pass
                 break
 
 
@@ -199,9 +196,10 @@ def _maybe_show_install_hint() -> str | None:
         hint = _("💡 裝 terminal-notifier 可點擊通知直接跳回 session：brew install terminal-notifier")
         _HINT_MARKER.parent.mkdir(parents=True, exist_ok=True)
         _HINT_MARKER.touch()
-        return hint
     except Exception:
         return None
+    else:
+        return hint
 
 
 __all__ = ["Notifier", "notifiers", "notify_summary", "notify_waiting", "register_notifier"]

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/notify_send.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import subprocess
 
 from ring.notify.base import notify_message, notify_title
@@ -20,10 +21,8 @@ class NotifySendNotifier(CommandNotifier):
         for s in sessions:
             title = notify_title(s)
             message = notify_message(s)
-            try:
+            with contextlib.suppress(Exception):
                 subprocess.run(["notify-send", title, message], capture_output=True, timeout=10)
-            except Exception:
-                pass
 
 
 notifier = NotifySendNotifier()

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/ntfy.py

@@ -11,6 +11,7 @@ timeout 短（3s）、失敗安靜吞掉，不擋 hook 主流程。
 
 from __future__ import annotations
 
+import contextlib
 import json
 import urllib.request
 from urllib.parse import urlsplit, urlunsplit
@@ -57,10 +58,8 @@ class NtfyNotifier:
                 headers={"Content-Type": "application/json"},
                 method="POST",
             )
-            try:
+            with contextlib.suppress(Exception):
                 urllib.request.urlopen(req, timeout=3).close()
-            except Exception:
-                pass
 
 
 notifier = NtfyNotifier()

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/osascript_notifier.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import contextlib
+
 from ring.config import get_config
 from ring.notify.base import notify_message, notify_title
 from ring.notify.command import CommandNotifier
@@ -22,10 +24,8 @@ class OsascriptNotifier(CommandNotifier):
             message = notify_message(s)
             title = notify_title(s)
             sound = f' sound name "{cfg.notify_sound_name}"' if cfg.notify_sound else ""
-            try:
+            with contextlib.suppress(Exception):
                 osascript(f'display notification "{message}" with title "{title}"{sound}')
-            except Exception:
-                pass
 
 
 notifier = OsascriptNotifier()

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/terminal_notifier.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import shlex
 import shutil
 import subprocess
@@ -54,10 +55,8 @@ class TerminalNotifierNotifier(CommandNotifier):
                 cmd.extend(["-sound", cfg.notify_sound_name or "default"])
             if cfg.notify_ignore_dnd:
                 cmd.append("-ignoreDnD")
-            try:
+            with contextlib.suppress(Exception):
                 subprocess.run(cmd, capture_output=True, timeout=10)
-            except Exception:
-                pass
 
 
 notifier = TerminalNotifierNotifier()

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify/webhook.py

@@ -12,6 +12,7 @@ timeout 短（3s）、失敗安靜吞掉，不擋 hook 主流程。
 
 from __future__ import annotations
 
+import contextlib
 import json
 import urllib.request
 
@@ -54,10 +55,8 @@ class WebhookNotifier:
                 headers={"Content-Type": "application/json"},
                 method="POST",
             )
-            try:
+            with contextlib.suppress(Exception):
                 urllib.request.urlopen(req, timeout=3).close()
-            except Exception:
-                pass
 
 
 notifier = WebhookNotifier()

{ring_cli-0.14.2 → ring_cli-0.15.1}/src/ring/notify_queue.py

@@ -26,7 +26,7 @@ import fcntl
 import json
 import time
 from collections.abc import Iterator
-from contextlib import contextmanager
+from contextlib import contextmanager, suppress
 from dataclasses import asdict
 from pathlib import Path
 from typing import Any
@@ -48,7 +48,7 @@ def _locked(path: Path) -> Iterator[None]:
     """跨 process 的 read-modify-write 臨界區（抄 ``registry._hidden_sessions_lock``）。"""
     path.parent.mkdir(parents=True, exist_ok=True)
     lock_path = path.with_name(path.name + ".lock")
-    with open(lock_path, "w", encoding="utf-8") as fh:
+    with lock_path.open("w", encoding="utf-8") as fh:
         fcntl.flock(fh, fcntl.LOCK_EX)
         try:
             yield
@@ -98,7 +98,7 @@ def _session_from_dict(d: dict[str, Any]) -> Session | None:
     if isinstance(todo, list) and len(todo) == 2:
         data["todo"] = (todo[0], todo[1])
     # 未知欄位（例如舊版留下的）會讓 Session(**data) 直接炸；只保留 Session 認得的欄位。
-    known = {f for f in Session.__dataclass_fields__}
+    known = set(Session.__dataclass_fields__)
     data = {k: v for k, v in data.items() if k in known}
     try:
         return Session(**data)
@@ -201,10 +201,8 @@ def set_quiet(until: float | None, *, quiet_path: Path | None = None) -> None:
 def clear_quiet(*, quiet_path: Path | None = None) -> None:
     """手動解除 quiet（``ring quiet off``）。"""
     path = quiet_path or _QUIET_PATH
-    try:
+    with suppress(OSError):
         path.unlink()
-    except OSError:
-        pass
 
 
 def _read_quiet(*, quiet_path: Path | None = None, now: float) -> dict[str, Any] | None:
@@ -218,10 +216,8 @@ def _read_quiet(*, quiet_path: Path | None = None, now: float) -> dict[str, Any]
         return None
     until = raw.get("until")
     if until is not None and isinstance(until, (int, float)) and now >= float(until):
-        try:
+        with suppress(OSError):
             path.unlink()
-        except OSError:
-            pass
         return None
     return raw
 

ring_cli-0.15.1/src/ring/pathutil.py

@@ -0,0 +1,49 @@
+"""cwd 比對用的路徑正規化helpers。
+
+「session 記的 cwd」與「live process 量到的 cwd」來源不同（前者是字面路徑，後者已解
+過 symlink），直接字串比對會誤判。這裡的函式只做比對用的正規化，不改動任何顯示值。
+"""
+
+from __future__ import annotations
+
+import os
+
+
+def _real(path: str) -> str:
+    """正規化路徑供「session cwd ↔ live process cwd」比對。
+
+    lsof 回報的是解析過 symlink 的真實路徑，但 hook / JSONL / sqlite 記的常是字面
+    路徑；兩者直接字串比對，遇到 symlink 專案路徑會對不上，導致活著的 session 被誤判
+    離場（counts 為 0）或被補成重複列。各自 realpath 後再比對即可避免。只用於比對鍵，
+    不改動 ``Session.cwd`` 的顯示值。
+    """
+    if not path:
+        return path
+    try:
+        return os.path.realpath(path)
+    except OSError:
+        return path
+
+
+def _is_ancestor_dir(ancestor: str, path: str) -> bool:
+    """``ancestor`` 是否為 ``path`` 本身或其祖先目錄（兩者皆須已用 ``_real`` 正規化）。
+
+    純字串 ``startswith`` 裸比對會誤判 ``/foo`` 命中 ``/foobar``；用尾斜線組出前綴
+    （或直接相等）才能正確界定「目錄」邊界。
+    """
+    if not ancestor or not path:
+        return False
+    if ancestor == path:
+        return True
+    prefix = ancestor if ancestor.endswith(os.sep) else ancestor + os.sep
+    return path.startswith(prefix)
+
+
+def _has_ancestor_live_process(row_cwd: str, live_cwds: list[str]) -> bool:
+    """``live_cwds`` 裡是否有任一筆是 ``row_cwd`` 本身或其祖先目錄。
+
+    用於：使用者在 session 裡 cd 進子目錄後，hook payload 記的 cwd 變成子目錄，但
+    claude process 實際 cwd（lsof 量到的）仍停在啟動目錄——子目錄底下量不到 live
+    process，不代表 session 已離場，只是 process 沒跟著 cd。
+    """
+    return any(_is_ancestor_dir(live_cwd, row_cwd) for live_cwd in live_cwds)

{ring_cli-0.14.2 → ring_cli-0.15.1}/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))