cdx-manager 0.9.1 → 0.9.2

package/changelogs/CHANGELOGS_0_9_2.md

@@ -0,0 +1,33 @@
+# CDX Manager 0.9.2
+
+## Highlights
+
+- `cdx import` gains a `--merge` flag to fill in missing data without overwriting what already exists locally.
+- npm and PyPI publication workflows now verify that the release tag's commit has a successful `CI` run before any registry upload step.
+
+## Changes
+
+### cdx import: `--merge` mode
+
+`cdx import` previously offered two stances on existing sessions: reject the conflict (default) or erase and replace (`--force`). A third mode is now available:
+
+```
+cdx import backup.cdx --merge
+```
+
+With `--merge`, for each session that already exists locally:
+
+- **Session fields** — existing values are kept; fields absent locally are pulled in from the bundle.
+- **Session state** — same merge rule: local data wins, bundle fills the gaps.
+- **Profile files** (auth.json, credentials, etc.) — files that already exist on disk are left untouched; files missing locally are restored from the bundle.
+- **New sessions** in the bundle that have no local counterpart are imported normally.
+
+`--force` and `--merge` are mutually exclusive and raise a clear error if combined.
+
+## Validation
+
+- `npm run prepublishOnly`
+- `npm pack --dry-run`
+- `python -m unittest discover -s test -p 'test_release_ci_py.py'`
+- `logics-manager lint --require-status`
+- `logics-manager audit --legacy-cutoff-version 1.1.0 --group-by-doc`

package/checksums/release-archives.json

@@ -68,6 +68,10 @@
     "v0.9.0": {
       "github_tarball_sha256": "809af5746e1287f4c5dc7a2fb7583e67e212aa250c45be905c32374e5dee26d6",
       "github_zip_sha256": "9118f81645c00a4a660923a1ae290f48bd458af7ebfcf9f6580a3b91023b7c76"
+    },
+    "v0.9.1": {
+      "github_tarball_sha256": "8cbab620c823aeaf56e72c1a4d20e251a1c7142bfeeb3d516321d59c2c0a621d",
+      "github_zip_sha256": "253909ede6dca61937835bd4ee29145ddacaa08fbdfba1b39810da73ae2ccc84"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdx-manager",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Terminal session manager for Codex and Claude accounts.",
   "license": "MIT",
   "author": "Alexandre Agostini",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdx-manager"
-version = "0.9.1"
+version = "0.9.2"
 description = "Terminal session manager for Codex and Claude accounts."
 readme = "README.md"
 requires-python = ">=3.9"

package/src/cli.py

@@ -64,7 +64,7 @@ from .status_view import (
 )
 from .update_check import check_for_update, check_logics_manager_for_update
 
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 
 
 # ---------------------------------------------------------------------------
@@ -108,7 +108,7 @@ def _print_help(use_color=False):
         f"  {_style('cdx rmv <name> [--force] [--json]', '36', use_color)}",
         f"  {_style('cdx clean [name] [--json]', '36', use_color)}",
         f"  {_style('cdx export <file> [--include-auth] [--sessions a,b] [--passphrase-env VAR] [--force] [--json]', '36', use_color)}",
-        f"  {_style('cdx import <file> [--sessions a,b] [--passphrase-env VAR] [--force] [--json]', '36', use_color)}",
+        f"  {_style('cdx import <file> [--sessions a,b] [--passphrase-env VAR] [--force|--merge] [--json]', '36', use_color)}",
         f"  {_style('cdx doctor [--json]', '36', use_color)}",
         f"  {_style('cdx repair [--dry-run] [--force] [--json]', '36', use_color)}",
         f"  {_style('cdx view [--json]', '36', use_color)}",

package/src/cli_commands.py

@@ -55,7 +55,7 @@ DOCTOR_USAGE = "Usage: cdx doctor [--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]"
-IMPORT_USAGE = "Usage: cdx import <file> [--force] [--json] [--sessions name1,name2] [--passphrase-env VAR]"
+IMPORT_USAGE = "Usage: cdx import <file> [--force|--merge] [--json] [--sessions name1,name2] [--passphrase-env VAR]"
 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 low|medium|high|xhigh|max] [--permission review|default|auto|full] [--fast on|off] [--rtk on|off] [--logics on|off] [--model MODEL] [--priority 0..100] [--json]"
