dsh-claude-subscription 0.2.0 → 0.3.1

package/AGENTS.md

@@ -6,7 +6,7 @@ Use this guide when a user asks an Agent to install, update, verify, or remove
 ## Safety
 
 - Confirm the target DSH profile; use `web` only when it is the user's target.
-- Use the pinned `v0.2.0` release assets for a first install, never a moving branch.
+- Use the pinned `v0.3.0` release assets for a first install, never a moving branch.
 - Never print OAuth credentials, account IDs, authorization callbacks, or the
   credential store.
 - Do not start, stop, or restart DSH without explicit permission.
@@ -16,6 +16,10 @@ Use this guide when a user asks an Agent to install, update, verify, or remove
 
 ## Detect the installation
 
+This plugin release supports only DeepSeek Harness `0.1.2-alpha.5`. Run
+`dsh --version` first and stop on any other version; do not upgrade DSH or
+ignore peer dependency warnings without explicit permission.
+
 Check whether the plugin is already installed in the target DSH profile. When
 it is already listed, use update or uninstall instead of installing again.
 
@@ -25,7 +29,7 @@ When `dsh`, Node.js, and pnpm are already available, install the pinned npm
 package directly:
 
 ```sh
-dsh plugin --profile web add dsh-claude-subscription@0.2.0
+dsh plugin --profile web add dsh-claude-subscription@0.3.0
 ```
 
 Update with `dsh plugin --profile web update dsh-claude-subscription`.
@@ -42,7 +46,7 @@ profile (`desktop`, `web`):
 
 1. `pnpm pack` the plugin into a tarball (or download the pinned release tarball).
 2. Copy the tarball into the profile directory.
-3. Add `"dsh-claude-subscription": "file:./dsh-claude-subscription-0.2.0.tgz"` to
+3. Add `"dsh-claude-subscription": "file:./dsh-claude-subscription-0.3.0.tgz"` to
    the profile's `package.json` `dependencies` and add `dsh-claude-subscription`
    to its `dsh.profile.bundles` array.
 4. Run `pnpm install` in the profile directory.
@@ -71,8 +75,9 @@ Success requires:
 
 Do not treat `dsh plugin --profile web peers check` as the completion test.
 If the user authorizes a live check, restart DSH manually, open
-**Settings -> Claude**, and verify the page loads and reports the saved
-login. Confirm that the `anthropic` provider and its Claude models are
+**Settings -> Models**, verify the Anthropic card reports the saved login,
+and check that **Settings -> Claude subscription** loads. Confirm that the
+`anthropic` provider and its Claude models are
 selectable in the model picker. Only when the user explicitly requests a
 quota-consuming live check, ask the Agent to send one short message with a
 Claude model and confirm the reply.

package/README.en.md

@@ -1,6 +1,5 @@
 # DSH Claude Subscription
 
