ring-cli 0.8.0__tar.gz → 0.9.0__tar.gz

{ring_cli-0.8.0 → ring_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ring-cli
-Version: 0.8.0
+Version: 0.9.0
 Summary: RiNG — Realtime Instance Notification Grid for active agent CLI sessions.
 Keywords: claude-code,codex,tui,dashboard,session,monitor,rich
 Author: Wei Lee
@@ -179,13 +179,6 @@ and sends a system notification right then — **no RiNG board needs to be open*
 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.
 
-A second kind of reminder is 🟡 **idle for too long** (`idle_threshold_seconds`, default 2h): once a
-session has sat idle past the threshold, it notifies once. Unlike waiting, idle is time-based — there
-is no event to hang a hook on, so it can only be detected by polling. That means it **fires only while
-`ring watch` or a TUI is open** (and when both are open, only one of them fires it, never twice). Close
-every board and idle reminders go silent — waiting still rings you, since that path runs off the hook.
-This is a deliberate trade-off: idle is a secondary signal, not worth a resident background process.
-
 For clickable notifications on macOS, install `terminal-notifier`:
 
 ```sh
@@ -373,7 +366,6 @@ legend = true
 active_window_seconds = 21600
 working_threshold_seconds = 90
 waiting_window_seconds = 1800
-idle_threshold_seconds = 7200    # 🟡 remind once idle for this long (default 2h; 0 = off)
 notify_sound = true
 notify_sound_name = "Glass"
 notify_ignore_dnd = false

{ring_cli-0.8.0 → ring_cli-0.9.0}/README.en.md

@@ -154,13 +154,6 @@ and sends a system notification right then — **no RiNG board needs to be open*
 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.
 
-A second kind of reminder is 🟡 **idle for too long** (`idle_threshold_seconds`, default 2h): once a
-session has sat idle past the threshold, it notifies once. Unlike waiting, idle is time-based — there
-is no event to hang a hook on, so it can only be detected by polling. That means it **fires only while
-`ring watch` or a TUI is open** (and when both are open, only one of them fires it, never twice). Close
-every board and idle reminders go silent — waiting still rings you, since that path runs off the hook.
-This is a deliberate trade-off: idle is a secondary signal, not worth a resident background process.
-
 For clickable notifications on macOS, install `terminal-notifier`:
 
 ```sh
@@ -348,7 +341,6 @@ legend = true
 active_window_seconds = 21600
 working_threshold_seconds = 90
 waiting_window_seconds = 1800
-idle_threshold_seconds = 7200    # 🟡 remind once idle for this long (default 2h; 0 = off)
 notify_sound = true
 notify_sound_name = "Glass"
 notify_ignore_dnd = false

{ring_cli-0.8.0 → ring_cli-0.9.0}/pyproject.toml

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

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/__init__.py

@@ -6,7 +6,9 @@ session 需要你回話時，它「響鈴」叫你。
 
 from importlib.metadata import PackageNotFoundError, version
 
+__distribution__ = "ring-cli"
+
 try:
-    __version__ = version("ring")
+    __version__ = version(__distribution__)
 except PackageNotFoundError:  # 直接從原始碼跑、尚未安裝
     __version__ = "0.0.0+dev"

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/cli.py

@@ -33,12 +33,10 @@ from ring.config import get_config as get_config
 from ring.config import set_value as set_value
 from ring.i18n import gettext as _
 from ring.i18n import ngettext, set_lang
-from ring.ipc import read_tui_presence
 from ring.labels import load_labels
 from ring.plugins import load_plugins
 from ring.registry import Session, Status, running_agent_pids
 from ring.sources import discover_sessions
-from ring.watcher import IdleAlertScheduler
 
 try:
     from rich.box import SIMPLE_HEAD
@@ -402,33 +400,15 @@ def run_config(args: list[str]) -> int:
 
 
 def watch(interval: float, count: int, show_all: bool, show_legend: bool) -> int:
-    # 🔴 等你的通知由 ``ring hook`` 在 session 轉態的當下就地發出（見 hook._ring_waiting_now），
-    # 這樣關掉看板也照樣 ring 你；watch 迴圈額外負責輪詢發 🟡 閒置提醒——
-    # 閒置是時間累積出來的，沒有事件可掛，只能靠輪詢偵測。
+    # 系統通知由 ``ring hook`` 在 session 轉 🔴 等你的當下就地發出（見 hook._ring_waiting_now）；
+    # watch 只負責顯示看板，不再輪詢發通知——這樣關掉看板也照樣 ring 你。
     frames = 0
     footer_text = _("每 {interval}s 刷新 · Ctrl-C 離場", interval=int(interval))
-    idle_alerts = IdleAlertScheduler(get_config().idle_threshold_seconds)
-
-    def _notify_idle_alerts(sessions: list[Session]) -> None:
-        # scheduler 照常 feed 讓狀態持續前進；但若 TUI（ring tui）也開著，
-        # 就讓它去發、watch 這邊不重複發系統通知——否則同一 session 會被兩個行程各響一次。
-        # 已標記為 due 的 session 在這裡仍算「提醒過」，所以 TUI 關掉後 watch 不會補發。
-        alerts = idle_alerts.feed(sessions)
-        if not alerts or read_tui_presence() is not None:
-            return
-        try:
-            from ring.notify import notify_idle
-
-            notify_idle(alerts)
-        except Exception:
-            pass
-
     if not HAVE_RICH:
         try:
             while True:
                 sys.stdout.write("\033[2J\033[H")
                 sessions = board(show_all)
-                _notify_idle_alerts(sessions)
                 print(_render_plain(sessions, show_legend, show_tool_column(sessions)))
                 print(f"\n{footer_text}")
                 sys.stdout.flush()
@@ -444,7 +424,6 @@ def watch(interval: float, count: int, show_all: bool, show_legend: bool) -> int
         with Live(console=console, screen=True, auto_refresh=False) as live:
             while True:
                 sessions = board(show_all)
-                _notify_idle_alerts(sessions)
                 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.8.0 → ring_cli-0.9.0}/src/ring/config.py

