kimi-code-usage 0.1.6__tar.gz → 0.2.0__tar.gz

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/.gitignore

@@ -14,6 +14,9 @@ build/
 node_modules/
 package-lock.json
 
+# The VS Code extension's lock file is tracked so CI can install reproducibly.
+!vscode-extension/package-lock.json
+
 # VSCode Extension artifacts
 *.vsix
 vscode-extension/out/
@@ -51,3 +54,9 @@ tokscale-export-*.json
 
 # Coverage
 htmlcov/
+
+# Isolated development worktrees
+.worktrees/
+
+# Oh My OpenAgent local session artifacts
+.omo/

kimi_code_usage-0.2.0/CHANGELOG.md

@@ -0,0 +1,40 @@
+# Changelog
+
+Notable changes to the Python package (`kimi-code-usage` on PyPI). The VS Code
+extension has its own changelog: [`vscode-extension/CHANGELOG.md`](vscode-extension/CHANGELOG.md).
+
+This file starts at 0.2.0; earlier releases are recorded by the `v0.1.0`–`v0.1.6`
+git tags.
+
+## [0.2.0] — 2026-10-20
+
+### Added
+
+- **Extra Usage row.** Kimi's booster wallet is now reported as its own row
+  (`Extra Usage`, `加油包` in Chinese) instead of being invisible. A wallet that
+  reports no usable amount produces no row rather than a made-up `¥0.00`.
+- **Monthly quota over the CLI OAuth token.** Monthly credits are read through
+  the Kimi Code CLI token, preferring that path and falling back to the
+  WebBridge browser snapshot when one is available.
+- Parsing of the live `/usages` payload shape, including its `booster_wallet`
+  field.
+
+### Changed
+
+- **`fastmcp` floor raised from 0.1.0 to 4.1.1** (`mcp` 2). The MCP surface used
+  here — `FastMCP(...)`, `@mcp.tool()`, `mcp.run()` — is unchanged, and the
+  upgrade is covered by a real stdio smoke test (`initialize` → `tools/list` →
+  `call_tool`). Projects that pin `mcp<2` in their own environment will need to
+  relax that pin.
+
+### Fixed
+
+- Kimi: read the live `/usages` shape and count only emitted windows.
+- Kimi: report OAuth monthly probe failures instead of dropping them silently.
+- Kimi: only treat a wallet as live on an explicit signal, and stay silent when
+  it is live but reports no amount.
+- Codex: label each rate-limit window from its own `limit_window_seconds`.
+- Claude: read the Claude Code OAuth token and utilization correctly.
+- OpenRouter: handle `BaseException` from `asyncio.gather` and fix typing.
+- Dependencies: upgraded the vulnerable locked packages; `aiohttp >= 3.14.3` is
+  required for the patched parser.

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: kimi-code-usage
-Version: 0.1.6
+Version: 0.2.0
 Summary: A curated Kimi Coding Plan usage monitor with aesthetic CLI and MCP server.
 Project-URL: Homepage, https://github.com/Golden0Voyager/kimi-code-usage
 Project-URL: Repository, https://github.com/Golden0Voyager/kimi-code-usage
@@ -9,8 +9,9 @@ Author-email: Haining Yu <hainingyu@gmail.com>
 License: MIT
 Keywords: curated,kimi,mcp,monitor,moonshot,usage
 Requires-Python: >=3.10
-Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: fastmcp>=0.1.0
+Requires-Dist: aiohttp>=3.14.3
+Requires-Dist: cloudscraper>=1.2.0
+Requires-Dist: fastmcp>=4.1.1
 Requires-Dist: httpx[socks]>=0.20.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: rich>=12.0.0