@@ -1000,6 +1000,7 @@ def _parse_export_args(args):
 def _parse_import_args(args):
     parsed = _parse_flag_args(args, {
         "--force": {"key": "force", "type": "bool", "default": False},
+        "--merge": {"key": "merge", "type": "bool", "default": False},
         "--json": {"key": "json", "type": "bool", "default": False},
         "--sessions": {
             "key": "session_names",
@@ -1012,6 +1013,8 @@ def _parse_import_args(args):
     parsed["file_path"] = parsed.pop("positionals")[0] if parsed["positionals"] else None
     if not parsed["file_path"]:
         raise CdxError(IMPORT_USAGE)
+    if parsed["force"] and parsed["merge"]:
+        raise CdxError("--force and --merge are mutually exclusive.")
     return parsed
 
 
@@ -2643,6 +2646,7 @@ def handle_import(rest, ctx):
         passphrase=passphrase,
         session_names=parsed["session_names"],
         force=parsed["force"],
+        merge=parsed["merge"],
     )
     session_count = len(result["session_names"])
     auth_suffix = " with auth" if result["include_auth"] else ""

package/src/session_service.py

@@ -1173,7 +1173,7 @@ def create_session_service(options=None):
             "bundle_size_bytes": len(bundle_bytes),
         }
 
-    def import_bundle(file_path, passphrase=None, session_names=None, force=False):
+    def import_bundle(file_path, passphrase=None, session_names=None, force=False, merge=False):
         if not file_path or not os.path.isfile(file_path):
             raise CdxError(f"Bundle file not found: {file_path}")
         with open(file_path, "rb") as handle:
@@ -1193,15 +1193,18 @@ def create_session_service(options=None):
 
         existing = {session["name"] for session in list_sessions()}
         conflicts = [name for name in names if name in existing]
-        if conflicts and not force:
+        if conflicts and not force and not merge:
             raise CdxError(f"Import would overwrite existing sessions: {', '.join(conflicts)}")
 
         for session_payload in imported_sessions:
             name = session_payload["name"]
             _validate_new_session_name(name)
             provider = _normalize_provider(session_payload["provider"])
-            if name in existing:
+            is_existing = name in existing
+
+            if is_existing and force:
                 remove_session(name)
+                is_existing = False
 
             session_root = _get_session_root(name)
             auth_home = _get_session_auth_home(name, provider)
@@ -1210,18 +1213,38 @@ def create_session_service(options=None):
             _ensure_private_dir(session_root)
             _ensure_private_dir(auth_home)
 
-            session_record = {
-                **session_payload,
-                "provider": provider,
-                "enabled": session_payload.get("enabled", True) is not False,
-                "sessionRoot": session_root,
-                "authHome": auth_home,
-            }
-            store["replace_session"](name, session_record)
+            if is_existing and merge:
+                existing_record = store["get_session"](name) or {}
+                bundle_record = {
+                    **session_payload,
+                    "provider": provider,
+                    "enabled": session_payload.get("enabled", True) is not False,
+                    "sessionRoot": session_root,
+                    "authHome": auth_home,
+                }
+                # Existing values take precedence; bundle fills in missing keys only.
+                merged_record = {**bundle_record, **{k: v for k, v in existing_record.items() if v is not None}}
+                merged_record["sessionRoot"] = session_root
+                merged_record["authHome"] = auth_home
+                store["replace_session"](name, merged_record)
+            else:
+                session_record = {
+                    **session_payload,
+                    "provider": provider,
+                    "enabled": session_payload.get("enabled", True) is not False,
+                    "sessionRoot": session_root,
+                    "authHome": auth_home,
+                }
+                store["replace_session"](name, session_record)
 
             state = (payload.get("states") or {}).get(name)
             if state is not None:
-                store["write_session_state"](name, state)
+                if is_existing and merge:
+                    existing_state = store["read_session_state"](name) or {}
+                    merged_state = {**state, **{k: v for k, v in existing_state.items() if v is not None}}
+                    store["write_session_state"](name, merged_state)
+                else:
+                    store["write_session_state"](name, state)
 
             for item in (payload.get("profiles") or {}).get(name, []):
                 rel_path = _safe_relpath(item.get("path"))
@@ -1230,6 +1253,9 @@ def create_session_service(options=None):
                 except (AttributeError, ValueError, UnicodeEncodeError) as error:
                     raise CdxError(f"Bundle contains invalid file data for session {name}: {rel_path}") from error
                 dest_path = os.path.join(session_root, rel_path)
+                # In merge mode, skip files that already exist locally.
+                if is_existing and merge and os.path.exists(dest_path):
+                    continue
                 _ensure_private_dir(os.path.dirname(dest_path))
                 with open(dest_path, "wb") as handle:
                     handle.write(content)