tsugite-claude-code 0.23.1__tar.gz → 0.23.2__tar.gz

{tsugite_claude_code-0.23.1 → tsugite_claude_code-0.23.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.5
 Name: tsugite-claude-code
-Version: 0.23.1
+Version: 0.23.2
 Summary: Tsugite plugin: Claude Code provider (routes LLM calls through the claude CLI)
 Author: Justyn Shull
 Requires-Python: >=3.11
-Requires-Dist: tsugite-cli==0.23.1
+Requires-Dist: tsugite-cli==0.23.2

{tsugite_claude_code-0.23.1 → tsugite_claude_code-0.23.2}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "tsugite-claude-code"
-version = "0.23.1"
+version = "0.23.2"
 description = "Tsugite plugin: Claude Code provider (routes LLM calls through the claude CLI)"
 authors = [{ name = "Justyn Shull" }]
 requires-python = ">=3.11"
 dependencies = [
-  "tsugite-cli==0.23.1",
+  "tsugite-cli==0.23.2",
 ]
 
 [project.entry-points."tsugite.providers"]

{tsugite_claude_code-0.23.1 → tsugite_claude_code-0.23.2}/tsugite_claude_code/process.py

@@ -10,11 +10,13 @@ import asyncio
 import json
 import logging
 import os
+import re
 import shutil
 import tempfile
 import time
 import uuid
 from collections.abc import AsyncIterator
+from pathlib import Path
 
 from tsugite.cli.helpers import get_workspace_dir
 
@@ -38,6 +40,34 @@ _STREAM_READ_LIMIT = 16 * 1024 * 1024
 _STALL_WARN_SECONDS = 300.0
 _STALL_WARN_ENV = "TSUGITE_CLAUDE_CODE_STALL_WARN_SECONDS"
 
+# The CLI reads `@path` in a user turn as its own file-mention syntax and injects that
+# file itself, below tsugite's tool layer and outside `allowed_secrets`. A backslash
+# blocks it. Escaping every `@` would mangle decorators, e-mail addresses and npm scopes.
+_AT_TOKEN = re.compile(r"@(\S+)")
+_MENTION_TRAILERS = ",.;:!?)]}>\"'"
+
+
+def _resolves_to_path(candidate: str, cwd: Path) -> bool:
+    try:
+        return (cwd / candidate).exists()
+    except OSError:
+        return False  # exists() raises ENAMETOOLONG rather than returning False.
+
+
+def _escape_at_mentions(content: str | list, cwd: Path) -> str | list:
+    def escape(match: re.Match) -> str:
+        candidate = match.group(1).rstrip(_MENTION_TRAILERS)
+        if candidate and _resolves_to_path(candidate, cwd):
+            return "\\" + match.group(0)
+        return match.group(0)
+
+    if isinstance(content, str):
+        return _AT_TOKEN.sub(escape, content)
+    return [
+        {**b, "text": _AT_TOKEN.sub(escape, b["text"])} if isinstance(b, dict) and b.get("type") == "text" else b
+        for b in content
+    ]
+
 
 class ClaudeCodeProcess:
     """Manages a persistent claude CLI subprocess for LLM completions.
@@ -61,6 +91,7 @@ class ClaudeCodeProcess:
             else float(os.environ.get(_STALL_WARN_ENV, _STALL_WARN_SECONDS))
         )
         self._last_output_at: float = 0.0
+        self._cwd: Path | None = None
 
     @property
     def session_id(self) -> str | None:
@@ -181,6 +212,7 @@ class ClaudeCodeProcess:
         env["CLAUDE_CODE_DISABLE_CLAUDE_MDS"] = "1"
 
         workspace = get_workspace_dir()
+        self._cwd = workspace
         self._process = await asyncio.create_subprocess_exec(
             *cmd,
             stdin=asyncio.subprocess.PIPE,
@@ -207,8 +239,8 @@ class ClaudeCodeProcess:
 
         Args:
             content: User message text, or an Anthropic content-block list
-                (text + image blocks) for a multimodal turn. Forwarded to the
-                CLI's stdin verbatim -- the CLI relays blocks to the API.
+                (text + image blocks) for a multimodal turn. The CLI relays
+                blocks to the API.
 
         Yields:
             Dicts with type "text_delta" (streaming chunk) or "result" (final)
@@ -216,6 +248,7 @@ class ClaudeCodeProcess:
         Raises:
             RuntimeError: If subprocess has crashed
         """
+        content = _escape_at_mentions(content, self._cwd or Path.cwd())
         msg = {
             "type": "user",
             "message": {"role": "user", "content": content},

tsugite_claude_code-0.23.2/tsugite_claude_code/usage.py

@@ -0,0 +1,106 @@
+"""Claude Code subscription limits as a tsugite quota source.
+
+Read from ``limits[]`` in the usage endpoint Claude Code calls, with its OAuth
+token. When that fails, the usage copy cached in Claude Code's config is used
+while it is under an hour old. The list is self-describing, so a limit kind
+tsugite has never seen still shows up.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import os
+import time
+from pathlib import Path
+
+import httpx
+
+from tsugite.usage.quota import QuotaReport, QuotaWindow, register_quota_source
+from tsugite.user_agent import set_user_agent_header
+
+logger = logging.getLogger(__name__)
+
+PROVIDER = "claude_code"
+LABEL = "Claude Code"
+USAGE_URL = "https://api.anthropic.com/api/oauth/usage"
+CACHE_MAX_AGE_MS = 60 * 60 * 1000
+LIVE_TTL_S = 60
+
+_last_live: tuple[float, list] | None = None
+
+
+def _config_path() -> Path:
+    base = os.environ.get("CLAUDE_CONFIG_DIR") or os.path.expanduser("~")
+    return Path(base) / ".claude.json"
+
+
+def _credentials_path() -> Path:
+    base = os.environ.get("CLAUDE_CONFIG_DIR") or os.path.expanduser("~/.claude")
+    return Path(base) / ".credentials.json"
+
+
+def _live_limits() -> list:
+    global _last_live
+    if _last_live and time.monotonic() - _last_live[0] < LIVE_TTL_S:
+        return _last_live[1]
+    token = json.loads(_credentials_path().read_text())["claudeAiOauth"]["accessToken"]
+    headers = {"Authorization": f"Bearer {token}", "anthropic-beta": "oauth-2025-04-20"}
+    set_user_agent_header(headers)
+    response = httpx.get(USAGE_URL, headers=headers, timeout=10)
+    response.raise_for_status()
+    limits = response.json()["limits"]
+    _last_live = (time.monotonic(), limits)
+    return limits
+
+
+def _cached_limits() -> list:
+    cache = json.loads(_config_path().read_text())["cachedUsageUtilization"]
+    if time.time() * 1000 - cache["fetchedAtMs"] > CACHE_MAX_AGE_MS:
+        raise ValueError("cached usage is over an hour old")
+    return cache["utilization"]["limits"]
+
+
+def _label(limit: dict) -> str:
+    kind = limit["kind"]
+    if kind == "weekly_all":
+        return "week"
+    if kind == "weekly_scoped":
+        model = (limit.get("scope") or {}).get("model") or {}
+        name = model.get("display_name")
+        return f"week · {name}" if name else kind
+    return kind
+
+
+def _error(message: str) -> QuotaReport:
+    return QuotaReport(provider=PROVIDER, label=LABEL, error=message)
+
+
+def fetch() -> QuotaReport:
+    try:
+        limits = _live_limits()
+    except Exception as live_error:
+        try:
+            limits = _cached_limits()
+        except Exception as cache_error:
+            logger.warning("Claude Code usage unavailable: live %r, cache %r", live_error, cache_error)
+            return _error("Claude Code's usage limits could not be fetched, and no recent cached copy exists")
+
+    try:
+        windows = tuple(
+            QuotaWindow(
+                key=limit["kind"],
+                label=_label(limit),
+                used_pct=float(limit["percent"]),
+                resets_at=limit.get("resets_at"),
+            )
+            for limit in limits
+            if limit.get("percent") is not None
+        )
+    except Exception:
+        return _error("Claude Code's usage limits are not in a shape tsugite understands")
+
+    return QuotaReport(provider=PROVIDER, label=LABEL, windows=windows)
+
+
+register_quota_source(PROVIDER, LABEL, fetch)

tsugite_claude_code-0.23.1/tsugite_claude_code/usage.py

@@ -1,70 +0,0 @@
-"""Claude Code subscription limits as a tsugite quota source.
-
-Read from ``utilization.limits[]`` in the usage cache Claude Code writes to its
-own config. That list is self-describing, so a limit kind tsugite has never seen
-still shows up. Its sibling keys hold an account id, and a spend figure that
-reads 100% while disabled; neither belongs in a report.
-"""
-
-from __future__ import annotations
-
-import json
-import os
-from pathlib import Path
-
-from tsugite.usage.quota import QuotaReport, QuotaWindow, register_quota_source
-
-PROVIDER = "claude_code"
-LABEL = "Claude Code"
-
-
-def _config_path() -> Path:
-    base = os.environ.get("CLAUDE_CONFIG_DIR") or os.path.expanduser("~")
-    return Path(base) / ".claude.json"
-
-
-def _label(limit: dict) -> str:
-    kind = limit["kind"]
-    if kind == "weekly_all":
-        return "week"
-    if kind == "weekly_scoped":
-        model = (limit.get("scope") or {}).get("model") or {}
-        name = model.get("display_name")
-        return f"week · {name}" if name else kind
-    return kind
-
-
-def _error(message: str) -> QuotaReport:
-    return QuotaReport(provider=PROVIDER, label=LABEL, error=message)
-
-
-def fetch() -> QuotaReport:
-    try:
-        data = json.loads(_config_path().read_text())
-    except Exception:
-        return _error("Claude Code's config could not be read")
-
-    cache = data.get("cachedUsageUtilization")
-    if not cache:
-        return _error("Claude Code has not cached its usage limits yet")
-
-    try:
-        # A window the cache has not filled in yet carries no percent; skip it
-        # rather than discard the ones it has.
-        windows = tuple(
-            QuotaWindow(
-                key=limit["kind"],
-                label=_label(limit),
-                used_pct=float(limit["percent"]),
-                resets_at=limit.get("resets_at"),
-            )
-            for limit in cache["utilization"]["limits"]
-            if limit.get("percent") is not None
-        )
-    except Exception:
-        return _error("Claude Code's cached usage limits are not in a shape tsugite understands")
-
-    return QuotaReport(provider=PROVIDER, label=LABEL, windows=windows)
-
-
-register_quota_source(PROVIDER, LABEL, fetch)