cc-session-tools 3.10.1__tar.gz → 3.10.2__tar.gz

{cc_session_tools-3.10.1/src/cc_session_tools.egg-info → cc_session_tools-3.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.10.1
+Version: 3.10.2
 Summary: Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)
 Author: raffishquartan
 License: MIT License

{cc_session_tools-3.10.1 → cc_session_tools-3.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cc-session-tools"
-version = "3.10.1"
+version = "3.10.2"
 description = "Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)"
 readme = "README.md"
 license = { file = "LICENSE" }

{cc_session_tools-3.10.1 → cc_session_tools-3.10.2/src/cc_session_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.10.1
+Version: 3.10.2
 Summary: Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)
 Author: raffishquartan
 License: MIT License

{cc_session_tools-3.10.1 → cc_session_tools-3.10.2}/src/hooks/model_info.py

@@ -5,8 +5,8 @@ source of truth this table is migrating from). Consumed by
 context_window_warning to phrase its nudge in terms of "% of the model's
 actual window" and to estimate a per-model cache-read cost.
 
-Figures current as of 2026-08-13 (Claude 5 family). Context windows: Fable 5 /
-Mythos 5 / Opus 5 / Opus 4.6-4.8 / Sonnet 5 / Sonnet 4.6 all 1,000,000 tokens
+Figures current as of 2026-09-29 (Claude 5 family; 5.5/5.1 ids added). Context windows: Fable 5 /
+Mythos 5 / Opus 5 / Opus 4.6-4.8 / Sonnet 5 / Sonnet 5.5 / Opus 5.5 / Fable 5.1 / Sonnet 4.6 all 1,000,000 tokens
 (the default, not a beta long-context mode); Haiku 4.5 stays at 200,000.
 Prices are the standard (non-cached) input rate per million tokens.
 
