@goodandready/dsh-opencode-provider 0.5.2 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.3
+
+- **Per-account runway**: the quota panel estimates time to exhaustion for each account from the 5-hour, weekly and monthly burn rate and flags the first window projected to run out before its reset. The estimate is intentionally approximate; only the current percentage and reset time are exposed by the usage endpoint.
+- 84 tests.
+
 ## 0.5.2
 
 - **Quota fallback**: choose a free model in Settings → OpenCode. A Go quota rejection retries the same request once on Console/Zen with that model; failures surface the original quota error.

package/README.md

@@ -86,6 +86,7 @@ graph LR
   - Gemini `thoughtSignature` on historical function calls.
 - **Multi-account rotation** before a stream starts: 401/403/429 and quota/usage-limit bodies (400/402/403/429). An invalid key cools down for 24h, a quota rejection for 10 minutes or `Retry-After`, a rate limit for 60s or `Retry-After`. A request already streaming is never replayed on another account; the next request uses the next usable key.
 - **Per-account quotas**: each account row shows its own 5-hour / weekly / monthly usage, the active account drives the sidebar and quota panel, and the panel lists every account side by side.
+- **Per-account runway**: estimates time to exhaustion from the average burn rate of each window and marks the first window projected to run out before its reset; approximate because the API exposes only the current percentage and reset time.
 - **Model → account rules**: first matching glob pins a preferred account for that model; the other accounts remain fallbacks if it fails or is cooling.
 - **Request heatmap** in the quota panel: a Monday-first weekday × hour grid in local time, plus a 24-hour aggregate strip underneath. Selectors switch between all requests, any single model, and any single account. The adapter appends `{at, provider, model, purpose?, account, reason}` to `~/.dsh/storages/dsh-opencode/requests.jsonl`; no prompt, response or key is stored. Auxiliary `session-title`/`compaction` calls are excluded from the heatmap and exact duplicate records collapse. The log compacts at 2 MB to the newest 5000 lines. Collection starts with this build — the projection cache only has `lastPromptAt`, not per-request timestamps.
 - **Stable `x-opencode-session`** derived from the durable session id, so retries and every turn of a conversation reuse the same routing key.
@@ -122,12 +123,12 @@ npm pack
 Install the **packed tarball** into a profile:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 
 # Or install the published package:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.2
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.3
 ```
 
 Restart dsh (or DSH Desktop), then pick `OpenCode` or `OpenCode Go` in the model picker.

package/README.ru.md

@@ -89,6 +89,7 @@ graph LR
   - Недействительный ключ охлаждается 24 часа, превышение квоты — 10 минут (или по заголовку `Retry-After`), rate limit — 60 секунд (или по `Retry-After`).
   - Если запрос уже начал стриминг, он не переключается посреди ответа; следующий запрос берёт следующий готовый ключ.
 - **Квоты по каждому аккаунту**: отображение индивидуального расхода за 5 часов, неделю и месяц; активный аккаунт управляет сайдбаром и панелью.
+- **Runway по каждому аккаунту**: оценка времени до исчерпания по среднему темпу каждого окна; отмечается первое окно, которое закончится раньше сброса. Оценка приблизительная: API отдаёт только текущий процент и время сброса.
 - **Онбординг аккаунтов**: **Import all from auth.json** переносит все ключи OpenCode в отдельные credential ref и добавляет аккаунты; **Check all accounts** обновляет квоты и health по каждому аккаунту.
 - **Правила «модель ➔ аккаунт»**: сопоставление по glob-паттернам закрепляет предпочтительный аккаунт за моделью; остальные аккаунты остаются в резерве.
 - **Квотный fallback**: выберите бесплатную модель в настройках; при ошибке квоты Go тот же запрос один раз повторяется через Console/Zen. Если fallback тоже не сработал, возвращается исходная ошибка квоты.
@@ -119,12 +120,12 @@ npm pack
 Установка из **упакованного tarball**:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 
 # Либо установка опубликованного пакета из npm:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.2
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.3
 ```
 
 После установки перезапустите dsh (или DSH Desktop) и выберите **OpenCode** или **OpenCode Go** в списке моделей.

