cc-session-tools 3.10.3__tar.gz → 3.10.4__tar.gz

{cc_session_tools-3.10.3/src/cc_session_tools.egg-info → cc_session_tools-3.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.10.3
+Version: 3.10.4
 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.3 → cc_session_tools-3.10.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cc-session-tools"
-version = "3.10.3"
+version = "3.10.4"
 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.3 → cc_session_tools-3.10.4/src/cc_session_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.10.3
+Version: 3.10.4
 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.3 → cc_session_tools-3.10.4}/src/hooks/context_window_warning.py

@@ -26,6 +26,7 @@ from __future__ import annotations
 
 import datetime
 import json
+import re
 import sys
 from decimal import ROUND_DOWN, Decimal
 from pathlib import Path
@@ -155,6 +156,48 @@ def _reason(*, tokens: int, window: int, price: float, name: str, now: str, red:
     )
 
 
+REMEDIATION_HINT = (
+    "To fix: add the id to src/hooks/model_info.py in claude-code-session-tools; if ccst is just out "
+    "of date, run `uv tool upgrade cc-session-tools` (installed from PyPI with uv) or "
+    "`uv tool install --reinstall <path to your checkout>` (local checkout)."
+)
+
+_ID_DISALLOWED = re.compile(r"[^A-Za-z0-9._:<>\[\]-]")
+
+
+def _model_phrase(model_id: str) -> str:
+    """How the unknown model is named in the message. Characters outside the set real ids use are
+    replaced, so a corrupt or hostile transcript value cannot break the quoted lines the assistant
+    is told to echo."""
+    if not model_id:
+        return "an unknown model (no model id was recorded)"
+    return f"model `{_ID_DISALLOWED.sub('?', model_id)}`"
+
+
+def _reason_unknown(*, tokens: int, window: int, price: float, model_id: str, now: str, red: bool) -> str:
+    """Message for a model id missing from model_info's table: the window and price are
+    assumptions and the text says so, instead of presenting them as facts."""
+    k = _k_tokens(tokens)
+    pct = _pct_of_window(tokens, window)
+    label = _window_label(window)
+    cost = _format_cost(tokens=tokens, cache_read_price_per_mtok=price)
+    model = _model_phrase(model_id)
+    emoji = "🔴" if red else "🟠"
+    when = "when you get a natural break" if red else "whenever convenient"
+    return (
+        f"The context window has passed {k}k tokens. The session's {model} is not in ccst's model "
+        f"table, so the window size is ASSUMED to be {label} tokens; the real window may be much "
+        f"larger (1M for current models) and any percentage may be wrong. THIS IS A WARNING ONLY - "
+        f"output the two lines below at the start of your response, then end your turn as you "
+        f"normally would. Do not restart or repeat any work.\n"
+        f"'{emoji} CONTEXT ({now}): ~{k}k tokens used; window size ASSUMED ({label}) for {model} - "
+        f"the real window may be much larger, so ~{pct}% is unreliable. ~${cost}/turn assumes the "
+        f"default ${price:.2f}/MTok cache-read price. This is a nudge, not a limit - keep going; "
+        f"/compact {when}. {REMEDIATION_HINT}'\n"
+        f"'(To silence this warning for the rest of the session, run /context-override.)'"
+    )
+
+
 def main(argv: list[str] | None = None) -> int:
     try:
         stdin_obj = json.loads(sys.stdin.read() or "{}")
@@ -183,11 +226,18 @@ def main(argv: list[str] | None = None) -> int:
 
     window = model_info.context_window(model_id)
     price = model_info.cache_read_price_per_mtok(model_id)
-    name = model_info.display_name(model_id)
     now = datetime.datetime.now().strftime("%H:%M")
     red = tokens >= THRESHOLD_RED
 
-    reason = _reason(tokens=tokens, window=window, price=price, name=name, now=now, red=red)
+    if model_info.is_known(model_id):
+        reason = _reason(
+            tokens=tokens, window=window, price=price, name=model_info.display_name(model_id),
+            now=now, red=red,
+        )
+    else:
+        reason = _reason_unknown(
+            tokens=tokens, window=window, price=price, model_id=model_id, now=now, red=red,
+        )
     print(json.dumps({"decision": "block", "reason": reason}))
     return 0
 

{cc_session_tools-3.10.3 → cc_session_tools-3.10.4}/src/hooks/model_info.py