@@ -25,50 +25,55 @@ design spec's section 2.
 """
 from __future__ import annotations
 
+import re
+
 _WINDOW_1M = {
     "claude-fable-5", "claude-mythos-5",
     "claude-opus-5", "claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6",
     "claude-sonnet-5", "claude-sonnet-4-6",
+    "claude-sonnet-5-5", "claude-opus-5-5", "claude-fable-5-1",
 }
 _PRICE = {
     "claude-fable-5": 10.00, "claude-mythos-5": 10.00,
     "claude-opus-5": 5.00, "claude-opus-4-8": 5.00, "claude-opus-4-7": 5.00, "claude-opus-4-6": 5.00,
     "claude-sonnet-5": 3.00, "claude-sonnet-4-6": 3.00,
+    # Assumed equal to the family's existing price (no published figure for these ids); the
+    # price only feeds the rough "~$/turn in cache reads" estimate.
+    "claude-sonnet-5-5": 3.00, "claude-opus-5-5": 5.00, "claude-fable-5-1": 10.00,
+    "claude-haiku-4-5": 1.00,
 }
 _NAME = {
     "claude-fable-5": "Fable 5", "claude-mythos-5": "Mythos 5",
     "claude-opus-5": "Opus 5", "claude-opus-4-8": "Opus 4.8",
     "claude-opus-4-7": "Opus 4.7", "claude-opus-4-6": "Opus 4.6",
     "claude-sonnet-5": "Sonnet 5", "claude-sonnet-4-6": "Sonnet 4.6",
+    "claude-sonnet-5-5": "Sonnet 5.5", "claude-opus-5-5": "Opus 5.5",
+    "claude-fable-5-1": "Fable 5.1", "claude-haiku-4-5": "Haiku 4.5",
 }
 _DEFAULT_WINDOW = 200_000
 _DEFAULT_PRICE = 5.00
 _DEFAULT_NAME = "an unrecognized model"
 
 
-def _is_haiku_4_5(model_id: str) -> bool:
-    return model_id.startswith("claude-haiku-4-5")
+_DATED_SNAPSHOT = re.compile(r"(.+)-\d{8}")
+
+
+def _canonical(model_id: str) -> str:
+    """A dated snapshot id (`<id>-YYYYMMDD`) resolves to its undated row. Applied once, and
+    only for an exactly-eight-digit suffix: any other suffix (or a snapshot of an unknown id)
+    stays unrecognised. `[1m]`/`-latest` are not handled - transcripts' `message.model` never
+    carries them."""
+    match = _DATED_SNAPSHOT.fullmatch(model_id)
+    return match.group(1) if match else model_id
 
 
 def context_window(model_id: str) -> int:
-    if model_id in _WINDOW_1M:
-        return 1_000_000
-    if _is_haiku_4_5(model_id):
-        return 200_000
-    return _DEFAULT_WINDOW
+    return 1_000_000 if _canonical(model_id) in _WINDOW_1M else _DEFAULT_WINDOW
 
 
 def input_price_per_mtok(model_id: str) -> float:
-    if model_id in _PRICE:
-        return _PRICE[model_id]
-    if _is_haiku_4_5(model_id):
-        return 1.00
-    return _DEFAULT_PRICE
+    return _PRICE.get(_canonical(model_id), _DEFAULT_PRICE)
 
 
 def display_name(model_id: str) -> str:
-    if model_id in _NAME:
-        return _NAME[model_id]
-    if _is_haiku_4_5(model_id):
-        return "Haiku 4.5"
-    return _DEFAULT_NAME
+    return _NAME.get(_canonical(model_id), _DEFAULT_NAME)

{cc_session_tools-3.10.1 → cc_session_tools-3.10.2}/tests/test_context_window_warning.py

@@ -180,3 +180,26 @@ def test_override_end_to_end_via_real_store(tmp_path, monkeypatch, capsys):
     out = capsys.readouterr()
     assert rc == 0
     assert out.out == ""
+
+
+@pytest.mark.parametrize(
+    ("model_id", "name", "cost"),
+    [
+        ("claude-sonnet-5-5", "Sonnet 5.5", "0.07"),
+        ("claude-opus-5-5", "Opus 5.5", "0.13"),
+        ("claude-fable-5-1", "Fable 5.1", "0.26"),
+    ],
+)
+def test_new_5x_models_are_measured_against_their_one_million_token_window(
+    tmp_path, monkeypatch, capsys, model_id, name, cost
+):
+    p = tmp_path / "t.jsonl"
+    _write_transcript(p, [{"type": "assistant", "message": {"model": model_id,
+        "usage": {"input_tokens": 266000, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}}}])
+    monkeypatch.setattr(cww, "_is_overridden", lambda session_id: False)
+    rc, out = _run_main(monkeypatch, capsys, {"transcript_path": str(p), "session_id": "s1"})
+    reason = json.loads(out.out)["reason"]
+    assert "~27% of the 1M-token window" in reason
+    assert name in reason
+    assert f"~${cost}/turn" in reason
+    assert "unrecognized" not in reason

cc_session_tools-3.10.2/tests/test_model_info.py

@@ -0,0 +1,67 @@
+from hooks import model_info
+
+CASES = [
+    ("claude-fable-5", 1_000_000, 10.00, "Fable 5"),
+    ("claude-mythos-5", 1_000_000, 10.00, "Mythos 5"),
+    ("claude-opus-5", 1_000_000, 5.00, "Opus 5"),
+    ("claude-opus-4-8", 1_000_000, 5.00, "Opus 4.8"),
+    ("claude-opus-4-7", 1_000_000, 5.00, "Opus 4.7"),
+    ("claude-opus-4-6", 1_000_000, 5.00, "Opus 4.6"),
+    ("claude-sonnet-5", 1_000_000, 3.00, "Sonnet 5"),
+    ("claude-sonnet-4-6", 1_000_000, 3.00, "Sonnet 4.6"),
+    ("claude-sonnet-5-5", 1_000_000, 3.00, "Sonnet 5.5"),
+    ("claude-opus-5-5", 1_000_000, 5.00, "Opus 5.5"),
+    ("claude-fable-5-1", 1_000_000, 10.00, "Fable 5.1"),
+    ("claude-haiku-4-5-20251001", 200_000, 1.00, "Haiku 4.5"),
+]
+
+
+def test_known_models():
+    for model_id, window, price, name in CASES:
+        assert model_info.context_window(model_id) == window
+        assert model_info.input_price_per_mtok(model_id) == price
+        assert model_info.display_name(model_id) == name
+
+
+def test_unrecognized_model_falls_back():
+    assert model_info.context_window("claude-nonexistent-9") == 200_000
+    assert model_info.input_price_per_mtok("claude-nonexistent-9") == 5.00
+    assert model_info.display_name("claude-nonexistent-9") == "an unrecognized model"
+
+
+def test_empty_model_id_falls_back():
+    assert model_info.context_window("") == 200_000
+
+
+def test_dated_snapshot_ids_resolve_like_their_family_id():
+    """Claude Code can report a dated snapshot id (`<family>-YYYYMMDD`); it must resolve to the
+    same row as the undated id, not fall to the 200k default."""
+    for base, window, price, name in CASES:
+        if base.startswith("claude-haiku"):
+            continue
+        dated = f"{base}-20261001"
+        assert model_info.context_window(dated) == window
+        assert model_info.input_price_per_mtok(dated) == price
+        assert model_info.display_name(dated) == name
+
+
+def test_unknown_dated_and_decorated_ids_stay_unrecognised():
+    for model_id in (
+        "claude-sonnet-5-9-20261001",
+        "claude-nonexistent-9-20261001",
+        "claude-sonnet-5-5-2026100",      # 7 digits
+        "claude-sonnet-5-5-202610011",    # 9 digits
+        "claude-sonnet-5-5-latest",
+        "claude-sonnet-5-5[1m]",
+        "claude-sonnet-5-5-20261001-20261002",  # normalised once only
+        "claude-haiku-4-5-garbage",
+    ):
+        assert model_info.context_window(model_id) == 200_000, model_id
+        assert model_info.display_name(model_id) == "an unrecognized model", model_id
+
+
+def test_id_that_merely_starts_with_a_known_id_is_not_recognised():
+    """Guards against a future lazy prefix implementation (already true before the fix):
+    `claude-sonnet-5-9` must not inherit `claude-sonnet-5`'s row."""
+    assert model_info.context_window("claude-sonnet-5-9") == 200_000
+    assert model_info.display_name("claude-sonnet-5-9") == "an unrecognized model"