package/README.zh.md

@@ -90,6 +90,7 @@ graph LR
   - 无效密钥冷却 24 小时，超额冷却 10 分钟（或遵循 `Retry-After`），速率限制冷却 60 秒。
   - 正在流式传输中的请求不会被打断，下一个请求会自动使用下一个可用密钥。
 - **多账户额度与健康监控**：每行独立展示 5 小时、每周与每月使用情况，活跃账户驱动侧边栏与配额面板。
+- **每账户预计可用时长**：按各窗口的平均消耗速度估算耗尽时间，并标记在重置前最先耗尽的窗口；API 仅提供当前百分比与重置时间，因此为近似值。
 - **模型 ➔ 账户路由规则**：支持 Glob 通配符（如 `*free*`、`deepseek-*`）将模型优先绑定至特定账户，其他账户保留为备用。
 - **配额回退**：在设置中选择免费模型；Go 返回配额错误时，同一请求通过 Console/Zen 重试一次。若回退也失败，返回原始配额错误。
 - **会话粘性账户**：同一会话优先使用上次成功的账户；显式模型规则、固定账户和配额回退优先。
@@ -116,12 +117,12 @@ npm pack
 通过**打包文件 (.tgz)**安装：
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 # DSH 桌面端：
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.2.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.3.tgz
 
 # 或从 npm 安装已发布版本：
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.2
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.3
 ```
 
 安装完成后重启 dsh 或 DSH 桌面端，在模型选择器中选择 **OpenCode** 或 **OpenCode Go** 即可。

package/lib/client.js

@@ -67,6 +67,8 @@ window.__ModuleLoader__.load({
 				fiveHour: "5-hour",
 				weekly: "Weekly",
 				monthly: "Monthly",
+				runway: "Runway (est.)",
+				runwaySafe: "safe",
 				noUsage: "Quota is unavailable.",
 				usageError: "Quota error",
 				refresh: "Refresh",
@@ -245,6 +247,8 @@ window.__ModuleLoader__.load({
 				fiveHour: "5 小时",
 				weekly: "每周",
 				monthly: "每月",
+				runway: "预计可用时长",
+				runwaySafe: "安全",
 				noUsage: "配额不可用。",
 				usageError: "配额错误",
 				refresh: "刷新",
@@ -915,6 +919,73 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/quota-runway.ts
+		const HOUR = 36e5;
+		const DAY = 24 * HOUR;
+		const DURATIONS = {
+			fiveHour: 5 * HOUR,
+			weekly: 7 * DAY,
+			monthly: 30 * DAY
+		};
+		function percentOf(window) {
+			const value = Number(window.percentUsed);
+			return Number.isFinite(value) ? Math.max(0, Math.min(100, value)) : 0;
+		}
+		/**
+		* Estimate when one window reaches 100% at the average burn rate observed
+		* since it started. The API exposes only the current percentage and reset
+		* time; the start is derived from the known window length, so this is a
+		* deliberately conservative, approximate runway.
+		*/
+		function estimateRunway(window, durationMs, now = Date.now()) {
+			if (window === void 0 || window.resetsAt === void 0) return void 0;
+			const resetsAtMs = Date.parse(window.resetsAt);
+			if (!Number.isFinite(resetsAtMs) || resetsAtMs <= now) return void 0;
+			const used = percentOf(window);
+			const timeToReset = resetsAtMs - now;
+			if (used >= 100) return {
+				etaMs: 0,
+				resetsAtMs,
+				exhaustsBeforeReset: true
+			};
+			const elapsed = now - (resetsAtMs - durationMs);
+			if (elapsed <= 0) return void 0;
+			const rate = used / elapsed;
+			if (!Number.isFinite(rate) || rate <= 0) return {
+				etaMs: Number.POSITIVE_INFINITY,
+				resetsAtMs,
+				exhaustsBeforeReset: false
+			};
+			const etaMs = (100 - used) / rate;
+			return {
+				etaMs,
+				resetsAtMs,
+				exhaustsBeforeReset: etaMs < timeToReset
+			};
+		}
+		/** Pick the window that is projected to run out first, if any. */
+		function accountRunway(windows, now = Date.now()) {
+			if (windows === void 0) return { kind: "unknown" };
+			let best;
+			let known = 0;
+			for (const name of Object.keys(DURATIONS)) {
+				const estimate = estimateRunway(windows[name], DURATIONS[name], now);
+				if (estimate === void 0) continue;
+				known += 1;
+				if (!estimate.exhaustsBeforeReset) continue;
+				if (best === void 0 || estimate.etaMs < best.etaMs) best = {
+					etaMs: estimate.etaMs,
+					window: name
+				};
+			}
+			if (best !== void 0) return {
+				kind: "eta",
+				etaMs: best.etaMs,
+				window: best.window
+			};
+			return known === 0 ? { kind: "unknown" } : { kind: "safe" };
+		}
+		//#endregion
 		//#region src/client/quota-card.tsx
 		const PANEL_EVENT = "dsh-opencode-panel-state";
 		function broadcastPanel(open) {
@@ -969,6 +1040,18 @@ window.__ModuleLoader__.load({
 		function usagePercent(window) {
 			return window === void 0 ? "—" : `${Math.round(window.percentUsed)}%`;
 		}
+		function runwayText(summary) {
+			if (summary.kind === "safe") return "safe";
+			if (summary.kind === "unknown") return "—";
+			if (summary.etaMs <= 0) return "now";
+			const hours = summary.etaMs / 36e5;
+			if (hours >= 24) return `~${Math.round(hours / 24)}d`;
+			if (hours >= 1) return `~${Math.round(hours)}h`;
+			return `~${Math.max(1, Math.round(hours * 60))}m`;
+		}
+		function runwayTitle(summary, t) {
+			return summary.kind === "eta" ? `${t("runway")}: ${summary.window}` : "";
+		}
 		function accountStatus(account, t) {
 			if (account.mark !== "") {
 				const label = account.mark === "invalid-credential" ? t("markInvalid") : account.mark === "quota" ? t("markQuota") : account.mark === "rate-limit" ? t("markRateLimit") : t("markTransport");
@@ -1277,9 +1360,11 @@ window.__ModuleLoader__.load({
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("accountLabel") }),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("fiveHour") }),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("weekly") }),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("monthly") })
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("monthly") }),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("runway") })
 								] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: state.accounts.map((account) => {
 									const accountWindows = account.usage?.report?.windows;
+									const runway = accountRunway(accountWindows);
 									const status = accountStatus(account, t);
 									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
 										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [
@@ -1294,7 +1379,11 @@ window.__ModuleLoader__.load({
 										] }),
 										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: usagePercent(accountWindows?.fiveHour) }),
 										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: usagePercent(accountWindows?.weekly) }),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: usagePercent(accountWindows?.monthly) })
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: usagePercent(accountWindows?.monthly) }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", {
+											title: runwayTitle(runway, t),
+											children: runway.kind === "safe" ? t("runwaySafe") : runwayText(runway)
+										})
 									] }, account.label);
 								}) })]
 							}),

package/lib/index.js

@@ -17,7 +17,7 @@ const DEFAULT_GO_API_BASE = "https://opencode.ai/inference/go";
 const DEFAULT_GO_ZEN_BASE = "https://opencode.ai/zen/go/v1";
 const DEFAULT_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
 const DEFAULT_AUTH_ENTRY = "opencode-go";
-const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.2";
+const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.3";
 const DEFAULT_CONTEXT_WINDOW = 262144;
 const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_GENERATE_MAX_TOKENS = 32768;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-opencode-provider",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "OpenCode / OpenCode Go LLM provider plugin for DeepSeek Harness (dsh).",
   "license": "MIT",
   "type": "module",