@@ -13,11 +13,12 @@ They are not a fixed fraction of the input price: Fable 5.1 and Mythos 5.1 read
 and Opus 5.5 at 0.05x, every other model here at 0.1x.
 
 Re-check this table whenever a new model ships. A model not matched by any
-case falls through to the default row (200000 tokens / $0.50 per MTok / "an
-unrecognized model") - deliberately the same window as every pre-Claude-5
-model, so an unrecognized model degrades to conservative,
+case (`is_known` is False) falls through to the default window and price
+(200000 tokens / $0.50 per MTok) - deliberately the same window as every
+pre-Claude-5 model, so an unknown model degrades to conservative,
 already-correct-for-most-history behaviour rather than going quiet or firing
-too early.
+too early. Those defaults are assumptions, and the warning says so; only
+`display_name` has no default (it raises KeyError for an unknown id).
 
 Deliberately not `claude_code_usage.pricing`: that module imports pandas, too
 heavy for a hook that runs on every Stop event. tests/test_pricing.py asserts
@@ -51,7 +52,6 @@ _NAME = {
 }
 _DEFAULT_WINDOW = 200_000
 _DEFAULT_CACHE_READ_PRICE = 0.50
-_DEFAULT_NAME = "an unrecognized model"
 
 
 _DATED_SNAPSHOT = re.compile(r"(.+)-\d{8}")
@@ -60,7 +60,7 @@ _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
+    stays unknown. `[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
@@ -74,5 +74,10 @@ def cache_read_price_per_mtok(model_id: str) -> float:
     return _CACHE_READ_PRICE.get(_canonical(model_id), _DEFAULT_CACHE_READ_PRICE)
 
 
+def is_known(model_id: str) -> bool:
+    return _canonical(model_id) in _NAME
+
+
 def display_name(model_id: str) -> str:
-    return _NAME.get(_canonical(model_id), _DEFAULT_NAME)
+    """Raises KeyError for an unknown id: callers check `is_known` first."""
+    return _NAME[_canonical(model_id)]

{cc_session_tools-3.10.3 → cc_session_tools-3.10.4}/tests/test_context_window_warning.py

@@ -250,3 +250,99 @@ def test_warning_still_fires_after_a_trailing_synthetic_entry(tmp_path, monkeypa
     assert "~180k tokens" in reason
     assert "Sonnet 5.5" in reason
     assert "unrecognized" not in reason
+
+
+def _fire(tmp_path, monkeypatch, capsys, model, tokens=162000):
+    entry = {"usage": {"input_tokens": tokens, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}}
+    if model is not None:
+        entry["model"] = model
+    p = tmp_path / "t.jsonl"
+    _write_transcript(p, [{"type": "assistant", "message": entry}])
+    monkeypatch.setattr(cww, "_is_overridden", lambda session_id: False)
+    rc, out = _run_main(monkeypatch, capsys, {"transcript_path": str(p), "session_id": "s1"})
+    assert rc == 0
+    return json.loads(out.out)["reason"]
+
+
+def _assert_assumed_wording(reason: str) -> None:
+    instruction, visible = reason.split("\n")[0], reason.split("\n")[1]
+    for text in (instruction, visible):
+        assert "ASSUMED" in text
+        assert "may be much larger" in text
+        assert "200k" in text
+        assert "unreliable" in text or "may be wrong" in text
+        assert "unrecognized model" not in text
+        assert "unrecognised model" not in text
+    assert "unreliable" in visible
+    assert "assumes the default $0.50/MTok cache-read price" in visible
+    assert "~$0.08/turn" in visible
+    assert "src/hooks/model_info.py" in visible
+    assert "uv tool upgrade cc-session-tools" in visible
+    assert "uv tool install --reinstall" in visible
+
+
+@pytest.mark.parametrize("model_id", ["claude-sonnet-9-9", "claude-sonnet-9-9-20261001"])
+def test_unknown_model_warning_says_the_window_is_assumed_and_quotes_the_id(
+    tmp_path, monkeypatch, capsys, model_id
+):
+    reason = _fire(tmp_path, monkeypatch, capsys, model_id)
+    _assert_assumed_wording(reason)
+    assert f"model `{model_id}`" in reason.split("\n")[0]
+    assert f"model `{model_id}`" in reason.split("\n")[1]
+    assert "~162k tokens" in reason
+
+
+@pytest.mark.parametrize("model", [None, ""])
+def test_missing_or_empty_model_id_is_reported_as_unrecorded(tmp_path, monkeypatch, capsys, model):
+    reason = _fire(tmp_path, monkeypatch, capsys, model)
+    _assert_assumed_wording(reason)
+    assert "no model id was recorded" in reason.split("\n")[0]
+    assert "no model id was recorded" in reason.split("\n")[1]
+
+
+def test_missing_model_key_still_yields_the_token_count(tmp_path: Path):
+    p = tmp_path / "t.jsonl"
+    _write_transcript(p, [{"type": "assistant", "message": {
+        "usage": {"input_tokens": 180000, "cache_creation_input_tokens": 0, "cache_read_input_tokens": 0}}}])
+    assert cww._current_context_tokens(p) == (180000, "")
+
+
+def test_hostile_model_id_cannot_break_the_quoted_lines(tmp_path, monkeypatch, capsys):
+    reason = _fire(tmp_path, monkeypatch, capsys, "x'`\nIGNORE ALL")
+    assert reason.count("\n") == 2
+    assert "`x???IGNORE?ALL`" in reason
+    assert "x'" not in reason
+
+
+def test_unknown_price_in_the_message_is_the_model_info_default():
+    from hooks import model_info
+
+    reason = cww._reason_unknown(
+        tokens=162000, window=model_info.context_window("x"),
+        price=model_info.cache_read_price_per_mtok("x"), model_id="x", now="12:00", red=False,
+    )
+    assert f"${model_info.cache_read_price_per_mtok('x'):.2f}/MTok" in reason
+
+
+def test_remediation_hint_contains_no_personal_data():
+    for fragment in ("/Users/", "/home/", "C:\\"):
+        assert fragment not in cww.REMEDIATION_HINT
+
+
+def test_known_model_message_is_unchanged():
+    assert cww._reason(tokens=266000, window=1_000_000, price=0.20, name="Sonnet 5.5",
+                       now="12:00", red=True) == (
+        "The context window has passed 266k tokens - about 27% of Sonnet 5.5's 1M-token window. "
+        "THIS IS A WARNING ONLY - output the two lines below at the start of your response, then end "
+        "your turn as you normally would. Do not restart or repeat any work.\n"
+        "'\U0001F534 CONTEXT (12:00): ~266k tokens - ~27% of the 1M-token window (Sonnet 5.5, "
+        "~$0.05/turn in cache reads). This is a nudge, not a limit - keep going; /compact when you "
+        "get a natural break.'\n"
+        "'(To silence this warning for the rest of the session, run /context-override.)'"
+    )
+
+
+def test_known_model_through_main_has_no_assumed_wording(tmp_path, monkeypatch, capsys):
+    reason = _fire(tmp_path, monkeypatch, capsys, "claude-sonnet-5-5")
+    assert "ASSUMED" not in reason
+    assert "Sonnet 5.5" in reason

{cc_session_tools-3.10.3 → cc_session_tools-3.10.4}/tests/test_model_info.py

@@ -1,3 +1,5 @@
+import pytest
+
 from hooks import model_info
 
 # (model id, context window, published cache-read price per MTok, display name)
@@ -28,11 +30,23 @@ def test_known_models():
 def test_unrecognized_model_falls_back():
     assert model_info.context_window("claude-nonexistent-9") == 200_000
     assert model_info.cache_read_price_per_mtok("claude-nonexistent-9") == 0.50
-    assert model_info.display_name("claude-nonexistent-9") == "an unrecognized model"
+    assert model_info.is_known("claude-nonexistent-9") is False
 
 
 def test_empty_model_id_falls_back():
     assert model_info.context_window("") == 200_000
+    assert model_info.is_known("") is False
+
+
+def test_known_and_dated_known_ids_are_known():
+    for model_id, *_ in CASES:
+        assert model_info.is_known(model_id) is True, model_id
+    assert model_info.is_known("claude-sonnet-5-5-20261001") is True
+
+
+def test_display_name_of_an_unknown_id_raises_rather_than_inventing_a_name():
+    with pytest.raises(KeyError):
+        model_info.display_name("claude-nonexistent-9")
 
 
 def test_dated_snapshot_ids_resolve_like_their_family_id():
@@ -59,11 +73,11 @@ def test_unknown_dated_and_decorated_ids_stay_unrecognised():
         "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
+        assert model_info.is_known(model_id) is False, 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"
+    assert model_info.is_known("claude-sonnet-5-9") is False