@@ -9,7 +9,6 @@
     active_window_seconds = 21600     # 只看最近這段時間動過的 session（預設 6h）
     working_threshold_seconds = 90    # 多久沒動就從 🟢 工作中 變 🟡 閒置
     waiting_window_seconds = 1800     # 跑完停著升等你的時間窗上限（預設 30 分）
-    idle_threshold_seconds = 7200     # 🟡 閒置多久後提醒一次（預設 2h；0 = 關閉）
     notify_sound = true               # 系統通知帶聲音
     notify_sound_name = "Glass"       # macOS / terminal-notifier sound name
     notify_ignore_dnd = false         # terminal-notifier 是否加 -ignoreDnD（穿透勿擾 / Focus）
@@ -59,7 +58,6 @@ class Config:
     active_window_seconds: int = 6 * 60 * 60
     working_threshold_seconds: int = 90
     waiting_window_seconds: int = 1800  # 跑完停著升等你的時間窗上限（預設 30 分）
-    idle_threshold_seconds: int = 2 * 60 * 60  # 🟡 閒置多久後提醒一次；0 = 關閉
     notify_sound: bool = True
     notify_sound_name: str = "Glass"
     notify_ignore_dnd: bool = False
@@ -133,7 +131,6 @@ def load(path: Path | None = None) -> Config:
         active_window_seconds=_as_int(raw.get("active_window_seconds"), d.active_window_seconds),
         working_threshold_seconds=_as_int(raw.get("working_threshold_seconds"), d.working_threshold_seconds),
         waiting_window_seconds=_as_int(raw.get("waiting_window_seconds"), d.waiting_window_seconds),
