@liyang8246/dsh-accounts 0.1.3 → 0.1.5

package/lib/client.js

@@ -36,6 +36,8 @@
 		empty: "No accounts yet",
 		remove: "Remove",
 		confirmRemove: "Remove this saved login and its local credentials?",
+		resetCredit: "Reset",
+		confirmResetCredit: "Spend one reset credit to clear the used 5-hour window?",
 		cancel: "Cancel",
 		open: "Open authorization page",
 		code: "Authorization code",
@@ -64,6 +66,8 @@
 		empty: "暂无账号",
 		remove: "删除",
 		confirmRemove: "删除此登录账号及其本地凭据？",
+		resetCredit: "重置",
+		confirmResetCredit: "消耗 1 次重置额度，清空已用的 5 小时窗口？",
 		cancel: "取消",
 		open: "打开授权页面",
 		code: "授权码",
@@ -100,7 +104,7 @@
 .zph-accounts button{cursor:pointer}.zph-accounts button:hover{background:var(--dsw-alias-bg-layer-2)}.zph-accounts button:disabled{opacity:.5;cursor:default}.zph-accounts button.zph-link{border:0;background:none;min-height:0;padding:0;color:var(--dsw-alias-brand-primary);text-decoration:underline}.zph-accounts input{max-width:100%;min-width:0}.zph-accounts input[type=radio]{accent-color:var(--dsw-alias-brand-primary);min-height:0;padding:0}
 .zph-accounts button:focus-visible,.zph-accounts input:focus-visible,.zph-accounts a:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}.zph-accounts a{color:var(--dsw-alias-brand-primary)}
 .zph-accounts .zph-quota{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:8px}.zph-accounts .zph-window{padding:8px 10px;border-radius:8px;background:var(--dsw-alias-bg-layer-2);font-size:11px;overflow-wrap:anywhere}.zph-accounts .zph-window-head{display:flex;align-items:baseline;justify-content:space-between;gap:8px}
-.zph-accounts .zph-track{margin:6px 0 0;width:100%}.zph-accounts .zph-error{color:var(--dsw-alias-state-error-primary);overflow-wrap:anywhere}.zph-accounts .zph-quota-unavailable{padding-left:10px}.zph-accounts .zph-quota-unavailable > p{display:inline}.zph-accounts .zph-quota-unavailable > p + p{margin-left:8px}
+.zph-accounts .zph-track{margin:6px 0 0;width:100%}.zph-accounts .zph-error{color:var(--dsw-alias-state-error-primary);overflow-wrap:anywhere}.zph-accounts .zph-quota-unavailable{padding-left:5px}.zph-accounts .zph-quota-unavailable > p{display:inline}.zph-accounts .zph-quota-unavailable > p + p{margin-left:8px}
 .zph-accounts .zph-add{padding:12px 16px;border-top:1px solid var(--dsw-alias-border-l1)}.zph-accounts .zph-form{display:flex;flex-direction:column;gap:10px;margin-top:10px}.zph-accounts .zph-form label{display:flex;flex-direction:column;gap:4px}.zph-accounts .zph-grow{flex:1 1 180px;min-width:0}.zph-accounts .zph-align-end{align-items:flex-end}
 .zph-accounts .zph-switch{display:flex;align-items:center;cursor:pointer}.zph-accounts .zph-switch input{appearance:none;-webkit-appearance:none;position:relative;width:36px;height:20px;min-height:0;padding:0;border:0;border-radius:10px;background:var(--dsw-alias-bg-layer-2);cursor:pointer;transition:background .15s}
 .zph-accounts .zph-switch input::after{content:'';position:absolute;top:2px;left:2px;width:16px;height:16px;border-radius:50%;background:var(--dsw-alias-label-secondary);transition:transform .15s,background .15s}
