cdx-manager 0.9.16 → 0.11.0

package/src/cli.py

@@ -3,10 +3,14 @@
 import json
 import os
 import sys
+from datetime import datetime, timezone
 
 from .cli_commands import (
     API_SCHEMA_VERSION,
     STATUS_USAGE,
+    _collect_profile_cleanup_candidates,
+    _directory_child_sizes,
+    _directory_size_bytes,
     handle_add,
     handle_can_resume,
     handle_clean,
@@ -15,6 +19,7 @@ from .cli_commands import (
     handle_context,
     handle_copy,
     handle_disable,
+    handle_disk,
     handle_doctor,
     handle_enable,
     handle_export,
@@ -31,6 +36,7 @@ from .cli_commands import (
     handle_remove,
     handle_rename,
     handle_repair,
+    handle_reset,
     handle_resume,
     handle_run,
     handle_run_report,
@@ -44,6 +50,10 @@ from .cli_commands import (
     handle_update,
     handle_view,
 )
+from .cli_commands import (
+    _format_bytes as _format_disk_bytes,
+)
+from .cli_helpers import _update_notice_warnings
 from .cli_render import (
     _format_sessions,
     _pad_table,
@@ -66,7 +76,7 @@ from .status_view import (
 )
 from .update_check import check_for_update, check_logics_manager_for_update
 
-VERSION = "0.9.16"
+VERSION = "0.11.0"
 
 # Public surface: this module is a facade. Names below are imported above
 # purely to be re-exported (consumed by tests and external callers); listing
@@ -94,6 +104,7 @@ _COMMAND_HANDLERS = {
     "config": handle_config,
     "configs": handle_configs,
     "context": handle_context,
+    "disk": handle_disk,
     "doctor": handle_doctor,
     "disable": handle_disable,
     "enable": handle_enable,
@@ -107,6 +118,7 @@ _COMMAND_HANDLERS = {
     "next": handle_next,
     "notify": handle_notify,
     "repair": handle_repair,
+    "reset": handle_reset,
     "rename": handle_rename,
     "resume": handle_resume,
     "can-resume": handle_can_resume,
@@ -165,12 +177,14 @@ def _print_help(use_color=False):
         f"  {_style('cdx status --small|-s [--refresh|--cached] [--timeout SECONDS]', '36', use_color)}",
         f"  {_style('cdx status <name> [--json] [--refresh|--cached] [--timeout SECONDS]', '36', use_color)}",
         f"  {_style('cdx next [--json] [--refresh]', '36', use_color)}",
+        f"  {_style('cdx reset <name> [--yes] [--json]', '36', use_color)}",
         f"  {_style('cdx select --provider PROVIDER [--min-reasoning-effort minimal|low|medium|high|xhigh] [--min-power minimal|low|medium|high|xhigh] [--require-ready] [--refresh] --json', '36', use_color)}",
-        f"  {_style('cdx run [session] --cwd PATH (--prompt-file PATH|--prompt TEXT) [--provider PROVIDER] [--model MODEL] [--reasoning-effort minimal|low|medium|high|xhigh] [--power minimal|low|medium|high|xhigh] [--permission review|default|auto|full|workspace-write|read-only|danger-full-access] [--timeout-seconds N] --json', '36', use_color)}",
+        f"  {_style('cdx run [session] --cwd PATH (--prompt-file PATH|--prompt TEXT) [--provider PROVIDER] [--model MODEL] [--kind assistant|code-review] [--reasoning-effort minimal|low|medium|high|xhigh] [--power minimal|low|medium|high|xhigh] [--permission review|default|auto|full|workspace-write|read-only|danger-full-access] [--timeout-seconds N] --json', '36', use_color)}",
         f"  {_style('cdx runs [--limit N] --json', '36', use_color)}",
         f"  {_style('cdx run-status <run_id> --json', '36', use_color)}",
         f"  {_style('cdx run-report <run_id> --json', '36', use_color)}",
         f"  {_style('cdx context show|path|init|edit|clear|set [text...] [--json]', '36', use_color)}",
+        f"  {_style('cdx disk [profiles] [--candidates] [--json]', '36', use_color)}",
         f"  {_style('cdx config <name> [--json]', '36', use_color)}",
         f"  {_style('cdx configs [--json]', '36', use_color)}",
         f"  {_style('cdx power|perm|fast|model <name|all|provider:PROVIDER|a,b> <value|default> [--json]', '36', use_color)}",
@@ -191,7 +205,8 @@ def _print_help(use_color=False):
         f"  {_style('cdx disable <name> [--json]', '36', use_color)}",
         f"  {_style('cdx enable <name> [--json]', '36', use_color)}",
         f"  {_style('cdx rmv <name> [--force] [--json]', '36', use_color)}",
-        f"  {_style('cdx clean [name] [--json]', '36', use_color)}",
+        f"  {_style('cdx clean [name] [--yes] [--json]', '36', use_color)}",
+        f"  {_style('cdx clean profiles (--tmp|--old-logs DAYS) [--yes] [--json]', '36', use_color)}",
         f"  {_style('cdx export <file> [--include-auth] [--sessions a,b] [--passphrase-env VAR|--passphrase-stdin] [--force] [--json]', '36', use_color)}",
         f"  {_style('cdx import <file> [--sessions a,b] [--passphrase-env VAR|--passphrase-stdin] [--force|--merge] [--json]', '36', use_color)}",
         f"  {_style('cdx doctor [--json]', '36', use_color)}",
@@ -264,36 +279,156 @@ def _get_update_notices(service, env, options):
     )
     if logics_notice:
         notices.append(logics_notice)
+    disk_notice = _get_disk_cleanup_notice(service, options)
+    if disk_notice:
+        notices.append(disk_notice)
     return notices
 
 
-def _update_warning_payload(notices):
-    if isinstance(notices, dict):
-        notices = [notices]
-    if not notices:
-        return []
-    warnings = []
-    for notice in notices:
-        tool = notice.get("tool") or "cdx-manager"
-        current = notice.get("current_version") or VERSION
-        command = notice.get("update_command") or ("cdx update" if tool == "cdx-manager" else None)
-        message = f"Update available: {tool} {notice['latest_version']} (current {current})"
-        if command:
-            message = f"{message}. Run: {command}"
-        warnings.append({
-            "code": "update_available" if tool == "cdx-manager" else f"{tool.replace('-', '_')}_update_available",
-            "message": message,
-            "tool": tool,
-            "latest_version": notice["latest_version"],
-            "current_version": current,
-            "update_command": command,
-            "url": notice.get("url"),
-        })
-    return warnings
+_DISK_CHECK_INTERVAL_SECONDS = 24 * 60 * 60
+_DISK_HOME_THRESHOLD_BYTES = 10 * 1024 * 1024 * 1024
+_DISK_RECLAIMABLE_THRESHOLD_BYTES = 1 * 1024 * 1024 * 1024
+_DISK_CATEGORY_THRESHOLD_BYTES = 500 * 1024 * 1024
+_DISK_PROFILE_THRESHOLD_BYTES = 2 * 1024 * 1024 * 1024
+
+
+def _now_utc(options):
+    now_fn = options.get("now")
+    value = now_fn() if callable(now_fn) else None
+    if isinstance(value, datetime):
+        return value.astimezone(timezone.utc)
+    return datetime.now(timezone.utc)
+
+
+def _read_json_file(path):
+    try:
+        with open(path, encoding="utf-8") as handle:
+            return json.load(handle)
+    except (OSError, ValueError):
+        return {}
+
+
+def _write_json_file(path, payload):
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    tmp_path = f"{path}.tmp"
+    with open(tmp_path, "w", encoding="utf-8") as handle:
+        json.dump(payload, handle, indent=2, sort_keys=True)
+        handle.write("\n")
+    os.replace(tmp_path, path)
+
+
+def _parse_iso_datetime(value):
+    if not value:
+        return None
+    try:
+        return datetime.fromisoformat(str(value).replace("Z", "+00:00")).astimezone(timezone.utc)
+    except ValueError:
+        return None
+
+
+def _get_disk_cleanup_notice(service, options):
+    checker = options.get("checkDiskCleanup")
+    if callable(checker):
+        return checker(service, options)
+
+    base_dir = service["base_dir"]
+    state_path = os.path.join(base_dir, "state", "disk-cleanup-check.json")
+    now = _now_utc(options)
+    state = _read_json_file(state_path)
+    last_checked = _parse_iso_datetime(state.get("last_checked_at"))
+    if last_checked and (now - last_checked).total_seconds() < _DISK_CHECK_INTERVAL_SECONDS:
+        return None
+
+    runner = options.get("diskUsageRunner")
+    try:
+        home_bytes = _directory_size_bytes(base_dir, runner=runner)
+        profiles_dir = os.path.join(base_dir, "profiles")
+        profile_rows = _directory_child_sizes(profiles_dir, runner=runner)
+        profile_total = sum(row["bytes"] for row in profile_rows)
+        candidates = _collect_profile_cleanup_candidates(base_dir, runner=runner, now=now.timestamp())
+    except Exception:
+        return None
+
+    reclaimable_bytes = sum(item["bytes"] for item in candidates)
+    tmp_bytes = sum(item["bytes"] for item in candidates if item["kind"].startswith("tmp-"))
+    old_log_bytes = sum(item["bytes"] for item in candidates if item["kind"].startswith("old-logs-"))
+    large_profiles = [
+        {
+            "name": row["name"],
+            "bytes": row["bytes"],
+            "size": _format_disk_bytes(row["bytes"]),
+            "share_pct": round((row["bytes"] / profile_total) * 100, 1) if profile_total else 0,
+        }
+        for row in profile_rows
+        if row["bytes"] >= _DISK_PROFILE_THRESHOLD_BYTES
+        or (
+            profile_total >= _DISK_RECLAIMABLE_THRESHOLD_BYTES
+            and row["bytes"] / profile_total >= 0.25
+        )
+    ]
+    triggered = (
+        home_bytes >= _DISK_HOME_THRESHOLD_BYTES
+        or reclaimable_bytes >= _DISK_RECLAIMABLE_THRESHOLD_BYTES
+        or tmp_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES
+        or old_log_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES
+        or bool(large_profiles)
+    )
+    state_payload = {
+        "last_checked_at": now.isoformat(),
+        "home_bytes": home_bytes,
+        "reclaimable_bytes": reclaimable_bytes,
+        "tmp_bytes": tmp_bytes,
+        "old_log_bytes": old_log_bytes,
+        "large_profiles": large_profiles,
+    }
+    try:
+        _write_json_file(state_path, state_payload)
+    except OSError:
+        pass
+    if not triggered:
+        return None
+
+    if reclaimable_bytes > 0:
+        message = (
+            f"Disk cleanup available: {_format_disk_bytes(reclaimable_bytes)} reclaimable "
+            f"in CDX profiles. Inspect: cdx disk profiles --candidates"
+        )
+    else:
+        message = (
+            f"CDX_HOME uses {_format_disk_bytes(home_bytes)}. "
+            "Inspect: cdx disk profiles --candidates"
+        )
+    if tmp_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES:
+        message = (
+            f"{message}. Safe temp cleanup: {_format_disk_bytes(tmp_bytes)} "
+            "with cdx clean profiles --tmp"
+        )
+    if old_log_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES:
+        message = (
+            f"{message}. Old logs: {_format_disk_bytes(old_log_bytes)} "
+            "with cdx clean profiles --old-logs 30d"
+        )
+    return {
+        "tool": "cdx-disk",
+        "code": "disk_cleanup_available",
+        "message": message,
+        "reclaimable_bytes": reclaimable_bytes,
+        "reclaimable_size": _format_disk_bytes(reclaimable_bytes),
+        "home_bytes": home_bytes,
+        "home_size": _format_disk_bytes(home_bytes),
+        "tmp_bytes": tmp_bytes,
+        "tmp_size": _format_disk_bytes(tmp_bytes),
+        "old_log_bytes": old_log_bytes,
+        "old_log_size": _format_disk_bytes(old_log_bytes),
+        "large_profiles": large_profiles,
+        "inspect_command": "cdx disk profiles --candidates",
+        "cleanup_tmp_command": "cdx clean profiles --tmp" if tmp_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES else None,
+        "cleanup_old_logs_command": "cdx clean profiles --old-logs 30d" if old_log_bytes >= _DISK_CATEGORY_THRESHOLD_BYTES else None,
+    }
 
 
 def _update_warning_text(notices):
-    payloads = _update_warning_payload(notices)
+    payloads = _update_notice_warnings({"update_notices": notices or [], "version": VERSION})
     if not payloads:
         return None
     return "\n".join(payload["message"] for payload in payloads)
@@ -405,7 +540,7 @@ def _list_json_payload(rows, notices=None):
         "ok": True,
         "action": "list",
         "message": "Listed known sessions",
-        "warnings": _update_warning_payload(notices),
+        "warnings": _update_notice_warnings({"update_notices": notices or [], "version": VERSION}),
         "sessions": rows,
     }
 

package/src/cli_args.py

@@ -13,14 +13,15 @@ from .provider_runtime import _normalize_reasoning_effort
 
 STATUS_USAGE = "Usage: cdx status [--json] [--refresh|--cached] [--timeout SECONDS] | cdx status --small|-s [--refresh|--cached] [--timeout SECONDS] | cdx status <name> [--json] [--refresh|--cached] [--timeout SECONDS]"
 DOCTOR_USAGE = "Usage: cdx doctor [--json]"
+DISK_USAGE = "Usage: cdx disk [profiles] [--candidates] [--json]"
 REPAIR_USAGE = "Usage: cdx repair [--dry-run] [--force] [--json]"
 UPDATE_USAGE = "Usage: cdx update [--check] [--yes] [--json] [--version TAG]"
 EXPORT_USAGE = "Usage: cdx export <file> [--include-auth] [--force] [--json] [--sessions name1,name2] [--passphrase-env VAR|--passphrase-stdin]"
-IMPORT_USAGE = "Usage: cdx import <file> [--force|--merge] [--json] [--sessions name1,name2] [--passphrase-env VAR|--passphrase-stdin]"
+IMPORT_USAGE = "Usage: cdx import <file> [--force|--merge] [--allow-authless-force] [--json] [--sessions name1,name2] [--passphrase-env VAR|--passphrase-stdin]"
 CONTEXT_USAGE = "Usage: cdx context show|path|init|edit|clear|set [text...] [--json]"
 HANDOFF_USAGE = "Usage: cdx handoff <name> [--json] | cdx handoff <source> <target> [--json]"
 SET_USAGE = "Usage: cdx set <name>|--sessions all|a,b|--provider PROVIDER [--power minimal|low|medium|high|xhigh] [--permission review|default|auto|full] [--fast on|off] [--rtk on|off] [--logics on|off] [--model MODEL] [--priority 0..100] [--json]"
-UNSET_USAGE = "Usage: cdx unset <name>|--sessions all|a,b|--provider PROVIDER (--power|--permission|--fast|--rtk|--logics|--model|--priority|--all) [--json]"
+UNSET_USAGE = "Usage: cdx unset <name>|--sessions all|a,b|--provider PROVIDER (--power|--reasoning-effort|--permission|--fast|--rtk|--logics|--model|--priority|--all) [--json]"
 SETTING_ALIAS_USAGE = "Usage: cdx power|perm|fast|model <name|all|provider:PROVIDER|a,b> <value|default> [--json]"
 CONFIG_USAGE = "Usage: cdx config <name> [--json]"
 CONFIGS_USAGE = "Usage: cdx configs [--json]"
@@ -185,6 +186,7 @@ def _parse_set_args(args):
 def _parse_unset_args(args):
     parsed = _parse_flag_args(args, {
         "--power": {"key": "power", "type": "bool", "default": False},
+        "--reasoning-effort": {"key": "reasoning_effort", "type": "bool", "default": False},
         "--permission": {"key": "permission", "type": "bool", "default": False},
         "--fast": {"key": "fast", "type": "bool", "default": False},
         "--rtk": {"key": "rtk", "type": "bool", "default": False},
@@ -206,8 +208,8 @@ def _parse_unset_args(args):
         raise CdxError(UNSET_USAGE)
     if not parsed["names"] and not parsed["sessions"] and not parsed["provider"]:
         raise CdxError(UNSET_USAGE)
-    keys = ["power", "permission", "fast", "rtk", "logics", "model", "priority"] if parsed["all"] else [
-        key for key in ("power", "permission", "fast", "rtk", "logics", "model", "priority") if parsed[key]
+    keys = ["power", "reasoning_effort", "permission", "fast", "rtk", "logics", "model", "priority"] if parsed["all"] else [
+        key for key in ("power", "reasoning_effort", "permission", "fast", "rtk", "logics", "model", "priority") if parsed[key]
     ]
     if not keys:
         raise CdxError(UNSET_USAGE)
@@ -404,18 +406,18 @@ def _format_period_datetime(value):
     return value.isoformat(timespec="seconds")
 
 
-def _parse_history_period(parsed, now):
+def _parse_history_period(parsed, now, usage=HISTORY_USAGE):
     since = parsed.get("since")
     from_value = parsed.get("from")
     to_value = parsed.get("to")
     if since and from_value:
-        raise CdxError("Usage: cdx history cannot combine --since and --from.")
-    start = _parse_since_value(since, now, HISTORY_USAGE) if since else None
+        raise CdxError(f"{usage} cannot combine --since and --from.")
+    start = _parse_since_value(since, now, usage) if since else None
     if from_value:
-        start = _parse_datetime_value(from_value, HISTORY_USAGE, end_of_day=False)
-    end = _parse_datetime_value(to_value, HISTORY_USAGE, end_of_day=True) if to_value else None
+        start = _parse_datetime_value(from_value, usage, end_of_day=False)
+    end = _parse_datetime_value(to_value, usage, end_of_day=True) if to_value else None
     if start and end and start.timestamp() > end.timestamp():
-        raise CdxError("Usage: cdx history period start must be before period end.")
+        raise CdxError(f"{usage} period start must be before period end.")
     return {
         "from": _format_period_datetime(start),
         "to": _format_period_datetime(end),
@@ -479,7 +481,7 @@ def _parse_history_args(args, now=None):
         "--to": {"key": "to", "type": "str", "default": None},
         "--json": {"key": "json", "type": "bool", "default": False},
     }, HISTORY_USAGE, positionals_key="names", max_positionals=1)
-    period = _parse_history_period(parsed, now)
+    period = _parse_history_period(parsed, now, HISTORY_USAGE)
     return {
         "name": parsed["names"][0] if parsed["names"] else None,
         "limit": parsed["limit"],
@@ -497,7 +499,7 @@ def _parse_stats_args(args, now=None):
         "--to": {"key": "to", "type": "str", "default": None},
         "--json": {"key": "json", "type": "bool", "default": False},
     }, STATS_USAGE, positionals_key="names", max_positionals=1)
-    period = _parse_history_period(parsed, now)
+    period = _parse_history_period(parsed, now, STATS_USAGE)
     return {
         "name": parsed["names"][0] if parsed["names"] else None,
         "period": period,
@@ -611,6 +613,7 @@ def _parse_import_args(args):
     parsed = _parse_flag_args(args, {
         "--force": {"key": "force", "type": "bool", "default": False},
         "--merge": {"key": "merge", "type": "bool", "default": False},
+        "--allow-authless-force": {"key": "allow_authless_force", "type": "bool", "default": False},
         "--json": {"key": "json", "type": "bool", "default": False},
         "--sessions": {
             "key": "session_names",