cdx-manager 0.20.1 → 0.20.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.20.1-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.20.3-4C8BF5) ![Python](https://img.shields.io/badge/python-3.9%2B-3776AB?logo=python&logoColor=white)
 
 **Stop guessing which AI account still has quota.** `cdx` tracks the rate-limit window of every Codex and Claude account you own, tells you which one is usable right now, and launches it with isolated auth — in one command.
 

package/VERSION

@@ -1 +1 @@
-0.20.1
+0.20.3

package/changelogs/CHANGELOGS_0_20_2.md

@@ -0,0 +1,12 @@
+# CDX Manager 0.20.2
+
+## Fixes
+
+- Claude transcripts up to 128 MiB are now measured. Before each relaunch, CDX
+  reconciles the preceding Claude conversation when its exact transcript was
+  not captured; `cdx repair --force` also repairs safely attributable history.
+- Token pricing now ignores synthetic transcript model placeholders when a real
+  provider model is present, so measured Claude sessions receive their price.
+- `cdx history` and `cdx stats --since` now include sessions that overlap the
+  requested period, including sessions that started before the window and
+  completed inside it.

package/changelogs/CHANGELOGS_0_20_3.md

@@ -0,0 +1,23 @@
+# CDX Manager 0.20.3
+
+## Fixes
+
+- Playwright, npm, pip, and uv now share one cache under `<CDX_HOME>/shared-cache`
+  instead of each isolated profile re-downloading its own copy, since profile
+  isolation redirects `HOME` per profile and those tools resolve their cache
+  dir from it.
+- A session now prints a short line when it ends, cleanly or by Ctrl-C/a
+  forwarded signal: the session name, how long it ran, and this run's own
+  cost (or token count when the model isn't priced). A genuine provider
+  crash still gets no line.
+
+## Performance
+
+- `cdx status --refresh` is faster: ~2.5s → ~2.2s on a 15-profile fleet,
+  verified to return identical data before and after. The Claude auth probe
+  now runs concurrently across sessions instead of one at a time, and no
+  longer spawns `claude auth status` twice per session (the probe and the
+  usage refresh were each independently running the exact same command).
+- `cdx disk profiles --candidates` is faster too: ~5.1s → ~4.6s, same
+  before/after verification. Per-profile `du` calls now run concurrently
+  instead of one profile at a time.

package/checksums/release-archives.json

@@ -320,6 +320,28 @@
         "x86_64-pc-windows-msvc": "e88d296e706ae90624a1f82bf14d36d67787d5f73bbb04986c1ca82293178c68",
         "x86_64-unknown-linux-musl": "cf8ec3f5a56bf50ba42d2dfa44f05ecc4471c5a5a819ca8b5180c6d9eff75ff1"
       }
+    },
+    "v0.20.1": {
+      "github_tarball_sha256": "00922589fbfa5edaee8bff2b9328bd185e91551eb63932fd7e0642a2fd101923",
+      "github_zip_sha256": "16aa1e4376368454769150b3adfec146dde5c88ddef8a157c343c00025ed58ce",
+      "tray_assets": {
+        "aarch64-apple-darwin": "4f73559113b77a67612e47be3cb3d81bfd9cee7b99fd8b5257f01ea6ec1b9d36",
+        "aarch64-unknown-linux-musl": "27f3bd4a6c03d164340a753387ac522d43ce0523f70f0251484b2d24a8e504df",
+        "x86_64-apple-darwin": "6a11eee823a76e00f02ab1c75c247b079f1e264351f467c41f4aeeb46bc9a3c3",
+        "x86_64-pc-windows-msvc": "3513680e96fd5f669c2f2868b3a195899e48ed4d5f3dce080289f90648e60199",
+        "x86_64-unknown-linux-musl": "ee86688537638671ceec1d805d23124d8511c11ab62836f14fa2545b418741d2"
+      }
+    },
+    "v0.20.2": {
+      "github_tarball_sha256": "aeadbd180438862b7b1c0cdb31aece5c3ddbfbf2f20631733ffc48e1fd0a9fb7",
+      "github_zip_sha256": "79043ee3366f4e3006a51038d011416d510acd29e1cb35038519a3c4ff91571f",
+      "tray_assets": {
+        "aarch64-apple-darwin": "3da1c5b786fffe757e2d763cf36a5bf6dd9baf6bec06c3f4ba1d521a9919fbe9",
+        "aarch64-unknown-linux-musl": "8f9b0181b95d010ea3a13154d0a41fe150e32982847e43a3bba6c5674a8dea6e",
+        "x86_64-apple-darwin": "e35682db7adc4c6b4e2a9c112124411726f522423180c3a753bfb8aa7aa1008a",
+        "x86_64-pc-windows-msvc": "5ceff82ecd907fda949dfc27835112ad9e3597da78191a0ede4f7d9db82607a8",
+        "x86_64-unknown-linux-musl": "db70bb77f08fd954a7378561954d00ad3084b4ada99a4930aa8f021978439e65"
+      }
     }
   }
 }

