cdx-manager 0.24.2 → 0.24.3

package/README.md

@@ -4,7 +4,7 @@
 
 <br clear="left"/>
 
-[![License](https://img.shields.io/badge/license-MIT-4C8BF5)](LICENSE) ![Version](https://img.shields.io/badge/version-v0.24.2-4C8BF5) ![Python](https://img.shields.io/badge/python-3.9%2B-3776AB?logo=python&logoColor=white)
+[![License](https://img.shields.io/badge/license-MIT-4C8BF5)](LICENSE) ![Version](https://img.shields.io/badge/version-v0.24.3-4C8BF5) ![Python](https://img.shields.io/badge/python-3.9%2B-3776AB?logo=python&logoColor=white)
 
 **The right AI coding account, when you need it.** CDX Manager keeps your Codex and Claude accounts in separate profiles, shows which ones have quota, and helps you pick the next usable session from your terminal.
 

package/VERSION

@@ -1 +1 @@
-0.24.2
+0.24.3

package/changelogs/CHANGELOGS_0_24_3.md

@@ -0,0 +1,13 @@
+# CDX Manager 0.24.3
+
+Release date: 2026-10-29
+
+This patch preserves observed serving models in run history and reports for more reliable usage attribution and pricing. (#57)
+
+## Runs and statistics
+
+- Expose `usage_model` separately from the requested `model` in completed run JSON and registry reports, and retain observed model evidence in interactive history even when token usage is unavailable.
+- Recover Codex model evidence from the exact rollout identified by `thread.started.thread_id`, while keeping token totals from the run's own output. Configured defaults alone do not establish the serving model; missing or mixed model evidence stays unpriced.
+- Group Claude's `[1m]` context variants with their base model in `cdx stats --by model`, preserving the original model string and per-run pricing.
+
+These changes apply to newly recorded runs; existing history is not rewritten.

package/checksums/release-archives.json

@@ -595,6 +595,17 @@
         "x86_64-pc-windows-msvc": "89a7e43654ea5f0d4efc20a14c1398377a1d48485f1b9867b199e85aa9c25daf",
         "x86_64-unknown-linux-musl": "a36a3589a3766d67e44a0466b11a18bda4297963416eec7b5b9d23a5c9f363a4"
       }
+    },
+    "v0.24.2": {
+      "github_tarball_sha256": "90ea3d050c278500b975bbc8bfe1b185f90fc35dfcf6b07d84eb59439bb24e58",
+      "github_zip_sha256": "3c53f0f0550416ebe3d7281e9c823a682a2c3560130df6fafec48d35278f4f8a",
+      "tray_assets": {
+        "aarch64-apple-darwin": "8fc48c8772b5ea50700933f0836e153104ef328b395de059749bd5a5aa864076",
+        "aarch64-unknown-linux-musl": "ce7708f4196cfdf7b7226ba3199e772e767c2d470c37d19589cb41bfc35de7af",
+        "x86_64-apple-darwin": "2d1d6e84ee08d9dea5a707332a39509edbe68b05e3d062bdae93e9c6704db543",
+        "x86_64-pc-windows-msvc": "eecc8f8c46d2ce50e6cf6ec6c48c10a10e165ec7ec0058cfb55c8aa486d17d7b",
+        "x86_64-unknown-linux-musl": "4cf3289c5d9d7a540a032a11d27e93093d69ec507e1796a726f429c0670f7bc5"
+      }
     }
   }
 }

package/docs/cli.md

@@ -269,6 +269,8 @@ The figure uses standard public list prices, excluding Fast/priority, Batch/Flex
 
 `cdx stats` counts completed history attempts. A headless failover has one logical run in `cdx runs` but one history row per attempted session, including failed attempts that reported usage. Period filtering includes the entire run in every period it overlaps, so adjacent daily results can both include a run crossing midnight; adding daily totals may exceed a combined period. JSON `accounting` names this policy and the current price-table source. `usage_runs` and `priced_runs` show how much of the token total has a dollar estimate. Live runs are absent until their history row is written, and unknown usage is different from measured zero.
 
+Completed run JSON and registry reports expose `usage_model` separately from the requested `model`. Pricing uses the observed model from provider output; Codex can also supply it through the exact rollout identified by `thread.started.thread_id`. Configured defaults alone never establish serving-model identity, and missing or mixed model evidence stays unpriced. `--by model` groups Claude's `[1m]` context variant with its base model while preserving the original model string and per-run pricing. These changes apply to newly recorded runs; existing history is not rewritten.
+
 The built-in price table ships with **cdx-manager**. Run `cdx update` to receive new model prices; updating Codex or Claude alone does not refresh it. Then check `cdx --version` and `cdx stats --json`. Existing runs with a recorded model are recalculated using the new table when stats are read. `CDX_TOKEN_PRICES` overrides still take precedence. Maintainers: follow [the model and pricing update runbook](https://github.com/AlexAgo83/cdx-manager/blob/main/logics/runbook/run_005_maintaining_the_token_price_table.md) for source checks, tests, release preparation and installed-version verification.
 
 A model absent from the table stays unpriced rather than being charged a default tier, and the totals line names it — which is exactly the key `CDX_TOKEN_PRICES` wants:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdx-manager",
-  "version": "0.24.2",
+  "version": "0.24.3",
   "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.24.2"
+version = "0.24.3"
 description = "Terminal session manager for Codex and Claude accounts."
 readme = "README.md"
 requires-python = ">=3.9"

package/src/commands/launch.py

@@ -458,16 +458,16 @@ def _attach_interactive_usage(session, run_info, history=None, baseline=None, un
         # way as an id match would let a wrong attribution read as a
         # measurement, which is the failure this replaced.
         run_info["provider_transcript_match"] = match
-    if not cumulative:
-        return run_info
-
-    run_info["usage_cumulative"] = cumulative
     if model:
         # Which model actually served the run, read from the transcript rather
         # than inferred from the session's configured launch settings -- where
         # `model` is optional and usually unset, because the session takes the
         # provider's default.
         run_info["usage_model"] = model
+    if not cumulative:
+        return run_info
+
+    run_info["usage_cumulative"] = cumulative
     if uncertain_reason:
         run_info["usage_attribution"] = uncertain_reason
         return run_info

package/src/commands/runs.py

@@ -687,6 +687,7 @@ def handle_run(rest, ctx):
             )
             usage, usage_model = extract_run_observation(
                 run_session.get("provider"), run_info.get("stdout_path"),
+                run_session.get("authHome"),
             )
             run_info = {**run_info, "usage": usage, "usage_model": usage_model}
             ctx["service"]["record_launch_history"](run_session["name"], {
@@ -807,6 +808,7 @@ def handle_run(rest, ctx):
         if run_info and run_id:
             usage, usage_model = extract_run_observation(
                 run_session.get("provider"), run_info.get("stdout_path"),
+                run_session.get("authHome"),
             )
             run_info = {**run_info, "usage": usage, "usage_model": usage_model}
             ctx["service"]["record_launch_history"](run_session["name"], {

package/src/commands/status.py

@@ -491,7 +491,8 @@ def _stats_group(entry, by):
     """The project (launch folder) or the model a run is counted under."""
     if by == "project":
         return str(entry.get("cwd") or "").rstrip("/\\") or "-"
-    return entry.get("usage_model") or "-"
+    model = entry.get("usage_model") or "-"
+    return model.removesuffix("[1m]") if model.startswith("claude-") else model
 
 
 def _project_labels(paths):

package/src/run_command.py

@@ -4,7 +4,7 @@ import sys
 from .cli_args import ARG_CODE_INVALID_VALUE
 from .errors import CdxArgumentError, CdxError
 from .provider_runtime import headless_permission_disables_network
-from .run_usage import empty_usage, extract_run_usage
+from .run_usage import empty_usage, extract_run_observation
 
 PROMPT_STDIN = "-"
 
@@ -182,11 +182,11 @@ def run_launch_payload(api_schema_version, parsed, session, artifacts, cwd=None,
 def run_result_payload(api_schema_version, ok, parsed, session, run_info=None,
                        error=None, error_source=None, error_code=None, selection_row=None):
     run_info = run_info or {}
-    usage = run_info.get("usage") if isinstance(run_info.get("usage"), dict) else (
-        extract_run_usage(session.get("provider"), run_info.get("stdout_path"))
-        if session else
-        empty_usage()
-    )
+    usage, usage_model = run_info.get("usage"), run_info.get("usage_model")
+    if not isinstance(usage, dict):
+        usage, usage_model = extract_run_observation(
+            session.get("provider"), run_info.get("stdout_path"), session.get("authHome"),
+        ) if session else (empty_usage(), None)
     message = None if ok else (
         _provider_failure_message(error, run_info, error_code)
         if error_source == "provider"
@@ -221,6 +221,7 @@ def run_result_payload(api_schema_version, ok, parsed, session, run_info=None,
         "stdout_path": run_info.get("stdout_path"),
         "stderr_path": run_info.get("stderr_path"),
         "usage": usage,
+        "usage_model": usage_model,
         "warnings": warnings,
         "error": None if ok else {
             "source": error_source or "cdx",

package/src/run_registry.py

@@ -358,6 +358,7 @@ class RunRegistry:
                 # what `cdx run-status` and `cdx run-report` publish, and it
                 # used to store whichever shape the producing reader emitted.
                 run["usage"] = coerce_usage(final_payload.get("usage"))
+                run["usage_model"] = final_payload.get("usage_model")
                 run["final_payload"] = final_payload
             if error:
                 run["error"] = error

package/src/run_usage.py

@@ -413,7 +413,7 @@ def extract_run_usage(provider, stdout_path):
     return extract_run_observation(provider, stdout_path)[0]
 
 
-def extract_run_observation(provider, stdout_path):
+def extract_run_observation(provider, stdout_path, auth_home=None):
     if not stdout_path or not provider:
         return empty_usage(), None
     if provider not in SUPPORTED_PROVIDERS:
@@ -444,9 +444,46 @@ def extract_run_observation(provider, stdout_path):
         model_usage = record.get("modelUsage")
         if isinstance(model_usage, dict):
             models.update(model_usage)
+    if provider == "codex" and auth_home:
+        models.update(_codex_run_models(records, auth_home))
     return usage, next(iter(models)) if len(models) == 1 else None
 
 
+def _codex_run_models(records, auth_home):
+    # Exec's token totals belong to this run; a rollout's totals may include
+    # earlier turns. Read only model evidence from the exact thread's rollout.
+    from .interactive_usage import MAX_TRANSCRIPT_BYTES, conversation_transcript
+
+    thread_ids = {record.get("thread_id") for record in records
+                  if isinstance(record, dict) and record.get("type") == "thread.started"
+                  and isinstance(record.get("thread_id"), str) and record["thread_id"]}
+    if len(thread_ids) != 1:
+        return set()
+    path = conversation_transcript("codex", auth_home, next(iter(thread_ids)))
+    if not path:
+        return set()
+    models = set()
+    try:
+        with open(path, encoding="utf-8", errors="replace") as handle:
+            text = handle.read(MAX_TRANSCRIPT_BYTES + 1)
+            if len(text) > MAX_TRANSCRIPT_BYTES:
+                return set()
+            for line in text.splitlines():
+                try:
+                    record = json.loads(line)
+                except ValueError:
+                    continue
+                if not isinstance(record, dict) or record.get("type") != "turn_context":
+                    continue
+                payload = record.get("payload")
+                model = payload.get("model") if isinstance(payload, dict) else None
+                if isinstance(model, str) and model:
+                    models.add(model)
+    except OSError:
+        return set()
+    return models
+
+
 def _parse_json_records(text):
     stripped = text.strip()
     try: