cc-session-control 0.6.2__tar.gz → 0.6.3__tar.gz

{cc_session_control-0.6.2/src/cc_session_control.egg-info → cc_session_control-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-control
-Version: 0.6.2
+Version: 0.6.3
 Summary: TUI manager for Claude Code sessions and Remote Control
 Author: dzshzx
 License-Expression: MIT

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/__init__.py

@@ -1,3 +1,3 @@
 """cc-session-control — TUI manager for Claude Code sessions and Remote Control."""
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/app.py

@@ -6,7 +6,7 @@ import curses
 import os
 import threading
 from collections.abc import Callable
-from typing import Protocol, runtime_checkable
+from typing import TYPE_CHECKING, Protocol, runtime_checkable
 
 import urwid
 
@@ -16,6 +16,9 @@ from .views.agents import AgentsView
 from .views.rc import RCView
 from .views.sessions import SessionsView
 
+if TYPE_CHECKING:
+    from .actions.session_ops import ExitIntent
+
 # D7/R10: shown across all tabs when `/proc` is unavailable (e.g. macOS), where
 # the "current" session can't be determined and destructive ops are refused.
 _DEGRADED_BANNER = "⚠ liveness 降级（无 /proc）：terminate/delete/cleanup 已受限"
@@ -89,7 +92,7 @@ def _make_screen() -> urwid.raw_display.Screen:
 
 class App:
     def __init__(self) -> None:
-        self.result: object | None = None  # a session_ops.ExitIntent, or None
+        self.result: ExitIntent | None = None
         self._exiting = False
         self._alarm_handle: object | None = None
         self._notify_alarm: object | None = None
@@ -211,14 +214,14 @@ class App:
         self._confirm_yes = None
         self.set_hints(self.views[self._active].keyhints())
 
-    def _exit(self, result: object = None) -> None:
+    def _exit(self, result: ExitIntent | None = None) -> None:
         self._exiting = True
         if self._alarm_handle:
             self.loop.remove_alarm(self._alarm_handle)
         self.result = result
         raise urwid.ExitMainLoop()
 
-    def exit_with(self, intent: object) -> None:
+    def exit_with(self, intent: ExitIntent) -> None:
         """Exit the MainLoop carrying a `session_ops.ExitIntent`.
 
         Views construct the intent (they know the verb); `cli._cmd_tui` calls
@@ -312,7 +315,7 @@ class App:
                 view.apply_data()
         return True
 
-    def run(self) -> object | None:
+    def run(self) -> ExitIntent | None:
         self._pipe_fd = self.loop.watch_pipe(self._on_pipe)
         self.views[self._active].load()
         self.set_hints(self.views[self._active].keyhints())

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/views/_base.py

@@ -16,6 +16,7 @@ import urwid
 
 if TYPE_CHECKING:
     from ..app import App
+    from ._keytable import Key
 
 
 class ListTabView:
@@ -69,7 +70,20 @@ class ListTabView:
     # --- key-table dispatch (see views/_keytable.py) ---
 
     #: the view's single-source key table; subclasses override.
-    KEY_TABLE: tuple = ()
+    KEY_TABLE: tuple[Key, ...] = ()
+
+    def handle_key(self, key: str) -> None:
+        """Default TabView key handling: overlay mode intercepts, list mode
+        dispatches from KEY_TABLE. A view with extra modes (e.g. the Sessions
+        filter/cleanup/preview) overrides, handles those, then calls super()."""
+        if self._overlay_active():
+            self._handle_overlay_key(key)
+            return
+        self._dispatch_key(key)
+
+    def _overlay_active(self) -> bool:
+        """Whether the view is in its overlay (help/watch) mode right now."""
+        raise NotImplementedError
 
     def _dispatch_key(self, key: str) -> None:
         """List-mode dispatch driven by `KEY_TABLE` — the same declaration that

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/views/_keytable.py

@@ -19,7 +19,7 @@ class Key:
     keys: tuple[str, ...]        # urwid key names, e.g. ("enter", "o")
     hint: str | None             # footer label; None = shown only in help
     handler: str                 # view method name (resolved via getattr)
-    help: tuple[str, ...] = ()   # pre-indented help-overlay lines
+    help_lines: tuple[str, ...] = ()  # pre-indented help-overlay display lines
     section: str | None = None   # help section this entry lists under
     needs_selection: bool = True  # call handler(_selected()) vs handler()
 
@@ -45,7 +45,7 @@ def help_lines(table: tuple[Key, ...], layout: HelpLayout) -> list[str]:
         lines.append(title)
         for e in table:
             if e.section == title:
-                lines.extend(e.help)
+                lines.extend(e.help_lines)
         lines.append("")
     lines.extend(layout.suffix)
     return lines

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/views/agents.py

@@ -79,23 +79,23 @@ class AgentsView(ListTabView):
     # App-level FOOTER_PREFIX, so its entry is hint-less.
     KEY_TABLE = (
         Key(("enter", "o"), "Enter/o 接回", "_takeover",
-            section="后台 agent 生命周期:", help=(
+            section="后台 agent 生命周期:", help_lines=(
                 "  Enter/o 接回（拉回前台，复用 resume；接运行中的 agent 会先确认接管）",
             )),
-        Key(("s",), "s 停止", "_stop", section="后台 agent 生命周期:", help=(
+        Key(("s",), "s 停止", "_stop", section="后台 agent 生命周期:", help_lines=(
             "  s       停止（仅运行中，需确认）",
         )),
-        Key(("d",), "d 删除", "_remove", section="后台 agent 生命周期:", help=(
+        Key(("d",), "d 删除", "_remove", section="后台 agent 生命周期:", help_lines=(
             "  d       删除（仅已结束）",
         )),
-        Key(("w",), "w 查看", "_watch", section="后台 agent 生命周期:", help=(
+        Key(("w",), "w 查看", "_watch", section="后台 agent 生命周期:", help_lines=(
             "  w       查看 timeline（只读）",
         )),
-        Key(("R",), "R 重启", "_key_respawn", section="后台 agent 生命周期:", help=(
+        Key(("R",), "R 重启", "_key_respawn", section="后台 agent 生命周期:", help_lines=(
             "  R       重启（respawn）",
         )),
         Key(("r",), None, "_key_refresh", needs_selection=False,
-            section="后台 agent 生命周期:", help=(
+            section="后台 agent 生命周期:", help_lines=(
                 "  r       刷新",
             )),
         Key(("?",), "? 详细说明", "_show_help", needs_selection=False),
@@ -126,12 +126,15 @@ class AgentsView(ListTabView):
     # --- TabView contract ---
 
     def keyhints(self) -> str:
-        if self._mode in ("help", "watch"):
+        if self._overlay_active():
             # "其余" is honest: the prefix's Tab/q stay global (Tab switches
             # tabs, q QUITS — neither returns to the list).
             return "其余任意键返回"
         return footer_hints(self.KEY_TABLE)
 
+    def _overlay_active(self) -> bool:
+        return self._mode in ("help", "watch")
+
     def _enrich(self, jobs: list[AgentJob]) -> list[AgentJob]:
         """Fill host liveness for the self-fetch path (snapshot already enriched).
 
@@ -185,14 +188,7 @@ class AgentsView(ListTabView):
             return widget.job
         return None
 
-    # --- key dispatch ---
-
-    def handle_key(self, key: str) -> None:
-        if self._mode in ("help", "watch"):
-            self._handle_overlay_key(key)
-            return
-        # Normal list mode — dispatch straight from KEY_TABLE.
-        self._dispatch_key(key)
+    # --- key handlers (bound by name in KEY_TABLE; dispatch lives in the base) ---
 
     def _key_respawn(self, job: AgentJob) -> None:
         cmd = agent_ops.respawn(job)

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/views/rc.py

@@ -138,35 +138,35 @@ class RCView(ListTabView):
     # App-level FOOTER_PREFIX, so its entry is hint-less.
     KEY_TABLE = (
         Key(("t",), "t 新建会话", "_key_tmux_new",
-            section="项目操作（仅对「项目」行生效）:", help=(
+            section="项目操作（仅对「项目」行生效）:", help_lines=(
                 "  t      在项目目录新建 tmux claude 会话并直接进入（离开 csctl）",
             )),
         Key(("enter",), "Enter 启动远控", "_key_start",
-            section="项目操作（仅对「项目」行生效）:", help=(
+            section="项目操作（仅对「项目」行生效）:", help_lines=(
                 "  Enter  启动选中项目的远程控制服务",
             )),
         Key(("s",), "s 停止", "_key_stop",
-            section="项目操作（仅对「项目」行生效）:", help=(
+            section="项目操作（仅对「项目」行生效）:", help_lines=(
                 "  s      停止选中项目的远程控制服务（需确认）",
             )),
         Key(("a",), "a 开机自启", "_key_autostart",
-            section="项目操作（仅对「项目」行生效）:", help=(
+            section="项目操作（仅对「项目」行生效）:", help_lines=(
                 "  a      切换「开机自启」：A 键一键启动时是否带上本项目",
             )),
         Key(("c",), "c 自动远控", "_key_rc_toggle",
-            section="项目操作（仅对「项目」行生效）:", help=(
+            section="项目操作（仅对「项目」行生效）:", help_lines=(
                 "  c      切换「自动远控」：claude 启动时自动开远程控制，手机即可接管",
             )),
         Key(("A",), "A 全部启动", "_key_start_all", needs_selection=False,
-            section="批量操作:", help=(
+            section="批量操作:", help_lines=(
                 "  A      启动所有「开机自启」项目",
             )),
         Key(("S",), "S 全部停止", "_key_stop_all", needs_selection=False,
-            section="批量操作:", help=(
+            section="批量操作:", help_lines=(
                 "  S      停止全部远程控制服务（需确认）",
             )),
         Key(("r",), None, "_key_refresh", needs_selection=False,
-            section="批量操作:", help=(
+            section="批量操作:", help_lines=(
                 "  r      重新扫描刷新",
             )),
         Key(("?",), "? 详细说明", "_show_help", needs_selection=False),
@@ -198,7 +198,7 @@ class RCView(ListTabView):
         self._help = False
 
     def keyhints(self) -> str:
-        if self._help:
+        if self._overlay_active():
             # "其余" is honest: the prefix's Tab/q stay global (Tab switches
             # tabs, q QUITS — neither returns to the list).
             return "其余任意键返回"
@@ -206,6 +206,9 @@ class RCView(ListTabView):
         # footer Text wraps on narrow terminals (vertical for width).
         return footer_hints(self.KEY_TABLE)
 
+    def _overlay_active(self) -> bool:
+        return self._help
+
     def load(self) -> None:
         self._projects = rc.scan()
         self._servers = rc.scan_servers()
@@ -268,14 +271,7 @@ class RCView(ListTabView):
             return widget.project
         return None
 
-    def handle_key(self, key: str) -> None:
-        if self._help:
-            self._handle_overlay_key(key)
-            return
-        # Normal list mode — dispatch straight from KEY_TABLE.
-        self._dispatch_key(key)
-
-    # --- key handlers (bound by name in KEY_TABLE) ---
+    # --- key handlers (bound by name in KEY_TABLE; dispatch lives in the base) ---
 
     def _key_tmux_new(self, p: RCProject) -> None:
         if not p.dir_exists:

{cc_session_control-0.6.2 → cc_session_control-0.6.3}/src/cc_session_control/views/sessions.py

@@ -48,44 +48,44 @@ class SessionsView(CleanupMixin, ListTabView):
     # table in the footer is a user preference (2026-07-05); `r 刷新` stays in
     # the App-level FOOTER_PREFIX, so its entry is hint-less here.
     KEY_TABLE = (
-        Key(("enter",), "Enter 接回", "_key_resume", section="会话操作:", help=(
+        Key(("enter",), "Enter 接回", "_key_resume", section="会话操作:", help_lines=(
             "  Enter  接回选中的会话（在当前终端恢复；接运行中的会话会先确认接管）",
         )),
-        Key(("t",), "t tmux接回", "_key_tmux", section="会话操作:", help=(
+        Key(("t",), "t tmux接回", "_key_tmux", section="会话操作:", help_lines=(
             "  t      tmux 接回（会话恢复进 tmux 窗口并接入前台——终端断线会话不死，",
             "         重连后 tmux attach 可捡回；已在 tmux 中的会话直接接入不重启；",
             "         接运行中的裸终端会话会先确认接管）",
         )),
-        Key(("f",), "f 分叉", "_key_fork", section="会话操作:", help=(
+        Key(("f",), "f 分叉", "_key_fork", section="会话操作:", help_lines=(
             "  f      分叉会话（创建副本后接回，不影响原会话）",
         )),
-        Key(("s",), "s 停止", "_key_stop", section="会话操作:", help=(
+        Key(("s",), "s 停止", "_key_stop", section="会话操作:", help_lines=(
             "  s      停止运行中的会话（发送 SIGTERM，需二次确认）",
         )),
-        Key(("R",), "R 转后台", "_key_relaunch", section="会话操作:", help=(
+        Key(("R",), "R 转后台", "_key_relaunch", section="会话操作:", help_lines=(
             "  R      转入 tmux 后台并开启远控（脱离终端，手机/网页可接管；",
             "         接运行中的会话会先确认接管）",
         )),
-        Key(("d",), "d 删除", "_key_delete", section="会话操作:", help=(
+        Key(("d",), "d 删除", "_key_delete", section="会话操作:", help_lines=(
             "  d      删除已结束的会话记录",
         )),
-        Key(("y",), "y 复制命令", "_key_yank", section="会话操作:", help=(
+        Key(("y",), "y 复制命令", "_key_yank", section="会话操作:", help_lines=(
             "  y      复制接回命令到剪贴板",
         )),
         Key(("h",), "h 桥接显隐", "_key_toggle_hidden", needs_selection=False,
-            section="会话操作:", help=(
+            section="会话操作:", help_lines=(
                 "  h      显示/隐藏桥接、SDK 会话",
             )),
         Key(("c",), "c 清理", "_enter_cleanup", needs_selection=False,
-            section="清理与过滤:", help=(
+            section="清理与过滤:", help_lines=(
                 "  c      打开清理子菜单",
             )),
         Key(("/",), "/ 过滤", "_enter_filter", needs_selection=False,
-            section="清理与过滤:", help=(
+            section="清理与过滤:", help_lines=(
                 "  /      按关键词过滤会话列表",
             )),
         Key(("r",), None, "_key_refresh", needs_selection=False,
-            section="清理与过滤:", help=(
+            section="清理与过滤:", help_lines=(
                 "  r      刷新",
             )),
         Key(("?",), "? 详细说明", "_show_help", needs_selection=False),
@@ -127,7 +127,7 @@ class SessionsView(CleanupMixin, ListTabView):
         self._cleanup_walker = urwid.SimpleFocusListWalker([])
 
     def keyhints(self) -> str:
-        if self._mode == "help":
+        if self._overlay_active():
             # "其余" is honest: the prefix's Tab/q stay global (Tab switches
             # tabs, q QUITS — neither returns to the list).
             return "其余任意键返回"
@@ -362,11 +362,12 @@ class SessionsView(CleanupMixin, ListTabView):
 
     # --- Key dispatch ---
 
-    def handle_key(self, key: str) -> None:
-        if self._mode == "help":
-            self._handle_overlay_key(key)
-            return
+    def _overlay_active(self) -> bool:
+        return self._mode == "help"
 
+    def handle_key(self, key: str) -> None:
+        """Extra modes first (filter/preview/cleanup are Sessions-only); the
+        help overlay + list dispatch fall through to the base handle_key."""
         if self._mode == "filter":
             if key == "enter":
                 self._exit_filter()
@@ -398,8 +399,8 @@ class SessionsView(CleanupMixin, ListTabView):
                 self.app.refresh_with_notice()
             return
 
-        # Normal list mode — dispatch straight from KEY_TABLE.
-        self._dispatch_key(key)
+        # Help overlay + normal list mode: the base handle_key.
+        super().handle_key(key)
 
     # --- key handlers (bound by name in KEY_TABLE) ---
 

{cc_session_control-0.6.2 → cc_session_control-0.6.3/src/cc_session_control.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-control
-Version: 0.6.2
+Version: 0.6.3
 Summary: TUI manager for Claude Code sessions and Remote Control
 Author: dzshzx
 License-Expression: MIT