From 9da0feeecfacebf311b537a18bdbcc9c95fcb2d2 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sat, 4 Apr 2026 12:43:44 +0100 Subject: [PATCH] docs: fix minimax usage docs merge markers --- docs/concepts/usage-tracking.md | 17 +++++++++++++---- docs/providers/minimax.md | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/concepts/usage-tracking.md b/docs/concepts/usage-tracking.md index 839e828bdfd..947e854632d 100644 --- a/docs/concepts/usage-tracking.md +++ b/docs/concepts/usage-tracking.md @@ -37,10 +37,19 @@ title: "Usage Tracking" - JSON usage falls back to `stats`; `stats.cached` is normalized into `cacheRead`. - **OpenAI Codex**: OAuth tokens in auth profiles (accountId used when present). -<<<<<<< HEAD -- **MiniMax**: API key or MiniMax OAuth auth profile. OpenClaw treats `minimax`, `minimax-cn`, and `minimax-portal` as the same MiniMax quota surface, prefers stored MiniMax OAuth when present, and otherwise falls back to `MINIMAX_CODE_PLAN_KEY`, `MINIMAX_CODING_API_KEY`, or `MINIMAX_API_KEY`. MiniMax's raw `usage_percent` / `usagePercent` fields mean **remaining** quota, so OpenClaw inverts them before display; count-based fields win when present. - - Coding-plan window labels come from provider hours/minutes fields when present, then fall back to the `start_time` / `end_time` span. - - If the coding-plan endpoint returns `model_remains`, OpenClaw prefers the chat-model entry, derives the window label from timestamps when explicit `window_hours` / `window_minutes` fields are absent, and includes the model name in the plan label. +- **MiniMax**: API key or MiniMax OAuth auth profile. OpenClaw treats + `minimax`, `minimax-cn`, and `minimax-portal` as the same MiniMax quota + surface, prefers stored MiniMax OAuth when present, and otherwise falls back + to `MINIMAX_CODE_PLAN_KEY`, `MINIMAX_CODING_API_KEY`, or `MINIMAX_API_KEY`. + MiniMax's raw `usage_percent` / `usagePercent` fields mean **remaining** + quota, so OpenClaw inverts them before display; count-based fields win when + present. + - Coding-plan window labels come from provider hours/minutes fields when + present, then fall back to the `start_time` / `end_time` span. + - If the coding-plan endpoint returns `model_remains`, OpenClaw prefers the + chat-model entry, derives the window label from timestamps when explicit + `window_hours` / `window_minutes` fields are absent, and includes the model + name in the plan label. - **Xiaomi MiMo**: API key via env/config/auth store (`XIAOMI_API_KEY`). - **z.ai**: API key via env/config/auth store. diff --git a/docs/providers/minimax.md b/docs/providers/minimax.md index a2450bd09fe..9034d32265c 100644 --- a/docs/providers/minimax.md +++ b/docs/providers/minimax.md @@ -237,7 +237,6 @@ Current MiniMax auth choices in the wizard/CLI: - OpenClaw normalizes MiniMax coding-plan usage to the same `% left` display used by other providers. MiniMax's raw `usage_percent` / `usagePercent` fields are remaining quota, not consumed quota, so OpenClaw inverts them. -<<<<<<< HEAD Count-based fields win when present. When the API returns `model_remains`, OpenClaw prefers the chat-model entry, derives the window label from `start_time` / `end_time` when needed, and includes the selected model name