claude-dev-env 8.48.4 → 8.48.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "8.48.4",
+    "version": "8.48.5",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {

package/scripts/claude_chain_usage.py

@@ -28,11 +28,31 @@ class WeeklyUtilizationProbeError(Exception):
     """Raised when an account's usage meters cannot be measured."""
 
 
-def _usage_pause_scripts_directory() -> Path:
-    package_root = Path(__file__).resolve().parent.parent
-    return (
+def _usage_pause_scripts_directory(module_file: Path) -> Path:
+    """Return the usage-pause scripts directory beside this scripts tree.
+
+    ::
+
+        packages/claude-dev-env/scripts/x.py  ->  packages/claude-dev-env/.agents/skills/usage-pause/scripts
+        ~/.claude/scripts/x.py (link)         ->  ~/.agents/skills/usage-pause/scripts
+
+    The installer links ~/.claude/scripts to ~/.agents/scripts, so the
+    resolved scripts tree already sits inside the agents home.
+
+    Args:
+        module_file: Path of a module inside the scripts tree.
+
+    Returns:
+        The directory that holds the usage-pause resolver.
+    """
+    package_root = module_file.resolve().parent.parent
+    agents_home = (
         package_root
-        / USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME
+        if package_root.name.endswith(USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME)
+        else package_root / USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME
+    )
+    return (
+        agents_home
         / USAGE_PAUSE_SKILL_DIRECTORY_NAME
         / USAGE_PAUSE_SKILL_NAME
         / USAGE_PAUSE_SCRIPTS_DIRECTORY_NAME
@@ -48,7 +68,7 @@ def _load_resolve_usage_window_module() -> ModuleType:
     already_loaded = sys.modules.get(RESOLVE_USAGE_WINDOW_MODULE_NAME)
     if already_loaded is not None:
         return already_loaded
-    scripts_directory = _usage_pause_scripts_directory()
+    scripts_directory = _usage_pause_scripts_directory(Path(__file__))
     module_path = scripts_directory / RESOLVE_USAGE_WINDOW_FILENAME
     if not module_path.is_file():
         raise WeeklyUtilizationProbeError(
@@ -90,12 +110,43 @@ class AccountUsageMeters:
     weekly_resets_at: datetime | None
 
 
+def _read_access_token(
+    usage_window_resolver: ModuleType, credentials_path: Path, now: datetime
+) -> str | None:
+    """Return the bearer token that reads one account's meters.
+
+    ::
+
+        credential file holds a token                ->  that token
+        no token, the session's own credential path  ->  the session ingress token
+        no token, another account's credential path  ->  None
+
+    A cloud session has no credential file, only the ingress token, and that
+    token belongs to the account the session runs on.
+
+    Args:
+        usage_window_resolver: The loaded usage-pause resolver module.
+        credentials_path: The account's CLI credential file.
+        now: The current time, for the token expiry check.
+
+    Returns:
+        A bearer token, or None when the account has none.
+    """
+    file_token = usage_window_resolver.read_oauth_access_token(credentials_path, now)
+    if file_token is not None:
+        return file_token
+    session_credentials_path = usage_window_resolver.default_credentials_path()
+    if credentials_path.resolve() != session_credentials_path.resolve():
+        return None
+    return usage_window_resolver.read_session_ingress_token()
+
+
 def _fetch_account_usage_payload(
     usage_window_resolver: ModuleType, credentials_path: Path
 ) -> dict[str, object]:
     now = datetime.now().astimezone()
     try:
-        access_token = usage_window_resolver.read_oauth_access_token(credentials_path, now)
+        access_token = _read_access_token(usage_window_resolver, credentials_path, now)
         if access_token is None:
             raise WeeklyUtilizationProbeError(
                 NO_ACCESS_TOKEN_ERROR_TEMPLATE.format(credentials_path=credentials_path)

package/scripts/test_claude_chain_usage.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import importlib
+import os
 import subprocess
 import sys
 import urllib.error
@@ -44,18 +46,95 @@ def test_probe_reads_both_meters_and_resets(monkeypatch: pytest.MonkeyPatch) ->
     )
 
 
-def test_probe_rejects_missing_access_token(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_probe_reads_the_session_token_for_the_session_account(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    session_credentials = Path("home") / ".claude" / ".credentials.json"
+    all_fetched_tokens: list[str] = []
+
+    class Windows:
+        session_utilization = 15.0
+        session_resets_at = None
+        weekly_utilization = 70.0
+        weekly_resets_at = None
+
     class Resolver:
         def read_oauth_access_token(self, credentials_path: Path, now: datetime) -> None:
             return None
 
+        def default_credentials_path(self) -> Path:
+            return session_credentials
+
+        def read_session_ingress_token(self) -> str:
+            return "session-token"
+
+        def _fetch_usage_payload(self, access_token: str) -> dict[str, object]:
+            all_fetched_tokens.append(access_token)
+            return {"usage": 70.0}
+
+        def extract_usage_windows(self, payload: dict[str, object]) -> Windows:
+            return Windows()
+
+    monkeypatch.setattr(usage, "_load_resolve_usage_window_module", lambda: Resolver())
+
+    assert usage.probe_account_meters(session_credentials) == usage.AccountUsageMeters(
+        15.0, None, 70.0, None
+    )
+    assert all_fetched_tokens == ["session-token"]
+
+
+def test_probe_rejects_missing_access_token_for_another_account(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    class Resolver:
+        def read_oauth_access_token(self, credentials_path: Path, now: datetime) -> None:
+            return None
+
+        def default_credentials_path(self) -> Path:
+            return Path("home") / ".claude" / ".credentials.json"
+
+        def read_session_ingress_token(self) -> str:
+            return "session-token"
+
         def _fetch_usage_payload(self, access_token: str) -> dict[str, object]:
             pytest.fail("meter request must not run")
 
     monkeypatch.setattr(usage, "_load_resolve_usage_window_module", lambda: Resolver())
 
     with pytest.raises(usage.WeeklyUtilizationProbeError, match="bearer token"):
-        usage.probe_account_meters(Path("account.json"))
+        usage.probe_account_meters(Path("home") / ".claude-profiles" / "ev" / ".credentials.json")
+
+
+def _create_directory_link(*, from_link: Path, to_target: Path) -> None:
+    if sys.platform.startswith("win32"):
+        importlib.import_module("_winapi").CreateJunction(str(to_target), str(from_link))
+        return
+    os.symlink(to_target, from_link, target_is_directory=True)
+
+
+def test_scripts_directory_follows_the_installed_scripts_link(tmp_path: Path) -> None:
+    home = tmp_path.resolve()
+    (home / ".agents" / "scripts").mkdir(parents=True)
+    (home / ".claude").mkdir()
+    _create_directory_link(
+        from_link=home / ".claude" / "scripts", to_target=home / ".agents" / "scripts"
+    )
+
+    scripts_directory = usage._usage_pause_scripts_directory(
+        home / ".claude" / "scripts" / "claude_chain_usage.py"
+    )
+
+    assert scripts_directory == home / ".agents" / "skills" / "usage-pause" / "scripts"
+
+
+def test_scripts_directory_in_the_package_tree(tmp_path: Path) -> None:
+    package_root = tmp_path.resolve() / "claude-dev-env"
+
+    scripts_directory = usage._usage_pause_scripts_directory(
+        package_root / "scripts" / "claude_chain_usage.py"
+    )
+
+    assert scripts_directory == package_root / ".agents" / "skills" / "usage-pause" / "scripts"
 
 
 def test_probe_wraps_network_failure(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -79,7 +158,7 @@ def test_failed_module_load_does_not_poison_cache(
     (tmp_path / "resolve_usage_window.py").write_text(
         "raise ImportError('intentional load failure')\n", encoding="utf-8"
     )
-    monkeypatch.setattr(usage, "_usage_pause_scripts_directory", lambda: tmp_path)
+    monkeypatch.setattr(usage, "_usage_pause_scripts_directory", lambda _module_file: tmp_path)
 
     with pytest.raises(ImportError, match="intentional load failure"):
         usage._load_resolve_usage_window_module()