codex-manager 6.0.0__tar.gz → 8.0.0__tar.gz

{codex_manager-6.0.0 → codex_manager-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-manager
-Version: 6.0.0
+Version: 8.0.0
 Summary: Codex account snapshot manager
 Author-email: Dhruv <dhruv13x@gmail.com>
 License: MIT

{codex_manager-6.0.0 → codex_manager-8.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codex-manager"
-version = "6.0.0"
+version = "8.0.0"
 description = "Codex account snapshot manager"
 readme = "README.md"
 requires-python = ">=3.10"

{codex_manager-6.0.0 → codex_manager-8.0.0}/src/codex_manager/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "6.0.0"
+__version__ = "8.0.0"

{codex_manager-6.0.0 → codex_manager-8.0.0}/src/codex_manager/cli.py

@@ -72,7 +72,8 @@ def list_entries_from_args(args: Any) -> list[BackupEntry]:
             sys.exit(1)
 
     if latest_per_email:
-        all_entries.sort(key=lambda entry: entry.created_at, reverse=True)
+        # Sort by reset_at descending so the newest state is picked
+        all_entries.sort(key=lambda entry: entry.reset_at, reverse=True)
         seen_emails: dict[str, BackupEntry] = {}
         for entry in all_entries:
             if entry.email not in seen_emails:
@@ -166,6 +167,8 @@ def build_live_status(args: Any) -> CooldownStatus | None:
         validation_status="live",
         proposed_archive_name=live_status.proposed_archive_name,
         remaining_seconds=max(0, remaining_seconds),
+        quota_text=live_status.quota_text,
+        quota_percent_left=live_status.quota_percent_left,
         is_expired=live_status.is_expired,
     )
 
@@ -284,7 +287,13 @@ def handle_status(args: Any) -> None:
 
 
 def handle_backup(args: Any) -> None:
-    archive_path, metadata_path, metadata = perform_backup(args)
+    try:
+        archive_path, metadata_path, metadata = perform_backup(args)
+    except FileExistsError as exc:
+        console.print(f"[bold red]Stop:[/] {exc}")
+        console.print(f"[dim]Note: Backups are named after the account's weekly reset time.[/]")
+        console.print(f"[dim]If you want to update your current snapshot, run with: [bold white]--force[/][/]")
+        sys.exit(1)
 
     if getattr(args, "cloud", False):
         cp = get_cloud_provider(args)

{codex_manager-6.0.0 → codex_manager-8.0.0}/src/codex_manager/cooldown.py

@@ -16,6 +16,8 @@ class CooldownStatus:
     validation_status: str
     proposed_archive_name: str
     remaining_seconds: int
+    quota_text: str | None = None
+    quota_percent_left: int | None = None
     is_expired: bool = False
 
 
@@ -34,9 +36,6 @@ def evaluate_entry(entry: BackupEntry, now: datetime | None = None) -> CooldownS
     remaining_seconds = int((next_available_at - current).total_seconds())
     status = "ready" if remaining_seconds <= 0 else "cooldown"
 
-    # metadata for entry might have is_expired
-    # we need to load it if not already there, but BackupEntry doesn't have it.
-    # However, list_backups.py build_backup_entry could be updated to include it.
     is_expired = getattr(entry, "is_expired", False)
 
     return CooldownStatus(
@@ -48,6 +47,8 @@ def evaluate_entry(entry: BackupEntry, now: datetime | None = None) -> CooldownS
         validation_status="backup",
         proposed_archive_name=entry.archive_path.name,
         remaining_seconds=max(0, remaining_seconds),
+        quota_text=getattr(entry, "quota_text", None),
+        quota_percent_left=getattr(entry, "quota_percent_left", None),
         is_expired=is_expired,
     )
 
@@ -90,6 +91,8 @@ def evaluate_records(
                     validation_status="registry",
                     proposed_archive_name=existing_status.proposed_archive_name,
                     remaining_seconds=max(0, remaining_seconds),
+                    quota_text=reg_entry.get("quota_text"),
+                    quota_percent_left=reg_entry.get("quota_percent_left"),
                     is_expired=reg_entry.get("is_expired", False)
                 )
         else:
@@ -107,6 +110,8 @@ def evaluate_records(
                     validation_status="registry",
                     proposed_archive_name="none",
                     remaining_seconds=max(0, remaining_seconds),
+                    quota_text=reg_entry.get("quota_text"),
+                    quota_percent_left=reg_entry.get("quota_percent_left"),
                     is_expired=reg_entry.get("is_expired", False)
                 )
             )