@@ -134,7 +138,7 @@
 		return isObject(value) && (value.period === "5h" || value.period === "week" || value.period === "month" || value.period === "other") && optionalString(value.label) && optionalString(value.unit) && optionalString(value.resetsAt) && optionalNumber(value.usedPercent) && optionalNumber(value.used) && optionalNumber(value.limit) && (value.exhausted === void 0 || typeof value.exhausted === "boolean");
 	}
 	function isQuota(value) {
-		return isObject(value) && (value.status === "ok" || value.status === "unavailable" || value.status === "error") && typeof value.fetchedAt === "string" && Array.isArray(value.windows) && value.windows.every(isQuotaWindow) && optionalString(value.reason) && optionalString(value.plan);
+		return isObject(value) && (value.status === "ok" || value.status === "unavailable" || value.status === "error") && typeof value.fetchedAt === "string" && Array.isArray(value.windows) && value.windows.every(isQuotaWindow) && optionalString(value.reason) && optionalString(value.plan) && optionalNumber(value.resetCredits);
 	}
 	function isAccount(value) {
 		return isObject(value) && typeof value.id === "string" && isChannelId(value.channel) && typeof value.label === "string" && typeof value.createdAt === "string" && (value.auth === "api-key" || value.auth === "oauth") && typeof value.active === "boolean" && optionalString(value.email) && optionalString(value.orgName) && (value.quota === void 0 || isQuota(value.quota));
@@ -235,6 +239,7 @@
 			const [answer, setAnswer] = React.useState("");
 			const [paste, setPaste] = React.useState(false);
 			const [removing, setRemoving] = React.useState(null);
+			const [resetting, setResetting] = React.useState(null);
 			const mounted = React.useRef(true);
 			React.useEffect(() => {
 				mounted.current = true;
@@ -307,6 +312,7 @@
 					const value = isLoginRequest(request) ? await call(request) : await store.update(() => call(request));
 					if ("accounts" in value) {
 						if (mounted.current && request.action === "remove") setRemoving(null);
+						if (mounted.current && request.action === "reset_credit") setResetting(null);
 						if (mounted.current && request.action === "add_key") {
 							setApiKey("");
 							setForm(null);
@@ -429,7 +435,13 @@
 							id: account.id
 						});
 					}
-				}), /* @__PURE__ */ React.createElement("strong", null, account.label)), account.quota?.plan && /* @__PURE__ */ React.createElement("span", { className: "zph-pill" }, account.quota.plan), /* @__PURE__ */ React.createElement("div", { className: "zph-actions" }, button(t("refresh"), {
+				}), /* @__PURE__ */ React.createElement("strong", null, account.label)), account.quota?.plan && /* @__PURE__ */ React.createElement("span", { className: "zph-pill" }, account.quota.plan), /* @__PURE__ */ React.createElement("div", { className: "zph-actions" }, typeof account.quota?.resetCredits === "number" && /* @__PURE__ */ React.createElement("button", {
+					type: "button",
+					disabled: busy || !account.quota.resetCredits,
+					"aria-expanded": resetting === account.id,
+					"aria-controls": `zph-reset-${account.id}`,
+					onClick: () => setResetting(account.id)
+				}, `${t("resetCredit")} (${account.quota.resetCredits})`), button(t("refresh"), {
 					action: "refresh_quota",
 					id: account.id
 				}), /* @__PURE__ */ React.createElement("button", {
@@ -438,7 +450,19 @@
 					"aria-expanded": removing === account.id,
 					"aria-controls": `zph-remove-${account.id}`,
 					onClick: () => setRemoving(account.id)
-				}, t("remove")))), removing === account.id && /* @__PURE__ */ React.createElement("div", {
+				}, t("remove")))), resetting === account.id && /* @__PURE__ */ React.createElement("div", {
+					id: `zph-reset-${account.id}`,
+					className: "zph-row",
+					role: "group",
+					"aria-label": t("confirmResetCredit")
+				}, /* @__PURE__ */ React.createElement("span", null, t("confirmResetCredit")), button(t("resetCredit"), {
+					action: "reset_credit",
+					id: account.id
+				}), /* @__PURE__ */ React.createElement("button", {
+					type: "button",
+					disabled: busy,
+					onClick: () => setResetting(null)
+				}, t("cancel"))), removing === account.id && /* @__PURE__ */ React.createElement("div", {
 					id: `zph-remove-${account.id}`,
 					className: "zph-row",
 					role: "group",

package/lib/index.js

@@ -6708,6 +6708,16 @@ async function loginOpenCode(interaction) {
 	});
 }
 // src/providers/quota.ts
+const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
+const CODEX_RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume";
+function codexHeaders(account) {
+	if (account.credential.kind !== "oauth") throw new Error("Codex requires OAuth");
+	return {
+		"Authorization": `Bearer ${account.credential.tokens.access}`,
+		"User-Agent": "dsh-zephyr/0.2.0",
+		...account.credential.tokens.accountId ? { "ChatGPT-Account-Id": account.credential.tokens.accountId } : {}
+	};
+}
 function percent(value) {
 	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
 }