package/package.json

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

package/src/claude_refresh.py

@@ -30,8 +30,9 @@ def _is_stale(session, now=None, ttl_seconds=CLAUDE_REFRESH_TTL_SECONDS):
     return (now - updated_at.astimezone(now.tzinfo)).total_seconds() >= ttl_seconds
 
 
-def _refresh_claude_sessions(service, refresh_fn=None, target_names=None, force=False, ttl_seconds=CLAUDE_REFRESH_TTL_SECONDS):
+def _refresh_claude_sessions(service, refresh_fn=None, target_names=None, force=False, ttl_seconds=CLAUDE_REFRESH_TTL_SECONDS, already_auth_refreshed=None):
     refresh_fn = refresh_fn or refresh_claude_session_status
+    already_auth_refreshed = already_auth_refreshed or set()
     target_names = set(target_names or [])
     sessions = service["list_sessions"]()
     claude_sessions = [
@@ -52,7 +53,17 @@ def _refresh_claude_sessions(service, refresh_fn=None, target_names=None, force=
 
     def fetch(s):
         try:
-            usage = refresh_fn(s)
+            # The auth-probe phase right before this one already ran
+            # `claude auth status` for this session (see
+            # commands/status.py:_refresh_claude_auth_states), which is the
+            # exact side effect this refresh needs before reading
+            # credentials from disk. Skip re-running it - but only when
+            # refresh_fn is the real default, since a caller-injected
+            # refresh_fn (tests, mocks) may not accept auth_refresher.
+            if refresh_fn is refresh_claude_session_status and s["name"] in already_auth_refreshed:
+                usage = refresh_fn(s, auth_refresher=lambda _auth_home: None)
+            else:
+                usage = refresh_fn(s)
             if inspect.isawaitable(usage):
                 raise CdxError("Claude refresh function returned an awaitable from a sync callable.")
             if usage:

package/src/cli_args.py

@@ -745,8 +745,8 @@ def _has_history_period(period):
     return period.get("from_ts") is not None or period.get("to_ts") is not None
 
 
-def _parse_entry_timestamp(entry):
-    value = entry.get("started_at")
+def _parse_entry_timestamp(entry, field="started_at"):
+    value = entry.get(field)
     if not value:
         return None
     text = str(value)
@@ -768,12 +768,16 @@ def _filter_history_period(entries, period):
     start = period.get("from_ts")
     end = period.get("to_ts")
     for entry in entries:
-        timestamp = _parse_entry_timestamp(entry)
-        if timestamp is None:
+        started = _parse_entry_timestamp(entry)
+        if started is None:
             continue
-        if start is not None and timestamp < start:
+        # A long run belongs to a period it overlaps, not only the day it was
+        # launched. Usage is recorded per run, so include its whole measured
+        # total rather than inventing a time-proportional split.
+        ended = _parse_entry_timestamp(entry, "ended_at") or started
+        if start is not None and ended < start:
             continue
-        if end is not None and timestamp > end:
+        if end is not None and started > end:
             continue
         filtered.append(entry)
     return filtered

package/src/commands/launch.py

@@ -26,7 +26,14 @@ from ..config import PROVIDER_CODEX
 from ..context_store import install_context_for_session, write_context
 from ..errors import CdxError
 from ..interactive_usage import extract_interactive_usage, transcript_predates_run, usage_delta
-from ..provider_runtime import _conversation_id, _ensure_session_authentication, _get_auth_home, _run_interactive_provider_command
+from ..provider_runtime import (
+    INTERRUPT_EXIT_CODES,
+    _conversation_id,
+    _ensure_session_authentication,
+    _get_auth_home,
+    _run_interactive_provider_command,
+)
+from ..run_usage import estimate_cost
 
 
 def _parse_launch_args(args):
@@ -268,6 +275,8 @@ def handle_launch(command, ctx, initial_prompt=None, resume=False, force_json=No
         run_info = _attach_interactive_usage(
             session, run_info, ctx["service"]["get_launch_history"](session["name"], limit=50)
         )
+        if not json_flag and error.exit_code in INTERRUPT_EXIT_CODES:
+            ctx["out"](f"{_goodbye_line(session, run_info, ctx['use_color'])}\n")
         if runtime_run_id:
             ctx["service"]["finish_session_runtime"](
                 session["name"],
@@ -283,15 +292,18 @@ def handle_launch(command, ctx, initial_prompt=None, resume=False, force_json=No
                 **run_info,
             })
         raise
+    success_run_info = _attach_interactive_usage(
+        session, run_info, ctx["service"]["get_launch_history"](session["name"], limit=50)
+    )
     ctx["service"]["record_launch_history"](session["name"], {
         "status": "success",
         "action": "resume" if resume else "launch",
         "cwd": cwd,
         "exit_code": 0,
-        **_attach_interactive_usage(
-            session, run_info, ctx["service"]["get_launch_history"](session["name"], limit=50)
-        ),
+        **success_run_info,
     })
+    if not json_flag:
+        ctx["out"](f"{_goodbye_line(session, success_run_info, ctx['use_color'])}\n")
     if json_flag:
         extra = {"session": ctx["service"]["get_session"](session["name"]), "cwd": cwd}
         if capability:
@@ -300,6 +312,29 @@ def handle_launch(command, ctx, initial_prompt=None, resume=False, force_json=No
     return 0
 
 
+def _goodbye_line(session, run_info, use_color):
+    """One line printed when a session ends: cleanly, or by SIGINT/SIGTERM/SIGHUP.
+
+    Not printed for a genuine provider crash (a nonzero exit that isn't one
+    of those signals) - that path already gets its own error message.
+
+    Local import: `commands.status` imports `handle_launch` from this module,
+    so importing it back at module scope would be circular.
+    """
+    from .status import _format_duration_ms, _format_token_count, _format_usd
+
+    parts = [f"Session {session['name']} ended", _format_duration_ms(run_info.get("duration_ms"))]
+    usage = run_info.get("usage")
+    cost = estimate_cost(usage, run_info.get("usage_model"))
+    if cost is not None:
+        parts.append(_format_usd(cost))
+    elif isinstance(usage, dict):
+        total_tokens = sum(v for v in usage.values() if isinstance(v, (int, float)))
+        if total_tokens:
+            parts.append(f"{_format_token_count(total_tokens)} tokens")
+    return _dim(" · ".join(parts), use_color)
+
+
 def _attach_interactive_usage(session, run_info, history=None):
     """Attach this run's own token usage without affecting launch outcome.
 

package/src/commands/maintenance.py

@@ -9,6 +9,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import threading
 import time
 from datetime import datetime
 
@@ -83,20 +84,35 @@ def _directory_size_bytes(path, runner=None):
         return total
 
 def _directory_child_sizes(path, runner=None, progress=None):
-    rows = []
     try:
         names = os.listdir(path)
     except OSError:
-        return rows
+        return []
     children = [(name, os.path.join(path, name)) for name in names if os.path.isdir(os.path.join(path, name))]
-    for index, (name, child_path) in enumerate(children, start=1):
+    # `du` per profile is I/O-bound (a subprocess spawn + directory walk), so
+    # one profile's measurement doesn't block the next - same reasoning as
+    # the auth-probe fix in commands/status.py. Progress is announced from
+    # the main thread, in listing order, before dispatch: du itself only
+    # runs concurrently, so the printed order still matches `len(children)`.
+    sizes = [None] * len(children)
+    threads = []
+
+    def measure(index, child_path):
+        sizes[index] = _directory_size_bytes(child_path, runner=runner)
+
+    for index, (name, child_path) in enumerate(children):
         if progress:
-            progress("profile", name, index, len(children))
-        rows.append({
-            "name": name,
-            "path": child_path,
-            "bytes": _directory_size_bytes(child_path, runner=runner),
-        })
+            progress("profile", name, index + 1, len(children))
+        t = threading.Thread(target=measure, args=(index, child_path), daemon=True)
+        threads.append(t)
+        t.start()
+    for t in threads:
+        t.join()
+
+    rows = [
+        {"name": name, "path": child_path, "bytes": sizes[index]}
+        for index, (name, child_path) in enumerate(children)
+    ]
     rows.sort(key=lambda row: row["bytes"], reverse=True)
     for row in rows:
         row["size"] = _format_bytes(row["bytes"])
@@ -170,11 +186,15 @@ def _collect_old_logs(profile_name, profile_path, days, now=None):
     )
 
 def _collect_profile_cleanup_candidates(base_dir, *, old_log_days=30, runner=None, now=None, progress=None):
-    candidates = []
     profiles = list(_iter_profile_dirs(base_dir))
-    for index, (profile_name, profile_path) in enumerate(profiles, start=1):
-        if progress:
-            progress("candidates", profile_name, index, len(profiles))
+    # Same reasoning as _directory_child_sizes: each profile's du calls and
+    # log walk are independent I/O, so profiles scan concurrently. Each
+    # thread only appends to its own slot in `per_profile`, never a shared list.
+    per_profile = [None] * len(profiles)
+    threads = []
+
+    def scan(index, profile_name, profile_path):
+        local = []
         tmp_dir = os.path.join(profile_path, ".tmp")
         tmp_targets = [
             ("tmp-marketplaces", os.path.join(tmp_dir, "marketplaces"), "temporary marketplace cache/staging"),
@@ -198,7 +218,7 @@ def _collect_profile_cleanup_candidates(base_dir, *, old_log_days=30, runner=Non
                 mtime = datetime.fromtimestamp(os.path.getmtime(path)).isoformat()
             except OSError:
                 mtime = None
-            candidates.append(_candidate(
+            local.append(_candidate(
                 profile_name,
                 kind,
                 path,
@@ -208,7 +228,19 @@ def _collect_profile_cleanup_candidates(base_dir, *, old_log_days=30, runner=Non
             ))
         old_logs = _collect_old_logs(profile_name, profile_path, old_log_days, now=now)
         if old_logs and old_logs["bytes"] > 0:
-            candidates.append(old_logs)
+            local.append(old_logs)
+        per_profile[index] = local
+
+    for index, (profile_name, profile_path) in enumerate(profiles):
+        if progress:
+            progress("candidates", profile_name, index + 1, len(profiles))
+        t = threading.Thread(target=scan, args=(index, profile_name, profile_path), daemon=True)
+        threads.append(t)
+        t.start()
+    for t in threads:
+        t.join()
+
+    candidates = [item for local in per_profile for item in (local or [])]
     candidates.sort(key=lambda item: item["bytes"], reverse=True)
     return candidates
 

package/src/commands/status.py

@@ -4,6 +4,7 @@ Split out of cli_commands.py. Moved verbatim; re-exported by cli_commands.
 """
 
 import os
+import threading
 import time
 from datetime import datetime
 
@@ -40,7 +41,14 @@ from ..cli_render import _dim, _info, _pad_table, _style, _warn
 from ..commands.launch import handle_launch
 from ..config import PROVIDER_CLAUDE
 from ..errors import CdxError
-from ..provider_runtime import AUTH_PROBE_AUTHENTICATED, AUTH_PROBE_DEGRADED, _probe_provider_auth_status
+from ..provider_runtime import (
+    AUTH_PROBE_AUTHENTICATED,
+    AUTH_PROBE_DEGRADED,
+    AUTH_PROBE_TIMEOUT_SECONDS,
+    _get_auth_home,
+    _has_local_claude_auth,
+    _probe_provider_auth_status,
+)
 from ..run_usage import (
     USAGE_KEYS,
     estimate_cost,
@@ -692,6 +700,7 @@ def handle_status(rest, ctx):
             ctx.get("refresh_fn"),
             target_names=args if len(args) == 1 else None,
             force=parsed["refresh"],
+            already_auth_refreshed=auth_refresh.get("probed"),
         )
     )
     refresh_errors = [
@@ -746,40 +755,84 @@ def handle_status(rest, ctx):
 
 def _refresh_claude_auth_states(service, target_names=None, spawn_sync=None, env_override=None):
     target_names = set(target_names or [])
+    candidates = [
+        session for session in service["list_sessions"]()
+        if session["provider"] == PROVIDER_CLAUDE
+        and session.get("enabled", True) is not False
+        and (not target_names or session["name"] in target_names)
+        and (session.get("auth") or {}).get("status") in ("authenticated", "logged_out")
+    ]
+    if not candidates:
+        return {"updated": [], "errors": [], "probed": set()}
+
     errors = []
-    updated = []
-    for session in service["list_sessions"]():
-        if session["provider"] != PROVIDER_CLAUDE:
-            continue
-        if session.get("enabled", True) is False:
-            continue
-        if target_names and session["name"] not in target_names:
-            continue
-        if (session.get("auth") or {}).get("status") not in ("authenticated", "logged_out"):
-            continue
+    results = {}
+    threads = []
+    # Sessions without a local credentials file are the ones whose probe
+    # below actually spawns `claude auth status` (see _probe_provider_auth_status);
+    # the Claude usage refresh right after this call spawns that exact same
+    # command again to refresh its own on-disk copy before reading it. Track
+    # them so the caller can skip that second, redundant spawn.
+    probed = {
+        session["name"] for session in candidates
+        if not _has_local_claude_auth(_get_auth_home(session))
+    }
+
+    # The probe itself is the slow part (a subprocess spawn per session on a
+    # cache miss); it doesn't touch shared state, so it's safe to run
+    # concurrently, same as the sibling Claude usage refresh right after this
+    # call. Side effects (service["update_auth_state"]) still run serially,
+    # after every thread has joined.
+    def probe(session):
         try:
-            auth_status = _probe_provider_auth_status(
+            results[session["name"]] = _probe_provider_auth_status(
                 session,
                 spawn_sync=spawn_sync,
                 env_override=env_override,
             )
-            if auth_status == AUTH_PROBE_DEGRADED:
-                errors.append({
-                    "session": session["name"],
-                    "error": "Auth probe timed out; authentication status is degraded.",
-                })
-                continue
-            now = _local_now_iso()
-            service["update_auth_state"](session["name"], lambda auth, auth_status=auth_status, now=now: {
-                **auth,
-                "status": "authenticated" if auth_status == AUTH_PROBE_AUTHENTICATED else "logged_out",
-                "lastCheckedAt": now,
-                **({"lastAuthenticatedAt": now} if auth_status == AUTH_PROBE_AUTHENTICATED else {}),
-            })
-            updated.append(session["name"])
         except Exception as error:
             errors.append({"session": session["name"], "error": str(error)})
-    return {"updated": updated, "errors": errors}
+
+    for session in candidates:
+        t = threading.Thread(target=probe, args=(session,), daemon=True)
+        threads.append(t)
+        t.start()
+    for t in threads:
+        t.join(timeout=AUTH_PROBE_TIMEOUT_SECONDS + 1)
+
+    results = dict(results)
+    errors = list(errors)
+
+    updated = []
+    now = _local_now_iso()
+    for session in candidates:
+        auth_status = results.get(session["name"])
+        if auth_status is None:
+            continue
+        if auth_status == AUTH_PROBE_DEGRADED:
+            errors.append({
+                "session": session["name"],
+                "error": "Auth probe timed out; authentication status is degraded.",
+            })
+            # A timed-out probe never finished running `claude auth status`,
+            # so its on-disk credentials aren't necessarily fresh - don't
+            # tell the caller this session's auth refresh can be skipped.
+            probed.discard(session["name"])
+            continue
+        service["update_auth_state"](session["name"], lambda auth, auth_status=auth_status, now=now: {
+            **auth,
+            "status": "authenticated" if auth_status == AUTH_PROBE_AUTHENTICATED else "logged_out",
+            "lastCheckedAt": now,
+            **({"lastAuthenticatedAt": now} if auth_status == AUTH_PROBE_AUTHENTICATED else {}),
+        })
+        updated.append(session["name"])
+    for session in candidates:
+        if session["name"] not in results:
+            # Probe raised/never completed for this session (exception or a
+            # join() that outran an unresponsive thread); same reasoning as
+            # the degraded case above.
+            probed.discard(session["name"])
+    return {"updated": updated, "errors": errors, "probed": probed}
 
 def _rows_by_session(rows):
     return {

package/src/interactive_usage.py

@@ -22,7 +22,10 @@ import time
 from .run_usage import claude_usage_dedup_key, normalize_usage
 from .status_source import _normalize_terminal_transcript
 
-MAX_TRANSCRIPT_BYTES = 16 * 1024 * 1024
+# Readers stream JSONL line-by-line.  A 16 MiB cap excluded ordinary long
+# Claude sessions (for example a five-hour session at 26 MiB) without saving
+# meaningful memory; keep a bounded ceiling for genuinely pathological files.
+MAX_TRANSCRIPT_BYTES = 128 * 1024 * 1024
 MAX_TRANSCRIPT_CANDIDATES = 1000
 MAX_TRANSCRIPT_SCAN_SECONDS = 1
 
@@ -298,7 +301,7 @@ def _claude_usage(handle):
             totals["cache_creation_tokens"] += _number(usage.get("cache_creation_input_tokens"))
             totals["cache_read_tokens"] += _number(usage.get("cache_read_input_tokens"))
             totals["output_tokens"] += _number(usage.get("output_tokens"))
-            if message.get("model"):
+            if isinstance(message.get("model"), str) and not message["model"].startswith("<"):
                 model = message["model"]
         except (TypeError, ValueError):
             continue

package/src/provider_runtime.py

@@ -20,6 +20,7 @@ from .config import (
     PROVIDER_CODEX,
     PROVIDER_OLLAMA,
     REASONING_EFFORT_VALUES,
+    get_cdx_home,
     split_extra_args,
 )
 from .errors import CdxError
@@ -158,6 +159,25 @@ def _home_env_overrides(auth_home):
     return overrides
 
 
+def _shared_tool_cache_overrides(env):
+    """Pin tool download/build caches to one shared dir, outside any profile home.
+
+    Profile isolation redirects HOME to a per-profile auth_home (see
+    `_home_env_overrides`), and several dev tools resolve their cache dir from
+    HOME. Left alone, that means every profile re-downloads its own copy of
+    Playwright's browsers, npm/pip/uv packages, etc. `env` here is the ambient
+    env, before HOME gets swapped, so `get_cdx_home(env)` resolves the same
+    real per-user location regardless of which profile is launching.
+    """
+    shared_cache = os.path.join(get_cdx_home(env), "shared-cache")
+    return {
+        "PLAYWRIGHT_BROWSERS_PATH": os.path.join(shared_cache, "playwright"),
+        "NPM_CONFIG_CACHE": os.path.join(shared_cache, "npm"),
+        "PIP_CACHE_DIR": os.path.join(shared_cache, "pip"),
+        "UV_CACHE_DIR": os.path.join(shared_cache, "uv"),
+    }
+
+
 def _anthropic_profile_name():
     return "default"
 
@@ -562,6 +582,8 @@ def _build_launch_spec(session, cwd=None, env_override=None, initial_prompt=None
     cwd = cwd or os.getcwd()
     env_override = env_override or {}
     env = {**os.environ, **env_override}
+    for key, value in _shared_tool_cache_overrides(env).items():
+        env.setdefault(key, value)
     env.update(launch_notify_env(session, notifications_enabled(session)))
     initial_prompt = _with_launch_preferences(session, initial_prompt, env=env)
     _validate_initial_prompt(initial_prompt)
@@ -1190,11 +1212,17 @@ def _probe_provider_auth(session, spawn_sync=None, env_override=None, trust_loca
     ) == AUTH_PROBE_AUTHENTICATED
 
 
+_SIGNAL_EXIT_CODES = {signal.SIGINT: 130, signal.SIGTERM: 143}
+if hasattr(signal, "SIGHUP"):
+    _SIGNAL_EXIT_CODES[signal.SIGHUP] = 129
+
+# The exit codes above, on their own: what a caller checks to tell "the user
+# killed this session" apart from "the provider process crashed on its own".
+INTERRUPT_EXIT_CODES = frozenset(_SIGNAL_EXIT_CODES.values())
+
+
 def _signal_exit_code(sig):
-    mapping = {signal.SIGINT: 130, signal.SIGTERM: 143}
-    if hasattr(signal, "SIGHUP"):
-        mapping[signal.SIGHUP] = 129
-    return mapping.get(sig, 1)
+    return _SIGNAL_EXIT_CODES.get(sig, 1)
 
 
 def _signal_name(sig):

package/src/repair.py

@@ -51,6 +51,24 @@ def repair_health(service, base_dir, env=None, dry_run=True, force=False):
             None,
             None if dry_run else "applied",
         ))
+    backfill = service["backfill_interactive_usage"](dry_run=dry_run)
+    if backfill["backfilled"]:
+        actions.append(_action(
+            "backfill_interactive_usage",
+            f"backfill token usage for {backfill['backfilled']} exactly matched Claude launch record"
+            f"{'s' if backfill['backfilled'] != 1 else ''} (of {backfill['scanned']} scanned)",
+            None,
+            None if dry_run else "applied",
+        ))
+    models = service["refresh_interactive_usage_models"](dry_run=dry_run)
+    if models["backfilled"]:
+        actions.append(_action(
+            "refresh_interactive_usage_models",
+            f"replace placeholder models on {models['backfilled']} launch record"
+            f"{'s' if models['backfilled'] != 1 else ''}",
+            None,
+            None if dry_run else "applied",
+        ))
     return {
         "dry_run": dry_run,
         "force": force,

package/src/session_service.py

@@ -727,6 +727,72 @@ def get_launch_history(store, name=None, limit=20):
     return store["list_launch_history"](session_name=name, limit=limit)
 
 
+def backfill_interactive_usage(store, name=None, dry_run=True):
+    """Recover one safely attributable missing Claude launch per profile."""
+    from datetime import datetime
+
+    from .interactive_usage import MATCH_CONVERSATION_ID, extract_interactive_usage
+
+    updates = {}
+    sessions = [store["get_session"](name)] if name else store["list_sessions"]()
+    for session in sessions:
+        if not session:
+            continue
+        if session.get("provider") != PROVIDER_CLAUDE:
+            continue
+        conversation = session.get("conversation") or {}
+        identifier = conversation.get("id")
+        recorded = conversation.get("recordedAt")
+        if not identifier or not recorded:
+            continue
+        usage, path, match, model = extract_interactive_usage(
+            PROVIDER_CLAUDE, session.get("authHome"), conversation_id=identifier
+        )
+        if not usage or match != MATCH_CONVERSATION_ID:
+            continue
+        history = store["list_launch_history"](session_name=session["name"], limit=0)
+        target = next((entry for entry in history if not entry.get("usage") and entry.get("provider_transcript_path") in (None, path)), None)
+        if not target or not target.get("started_at"):
+            continue
+        try:
+            delta = abs((datetime.fromisoformat(recorded.replace("Z", "+00:00")) - datetime.fromisoformat(target["started_at"].replace("Z", "+00:00"))).total_seconds())
+        except ValueError:
+            continue
+        if delta > 300:
+            continue
+        updates[(session["name"], target["started_at"])] = {
+            "usage": usage,
+            "usage_cumulative": usage,
+            "usage_model": model,
+            "provider_transcript_path": path,
+            "provider_transcript_match": match,
+            "usage_backfilled_reason": "exact_current_conversation",
+        }
+    return store["backfill_launch_usage"](updates, dry_run=dry_run)
+
+
+def refresh_interactive_usage_models(store, dry_run=True):
+    """Replace a placeholder model with the exact transcript's real model."""
+    from .interactive_usage import MATCH_CONVERSATION_ID, extract_interactive_usage
+
+    updates = {}
+    for session in store["list_sessions"]():
+        if session.get("provider") != PROVIDER_CLAUDE:
+            continue
+        identifier = ((session.get("conversation") or {}).get("id"))
+        if not identifier:
+            continue
+        _usage, path, match, model = extract_interactive_usage(
+            PROVIDER_CLAUDE, session.get("authHome"), conversation_id=identifier
+        )
+        if not path or match != MATCH_CONVERSATION_ID or not model or model.startswith("<"):
+            continue
+        for entry in store["list_launch_history"](session_name=session["name"], limit=0):
+            if entry.get("provider_transcript_path") == path and str(entry.get("usage_model") or "").startswith("<"):
+                updates[(session["name"], entry.get("started_at"))] = {"usage_model": model}
+    return store["backfill_launch_usage"](updates, dry_run=dry_run)
+
+
 def start_session_runtime(store, name, payload=None):
     session = store["get_session"](name)
     if not session:
@@ -803,6 +869,9 @@ def launch_session(store, name, resume=False):
         raise CdxError(f"Unknown session: {name}")
     if session.get("enabled", True) is False:
         raise CdxError(f"Session is disabled: {name}")
+    # Reconcile the prior Claude conversation before a fresh launch replaces
+    # its id. This is a single exact transcript lookup, not a global stats scan.
+    backfill_interactive_usage(store, name=name, dry_run=False)
     now = _local_now_iso()
 
     def state_updater(state):
@@ -921,6 +990,8 @@ def create_session_service(options=None):
         "record_launch_history": partial(record_launch_history, store),
         "get_launch_history": partial(get_launch_history, store),
         "drop_unvouched_usage": store["drop_unvouched_usage"],
+        "backfill_interactive_usage": partial(backfill_interactive_usage, store),
+        "refresh_interactive_usage_models": partial(refresh_interactive_usage_models, store),
         "update_auth_state": partial(update_auth_state, store),
         "get_status_row": partial(get_status_row, store, base_dir, env, fetch_codex_status),
         "get_status_rows": partial(get_status_rows, store, base_dir, env, fetch_codex_status),

package/src/session_store.py

@@ -333,6 +333,37 @@ def create_session_store(base_dir):
                 _fsync_directory(state_dir)
             return {"scanned": scanned, "dropped": dropped, "dry_run": dry_run}
 
+    def backfill_launch_usage(updates, dry_run=True):
+        """Apply pre-validated usage updates to otherwise empty history rows."""
+        with _file_lock(lock_file):
+            try:
+                with open(launch_history_file, encoding="utf-8") as handle:
+                    lines = handle.readlines()
+            except FileNotFoundError:
+                return {"scanned": 0, "backfilled": 0, "dry_run": dry_run}
+            scanned = backfilled = 0
+            rewritten = []
+            for line in lines:
+                stripped = line.strip()
+                if not stripped:
+                    continue
+                try:
+                    entry = json.loads(stripped)
+                except ValueError:
+                    rewritten.append(line)
+                    continue
+                scanned += 1
+                update = updates.get((entry.get("session_name"), entry.get("started_at")))
+                if update and (not entry.get("usage") or str(entry.get("usage_model") or "").startswith("<")):
+                    entry.update(update)
+                    line = json.dumps(entry, separators=(",", ":")) + "\n"
+                    backfilled += 1
+                rewritten.append(line)
+            if not dry_run and backfilled:
+                atomic_write(launch_history_file, "".join(rewritten))
+                _fsync_directory(state_dir)
+            return {"scanned": scanned, "backfilled": backfilled, "dry_run": dry_run}
+
     def list_launch_history(session_name=None, limit=20):
         with _file_lock(lock_file):
             try:
@@ -369,5 +400,6 @@ def create_session_store(base_dir):
         "update_session_state": update_session_state,
         "append_launch_history": append_launch_history,
         "drop_unvouched_usage": drop_unvouched_usage,
+        "backfill_launch_usage": backfill_launch_usage,
         "list_launch_history": list_launch_history,
     }