@@ -145,6 +150,7 @@ def print_statuses_table(statuses: list[CooldownStatus], live_email: str | None
     table = Table(show_header=True, header_style="bold bright_magenta")
     table.add_column("Account", style="bright_cyan")
     table.add_column("Status", justify="center", no_wrap=True)
+    table.add_column("Quota", justify="right", style="bright_yellow")
     table.add_column("Available", justify="right", style="bright_yellow")
     table.add_column("Session Start", justify="right", style="dim")
     table.add_column("Reset At", justify="right", style="dim")
@@ -161,9 +167,16 @@ def print_statuses_table(statuses: list[CooldownStatus], live_email: str | None
         else:
             status_display = f"[bold bright_green]{status.status.upper()}[/]" if status.status == "ready" else f"[bold bright_yellow]{status.status.upper()}[/]"
 
+        quota_display = (
+            f"{status.quota_percent_left}%"
+            if status.quota_percent_left is not None
+            else "unknown"
+        )
+
         table.add_row(
             account_display,
             status_display,
+            quota_display,
             format_remaining(status.remaining_seconds),
             status.session_start_at.strftime("%Y-%m-%d %H:%M:%S"),
             status.next_available_at.strftime("%Y-%m-%d %H:%M:%S"),

{codex_manager-6.0.0 → codex_manager-8.0.0}/src/codex_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-manager
-Version: 6.0.0
+Version: 8.0.0
 Summary: Codex account snapshot manager
 Author-email: Dhruv <dhruv13x@gmail.com>
 License: MIT

{codex_manager-6.0.0 → codex_manager-8.0.0}/src/codex_manager.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ tests/test_args_cli_3.py
 tests/test_args_cli_extra.py
 tests/test_backup.py
 tests/test_backup2.py
+tests/test_backup_ux.py
 tests/test_cli2.py
 tests/test_cli_coverage.py
 tests/test_cli_coverage_2.py

codex_manager-8.0.0/tests/test_backup_ux.py

@@ -0,0 +1,36 @@
+import sys
+from pathlib import Path
+from types import SimpleNamespace
+from codex_manager.cli import handle_backup
+import pytest
+
+def test_handle_backup_file_exists_clean_error(tmp_path, capsys, mocker):
+    # Setup
+    backup_dir = tmp_path / "backups"
+    backup_dir.mkdir()
+    archive_name = "2026-01-01-test@example.com-codex.tar.gz"
+    (backup_dir / archive_name).write_text("existing")
+    
+    args = SimpleNamespace(
+        command="backup",
+        backup_dir=str(backup_dir),
+        force=False,
+        cloud=False,
+        dry_run=False
+    )
+    
+    # Mock perform_backup to raise the error like it does in real life
+    mocker.patch("codex_manager.cli.perform_backup", side_effect=FileExistsError(f"Archive already exists: {archive_name}. Use --force to overwrite."))
+    
+    with pytest.raises(SystemExit) as exc:
+        handle_backup(args)
+    
+    assert exc.value.code == 1
+    captured = capsys.readouterr()
+    assert "Stop:" in captured.out
+    assert "--force" in captured.out
+    assert "weekly reset time" in captured.out
+
+if __name__ == "__main__":
+    # Just a simple run to see it visually if needed
+    pass