cc-session-control 0.7.1__tar.gz → 0.7.3__tar.gz

{cc_session_control-0.7.1/src/cc_session_control.egg-info → cc_session_control-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-control
-Version: 0.7.1
+Version: 0.7.3
 Summary: TUI manager for Claude Code sessions and Remote Control
 Author: dzshzx
 License-Expression: MIT
@@ -66,8 +66,9 @@ uv tool install --reinstall git+https://github.com/dzshzx/cc-session-control.git
 ```
 
 `csctl` manages the Claude Code state on the machine where it is installed: the
-local `~/.claude`, local `tmux`, and local workspace. Install it separately on
-each machine whose sessions you want to manage. For working *on* the code
+local `~/.claude`, local `tmux`, and the projects recorded in the local
+`~/.claude.json`. Install it separately on each machine whose sessions you want
+to manage. For working *on* the code
 instead of using it, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Usage
@@ -78,9 +79,9 @@ csctl
 
 # Remote Control management (no TUI)
 csctl rc status          # Show all projects and RC status
-csctl rc add .           # Add current project to RC list and start
-csctl rc add myproject   # Add by name
-csctl rc rm myproject    # Remove and stop
+csctl rc add .           # Add current directory to RC list and start
+csctl rc add ~/code/app  # Add by directory path
+csctl rc rm ~/code/app   # Remove and stop
 csctl rc up              # Start all listed projects
 csctl rc stop all        # Stop all RC servers
 csctl rc list            # Show auto-start list
@@ -103,7 +104,7 @@ csctl skill install --force  # Replace an existing skill directory
 csctl skill uninstall
 
 # Options
-csctl --workspace ~/projects   # Override workspace root
+csctl --theme light            # Force the TUI palette (auto/dark/light)
 csctl --version
 ```
 
@@ -111,9 +112,9 @@ csctl --version
 
 | Environment Variable | Default | Description |
 |---|---|---|
-| `CSCTL_WORKSPACE` | `~/workspace` | Workspace root directory |
 | `CSCTL_RC_SESSION` | `rc` | tmux session name for RC servers |
 | `CSCTL_RC_STAGGER` | `2` | Seconds between starting RC servers |
+| `CSCTL_THEME` | `auto` | TUI palette: `auto` (detect the terminal background via OSC 11 / `$COLORFGBG`) / `dark` / `light`. tmux typically doesn't answer the OSC 11 query, so inside tmux `auto` falls back to `dark` — set this (or `--theme`) explicitly for a light terminal |
 | `XDG_CONFIG_HOME` | `~/.config` | Config directory base |
 
 RC auto-start list is stored at `$XDG_CONFIG_HOME/csctl/rc-enabled`.

{cc_session_control-0.7.1 → cc_session_control-0.7.3}/README.md

@@ -43,8 +43,9 @@ uv tool install --reinstall git+https://github.com/dzshzx/cc-session-control.git
 ```
 
 `csctl` manages the Claude Code state on the machine where it is installed: the
-local `~/.claude`, local `tmux`, and local workspace. Install it separately on
-each machine whose sessions you want to manage. For working *on* the code
+local `~/.claude`, local `tmux`, and the projects recorded in the local
+`~/.claude.json`. Install it separately on each machine whose sessions you want
+to manage. For working *on* the code
 instead of using it, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Usage
@@ -55,9 +56,9 @@ csctl
 
 # Remote Control management (no TUI)
 csctl rc status          # Show all projects and RC status
-csctl rc add .           # Add current project to RC list and start
-csctl rc add myproject   # Add by name
-csctl rc rm myproject    # Remove and stop
+csctl rc add .           # Add current directory to RC list and start
+csctl rc add ~/code/app  # Add by directory path
+csctl rc rm ~/code/app   # Remove and stop
 csctl rc up              # Start all listed projects
 csctl rc stop all        # Stop all RC servers
 csctl rc list            # Show auto-start list
@@ -80,7 +81,7 @@ csctl skill install --force  # Replace an existing skill directory
 csctl skill uninstall
 
 # Options
-csctl --workspace ~/projects   # Override workspace root
+csctl --theme light            # Force the TUI palette (auto/dark/light)
 csctl --version
 ```
 
@@ -88,9 +89,9 @@ csctl --version
 
 | Environment Variable | Default | Description |
 |---|---|---|
-| `CSCTL_WORKSPACE` | `~/workspace` | Workspace root directory |
 | `CSCTL_RC_SESSION` | `rc` | tmux session name for RC servers |
 | `CSCTL_RC_STAGGER` | `2` | Seconds between starting RC servers |
+| `CSCTL_THEME` | `auto` | TUI palette: `auto` (detect the terminal background via OSC 11 / `$COLORFGBG`) / `dark` / `light`. tmux typically doesn't answer the OSC 11 query, so inside tmux `auto` falls back to `dark` — set this (or `--theme`) explicitly for a light terminal |
 | `XDG_CONFIG_HOME` | `~/.config` | Config directory base |
 
 RC auto-start list is stored at `$XDG_CONFIG_HOME/csctl/rc-enabled`.

{cc_session_control-0.7.1 → cc_session_control-0.7.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.7.1"
+__version__ = "0.7.3"

{cc_session_control-0.7.1 → cc_session_control-0.7.3}/src/cc_session_control/app.py

@@ -10,6 +10,7 @@ from typing import TYPE_CHECKING, Protocol, runtime_checkable
 
 import urwid
 
+from . import theme
 from .data import proc
 from .data.snapshot import WorldSnapshot, build_world_snapshot
 from .views.agents import AgentsView
@@ -47,28 +48,6 @@ class TabView(Protocol):
     def handle_key(self, key: str) -> None: ...
     def captures_text(self) -> bool: ...  # True while a text mode owns EVERY key (incl. tab/q)
 
-# 6-tuple: (name, fg_16, bg_16, mono, fg_256, bg_256)
-# ONE semantic set — views reference these names only (no per-tab duplicates;
-# the old rc_running/rc_stopped were aliases of alive/dead and are gone).
-# 256-color foregrounds are kept ≥ 4.5:1 against their background (WCAG-AA-ish,
-# checked via relative luminance): #aaa/#111 ≈ 8.1, #7ab/#111 ≈ 7.4,
-# #9cc/#181818 ≈ 10.0, #bbb/#111 ≈ 9.8, #d66/#111 ≈ 5.5.
-PALETTE = [
-    ("header",      "white,bold",  "black", "bold",     "#fff,bold",  "#111"),
-    ("footer",      "light gray",  "black", None,       "#aaa",       "#111"),
-    ("tab_on",      "white,bold",  "dark cyan", "bold,standout", "#fff,bold", "#068"),
-    ("tab_off",     "light cyan",  "black", None,       "#7ab",       "#111"),
-    ("alive",       "light green", "black", None,       "#6d6",       "#111"),
-    ("status_busy", "light green,bold", "black", "bold", "#6d6,bold", "#111"),
-    ("status_err",  "light red",   "black", None,       "#d66",       "#111"),
-    ("dead",        "light gray",  "black", None,       "#ccc",       "#111"),
-    ("selected",    "white,bold",  "dark cyan", "standout", "#fff,bold", "#068"),
-    ("notify",      "yellow,bold", "black", "bold",     "#ff0,bold",  "#111"),
-    ("status",      "light gray",  "black", None,       "#bbb",       "#111"),
-    ("body",        "light gray",  "black", None,       "#ccc",       "#111"),
-    ("col_header",  "dark cyan",   "black", None,       "#9cc",       "#181818"),
-]
-
 # Launcher-first order (ADR-0001): startup lands on 项目 (the tmux-first
 # dispatch entry), then 会话 / 后台. In lockstep with `self.views` below.
 TAB_NAMES = ["项目", "会话", "后台"]
@@ -80,6 +59,10 @@ FOOTER_PREFIX = " Tab 切换 · q 退出 · r 刷新 · "
 
 
 def _make_screen() -> urwid.raw_display.Screen:
+    # The theme query (OSC 11) runs here, before `loop.run()` puts the tty
+    # into urwid's hands; the palette itself lives in `theme.py` (ONE semantic
+    # attr set, dark/light generated from a single spec).
+    mode = theme.detect_mode()
     screen = urwid.raw_display.Screen()
     try:
         curses.setupterm()
@@ -88,7 +71,7 @@ def _make_screen() -> urwid.raw_display.Screen:
             screen.set_terminal_properties(colors=256)
     except Exception:
         pass
-    screen.register_palette(PALETTE)
+    screen.register_palette(theme.palette(mode))
     return screen
 
 

{cc_session_control-0.7.1 → cc_session_control-0.7.3}/src/cc_session_control/cli.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import argparse
 import os
 import sys
-from pathlib import Path
 
 
 def _build_parser() -> argparse.ArgumentParser:
@@ -16,7 +15,10 @@ def _build_parser() -> argparse.ArgumentParser:
         description="TUI manager for Claude Code sessions and Remote Control",
     )
     parser.add_argument("--version", action="version", version=f"csctl {__version__}")
-    parser.add_argument("--workspace", type=Path, help="Override workspace root directory")
+    parser.add_argument(
+        "--theme", choices=("auto", "dark", "light"),
+        help="TUI palette (default: auto-detect the terminal background; env CSCTL_THEME)",
+    )
 
     sub = parser.add_subparsers(dest="command")
 
@@ -25,12 +27,12 @@ def _build_parser() -> argparse.ArgumentParser:
     rc_sub = rc_parser.add_subparsers(dest="rc_command")
     rc_sub.add_parser("status", help="Show RC status for all projects")
     rc_add = rc_sub.add_parser("add", help="Add project to RC list and start")
-    rc_add.add_argument("project", nargs="?", default=".", help="Project name or '.' for current dir")
+    rc_add.add_argument("project", nargs="?", default=".", help="Project directory (default: current dir)")
     rc_rm = rc_sub.add_parser("rm", help="Remove project from RC list and stop")
-    rc_rm.add_argument("project", help="Project name")
+    rc_rm.add_argument("project", help="Project directory")
     rc_sub.add_parser("up", help="Start all listed projects")
     rc_stop = rc_sub.add_parser("stop", help="Stop RC for a project")
-    rc_stop.add_argument("target", help="Project name or 'all'")
+    rc_stop.add_argument("target", help="Project directory or 'all'")
     rc_sub.add_parser("list", help="Show enabled project list")
 
     # prune subcommand
@@ -67,10 +69,10 @@ def _build_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _apply_workspace(args: argparse.Namespace) -> None:
-    if args.workspace:
-        from .config import cfg
-        cfg.workspace = args.workspace
+def _apply_global_flags(args: argparse.Namespace) -> None:
+    from .config import cfg
+    if args.theme:
+        cfg.theme = args.theme
 
 
 def _cmd_rc(args: argparse.Namespace) -> None:
@@ -83,36 +85,36 @@ def _cmd_rc(args: argparse.Namespace) -> None:
     sub = args.rc_command
 
     if sub == "status":
-        projects = rc.scan()
+        from .data.sessions import scan as scan_sessions
+
+        # Same ordering as the 项目 tab (rc.order_by_activity — single
+        # source); costs one transcript scan, like `csctl resume`.
+        projects = rc.order_by_activity(rc.scan(), scan_sessions())
         for p in projects:
             icon = {"running": "[running]", "dead": "[dead   ]", "stopped": "[stopped]"}.get(p.status, p.status)
             auto = "auto" if p.auto_start else "    "
             missing = "" if p.dir_exists else "  (directory missing)"
-            print(f"  {icon} {auto}  {p.name}{missing}")
+            print(f"  {icon} {auto}  {p.name}  {p.directory}{missing}")
 
     elif sub == "add":
-        proj = args.project
-        if proj == ".":
-            ws = str(rc.cfg.workspace)
-            cwd = os.getcwd()
-            if cwd.startswith(ws + "/"):
-                proj = cwd[len(ws) + 1:].split("/")[0]
-            else:
-                print(f"Current directory is not under {ws}. Specify project name explicitly.")
-                sys.exit(1)
-        if not rc.is_trusted(proj):
-            print(f"Not trusted: {proj} — run 'claude' in that directory first to accept the trust dialog")
+        path = os.path.abspath(args.project)
+        if not os.path.isdir(path):
+            print(f"No such directory: {path}")
+            sys.exit(1)
+        if not rc.is_trusted(path):
+            print(f"Not trusted: {path} — run 'claude' in that directory first to accept the trust dialog")
             sys.exit(1)
-        rc.list_add(proj)
-        print(f"Added to list: {proj}")
-        ok = rc.start_one(proj)
+        rc.list_add(path)
+        print(f"Added to list: {path}")
+        ok = rc.start_one(path)
         if ok:
-            print(f"Started: ws/{proj}")
+            print(f"Started RC server for {path}")
 
     elif sub == "rm":
-        rc.list_rm(args.project)
-        rc.stop_one(args.project)
-        print(f"Removed and stopped: {args.project}")
+        path = os.path.abspath(args.project)
+        rc.list_rm(path)
+        rc.stop_one(path)
+        print(f"Removed and stopped: {path}")
 
     elif sub == "up":
         enabled = rc.list_enabled()
@@ -127,8 +129,9 @@ def _cmd_rc(args: argparse.Namespace) -> None:
             rc.stop_all()
             print("Stopped all")
         else:
-            ok = rc.stop_one(args.target)
-            print(f"Stopped {args.target}" if ok else f"Not running: {args.target}")
+            path = os.path.abspath(args.target)
+            ok = rc.stop_one(path)
+            print(f"Stopped {path}" if ok else f"Not running: {path}")
 
     elif sub == "list":
         for name in rc.list_enabled():
@@ -311,7 +314,7 @@ def _cmd_tui(args: argparse.Namespace) -> None:
 def main() -> None:
     parser = _build_parser()
     args = parser.parse_args()
-    _apply_workspace(args)
+    _apply_global_flags(args)
 
     if args.command == "rc":
         _cmd_rc(args)

{cc_session_control-0.7.1 → cc_session_control-0.7.3}/src/cc_session_control/config.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import json
 import os
 from pathlib import Path
 
@@ -18,18 +17,8 @@ class Config:
         self.rc_stagger: int = int(os.environ.get("CSCTL_RC_STAGGER", "2"))
         # Age threshold (days) for the time/global-keyed cleanup strategy.
         self.cleanup_age_days: int = int(os.environ.get("CSCTL_CLEANUP_AGE_DAYS", "14"))
-        self._workspace: Path | None = None
-
-    @property
-    def workspace(self) -> Path:
-        if self._workspace is not None:
-            return self._workspace
-        self._workspace = _detect_workspace(self.claude_json)
-        return self._workspace
-
-    @workspace.setter
-    def workspace(self, value: Path) -> None:
-        self._workspace = value
+        # TUI palette: "auto" (detect the terminal background) | "dark" | "light".
+        self.theme: str = os.environ.get("CSCTL_THEME", "auto")
 
     @property
     def projects_root(self) -> Path:
@@ -106,28 +95,4 @@ class Config:
         return self.claude_home / "skills"
 
 
-def _detect_workspace(claude_json: Path) -> Path:
-    env = os.environ.get("CSCTL_WORKSPACE")
-    if env:
-        return Path(env)
-
-    default = Path.home() / "workspace"
-    if default.is_dir():
-        return default
-
-    try:
-        with open(claude_json) as f:
-            data = json.load(f)
-        dirs = [k for k in data.get("projects", {}) if "/" in k]
-        if dirs:
-            from os.path import commonpath
-            common = Path(commonpath(dirs))
-            if common.is_dir() and common != Path.home():
-                return common
-    except Exception:
-        pass
-
-    return Path.cwd()
-
-
 cfg = Config()