-[![CI](https://github.com/x5427876/dsh-claude-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/x5427876/dsh-claude-subscription/actions/workflows/ci.yml)
 [![npm version](https://img.shields.io/npm/v/dsh-claude-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-claude-subscription)
 [![License: MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 
@@ -16,7 +15,7 @@ DSH's host credential service: no token extraction, no resale, no extra billing.
 ## What it does
 
 - Uses your Claude Pro / Max subscription directly inside DSH, with no Anthropic API key required;
-- Signs in to claude.ai from Settings through the official OAuth flow and keeps credentials on the host;
+- Signs in to claude.ai from the Anthropic card under **Settings -> Models** or from **Settings -> Claude subscription**, using the official OAuth flow and keeping credentials on the host;
 - Refreshes the access token automatically with the refresh token;
 - Shows sign-in status and token expiry;
 - Shows the **subscription quota**: remaining percentage and reset time for the 5-hour, 7-day, Opus, and Sonnet windows;
@@ -25,10 +24,13 @@ DSH's host credential service: no token extraction, no resale, no extra billing.
 
 ## Prepare DSH
 
-This plugin supports DeepSeek Harness `0.1.0-rc.6` and `0.1.0-rc.7`, and
-requires a Claude Pro, Max, Team, or Enterprise subscription.
+This plugin currently supports only DeepSeek Harness `0.1.2-alpha.5` and
+requires a Claude Pro, Max, Team, or Enterprise subscription. DSH remains a
+developer preview; an npm `latest` or `next` release other than
+`0.1.2-alpha.5` is outside this plugin version's supported range.
 
-If DSH already opens normally, continue with the plugin installation below.
+Run `dsh --version` before installation. Do not merely ignore peer dependency
+warnings.
 
 ## Install
 
@@ -59,22 +61,23 @@ For DSH Desktop, put the `pnpm pack` tarball into
 `dsh.profile.bundles` entry in that profile's `package.json`, run
 `pnpm install` there, then restart DSH. After install:
 
-1. Open **Settings -> Claude subscription** in DSH.
+1. Open **Settings -> Models** and find Anthropic. Full quota details remain
+   under **Settings -> Claude subscription**.
 2. If not signed in, click **Browser sign-in** and authorize on claude.ai.
 3. Pick a Claude model under the `anthropic` provider in the model picker.
 4. Turn on **Composer quota** on the same page when you want it.
 
 ## Quota display
 
-The **Subscription quota** card in **Settings -> Claude subscription** shows the
-quota windows reported by Anthropic. The host reads them; the browser receives
-only a percentage projection, and the access token never leaves the machine.
-Results are cached for 60 seconds, and **Refresh** reads them again immediately.
+The model picker shows only models returned by the Anthropic Models API. The
+**Subscription quota** card in **Settings -> Claude subscription** shows only
+windows and labels returned by the Anthropic usage API. The host reads them,
+and the access token never leaves the machine. Results are cached for 60
+seconds, and **Refresh** reads them again immediately.
 
-With **Composer quota** on, a Claude model shows the tightest applicable window
-next to the message input (Opus and Sonnet models also count their 7-day
-window). Nothing is rendered when you are signed out or when the account
-reports no quota windows.
+With **Composer quota** on, the input shows the tightest API window explicitly
+marked as global or applicable to the current model. A window without API scope
+metadata is not used for composer quota.
 
 ## Update and uninstall
 

package/README.md

@@ -1,6 +1,5 @@
 # DSH Claude Subscription
 
-[![CI](https://github.com/x5427876/dsh-claude-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/x5427876/dsh-claude-subscription/actions/workflows/ci.yml)
 [![npm version](https://img.shields.io/npm/v/dsh-claude-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-claude-subscription)
 [![License: MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 
@@ -16,7 +15,7 @@
 ## 能做什麼
 
 - 在 DSH 中直接使用 Claude Pro / Max 訂閱，不需要 Anthropic API Key；
-- 在設定頁以官方 OAuth 流程登入 claude.ai，憑證保留在 DSH 本機；
+- 在**設定 → 模型**的 Anthropic 卡片或**設定 → Claude 訂閱**中，以官方 OAuth 流程登入 claude.ai，憑證保留在 DSH 本機；
 - access token 過期時自動以 refresh token 續期，不需手動處理；
 - 顯示登入狀態；
 - 顯示**訂閱額度**：5 小時、7 天、Opus 與 Sonnet 的剩餘百分比與重置時間；
@@ -25,10 +24,11 @@
 
 ## 準備 DSH
 
-本插件適配 DeepSeek Harness `0.1.0-rc.6` 與 `0.1.0-rc.7`，需要一個
-Claude Pro、Max、Team 或 Enterprise 訂閱帳號。
+本插件目前僅適配 DeepSeek Harness `0.1.2-alpha.5`，需要一個 Claude Pro、
+Max、Team 或 Enterprise 訂閱帳號。DSH 仍在 developer preview；npm 的
+`latest` / `next` 通道若不是 `0.1.2-alpha.5`，不在本版本的支援範圍。
 
-已經能正常打開 DSH 的使用者可以直接繼續安裝插件。
+安裝前請先以 `dsh --version` 確認版本；不要只忽略 peer dependency 警告。
 
 ## 安裝
 
@@ -58,20 +58,21 @@ DSH Desktop（桌面版）時，把 `pnpm pack` 產出的 tarball 放進
 `file:` 依賴與 `dsh.profile.bundles` 條目，然後在該目錄執行
 `pnpm install`，最後重啟 DSH。安裝後：
 
-1. 開啟 DSH 的**設定 → Claude 訂閱**。
+1. 開啟 DSH 的**設定 → 模型**，找到 Anthropic；完整額度資訊仍位於
+   **設定 → Claude 訂閱**。
 2. 若尚未登入，按**瀏覽器登入**，在 claude.ai 完成授權。
 3. 在模型選單選擇 `anthropic` provider 下的 Claude 模型。
 4. 需要時，在同一頁打開**輸入框額度**開關。
 
 ## 額度顯示
 
-**設定 → Claude 訂閱**的**訂閱額度**卡片顯示 Anthropic 回報的額度視窗。
-資料由 host 端讀取，瀏覽器只收到百分比投影，access token 不會離開本機。
-額度結果快取 60 秒，按**重新整理**可立即重新讀取。
+模型選單只顯示 Anthropic Models API 回傳的模型。**設定 → Claude 訂閱**的
+**訂閱額度**卡片只顯示 Anthropic usage API 回傳的額度視窗與名稱。
+資料由 host 端讀取，access token 不會離開本機。結果快取 60 秒，
+按**重新整理**可立即重新讀取。
 
-打開**輸入框額度**後，選用 Claude 模型時，輸入框右側顯示最緊的那個額度視窗
-（Opus 或 Sonnet 模型會納入對應的 7 天視窗）。未登入、或帳號走 API Key 計費
-而沒有額度視窗時，該處不顯示任何內容。
+打開**輸入框額度**後，輸入框右側顯示 API 明確標示為全域或適用於目前模型的
+最緊額度視窗。API 未提供適用範圍時，該視窗不會用於輸入框額度。
 
 ## 更新與解除安裝
 

package/lib/client.js

@@ -8,22 +8,10 @@ window.__ModuleLoader__.load({
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region src/composer-quota.js
-		const SHARED_WINDOW_IDS = Object.freeze(["five_hour", "seven_day"]);
-		const MODEL_WINDOW_IDS = Object.freeze({
-			opus: "seven_day_opus",
-			sonnet: "seven_day_sonnet"
-		});
 		const isDisplayableWindow = (window) => Number.isFinite(window?.remainingPercent) && window.remainingPercent >= 0 && window.remainingPercent <= 100;
-		const normalized = (value) => String(value ?? "").toLocaleLowerCase("en-US");
-		function applicableIds(model) {
-			const name = normalized(model);
-			const family = Object.entries(MODEL_WINDOW_IDS).find(([key]) => name.includes(key));
-			return family === void 0 ? SHARED_WINDOW_IDS : [...SHARED_WINDOW_IDS, family[1]];
-		}
-		/** Pick the tightest quota window that constrains the given model. */
+		/** Pick the tightest API-reported quota window that applies to the model. */
 		function selectModelQuota(usage, model) {
-			const ids = applicableIds(model);
-			const windows = Array.isArray(usage?.windows) ? usage.windows.filter((window) => ids.includes(window?.id) && isDisplayableWindow(window)) : [];
+			const windows = Array.isArray(usage?.windows) ? usage.windows.filter((window) => (window.appliesTo === "all" || window.appliesTo === model) && isDisplayableWindow(window)) : [];
 			if (windows.length === 0) return void 0;
 			const selected = windows.reduce((lowest, candidate) => candidate.remainingPercent < lowest.remainingPercent ? candidate : lowest);
 			return {
@@ -79,10 +67,6 @@ window.__ModuleLoader__.load({
 			usageEmpty: "此帳戶沒有回傳可顯示的額度視窗。請稍後重新整理；這不代表額度為零。",
 			usageUpdated: "更新於 {value}",
 			remaining: "剩餘 {value}%",
-			windowFiveHour: "5 小時額度",
-			windowSevenDay: "7 天額度",
-			windowSevenDayOpus: "Opus 7 天額度",
-			windowSevenDaySonnet: "Sonnet 7 天額度",
 			resets: "重置於 {value}",
 			resetUnknown: "重置時間未提供",
 			extraUsage: "額外用量",
@@ -118,10 +102,6 @@ window.__ModuleLoader__.load({
 			usageEmpty: "This account returned no displayable quota windows. Refresh later; this does not mean zero quota.",
 			usageUpdated: "Updated {value}",
 			remaining: "{value}% remaining",
-			windowFiveHour: "5-hour quota",
-			windowSevenDay: "7-day quota",
-			windowSevenDayOpus: "Opus 7-day quota",
-			windowSevenDaySonnet: "Sonnet 7-day quota",
 			resets: "Resets {value}",
 			resetUnknown: "Reset time not provided",
 			extraUsage: "Extra usage",
@@ -172,13 +152,14 @@ window.__ModuleLoader__.load({
 		};
 		const fill = (text, values) => Object.entries(values).reduce((next, [key, value]) => next.replace(`{${key}}`, String(value)), text);
 		const percent = (value) => Number(value).toLocaleString(void 0, { maximumFractionDigits: 1 });
-		const WINDOW_LABELS = {
-			five_hour: "windowFiveHour",
-			seven_day: "windowSevenDay",
-			seven_day_opus: "windowSevenDayOpus",
-			seven_day_sonnet: "windowSevenDaySonnet"
-		};
-		const windowLabel = (id, t) => t(WINDOW_LABELS[id] ?? "windowSevenDay");
+		const money = (value, currency, decimalPlaces) => new Intl.NumberFormat(void 0, {
+			style: "currency",
+			currency,
+			currencyDisplay: "code",
+			minimumFractionDigits: decimalPlaces,
+			maximumFractionDigits: decimalPlaces
+		}).format(value / 10 ** decimalPlaces);
+		const windowLabel = (window) => window.label ?? window.id;
 		const validDate = (value) => {
 			const date = new Date(value);
 			return Number.isFinite(date.getTime()) ? date : void 0;
@@ -539,9 +520,11 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function ExtraUsageRow({ extraUsage, t }) {
-			const detail = !extraUsage.enabled ? t("extraUsageOff") : extraUsage.usedCredits === void 0 ? t("extraUsageUnknown") : extraUsage.monthlyLimit === void 0 ? fill(t("extraUsageUsedOnly"), { used: extraUsage.usedCredits }) : fill(t("extraUsageUsed"), {
-				used: extraUsage.usedCredits,
-				limit: extraUsage.monthlyLimit
+			const amount = (value) => money(value, extraUsage.currency, extraUsage.decimalPlaces);
+			const hasExactAmount = extraUsage.usedCredits !== void 0 && extraUsage.currency !== void 0 && extraUsage.decimalPlaces !== void 0;
+			const detail = !extraUsage.enabled ? t("extraUsageOff") : !hasExactAmount ? t("extraUsageUnknown") : extraUsage.monthlyLimit === void 0 ? fill(t("extraUsageUsedOnly"), { used: amount(extraUsage.usedCredits) }) : fill(t("extraUsageUsed"), {
+				used: amount(extraUsage.usedCredits),
+				limit: amount(extraUsage.monthlyLimit)
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "claudeSubscriptionExtra",
@@ -640,13 +623,13 @@ window.__ModuleLoader__.load({
 									className: "claudeSubscriptionLimitTop",
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										className: "claudeSubscriptionLimitLabel",
-										children: windowLabel(window.id, t)
+										children: windowLabel(window)
 									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("strong", { children: [percent(window.remainingPercent), "%"] })]
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("progress", {
 									max: "100",
 									value: window.remainingPercent,
-									"aria-label": `${windowLabel(window.id, t)} ${fill(t("remaining"), { value: percent(window.remainingPercent) })}`
+									"aria-label": `${windowLabel(window)} ${fill(t("remaining"), { value: percent(window.remainingPercent) })}`
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									className: "claudeSubscriptionLimitMeta",
@@ -665,6 +648,37 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
+		function ClaudeProviderAuth({ provider, rpc, t }) {
+			const [account, setAccount] = (0, react.useState)();
+			const [error, setError] = (0, react.useState)();
+			const isClaude = provider?.provider === PROVIDER;
+			(0, react.useEffect)(() => {
+				if (!isClaude) return;
+				let live = true;
+				rpc.call(CHANNEL, "status", {}).then(unwrap).then((next) => {
+					if (live) setAccount(next);
+				}).catch(() => {
+					if (live) setError(t("loadFailed"));
+				});
+				return () => {
+					live = false;
+				};
+			}, [isClaude, rpc, t]);
+			if (!isClaude) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountCard, {
+					rpc,
+					t,
+					account,
+					setAccount,
+					onSignedOut: () => void 0
+				}), error === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "claudeSubscriptionError",
+					role: "alert",
+					children: error
+				})]
+			});
+		}
 		function ClaudeSection({ preference, rpc, t }) {
 			const [account, setAccount] = (0, react.useState)();
 			const [error, setError] = (0, react.useState)();
@@ -746,6 +760,15 @@ window.__ModuleLoader__.load({
 					t
 				})
 			}, ClaudeSection));
+			ctx.slots.inject("settings.models.provider-card", () => ctx.slots.register({
+				name: "settings.models.provider-card",
+				key: "llm-pi-ai",
+				locale: NS,
+				inject: () => ({
+					rpc: connection.rpc,
+					t
+				})
+			}, ClaudeProviderAuth));
 			ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
 				name: "conversation.input.right",
 				id: "claude-subscription-quota",

package/lib/index.js

@@ -1,9 +1,11 @@
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
-import { LlmError } from "@deepseek-ai/dsh-llm";
+import { LlmError, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
-import { settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
 import { spawn } from "node:child_process";
+import { access } from "node:fs/promises";
+import { homedir } from "node:os";
+import { resolve as resolvePath } from "node:path";
 import { anthropicProvider as createAnthropicProvider } from "@earendil-works/pi-ai/providers/anthropic";
 import { createModels } from "@earendil-works/pi-ai";
 //#region src/credential-store.js
@@ -429,6 +431,7 @@ function createClaudeRpcHandler(coordinator, options = {}) {
 */
 function anthropicSubscriptionProvider() {
 	const provider = createAnthropicProvider();
+	let models = Object.freeze([]);
 	const requestToken = Object.freeze({
 		name: "DSH-managed Anthropic OAuth request token",
 		async resolve({ credential }) {
@@ -445,10 +448,28 @@ function anthropicSubscriptionProvider() {
 		auth: Object.freeze({
 			...provider.auth,
 			apiKey: requestToken
-		})
+		}),
+		getModels: () => models,
+		setModels(value) {
+			models = Object.freeze([...value]);
+		}
 	});
 }
-const PI_AI_RUNTIME_VERSION = "0.82.1";
+const PI_AI_RUNTIME_VERSION = "0.84.2";
+const PI_AI_AUTH_CONTEXT = Object.freeze({
+	async env(name) {
+		return process.env[name];
+	},
+	async fileExists(path) {
+		const expanded = path === "~" || path.startsWith("~/") ? resolvePath(homedir(), path.slice(1).replace(/^\//, "")) : path;
+		try {
+			await access(expanded);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+});
 //#endregion
 //#region src/settings-contract.js
 const SETTINGS_NAMESPACE = "claude-subscription";
@@ -457,30 +478,95 @@ Object.freeze({ [QUICK_QUOTA_FIELD]: false });
 //#endregion
 //#region src/usage.js
 const CLAUDE_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+const CLAUDE_MODELS_URL = "https://api.anthropic.com/v1/models?limit=1000";
 const DEFAULT_TTL_MS = 6e4;
 const DEFAULT_TIMEOUT_MS = 15e3;
 const OAUTH_BETA = "oauth-2025-04-20";
-const WINDOW_IDS = Object.freeze([
-	"five_hour",
-	"seven_day",
-	"seven_day_opus",
-	"seven_day_sonnet"
-]);
 const record = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+function parseClaudeModels(value) {
+	if (!record(value) || !Array.isArray(value.data)) throw new Error("Claude returned a malformed model list");
+	return value.data.map((entry) => {
+		if (!record(entry) || typeof entry.id !== "string" || entry.id.length === 0 || typeof entry.display_name !== "string" || entry.display_name.length === 0) throw new Error("Claude returned a malformed model");
+		if (!Number.isSafeInteger(entry.max_input_tokens) || entry.max_input_tokens <= 0 || !Number.isSafeInteger(entry.max_tokens) || entry.max_tokens <= 0) throw new Error("Claude returned invalid model limits");
+		const capabilities = record(entry.capabilities) ? entry.capabilities : {};
+		return {
+			id: entry.id,
+			name: entry.display_name,
+			api: "anthropic-messages",
+			provider: "anthropic",
+			baseUrl: "https://api.anthropic.com",
+			reasoning: capabilities.thinking?.supported === true,
+			input: capabilities.image_input?.supported === true ? ["text", "image"] : ["text"],
+			cost: {
+				input: 0,
+				output: 0,
+				cacheRead: 0,
+				cacheWrite: 0
+			},
+			contextWindow: entry.max_input_tokens,
+			maxTokens: entry.max_tokens
+		};
+	});
+}
+function createClaudeModelReader(options) {
+	const getAuth = options.getAuth;
+	const setModels = options.setModels;
+	const fetchModels = options.fetch ?? fetch;
+	const now = options.now ?? Date.now;
+	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+	let fetchedAt = 0;
+	let inFlight;
+	const load = async (signal) => {
+		const access = (await getAuth({ signal }))?.auth?.apiKey;
+		if (typeof access !== "string" || access.length === 0) throw new Error("Claude subscription is not signed in");
+		const response = await fetchModels(CLAUDE_MODELS_URL, {
+			method: "GET",
+			redirect: "error",
+			headers: {
+				authorization: `Bearer ${access}`,
+				"anthropic-beta": OAUTH_BETA,
+				"anthropic-version": "2023-06-01",
+				accept: "application/json",
+				"cache-control": "no-store"
+			},
+			signal: requestSignal(signal, timeoutMs)
+		});
+		if (!response.ok) throw new Error(`Claude model request failed (HTTP ${response.status})`);
+		const models = parseClaudeModels(await response.json());
+		setModels(models);
+		fetchedAt = now();
+		return models;
+	};
+	return Object.freeze({
+		read({ force = false, signal } = {}) {
+			if (!force && fetchedAt !== 0 && now() - fetchedAt < ttlMs) return Promise.resolve();
+			if (inFlight !== void 0) return inFlight;
+			const current = load(signal).finally(() => {
+				if (inFlight === current) inFlight = void 0;
+			});
+			inFlight = current;
+			return current;
+		},
+		clear() {
+			fetchedAt = 0;
+			setModels([]);
+		}
+	});
+}
 function epochSecondsOf(value) {
 	if (typeof value !== "string" || value.length === 0) return void 0;
 	const parsed = Date.parse(value);
 	return Number.isFinite(parsed) ? Math.floor(parsed / 1e3) : void 0;
 }
-function windowOf(id, value) {
-	if (value === void 0 || value === null) return void 0;
-	if (!record(value)) throw new Error("Claude returned a malformed usage window");
-	const utilization = value.utilization;
+function windowOf(id, label, utilization, resetsAtValue, appliesTo) {
 	if (!Number.isFinite(utilization) || utilization < 0 || utilization > 100) throw new Error("Claude returned an invalid utilization percentage");
-	const resetsAt = epochSecondsOf(value.resets_at);
+	const resetsAt = epochSecondsOf(resetsAtValue);
 	return {
 		id,
+		label,
 		remainingPercent: 100 - utilization,
+		...appliesTo === void 0 ? {} : { appliesTo },
 		...resetsAt === void 0 ? {} : { resetsAt }
 	};
 }
@@ -489,15 +575,40 @@ function decimalOf(value, label) {
 	if (!Number.isFinite(value) || value < 0) throw new Error(`Claude returned an invalid ${label}`);
 	return value;
 }
-function extraUsageOf(value) {
+function extraUsageOf(value, spend) {
+	if (record(spend) && typeof spend.enabled === "boolean") {
+		const used = record(spend.used) ? spend.used : void 0;
+		const limit = record(spend.limit) ? spend.limit : void 0;
+		const usedCredits = decimalOf(used?.amount_minor, "used credit amount");
+		const monthlyLimit = decimalOf(limit?.amount_minor, "monthly credit limit");
+		const currency = used?.currency ?? limit?.currency;
+		const decimalPlaces = used?.exponent ?? limit?.exponent;
+		if (currency !== void 0 && (typeof currency !== "string" || !/^[A-Za-z]{3}$/.test(currency))) throw new Error("Claude returned an invalid extra usage currency");
+		if (decimalPlaces !== void 0 && (!Number.isSafeInteger(decimalPlaces) || decimalPlaces < 0 || decimalPlaces > 20)) throw new Error("Claude returned invalid extra usage decimal places");
+		if (typeof used?.currency === "string" && typeof limit?.currency === "string" && used.currency.toUpperCase() !== limit.currency.toUpperCase() || Number.isSafeInteger(used?.exponent) && Number.isSafeInteger(limit?.exponent) && used.exponent !== limit.exponent) throw new Error("Claude returned inconsistent extra usage units");
+		return {
+			enabled: spend.enabled,
+			...currency === void 0 ? {} : { currency: currency.toUpperCase() },
+			...decimalPlaces === void 0 ? {} : { decimalPlaces },
+			...monthlyLimit === void 0 ? {} : { monthlyLimit },
+			...usedCredits === void 0 ? {} : { usedCredits },
+			...Number.isFinite(spend.percent) ? { utilization: spend.percent } : {}
+		};
+	}
 	if (value === void 0 || value === null) return void 0;
 	if (!record(value)) throw new Error("Claude returned malformed extra usage details");
 	if (typeof value.is_enabled !== "boolean") return void 0;
 	const monthlyLimit = decimalOf(value.monthly_limit, "monthly credit limit");
 	const usedCredits = decimalOf(value.used_credits, "used credit amount");
 	const utilization = decimalOf(value.utilization, "extra usage utilization");
+	const currency = value.currency;
+	const decimalPlaces = value.decimal_places;
+	if (currency !== void 0 && currency !== null && (typeof currency !== "string" || !/^[A-Za-z]{3}$/.test(currency))) throw new Error("Claude returned an invalid extra usage currency");
+	if (decimalPlaces !== void 0 && decimalPlaces !== null && (!Number.isSafeInteger(decimalPlaces) || decimalPlaces < 0 || decimalPlaces > 20)) throw new Error("Claude returned invalid extra usage decimal places");
 	return {
 		enabled: value.is_enabled,
+		...typeof currency === "string" ? { currency: currency.toUpperCase() } : {},
+		...Number.isSafeInteger(decimalPlaces) ? { decimalPlaces } : {},
 		...monthlyLimit === void 0 ? {} : { monthlyLimit },
 		...usedCredits === void 0 ? {} : { usedCredits },
 		...utilization === void 0 ? {} : { utilization }
@@ -506,8 +617,16 @@ function extraUsageOf(value) {
 /** Reduce the provider payload to a browser-safe quota projection. */
 function parseClaudeUsage(value) {
 	if (!record(value)) throw new Error("Claude returned a malformed usage response");
-	const windows = WINDOW_IDS.map((id) => windowOf(id, value[id])).filter((entry) => entry !== void 0);
-	const extraUsage = extraUsageOf(value.extra_usage);
+	const windows = Array.isArray(value.limits) ? value.limits.map((entry, index) => {
+		if (!record(entry) || typeof entry.kind !== "string" || entry.kind.length === 0) throw new Error("Claude returned a malformed usage window");
+		const model = record(entry.scope) && record(entry.scope.model) ? entry.scope.model : void 0;
+		const modelName = typeof model?.display_name === "string" && model.display_name.length > 0 ? model.display_name : void 0;
+		const group = typeof entry.group === "string" && entry.group.length > 0 ? entry.group : entry.kind;
+		const label = modelName === void 0 ? group : `${group} (${modelName})`;
+		const appliesTo = model === void 0 ? "all" : typeof model.id === "string" && model.id.length > 0 ? model.id : void 0;
+		return windowOf(`${entry.kind}:${index}`, label, entry.percent, entry.resets_at, appliesTo);
+	}) : Object.entries(value).filter(([, entry]) => record(entry) && Object.hasOwn(entry, "utilization") && Object.hasOwn(entry, "resets_at")).map(([id, entry]) => windowOf(id, id, entry.utilization, entry.resets_at));
+	const extraUsage = extraUsageOf(value.extra_usage, value.spend);
 	return {
 		windows,
 		...extraUsage === void 0 ? {} : { extraUsage }
@@ -533,7 +652,7 @@ function createClaudeUsageReader(options) {
 	const now = options.now ?? Date.now;
 	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-	const userAgent = options.userAgent ?? "dsh-claude-subscription/0.2.0";
+	const userAgent = options.userAgent ?? "dsh-claude-subscription/0.3.1";
 	let cached;
 	let inFlight;
 	const load = async (signal) => {
@@ -583,22 +702,10 @@ function createClaudeUsageReader(options) {
 }
 //#endregion
 //#region src/composer-quota.js
-const SHARED_WINDOW_IDS = Object.freeze(["five_hour", "seven_day"]);
-const MODEL_WINDOW_IDS = Object.freeze({
-	opus: "seven_day_opus",
-	sonnet: "seven_day_sonnet"
-});
 const isDisplayableWindow = (window) => Number.isFinite(window?.remainingPercent) && window.remainingPercent >= 0 && window.remainingPercent <= 100;
-const normalized = (value) => String(value ?? "").toLocaleLowerCase("en-US");
-function applicableIds(model) {
-	const name = normalized(model);
-	const family = Object.entries(MODEL_WINDOW_IDS).find(([key]) => name.includes(key));
-	return family === void 0 ? SHARED_WINDOW_IDS : [...SHARED_WINDOW_IDS, family[1]];
-}
-/** Pick the tightest quota window that constrains the given model. */
+/** Pick the tightest API-reported quota window that applies to the model. */
 function selectModelQuota(usage, model) {
-	const ids = applicableIds(model);
-	const windows = Array.isArray(usage?.windows) ? usage.windows.filter((window) => ids.includes(window?.id) && isDisplayableWindow(window)) : [];
+	const windows = Array.isArray(usage?.windows) ? usage.windows.filter((window) => (window.appliesTo === "all" || window.appliesTo === model) && isDisplayableWindow(window)) : [];
 	if (windows.length === 0) return void 0;
 	const selected = windows.reduce((lowest, candidate) => candidate.remainingPercent < lowest.remainingPercent ? candidate : lowest);
 	return {
@@ -608,6 +715,28 @@ function selectModelQuota(usage, model) {
 	};
 }
 //#endregion
+class ClaudeApiAdapter extends PiAiAdapter {
+	constructor(options, modelReader) {
+		super(options);
+		this.modelReader = modelReader;
+	}
+	async listModels(provider) {
+		await this.modelReader.read();
+		return super.listModels(provider);
+	}
+	async resolveModel(provider, model, signal) {
+		await this.modelReader.read({ signal });
+		return super.resolveModel(provider, model, signal);
+	}
+	async prepareCall(provider, model, signal) {
+		await this.modelReader.read({ signal });
+		return super.prepareCall(provider, model, signal);
+	}
+	async *stream(options) {
+		await this.modelReader.read({ signal: options.signal });
+		yield* super.stream(options);
+	}
+}
 //#region src/index.js
 const name = "claude-subscription";
 const inject = [
@@ -636,7 +765,7 @@ const KNOWN_USAGE_ERRORS = /* @__PURE__ */ new Set([
 * Extend the account RPC with the preference toggle and the quota projection.
 * Unknown endpoints stay owned by the login coordinator.
 */
-function createSubscriptionRpcHandler({ authHandler, usageReader, preferences }) {
+function createSubscriptionRpcHandler({ authHandler, usageReader, modelReader, preferences }) {
 	return async (endpoint, payload, signal) => {
 		if (endpoint === "preferences/status" || endpoint === "preferences/update") try {
 			signal.throwIfAborted();
@@ -668,22 +797,36 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, preferences })
 			return publicError("internal", message);
 		}
 		const result = await authHandler(endpoint, payload, signal);
-		if (endpoint === "logout" && result.ok === true) usageReader.clear();
+		if (endpoint === "logout" && result.ok === true) {
+			usageReader.clear();
+			modelReader?.clear();
+		}
 		return result;
 	};
 }
 function apply(ctx) {
-	const settings = ctx.settings.register(settingsNamespace(SETTINGS_NAMESPACE), z.object({ [QUICK_QUOTA_FIELD]: z.boolean().default(false) }));
+	const defaultPreferences = Object.freeze({ [QUICK_QUOTA_FIELD]: false });
+	let preferenceSource = () => defaultPreferences;
+	ctx.settings.installSection(ctx, SETTINGS_NAMESPACE, z.object({ [QUICK_QUOTA_FIELD]: z.boolean().default(false) }), defaultPreferences, {
+		setSource: (current) => {
+			preferenceSource = current;
+		},
+		onChange: () => void 0
+	});
 	const preferences = {
 		status: () => ({
-			[QUICK_QUOTA_FIELD]: settings.get()[QUICK_QUOTA_FIELD],
+			[QUICK_QUOTA_FIELD]: preferenceSource()[QUICK_QUOTA_FIELD],
 			writable: ctx.settings.writable
 		}),
-		update: (patch) => settings.update(patch)
+		update: async (patch) => {
+			await ctx.settings.update(SETTINGS_NAMESPACE, patch);
+			return preferenceSource();
+		}
 	};
 	const store = new DshOAuthCredentialStore(ctx.credentials, CREDENTIAL_REF);
 	const provider = anthropicSubscriptionProvider();
-	const authModels = createModels({ credentials: store });
+	const auth = Object.freeze({ credentials: store, authContext: PI_AI_AUTH_CONTEXT });
+	const authModels = createModels(auth);
 	authModels.setProvider(provider);
 	const profile = Object.freeze({
 		provider: PROVIDER,
@@ -691,13 +834,22 @@ function apply(ctx) {
 		piProvider: provider,
 		configuredMaxTokens: /* @__PURE__ */ new Map(),
 		streamIdleTimeoutMs: 600 * 1e3,
+		maxRequestImageBytes: 20 * 1024 * 1024,
+		requestImagePixelBudget: 2048 * 2048,
+		requestImageMaxBytes: 1024 * 1024,
+		retryPolicy: resolveRetryPolicy(void 0, "claude-subscription retryPolicy"),
 		cacheRetention: "short",
 		transport: "sse"
 	});
 	const profiles = /* @__PURE__ */ new Map([[PROVIDER, profile]]);
 	const resolveAuth = () => authModels.getAuth(PROVIDER);
-	const adapter = new PiAiAdapter({
+	const modelReader = createClaudeModelReader({
+		getAuth: resolveAuth,
+		setModels: (models) => provider.setModels(models)
+	});
+	const adapter = new ClaudeApiAdapter({
 		profiles: () => profiles,
+		auth,
 		resolveApiKey: async () => {
 			let resolved;
 			try {
@@ -709,16 +861,17 @@ function apply(ctx) {
 			return resolved.auth.apiKey;
 		},
 		resolveAttachments: () => void 0
-	});
+	}, modelReader);
 	ctx.llm.registerAdapter([PROVIDER], adapter);
 	const coordinator = new ClaudeLoginCoordinator(createClaudeAuthService(authModels, store));
 	const usageReader = createClaudeUsageReader({ getAuth: resolveAuth });
 	const handler = createSubscriptionRpcHandler({
 		authHandler: createClaudeRpcHandler(coordinator, { openExternal: openClaudeAuthUrl }),
 		usageReader,
+		modelReader,
 		preferences
 	});
 	ctx.effect(() => ctx.connection.rpc.handle(CHANNEL, handler, { authority: "loopback" }), "claude-subscription: loopback account RPC");
 }
 //#endregion
-export { CLAUDE_USAGE_URL, ClaudeLoginCoordinator, DshOAuthCredentialStore, PI_AI_RUNTIME_VERSION, anthropicSubscriptionProvider, apply, assertClaudeAuthUrl, createClaudeAuthService, createClaudeRpcHandler, createClaudeUsageReader, createSubscriptionRpcHandler, inject, name, openClaudeAuthUrl, parseClaudeUsage, selectModelQuota };
+export { CLAUDE_MODELS_URL, CLAUDE_USAGE_URL, ClaudeLoginCoordinator, DshOAuthCredentialStore, PI_AI_RUNTIME_VERSION, anthropicSubscriptionProvider, apply, assertClaudeAuthUrl, createClaudeAuthService, createClaudeModelReader, createClaudeRpcHandler, createClaudeUsageReader, createSubscriptionRpcHandler, inject, name, openClaudeAuthUrl, parseClaudeModels, parseClaudeUsage, selectModelQuota };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-claude-subscription",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "packageManager": "pnpm@11.19.0",
   "description": "Claude Pro/Max subscription for DeepSeek Harness with official Anthropic OAuth login and automatic token refresh",
   "type": "module",
@@ -18,8 +18,6 @@
     "README.en.md",
     "AGENTS.md",
     "LICENSE",
-    "SECURITY.md",
-    "THIRD_PARTY_NOTICES.md",
     "docs/assets/*.png"
   ],
   "dsh": {
@@ -31,17 +29,17 @@
         "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-model-selection",
         "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-settings-models",
         "@deepseek-ai/dsh-client-ui-tool"
       ],
       "platform": "web"
     }
   },
   "scripts": {
-    "build": "tsdown --config tsdown.config.mjs",
+    "build": "node --check lib/index.js && node --check lib/client.js",
     "test": "node --test tests/*.test.mjs",
     "check": "pnpm run test && pnpm run build && pnpm pack --pack-destination .artifacts"
   },
@@ -65,25 +63,21 @@
     "node": "^22.19.0 || >=24.0.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6 || 0.1.0-rc.7",
-    "@deepseek-ai/schemastery": "3.18.1",
-    "@earendil-works/pi-ai": "0.82.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-alpha.5",
+    "@deepseek-ai/dsh-credentials": "0.1.2-alpha.5",
+    "@deepseek-ai/dsh-llm": "0.1.2-alpha.5",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-alpha.5",
+    "@deepseek-ai/schemastery": "^3.18.2",
+    "@earendil-works/pi-ai": "^0.84.2",
     "react": "^18.2.0"
   },
-  "devDependencies": {
-    "tsdown": "0.22.2"
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-ui-primitives": { "optional": true },
+    "@deepseek-ai/dsh-credentials": { "optional": true },
+    "@deepseek-ai/dsh-llm": { "optional": true },
+    "@deepseek-ai/dsh-llm-pi-ai": { "optional": true },
+    "@deepseek-ai/schemastery": { "optional": true },
+    "@earendil-works/pi-ai": { "optional": true },
+    "react": { "optional": true }
   }
 }

package/SECURITY.md

@@ -1,31 +0,0 @@
-# Security policy
-
-## Supported version
-
-Security fixes are applied to the latest tagged release. DeepSeek Harness is a developer preview, so compatibility fixes may require upgrading both DSH and this bundle.
-
-## Reporting a vulnerability
-
-Use a private GitHub security advisory at:
-
-https://github.com/x5427876/dsh-claude-subscription/security/advisories/new
-
-Do not open a public issue containing access tokens, refresh tokens, account identifiers, callback URLs with authorization codes, raw DSH credential data, or private prompts. Include the affected version, operating system, DSH version, a minimal reproduction, and impact. Replace all credentials with unmistakably fake placeholders.
-
-## Trust boundary
-
-- The plugin runs with the privileges of the DSH host process.
-- OAuth credentials remain in DSH's host credential service.
-- The browser settings client can call only a loopback-authorized, redacted RPC surface.
-- Login links are restricted to the HTTPS `claude.ai` origin before they are returned or opened.
-- Token refresh runs host-side through pi-ai's Anthropic OAuth flow; tokens never enter the browser client.
-- The bundle defines no API-key or cross-provider fallback.
-
-Installing any DSH plugin grants its host code access to the services named in its composition. Review the tag or commit you install. Prefer a tagged version or a full commit hash over a moving branch.
-
-## Out of scope
-
-- availability or policy changes in Claude, claude.ai, Anthropic OAuth, or DeepSeek Harness
-- compromised host machines or compromised DSH installations
-- secrets deliberately pasted into prompts, logs, issues, or screenshots
-- provider billing or quota disputes

package/THIRD_PARTY_NOTICES.md

@@ -1,12 +0,0 @@
-# Third-party notices
-
-This project depends on software distributed under its own terms. The dependency lockfile records the exact resolved graph used for the release.
-
-| Project | Role | License | Source |
-| --- | --- | --- | --- |
-| DeepSeek Harness packages | Plugin host, client slots, credential and LLM interfaces | MIT | https://github.com/deepseek-ai/deepseek-harness |
-| `@earendil-works/pi-ai` 0.82.1 | Anthropic OAuth (Claude Pro/Max), model catalog, and Messages transport | MIT | https://github.com/earendil-works/pi |
-| React | DSH settings component runtime | MIT | https://github.com/facebook/react |
-| tsdown | Development-time bundler | MIT | https://github.com/rolldown/tsdown |
-
-No third-party project endorses this community plugin. See each installed package for its complete license text and transitive dependency notices.