cc_session_tools-3.10.1/tests/test_model_info.py

@@ -1,30 +0,0 @@
-from hooks import model_info
-
-CASES = [
-    ("claude-fable-5", 1_000_000, 10.00, "Fable 5"),
-    ("claude-mythos-5", 1_000_000, 10.00, "Mythos 5"),
-    ("claude-opus-5", 1_000_000, 5.00, "Opus 5"),
-    ("claude-opus-4-8", 1_000_000, 5.00, "Opus 4.8"),
-    ("claude-opus-4-7", 1_000_000, 5.00, "Opus 4.7"),
-    ("claude-opus-4-6", 1_000_000, 5.00, "Opus 4.6"),
-    ("claude-sonnet-5", 1_000_000, 3.00, "Sonnet 5"),
-    ("claude-sonnet-4-6", 1_000_000, 3.00, "Sonnet 4.6"),
-    ("claude-haiku-4-5-20251001", 200_000, 1.00, "Haiku 4.5"),
-]
-
-
-def test_known_models():
-    for model_id, window, price, name in CASES:
-        assert model_info.context_window(model_id) == window
-        assert model_info.input_price_per_mtok(model_id) == price
-        assert model_info.display_name(model_id) == name
-
-
-def test_unrecognized_model_falls_back():
-    assert model_info.context_window("claude-nonexistent-9") == 200_000
-    assert model_info.input_price_per_mtok("claude-nonexistent-9") == 5.00
-    assert model_info.display_name("claude-nonexistent-9") == "an unrecognized model"
-
-
-def test_empty_model_id_falls_back():
-    assert model_info.context_window("") == 200_000