@@ -6718,6 +6728,8 @@ function reset(value) {
 function parseOpenAIQuota(input) {
 	const body = record(input, "OpenAI usage");
 	const rate = record(body.rate_limit, "OpenAI rate limit");
+	const credits = body.rate_limit_reset_credits;
+	const resetCredits = percent(credits && typeof credits === "object" && !Array.isArray(credits) ? credits.available_count : void 0);
 	const windows = [];
 	for (const key of ["primary_window", "secondary_window"]) {
 		if (rate[key] == null) continue;
@@ -6741,6 +6753,7 @@ function parseOpenAIQuota(input) {
 		fetchedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		windows,
 		...typeof body.plan_type === "string" ? { plan: body.plan_type.slice(0, 80) } : {},
+		...resetCredits === void 0 ? {} : { resetCredits },
 		...!windows.length ? { reason: "OpenAI did not return supported quota windows" } : {}
 	};
 }
@@ -6773,15 +6786,11 @@ function parseOpenCodeQuota(input) {
 }
 async function fetchQuota(account, signal) {
 	if (account.channel === "commandcode-go") throw new Error("Use the CommandCode quota adapter");
+	if (account.channel === "openai-codex") return parseOpenAIQuota(await fetchJSON(CODEX_USAGE_URL, { headers: codexHeaders(account) }, signal));
 	const headers = {
 		"Authorization": `Bearer ${account.credential.kind === "api-key" ? account.credential.key : account.credential.tokens.access}`,
 		"User-Agent": "dsh-zephyr/0.2.0"
 	};
-	if (account.channel === "openai-codex") {
-		if (account.credential.kind !== "oauth") throw new Error("Codex requires OAuth");
-		if (account.credential.tokens.accountId) headers["ChatGPT-Account-Id"] = account.credential.tokens.accountId;
-		return parseOpenAIQuota(await fetchJSON("https://chatgpt.com/backend-api/wham/usage", { headers }, signal));
-	}
 	if (account.credential.kind === "oauth" && account.credential.tokens.orgId) headers["x-opencode-org-id"] = account.credential.tokens.orgId;
 	try {
 		return parseOpenCodeQuota(await fetchJSON("https://opencode.ai/zen/go/v1/usage", { headers }, signal));
@@ -6795,6 +6804,21 @@ async function fetchQuota(account, signal) {
 		};
 	}
 }
+async function consumeCodexResetCredit(account, signal) {
+	const body = record(await fetchJSON(CODEX_RESET_CREDITS_URL, {
+		method: "POST",
+		headers: {
+			...codexHeaders(account),
+			"Content-Type": "application/json"
+		},
+		body: JSON.stringify({ redeem_request_id: randomUUID() })
+	}, signal), "Codex reset credit");
+	if (body.code === "reset") return;
+	if (body.code === "no_credit") throw new Error("No reset credit is available for this account");
+	if (body.code === "nothing_to_reset") throw new Error("No used quota window needs a reset");
+	if (body.code === "already_redeemed") throw new Error("This reset request was already redeemed");
+	throw new Error(`Codex reset returned an unknown outcome: ${String(body.code).slice(0, 40)}`);
+}
 // src/shared/channels.ts
 const channels = [
 	{
@@ -6893,6 +6917,7 @@ function readQuotas(value) {
 			windows: view.windows.flatMap(readWindow)
 		};
 		for (const key of ["reason", "plan"]) if (typeof view[key] === "string") quota[key] = view[key];
+		if (typeof view.resetCredits === "number" && Number.isFinite(view.resetCredits) && view.resetCredits >= 0) quota.resetCredits = view.resetCredits;
 		return [[id, quota]];
 	}));
 }
@@ -7290,6 +7315,13 @@ var ModelAccountsService = class {
 			this.fetching.delete(id);
 		}
 	}
+	async resetCredit(id, signal) {
+		const view = (await this.accounts.list()).find((account) => account.id === id);
+		if (!view) throw new Error("Account not found");
+		if (view.channel !== "openai-codex") throw new Error("Only OpenAI Codex accounts have reset credits");
+		await consumeCodexResetCredit(await this.accounts.resolve(view.channel, signal, id), signal);
+		await this.refreshQuota(id, signal);
+	}
 	async dispatch(raw, origin, signal) {
 		if (this.controller.signal.aborted) throw new Error("Plugin is unloading");
 		const args = record(raw);
@@ -7321,6 +7353,10 @@ var ModelAccountsService = class {
 				this.onChange?.();
 				break;
 			}
+			case "reset_credit":
+				if (origin !== "ui") throw new Error("Resetting quota is user-only; open Settings → Model Accounts");
+				await this.resetCredit(text(args.id, "account id"), signal);
+				break;
 			case "refresh_quota": {
 				const accounts = await this.accounts.list();
 				const ids = args.id === void 0 ? accounts.map((account) => account.id) : [text(args.id, "account id")];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liyang8246/dsh-accounts",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Independent multi-account Codex, OpenCode Go and CommandCode Go plugin for DeepSeek Harness.",
   "repository": { "type": "git", "url": "https://github.com/liyang8246/dsh-zolin.git", "directory": "packages/dsh-accounts" },
   "exports": {