@@ -50,6 +51,10 @@ In the era of "Vibecoding," transparency of resources is a prerequisite for flow
 
 **Prerequisite:** A [Kimi Coding Plan](https://api.kimi.com/coding/v1) API Key (`sk-kimi-xxx`), set as `KIMI_API_KEY` in your environment or `.env` file.
 
+> Monthly membership usage is optional. In interactive mode, if an installed Kimi WebBridge daemon is stopped, `kimi-usage` asks on every launch whether to start it. Declining affects only monthly credits. The browser extension must still be connected and Kimi must be logged in; weekly and 5-hour Kimi usage continue working when monthly usage is unavailable.
+
+> ChatGPT Plus usage reads the local Codex authentication file. After a 401 response, it refreshes the access token and retries once. If authentication still fails, run `codex login`.
+
 ---
 
 ### ⚡ CLI Reporter
@@ -60,6 +65,7 @@ In the era of "Vibecoding," transparency of resources is a prerequisite for flow
 ```bash
 pip install kimi-code-usage
 kimi-usage              # Aesthetic Rich panel
+kimi-usage -i           # Interactive panel with optional WebBridge startup prompt
 kimi-usage --json       # Machine-readable JSON
 kimi-usage --plain      # Plain text output
 ```

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/README.md

@@ -32,6 +32,10 @@ In the era of "Vibecoding," transparency of resources is a prerequisite for flow
 
 **Prerequisite:** A [Kimi Coding Plan](https://api.kimi.com/coding/v1) API Key (`sk-kimi-xxx`), set as `KIMI_API_KEY` in your environment or `.env` file.
 
+> Monthly membership usage is optional. In interactive mode, if an installed Kimi WebBridge daemon is stopped, `kimi-usage` asks on every launch whether to start it. Declining affects only monthly credits. The browser extension must still be connected and Kimi must be logged in; weekly and 5-hour Kimi usage continue working when monthly usage is unavailable.
+
+> ChatGPT Plus usage reads the local Codex authentication file. After a 401 response, it refreshes the access token and retries once. If authentication still fails, run `codex login`.
+
 ---
 
 ### ⚡ CLI Reporter
@@ -42,6 +46,7 @@ In the era of "Vibecoding," transparency of resources is a prerequisite for flow
 ```bash
 pip install kimi-code-usage
 kimi-usage              # Aesthetic Rich panel
+kimi-usage -i           # Interactive panel with optional WebBridge startup prompt
 kimi-usage --json       # Machine-readable JSON
 kimi-usage --plain      # Plain text output
 ```

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/README.zh.md

@@ -32,6 +32,10 @@
 
 **统一前提：** 在环境变量或 `.env` 文件中设置 `KIMI_API_KEY`（[Kimi Coding Plan](https://api.kimi.com/coding/v1) API Key，格式 `sk-kimi-xxx`）。
 
+> 月度会员额度为可选增强功能。在交互模式中，如果已安装的 Kimi WebBridge daemon 尚未运行，`kimi-usage` 每次启动都会询问是否启动它；拒绝只影响月度额度。浏览器扩展仍须保持连接且 Kimi 必须已登录；月度额度不可用时，周用量和 5 小时用量仍会正常显示。
+
+> ChatGPT Plus 用量读取本机 Codex 认证文件。接口返回 401 后会自动刷新 access token 并重试一次；认证仍失败时请运行 `codex login`。
+
 ---
 
 ### ⚡ CLI 终端报告器
@@ -42,6 +46,7 @@
 ```bash
 pip install kimi-code-usage
 kimi-usage              # 美观的 Rich 面板
+kimi-usage -i           # 带可选 WebBridge 启动询问的交互面板
 kimi-usage --json       # 机器可读的 JSON
 kimi-usage --plain      # 纯文本输出
 ```

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kimi-code-usage"
-version = "0.1.6"
+version = "0.2.0"
 description = "A curated Kimi Coding Plan usage monitor with aesthetic CLI and MCP server."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -10,11 +10,12 @@ authors = [
 license = { text = "MIT" }
 keywords = ["kimi", "moonshot", "mcp", "usage", "monitor", "curated"]
 dependencies = [
-    "aiohttp>=3.8.0",
+    "aiohttp>=3.14.3",
     "rich>=12.0.0",
     "python-dotenv>=1.0.0",
-    "fastmcp>=0.1.0",
+    "fastmcp>=4.1.1",
     "httpx[socks]>=0.20.0",
+    "cloudscraper>=1.2.0",
 ]
 
 [project.urls]
@@ -70,3 +71,15 @@ show_missing = true
 
 [tool.bandit]
 skips = ["B101", "B311", "B404", "B603"]
+
+[tool.hatch.build.targets.sdist]
+# Explicit, because the default "whatever VCS says" rule breaks inside a git
+# worktree: `.git` is a file there, detection fails, and hatchling falls back to
+# shipping everything untracked — including vscode-extension/node_modules, which
+# turned the sdist from 0.4 MB into 50 MB.
+exclude = [
+  "/vscode-extension",
+  "/docs",
+  "/.github",
+  "/.scratch",
+]

kimi_code_usage-0.2.0/src/kimi_code_usage/__main__.py

@@ -0,0 +1,3 @@
+from .main import run_cli
+
+run_cli()

{kimi_code_usage-0.1.6 → kimi_code_usage-0.2.0}/src/kimi_code_usage/config.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 DEFAULT_CONFIG_PATH = Path.home() / ".kimi-usage" / "config.json"
 
+
 @dataclass
 class ProviderConfig:
     api_key: str | None = None
@@ -12,6 +13,7 @@ class ProviderConfig:
     enabled: bool = True
     management_key: str | None = None
 
+
 @dataclass
 class AppConfig:
     providers: dict[str, ProviderConfig] = field(default_factory=dict)
@@ -28,6 +30,7 @@ class AppConfig:
     def enabled_providers(self) -> list[str]:
         return [name for name, p_conf in self.providers.items() if p_conf.api_key and p_conf.enabled]
 
+
 class ConfigResolver:
     def __init__(self, config_path: str | None = None):
         self.config_path = Path(config_path) if config_path else DEFAULT_CONFIG_PATH
@@ -56,9 +59,10 @@ class ConfigResolver:
             theme = os.getenv("KIMI_USAGE_THEME", "blue-dark")
         self.config.theme = theme
 
-        # Get language and visible providers from JSON
+        # Get language, visible providers, and provider order from JSON
         self.config.language = general_data.get("language")
         self.config.visible_providers = general_data.get("visibleProviders")
+        saved_provider_order = general_data.get("providerOrder")
 
         # Get OpenRouter metric preference, default requests
         or_metric = general_data.get("orMetric", "requests")
@@ -77,7 +81,7 @@ class ConfigResolver:
         self.config.days_window = days_window
 
         # 2. Setup providers
-        all_providers = ["kimi", "openai", "anthropic", "openrouter"]
+        all_providers = ["kimi", "openai", "anthropic", "openrouter", "codex", "claude"]
 
         # Envs map
         env_keys = {
@@ -85,6 +89,8 @@ class ConfigResolver:
             "openai": ("OPENAI_API_KEY",),
             "anthropic": ("ANTHROPIC_API_KEY",),
             "openrouter": ("OPENROUTER_API_KEY", "OPENROUTER_ADMIN_KEY"),
+            "codex": ("CODEX_API_KEY",),
+            "claude": ("CLAUDE_API_KEY",),
         }
 
         env_urls = {
@@ -92,6 +98,8 @@ class ConfigResolver:
             "openai": "OPENAI_BASE_URL",
             "anthropic": "ANTHROPIC_BASE_URL",
             "openrouter": "OPENROUTER_BASE_URL",
+            "codex": "CODEX_BASE_URL",
+            "claude": "CLAUDE_BASE_URL",
         }
 
         default_urls = {
@@ -99,6 +107,8 @@ class ConfigResolver:
             "openai": "https://api.openai.com",
             "anthropic": "https://api.anthropic.com",
             "openrouter": "https://openrouter.ai/api",
+            "codex": "https://chatgpt.com/backend-api",
+            "claude": "https://api.anthropic.com",
         }
 
         for p in all_providers:
@@ -128,14 +138,23 @@ class ConfigResolver:
                     or os.getenv("OPENROUTER_ADMIN_KEY")
                 )
 
-            # Get Enabled status from JSON, else ENV, default True
-            enabled = p_data.get("enabled")
-            if enabled is None:
-                env_enabled = os.getenv(f"{p.upper()}_ENABLED")
-                if env_enabled is not None:
-                    enabled = env_enabled.lower() not in ("false", "0", "no")
-                else:
-                    enabled = True
+            # Codex & Claude: default-off, read local auth files directly
+            if p in ("codex", "claude"):
+                enabled = p_data.get("enabled")
+                if enabled is None:
+                    env_enabled: str | None = os.getenv(f"{p.upper()}_ENABLED", "").lower()
+                    enabled = env_enabled in ("true", "1", "yes")
+                if enabled:
+                    api_key = "enabled"  # Sentinel: passes enabled_providers check
+            else:
+                # Get Enabled status from JSON, else ENV, default True
+                enabled = p_data.get("enabled")
+                if enabled is None:
+                    env_enabled = os.getenv(f"{p.upper()}_ENABLED")
+                    if env_enabled is not None:
+                        enabled = env_enabled.lower() not in ("false", "0", "no")
+                    else:
+                        enabled = True
 
             self.config.providers[p] = ProviderConfig(
                 api_key=api_key if api_key else None,
@@ -145,7 +164,7 @@ class ConfigResolver:
             )
 
         # 3. Determine provider ordering
-        default_order = ["anthropic", "openai", "openrouter", "kimi"]
+        default_order = ["anthropic", "openai", "openrouter", "kimi", "codex", "claude"]
         json_providers = list(providers_data.keys())
 
         final_order = []
@@ -156,6 +175,14 @@ class ConfigResolver:
             if p not in final_order:
                 final_order.append(p)
 
+        # Persisted order from settings view takes precedence over derived order
+        if saved_provider_order:
+            saved_order = [p for p in saved_provider_order if p in all_providers]
+            for p in default_order:
+                if p not in saved_order:
+                    saved_order.append(p)
+            final_order = saved_order
+
         self.config.provider_order = final_order
 
         return self.config
@@ -167,7 +194,8 @@ def save_theme(
     visible_providers: list[str] | None = None,
     or_metric: str | None = None,
     days_window: int | None = None,
-    config_path: Path | None = None
+    provider_order: list[str] | None = None,
+    config_path: Path | None = None,
 ) -> None:
     """Persist settings into ``general`` in the JSON config file.
 
@@ -195,6 +223,8 @@ def save_theme(
         general["orMetric"] = or_metric
     if days_window is not None:
         general["daysWindow"] = days_window
+    if provider_order is not None:
+        general["providerOrder"] = provider_order
     data["general"] = general
 
     with open(path, "w", encoding="utf-8") as fh: