cc-session-control 0.7.2__tar.gz → 0.7.4__tar.gz

{cc_session_control-0.7.2/src/cc_session_control.egg-info → cc_session_control-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-control
-Version: 0.7.2
+Version: 0.7.4
 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,6 @@ 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
 ```
@@ -112,7 +112,6 @@ 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 |

{cc_session_control-0.7.2 → cc_session_control-0.7.4}/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,6 @@ 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
 ```
@@ -89,7 +89,6 @@ 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 |

{cc_session_control-0.7.2 → cc_session_control-0.7.4}/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.2"
+__version__ = "0.7.4"

{cc_session_control-0.7.2 → cc_session_control-0.7.4}/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,6 @@ 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)",
@@ -29,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
@@ -73,8 +71,6 @@ def _build_parser() -> argparse.ArgumentParser:
 
 def _apply_global_flags(args: argparse.Namespace) -> None:
     from .config import cfg
-    if args.workspace:
-        cfg.workspace = args.workspace
     if args.theme:
         cfg.theme = args.theme
 
@@ -89,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()
@@ -133,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():

{cc_session_control-0.7.2 → cc_session_control-0.7.4}/src/cc_session_control/config.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import json
 import os
 from pathlib import Path
 
@@ -20,18 +19,6 @@ class Config:
         self.cleanup_age_days: int = int(os.environ.get("CSCTL_CLEANUP_AGE_DAYS", "14"))
         # TUI palette: "auto" (detect the terminal background) | "dark" | "light".
         self.theme: str = os.environ.get("CSCTL_THEME", "auto")
-        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
 
     @property
     def projects_root(self) -> Path:
@@ -108,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()