-        idle_threshold_seconds=max(0, _as_int(raw.get("idle_threshold_seconds"), d.idle_threshold_seconds)),
         notify_sound=_as_bool(raw.get("notify_sound"), d.notify_sound),
         notify_sound_name=(
             raw["notify_sound_name"] if isinstance(raw.get("notify_sound_name"), str) else d.notify_sound_name
@@ -205,7 +202,6 @@ _SETTERS: dict[str, Callable[[str], object]] = {
     "active_window_seconds": _coerce_int,
     "working_threshold_seconds": _coerce_int,
     "waiting_window_seconds": _coerce_int,
-    "idle_threshold_seconds": _coerce_int,
     "notify_sound": _coerce_bool,
     "notify_sound_name": str,
     "notify_ignore_dnd": _coerce_bool,

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/locale/en/LC_MESSAGES/ring.po

@@ -124,9 +124,6 @@ msgstr "↑/↓ to select, Enter or Space to jump to its terminal"
 msgid "🔔 {names} 在等你回話"
 msgstr "🔔 {names} waiting for your reply"
 
-msgid "🟡 {names} 已閒置"
-msgstr "🟡 {names} has gone idle"
-
 msgid "（沒有選到 session）"
 msgstr "(no session selected)"
 
@@ -198,15 +195,9 @@ msgid "✅ 已移除 RiNG hooks（{events}）從 {path}"
 msgstr "✅ Removed RiNG hooks ({events}) from {path}"
 
 # ── notify 文案明確化 ──
-msgid "RiNG · {project} 已閒置"
-msgstr "RiNG · {project} has gone idle"
-
 msgid "RiNG · {project} 在等你回話"
 msgstr "RiNG · {project} is waiting for you"
 
-msgid "已閒置 {duration}"
-msgstr "Idle for {duration}"
-
 msgid "{project} · …/{tail}"
 msgstr "{project} · …/{tail}"
 

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/locale/ring.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-07-08 21:39+0800\n"
+"POT-Creation-Date: 2026-07-10 15:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,144 +17,144 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.18.0\n"
 
-#: src/ring/cli.py:129
+#: src/ring/cli.py:127
 msgid "等你"
 msgstr ""
 
-#: src/ring/cli.py:130
+#: src/ring/cli.py:128
 msgid "工作中"
 msgstr ""
 
-#: src/ring/cli.py:131
+#: src/ring/cli.py:129
 msgid "跑完停著"
 msgstr ""
 
-#: src/ring/cli.py:132
+#: src/ring/cli.py:130
 msgid "已離場"
 msgstr ""
 
-#: src/ring/cli.py:158
+#: src/ring/cli.py:156
 #, python-brace-format
 msgid "{n} 個 session 在場"
 msgid_plural "{n} 個 session 在場"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/ring/cli.py:159
+#: src/ring/cli.py:157
 #, python-brace-format
 msgid "{n} 個 agent process 跑著"
 msgid_plural "{n} 個 agent process 跑著"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/ring/cli.py:160
+#: src/ring/cli.py:158
 #, python-brace-format
 msgid "🎤 RiNG — {sess} · {proc}"
 msgstr ""
 
-#: src/ring/cli.py:165 src/ring/cli.py:218 src/ring/tui.py:214
+#: src/ring/cli.py:163 src/ring/cli.py:216 src/ring/tui.py:213
 msgid "圖例"
 msgstr ""
 
-#: src/ring/cli.py:182 src/ring/cli.py:220
+#: src/ring/cli.py:180 src/ring/cli.py:218
 msgid "（場館目前沒人上台）"
 msgstr ""
 
-#: src/ring/cli.py:186 src/ring/cli.py:340 src/ring/commands/doctor.py:31
+#: src/ring/cli.py:184 src/ring/cli.py:338 src/ring/commands/doctor.py:31
 #: src/ring/commands/doctor.py:68 src/ring/commands/doctor.py:70
 #: src/ring/commands/doctor.py:72 src/ring/commands/doctor.py:134
-#: src/ring/tui.py:169
+#: src/ring/tui.py:168
 msgid "狀態"
 msgstr ""
 
-#: src/ring/cli.py:188 src/ring/cli.py:237 src/ring/tui.py:171
+#: src/ring/cli.py:186 src/ring/cli.py:235 src/ring/tui.py:170
 msgid "工具"
 msgstr ""
 
-#: src/ring/cli.py:189 src/ring/cli.py:237 src/ring/commands/stats.py:60
-#: src/ring/tui.py:172
+#: src/ring/cli.py:187 src/ring/cli.py:235 src/ring/commands/stats.py:60
+#: src/ring/tui.py:171
 msgid "專案"
 msgstr ""
 
-#: src/ring/cli.py:190 src/ring/cli.py:237 src/ring/tui.py:172
+#: src/ring/cli.py:188 src/ring/cli.py:235 src/ring/tui.py:171
 msgid "進度"
 msgstr ""
 
-#: src/ring/cli.py:191 src/ring/cli.py:237 src/ring/tui.py:172
+#: src/ring/cli.py:189 src/ring/cli.py:235 src/ring/tui.py:171
 msgid "閒置"
 msgstr ""
 
-#: src/ring/cli.py:192 src/ring/cli.py:237 src/ring/tui.py:172
+#: src/ring/cli.py:190 src/ring/cli.py:235 src/ring/tui.py:171
 msgid "去哪"
 msgstr ""
 
-#: src/ring/cli.py:194 src/ring/cli.py:237 src/ring/tui.py:172
+#: src/ring/cli.py:192 src/ring/cli.py:235 src/ring/tui.py:171
 msgid "動作"
 msgstr ""
 
-#: src/ring/cli.py:322
+#: src/ring/cli.py:320
 msgid "（內建預設）"
 msgstr ""
 
-#: src/ring/cli.py:338
+#: src/ring/cli.py:336
 msgid "RiNG 設定檔"
 msgstr ""
 
-#: src/ring/cli.py:339 src/ring/commands/doctor.py:133
+#: src/ring/cli.py:337 src/ring/commands/doctor.py:133
 msgid "路徑"
 msgstr ""
 
-#: src/ring/cli.py:340 src/ring/commands/doctor.py:134
+#: src/ring/cli.py:338 src/ring/commands/doctor.py:134
 msgid "已存在"
 msgstr ""
 
-#: src/ring/cli.py:340 src/ring/commands/doctor.py:134
+#: src/ring/cli.py:338 src/ring/commands/doctor.py:134
 msgid "不存在（全部用內建預設）"
 msgstr ""
 
-#: src/ring/cli.py:342
+#: src/ring/cli.py:340
 msgid "目前生效的設定（← = 你覆寫過的）"
 msgstr ""
 
-#: src/ring/cli.py:350
+#: src/ring/cli.py:348
 msgid ""
 "用 `ring config set KEY VALUE` 改，或直接編輯上面那個檔；完整選項見 src/ring/config.py 的 "
 "docstring。"
 msgstr ""
 
-#: src/ring/cli.py:361 src/ring/cli.py:364
+#: src/ring/cli.py:359 src/ring/cli.py:362
 #, python-brace-format
 msgid "未知的鍵：{key}"
 msgstr ""
 
-#: src/ring/cli.py:377
+#: src/ring/cli.py:375
 msgid "用法：ring config get KEY"
 msgstr ""
 
-#: src/ring/cli.py:388
+#: src/ring/cli.py:386
 msgid "用法：ring config set KEY VALUE"
 msgstr ""
 
-#: src/ring/cli.py:396
+#: src/ring/cli.py:394
 #, python-brace-format
 msgid "✅ 已設定 {key} = {value}（{path}）"
 msgstr ""
 
-#: src/ring/cli.py:397
+#: src/ring/cli.py:395
 msgid "註：set 會重寫整個設定檔，原有註解不會保留。"
 msgstr ""
 
-#: src/ring/cli.py:400
+#: src/ring/cli.py:398
 #, python-brace-format
 msgid "未知的 config 動作：{action}（用 get / set，或不帶參數看目前設定）"
 msgstr ""
 
-#: src/ring/cli.py:409
+#: src/ring/cli.py:406
 #, python-brace-format
 msgid "每 {interval}s 刷新 · Ctrl-C 離場"
 msgstr ""
 
-#: src/ring/cli.py:470
+#: src/ring/cli.py:449
 msgid ""
 "\n"
 "commands:\n"
@@ -174,28 +174,28 @@ msgid ""
 "  completion SHELL             印出 shell 補全腳本（zsh / bash）\n"
 msgstr ""
 
-#: src/ring/cli.py:492
+#: src/ring/cli.py:471
 msgid ""
 "usage: ring hook [PROVIDER] [--provider PROVIDER]\n"
 "\n"
 "從 stdin 讀 hook JSON，依 provider 正規化後寫入 RiNG registry。\n"
 msgstr ""
 
-#: src/ring/cli.py:498
+#: src/ring/cli.py:477
 msgid ""
 "usage: ring install-hooks [--dry-run]\n"
 "\n"
 "安裝 Claude Code / Codex hooks。\n"
 msgstr ""
 
-#: src/ring/cli.py:504
+#: src/ring/cli.py:483
 msgid ""
 "usage: ring remove-hooks [--dry-run]\n"
 "\n"
 "從 Claude Code / Codex hook 設定移除 RiNG 安裝的 hooks。\n"
 msgstr ""
 
-#: src/ring/cli.py:510
+#: src/ring/cli.py:489
 msgid ""
 "usage: ring config [get KEY | set KEY VALUE]\n"
 "\n"
@@ -204,14 +204,14 @@ msgid ""
 "  set KEY VALUE  寫入單一設定。注意：會重寫整個設定檔，原有註解不會保留。\n"
 msgstr ""
 
-#: src/ring/cli.py:518
+#: src/ring/cli.py:497
 msgid ""
 "usage: ring focus SESSION_ID\n"
 "\n"
 "聚焦指定 session；若 RiNG TUI 正在執行，會回到 TUI 並選中該列。\n"
 msgstr ""
 
-#: src/ring/cli.py:524
+#: src/ring/cli.py:503
 msgid ""
 "usage: ring gc [--dry-run] [--older-than DURATION] [--all-ended]\n"
 "\n"
@@ -223,7 +223,7 @@ msgid ""
 "  --all-ended            清理所有目前判定已離場的 registry\n"
 msgstr ""
 
-#: src/ring/cli.py:535
+#: src/ring/cli.py:514
 msgid ""
 "usage: ring doctor\n"
 "\n"
@@ -231,7 +231,7 @@ msgid ""
 "不寫任何檔案、不安裝、不發通知；固定回傳 0。\n"
 msgstr ""
 
-#: src/ring/cli.py:542
+#: src/ring/cli.py:521
 msgid ""
 "usage: ring digest [--since DURATION] [--format text|json]\n"
 "\n"
@@ -242,7 +242,7 @@ msgid ""
 "  --format text|json  輸出格式\n"
 msgstr ""
 
-#: src/ring/cli.py:552
+#: src/ring/cli.py:531
 msgid ""
 "usage: ring stats [--since DURATION]\n"
 "\n"
@@ -253,46 +253,46 @@ msgid ""
 "  --since DURATION  統計時間窗（例如 12h、7d、30d；預設 7d）\n"
 msgstr ""
 
-#: src/ring/cli.py:562
+#: src/ring/cli.py:541
 msgid ""
 "usage: ring completion zsh|bash\n"
 "\n"
 "印出 shell 補全腳本。zsh 放 ~/.zshrc：eval \"$(ring completion zsh)\"；bash 同理。\n"
 msgstr ""
 
-#: src/ring/cli.py:620
+#: src/ring/cli.py:599
 msgid "看所有 agent CLI session 上台。"
 msgstr ""
 
-#: src/ring/cli.py:625
+#: src/ring/cli.py:604
 msgid "持續刷新"
 msgstr ""
 
-#: src/ring/cli.py:626
+#: src/ring/cli.py:605
 msgid "watch 刷新秒數"
 msgstr ""
 
-#: src/ring/cli.py:627
+#: src/ring/cli.py:606
 msgid "watch 刷新幾格後自動結束（0=無限，預設）"
 msgstr ""
 
-#: src/ring/cli.py:628
+#: src/ring/cli.py:607
 msgid "連已離場的 session 也顯示"
 msgstr ""
 
-#: src/ring/cli.py:633
+#: src/ring/cli.py:612
 msgid "顯示顏色圖例（--no-legend 關閉）"
 msgstr ""
 
-#: src/ring/cli.py:635
+#: src/ring/cli.py:614
 msgid "語言（如 en / zh-Hant；也吃 config / RING_LANG / LANG）"
 msgstr ""
 
-#: src/ring/cli.py:640
+#: src/ring/cli.py:619
 msgid "輸出格式：table（預設）/ json（機器可讀）/ oneline（status bar 單行摘要）"
 msgstr ""
 
-#: src/ring/cli.py:646
+#: src/ring/cli.py:625
 #, python-brace-format
 msgid "--format {fmt} 只能用在快照模式，不能配 --watch。"
 msgstr ""
@@ -386,71 +386,66 @@ msgstr ""
 msgid "跳過去"
 msgstr ""
 
-#: src/ring/tui.py:190
+#: src/ring/tui.py:189
 msgid "💡 同專案開了多個 session，裝 hook 跳轉才精準：ring install-hooks"
 msgstr ""
 
-#: src/ring/tui.py:192
+#: src/ring/tui.py:191
 msgid "↑/↓ 選一列，Enter 或 Space 跳到那個 session 的終端"
 msgstr ""
 
-#: src/ring/tui.py:228
+#: src/ring/tui.py:227
 #, python-brace-format
 msgid "🔔 {names} 在等你回話"
 msgstr ""
 
-#: src/ring/tui.py:240
-#, python-brace-format
-msgid "🟡 {names} 已閒置"
-msgstr ""
-
-#: src/ring/tui.py:281
+#: src/ring/tui.py:268
 #, python-brace-format
 msgid "→ 已跳到 {project}（來自通知）"
 msgstr ""
 
-#: src/ring/tui.py:286
+#: src/ring/tui.py:273
 msgid "那個 session 已不在場"
 msgstr ""
 
-#: src/ring/tui.py:346
+#: src/ring/tui.py:332
 msgid "  ⚠ hook 可能失效：來源檔有更新但沒有 heartbeat"
 msgstr ""
 
-#: src/ring/tui.py:375 src/ring/tui.py:399 src/ring/tui.py:425
+#: src/ring/tui.py:361 src/ring/tui.py:385 src/ring/tui.py:411
 msgid "（沒有選到 session）"
 msgstr ""
 
-#: src/ring/tui.py:406
+#: src/ring/tui.py:392
 #, python-brace-format
 msgid "→ {project}（{where}）"
 msgstr ""
 
-#: src/ring/tui.py:408
+#: src/ring/tui.py:394
 #, python-brace-format
 msgid "{project}：{msg}"
 msgstr ""
 
-#: src/ring/tui.py:416
+#: src/ring/tui.py:402
 msgid "（沒有正在等待的 session）"
 msgstr ""
 
-#: src/ring/tui.py:433
+#: src/ring/tui.py:419
 #, python-brace-format
 msgid "再按一次 d 隱藏 {project}（有新活動會自動重新出現）"
 msgstr ""
 
-#: src/ring/tui.py:438
+#: src/ring/tui.py:424
 #, python-brace-format
 msgid "{project} 是仍在執行的 process，無法隱藏；請跳過去結束它"
 msgstr ""
 
-#: src/ring/tui.py:446
+#: src/ring/tui.py:432
 #, python-brace-format
 msgid "已隱藏 {project}，並清掉 RiNG 狀態；有新活動會自動重新出現"
 msgstr ""
 
-#: src/ring/tui.py:448
+#: src/ring/tui.py:434
 #, python-brace-format
 msgid "已隱藏 {project}（沒有 RiNG registry 可清；有新活動會自動重新出現）"
 msgstr ""
@@ -790,21 +785,11 @@ msgstr ""
 msgid "沒有 focuser 接得住（裝 hook，或一個專案只開一個 session 才測得到 tty）"
 msgstr ""
 
-#: src/ring/notify/__init__.py:152
+#: src/ring/notify/__init__.py:139
 msgid "💡 裝 terminal-notifier 可點擊通知直接跳回 session：brew install terminal-notifier"
 msgstr ""
 
-#: src/ring/notify/base.py:42
-#, python-brace-format
-msgid "RiNG · {project} 已閒置"
-msgstr ""
-
-#: src/ring/notify/base.py:43
+#: src/ring/notify/base.py:41
 #, python-brace-format
 msgid "RiNG · {project} 在等你回話"
 msgstr ""
-
-#: src/ring/notify/base.py:53
-#, python-brace-format
-msgid "已閒置 {duration}"
-msgstr ""

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/notify/__init__.py

@@ -81,17 +81,14 @@ def _select_notifier(backend: str) -> Notifier | None:
     return clickable[0] if clickable else available[0]
 
 
-def _dispatch(sessions: list[Session]) -> str | None:
-    """共用發送流程：選後端、送、加發 notify_also，必要時回傳一次性安裝引導。
-
-    每則通知的標題／內文會依 ``session.status`` 分流（見 ``notify/base.py``），
-    所以 waiting 與 idle 共用這一條路徑，只差呼叫端傳進來的 session 狀態。
+def notify_waiting(sessions: list[Session]) -> str | None:
+    """對一批「新轉為等你」的 session 發系統通知。
 
     依 config ``notify_backend`` 選一個 notifier 後端發送（見 ``_select_notifier``）。
     auto 模式下若只選到不支援點擊的後端、且在 macOS 上，回傳一次性的安裝引導字串
     （建議裝 terminal-notifier 取得點擊跳轉）；其餘情況回 ``None``。失敗一律安靜吞掉。
 
-    :param sessions: 要發通知的 session 清單；空清單時直接回傳。
+    :param sessions: 新轉為 waiting 的 session 清單；空清單時直接回傳。
     :returns: 安裝引導提示字串或 ``None``。
     """
     if not sessions:
@@ -113,16 +110,6 @@ def _dispatch(sessions: list[Session]) -> str | None:
     return None
 
 
-def notify_waiting(sessions: list[Session]) -> str | None:
-    """對一批「新轉為等你」的 session 發系統通知。見 ``_dispatch`` 的回傳語義。"""
-    return _dispatch(sessions)
-
-
-def notify_idle(sessions: list[Session]) -> str | None:
-    """對一批「首次超過閒置門檻」的 session 發系統通知。見 ``_dispatch`` 的回傳語義。"""
-    return _dispatch(sessions)
-
-
 def _send_also(sessions: list[Session], also: tuple[str, ...], primary: Notifier | None) -> None:
     """notify_also 的加發：主後端之外，再對指定名稱的後端各發一份。
 
@@ -157,4 +144,4 @@ def _maybe_show_install_hint() -> str | None:
         return None
 
 
-__all__ = ["Notifier", "notifiers", "notify_idle", "notify_waiting", "register_notifier"]
+__all__ = ["Notifier", "notifiers", "notify_waiting", "register_notifier"]

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/notify/base.py

@@ -10,7 +10,7 @@ from typing import Protocol
 
 from ring.i18n import gettext as _
 from ring.labels import get_label
-from ring.registry import Session, Status
+from ring.registry import Session
 
 
 class Notifier(Protocol):
@@ -38,8 +38,6 @@ def display_name(session: Session) -> str:
 
 def notify_title(session: Session) -> str:
     """通知標題——「哪個 session 在等你」，全後端共用一句。"""
-    if session.status is Status.IDLE:
-        return _("RiNG · {project} 已閒置", project=display_name(session))
     return _("RiNG · {project} 在等你回話", project=display_name(session))
 
 
@@ -49,13 +47,4 @@ def notify_message(session: Session) -> str:
     標題已經說了「誰在等你」，內文就補「等什麼、去哪」，讓你看一眼就能決定要不要現在回去。
     """
     location = f"📍 {session.location}"
-    if session.status is Status.IDLE:
-        return _("已閒置 {duration}", duration=_idle_duration(session.idle_for)) + f"\n{location}"
     return f"{session.waiting_detail}\n{location}" if session.waiting_detail else location
-
-
-def _idle_duration(seconds: float) -> str:
-    s = int(max(0, seconds))
-    if s < 3600:
-        return f"{s // 60}m"
-    return f"{s // 3600}h{(s % 3600) // 60:02d}m"

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/registry.py

@@ -855,10 +855,24 @@ def _scan_sessions(procs: list[tuple[str, str]]) -> list[Session]:
     out: list[Session] = []
     for _cwd, group in by_cwd.items():
         group.sort(key=lambda s: s.last_active, reverse=True)
+        skey = _real(group[0].cwd)  # 同一 group 內 cwd 皆相同（by_cwd 就是照 s.cwd 分組）
+        live_n = counts.get(skey, 0)
+        ordered = group
+        if 0 < live_n < len(group):
+            # 曖昧情境：同 cwd 的 transcript 數多於 live claude 數，純 mtime 排名不可靠
+            # ——已崩潰的 session 若剛好在真正還活著、但已安靜一段時間的 session 之後
+            # 才寫入最後一筆，mtime 反而「更新」，會把真正活著的那個擠出 live_n 名額
+            # （見 session-detection-review.md 症狀 1）。若能從 tmux pane 子孫 process
+            # 的 args 找到明確提到 session id 的強訊號（比照 _tmux_process_tree_targets
+            # 用在 tmux_target 配對的同一套邏輯），優先信任它決定誰佔 live 名額；沒有這
+            # 種訊號（多數非 tmux／非 --resume 情境）就 fallback 回既有 mtime 排名。
+            confirmed = _tmux_process_tree_targets(group)
+            if confirmed:
+                front = [s for s in group if s.session_id in confirmed]
+                back = [s for s in group if s.session_id not in confirmed]
+                ordered = front + back
         # 同一 cwd 組內，各 session 依自己的當下 cwd 查 live 名額與 tty
-        for i, s in enumerate(group):
-            skey = _real(s.cwd)
-            live_n = counts.get(skey, 0)
+        for i, s in enumerate(ordered):
             # 當下 cwd 只有一個 claude 時，把它的 tty 給那個活著的 session（終端跳轉用）；
             # 多個 claude 同 cwd 無法精準對應，留給 hook 模式處理。
             uniq_tty = cwd_ttys[skey][0] if live_n == 1 and cwd_ttys.get(skey) else ""
@@ -966,10 +980,13 @@ def _hook_sessions(
             s.hook_stale = _hook_heartbeat_stale(s.source_path, s.heartbeat_at, s.status)
     # SessionEnd 沒觸發（crash）會留下幽靈檔。判定離場：
     #   1. 該 cwd 完全沒有 live proc → 一定離場。
-    #   2. 該 cwd 的 hook row 數「多於」live proc 數（真的有多餘列要修剪）時，才用 tty
-    #      挑出 tty 對不上的那幾筆標離場。row 數 <= proc 數時每筆都可能還活著，不靠 tty 殺
-    #      ——因為 hook 寫進來的 tty 不一定可靠（終端 tty 會被作業系統重配，甚至跨 session
-    #      錯置），拿它隱藏唯一活著的 session 會讓整列憑空消失。
+    #   2. 該 cwd 的 hook row 數「多於一筆」時，用 tty 挑出 tty 對不上的那幾筆標離場——
+    #      不論這筆數是否 <= live proc 數：計數只是巧合對上（例如同 cwd 剛好有跟 RiNG
+    #      hook 無關的 live process 佔掉名額），不代表每筆 row 都真的還活著；row 數 > 1
+    #      時 tty 交叉比對才有意義去挑出誰是 stale 的。
+    #   3. 該 cwd 只有「單一」hook row 時，無論 tty 是否對得上都不靠 tty 殺——hook 寫進來
+    #      的 tty 不一定可靠（終端 tty 會被作業系統重配，甚至跨 session 錯置），拿它隱藏
+    #      唯一活著的 session 會讓整列憑空消失。
     if out:
         proc_counts: dict[tuple[str, str], int] = {}
         proc_ttys: dict[tuple[str, str], set[str]] = {}
@@ -994,7 +1011,10 @@ def _hook_sessions(
                 for s in rows:
                     s.status = Status.ENDED
                 continue
-            if len(rows) <= live_n:
+
+            # 單筆 row：不靠 tty 殺，理由見上方註解 3——避免唯一活著的 session 因 tty
+            # 重配而憑空消失（test_hook_sessions_keeps_lone_live_session_with_wrong_tty）。
+            if len(rows) == 1:
                 continue
 
             live_ttys = proc_ttys.get(key, set())
@@ -1003,6 +1023,12 @@ def _hook_sessions(
                     if s.tty and s.tty not in live_ttys:
                         s.status = Status.ENDED
 
+            if len(rows) <= live_n:
+                # 沒有多餘列要修剪，但上面的 tty 交叉比對仍然有效——即使計數巧合對上，
+                # tty 對不上的那幾筆（例如已 crash 的舊 row）還是會被標離場，不會永遠
+                # 靠計數巧合躲過清理。
+                continue
+
             remaining = [s for s in rows if s.status is not Status.ENDED]
             if len(remaining) > live_n:
                 remaining.sort(key=lambda s: s.last_active, reverse=True)

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/sources/__init__.py

@@ -91,6 +91,13 @@ def _merge_duplicate_session(current: Session, candidate: Session) -> Session:
     action-required 狀態之後未必會送出能清掉 waiting 的 hook；如果 zero-config scan
     已看到同一 session 有更新紀錄且不再是 WAITING，就用 scan 清掉 stale waiting，
     同時保留 hook 拿到的 tty，避免跳轉能力退化。
+
+    只看 last_active 先後還不夠：Claude Code 在送出需要權限的 tool_use 之後，會繼續
+    往同一份 transcript 追加幾筆非對話簿記紀錄（last-prompt / ai-title / mode /
+    permission-mode 等），這些紀錄一樣會推進檔案 mtime，但不代表使用者真的回應了
+    權限請求。因此還要求 candidate 的 ``_tail_kind`` 不是 ``"interrupted"``——
+    只有真人 prompt（"working"）或對話真的收尾（"waiting"）才算「使用者真的回應了」，
+    單純簿記寫入（tail 仍是 interrupted）不該觸發覆蓋。
     """
     if (
         current.source == "hook"
@@ -98,6 +105,7 @@ def _merge_duplicate_session(current: Session, candidate: Session) -> Session:
         and candidate.provider == current.provider
         and candidate.status is not Status.WAITING
         and candidate.last_active > current.last_active
+        and candidate._tail_kind != "interrupted"
     ):
         if not candidate.tty:
             candidate.tty = current.tty

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/tui.py

@@ -38,7 +38,7 @@ 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.registry import Session, Status, delete_session_state, hide_session, running_agent_pids
-from ring.watcher import IdleAlertScheduler, WaitingAlertScheduler
+from ring.watcher import WaitingAlertScheduler
 
 _ORDER = (Status.WAITING, Status.WORKING, Status.IDLE, Status.ENDED)
 
@@ -126,7 +126,6 @@ class RingApp(App[None]):
         self._focused_sid: str | None = None
         cfg = get_config()
         self._alerts = WaitingAlertScheduler(cfg.notify_repeat_seconds, cfg.notify_repeat_max)
-        self._idle_alerts = IdleAlertScheduler(cfg.idle_threshold_seconds)
         self.title = "RiNG 🎤"
         # 記下自己的 controlling tty，供 _poll_focus_request activate 視窗用。
         self._own_tty: str = self._detect_own_tty()
@@ -227,18 +226,6 @@ class RingApp(App[None]):
             names = ", ".join(sorted(self._display_name(s) for s in alerts))
             self.notify(_("🔔 {names} 在等你回話", names=names), timeout=8)
 
-    def _ring_on_idle_alerts(self, alerts: list[Session]) -> None:
-        if not alerts:
-            return
-        try:
-            from ring.notify import notify_idle
-
-            notify_idle(alerts)
-        except Exception:
-            pass
-        names = ", ".join(sorted(self._display_name(s) for s in alerts))
-        self.notify(_("🟡 {names} 已閒置", names=names), timeout=8)
-
     def _activate_own_window(self) -> None:
         """把 RiNG 自己的終端視窗帶到前景（best-effort，失敗安靜吞）。
 
@@ -310,7 +297,6 @@ class RingApp(App[None]):
         # 這裡只留 TUI 自己的 in-app 響鈴 / 訊息列與醒目標記，不重複發系統通知。
         alerts = self._alerts.feed(self._sessions)
         self._ring_on_waiting_alerts(alerts)
-        self._ring_on_idle_alerts(self._idle_alerts.feed(self._sessions))
         self.sub_title = _header(len(self._sessions), len(running_agent_pids()))
         labels = load_labels()
         table.clear()

{ring_cli-0.8.0 → ring_cli-0.9.0}/src/ring/watcher.py

@@ -105,33 +105,3 @@ class WaitingAlertScheduler:
         if state.repeats_sent < len(self._repeat_seconds):
             return now - state.first_seen >= self._repeat_seconds[state.repeats_sent]
         return now - state.last_alert >= self._repeat_seconds[-1]
-
-
-class IdleAlertScheduler:
-    """🟡 閒置提醒：超過門檻只通知一次，離開 idle 後 reset。"""
-
-    def __init__(self, threshold_seconds: int, *, now: Callable[[], float] = time.time) -> None:
-        self._threshold_seconds = max(0, threshold_seconds)
-        self._now = now
-        self._alerted: set[str] = set()
-        self._primed = False
-
-    def feed(self, sessions: list[Session]) -> list[Session]:
-        current = {s.session_id: s for s in sessions if s.status is Status.IDLE}
-        if not self._threshold_seconds:
-            self._alerted = set(current)
-            self._primed = True
-            return []
-
-        due = [
-            s
-            for sid, s in current.items()
-            if sid not in self._alerted and self._now() - s.last_active >= self._threshold_seconds
-        ]
-        current_ids = set(current)
-        if not self._primed:
-            self._alerted = current_ids
-            self._primed = True
-            return []
-        self._alerted = (self._alerted & current_ids) | {s.session_id for s in due}
-        return due