@ychris12138/dsh-usage-stats 0.2.8 → 0.2.10

package/README.md

@@ -53,8 +53,8 @@ dsh plugin --profile web add "github:Ychris12138/dsh-usage-stats"
 升级或卸载：
 
 ```bash
-dsh plugin --profile web update dsh-usage-stats
-dsh plugin --profile web remove dsh-usage-stats
+dsh plugin --profile web update "@ychris12138/dsh-usage-stats"
+dsh plugin --profile web remove "@ychris12138/dsh-usage-stats"
 ```
 
 <details>
@@ -66,7 +66,7 @@ PowerShell、命令提示符和 macOS/Linux 终端使用同一条命令：
 npx --yes github:Ychris12138/dsh-usage-stats
 ```
 
-安装器会把运行文件复制到 `~/.dsh/profiles/node_modules/dsh-usage-stats`，并在 `profiles/web/cordis.patch.yml` 中幂等启用插件。重复运行即可更新，不会重复追加配置。设置了 `DSH_HOME` 时使用该目录。
+安装器会把运行文件复制到 `~/.dsh/profiles/node_modules/@ychris12138/dsh-usage-stats`，并在 `profiles/web/cordis.patch.yml` 中以带引号的 scoped identity 幂等启用插件。重复运行即可更新，不会重复追加配置；旧版 `name: dsh-usage-stats` 和未加引号的 `name: @ychris12138/dsh-usage-stats` 会自动迁移。设置了 `DSH_HOME` 时使用该目录。
 
 `dsh plugin` 与 `npx` 是两条独立安装路径，请选择其中一种；不要同时保留手工 Cordis entry 和 bundle 注册，否则会重复挂载。
 
@@ -98,6 +98,7 @@ npx --yes github:Ychris12138/dsh-usage-stats --no-enable
 | Z.ai / 智谱 | 订阅 | `ZAI_API_KEY` | Coding Plan quota/subscription |
 | Kimi For Coding | 订阅 | `KIMI_API_KEY` | `/coding/v1/usages` |
 | MiniMax Coding Plan | 订阅 | `MINIMAX_API_KEY` | `/v1/token_plan/remains` |
+| Ollama 云 | 订阅 | `OLLAMA_API_KEY` | `/api/usage`（5小时 + 周窗口） |
 | New API | 余额 | provider 推理 Token | `/api/usage/token/` |
 | Sub2API / Passion | 自动判别 | provider `apiKeyEnv` | `/v1/usage` |
 | Sub2API 面板（真实） | 余额 | provider 推理 Token | `/user/balance`（复用 apiKey） |
@@ -139,15 +140,33 @@ KIMI_API_KEY: your-kimi-key
 MINIMAX_API_KEY: your-minimax-key
 # 中国区 MiniMax 用户可选；默认 global
 MINIMAX_API_REGION: cn
+OLLAMA_API_KEY: sk-ollama-your-key
 ```
 
 OpenCode Go 依次尝试 Harness credential、`~/.local/share/opencode/auth.json`，最后才使用显式 `OPENCODE_GO_AUTH_COOKIE + OPENCODE_GO_WORKSPACE_ID` 兼容回退。Bearer usage endpoint 目前不是公开 API，可能随上游变化；Cookie 等同登录凭据，不应进入日志或 issue。
 
+Ollama 云读取 `OLLAMA_API_KEY`，调用 `/api/usage` 展示两个订阅窗口（5 小时会话 + 每周），无余额；`usage` 按 0..1 比例换算为进度条。
+
+Ollama 适配器只对**已配置的 provider** 生效，不会自动添加账户：当 provider 的 id 为 `ollama`，或其 baseURL 主机为 `ollama.com`（含子域）时自动选用；本地 Ollama（`localhost:11434`）不会被当作云配额账户。特殊代理/自定义端点可用显式 monitor 绑定：
+
+```yaml
+# ~/.dsh/profiles/web/cordis.patch.yml
+- insert:
+    - id: usage-stats
+      name: dsh-usage-stats
+      config:
+        monitors:
+          relay-ollama:            # 你配置的 provider id
+            adapter: ollama
+            usageBaseURL: https://ollama.example.com
+            credentialRef: OLLAMA_API_KEY   # 非已配置 provider 时必填
+```
+
 Z.ai 全球区使用 `api.z.ai`，中国区使用 `open.bigmodel.cn`。MiniMax 优先使用官方 `www.minimax.io` / `www.minimaxi.com` Token Plan 地址，并解析 5 小时与周窗口的剩余比例和重置时间。
 
 ### New API、Sub2API 与自定义 monitor
 
-在现有 `name: dsh-usage-stats` Cordis entry 下合并 `config`，不要追加第二个插件 entry。monitor 键必须是 Harness 中真实存在的 provider id；未知 provider、adapter 或非法映射会在路由和 timer 注册前阻止插件启动。例外：monitor 同时显式提供 `usageBaseURL` 与 `credentialRef` 时视为自包含，会在 provider 注册可见前临时物化为 provider（适用于 Harness 设置页里后加载的 provider），此时不要求该 provider 已出现在注册表中。
+在现有 `name: "@ychris12138/dsh-usage-stats"` Cordis entry 下合并 `config`，不要追加第二个插件 entry。monitor 键必须是 Harness 中真实存在的 provider id；未知 provider、adapter 或非法映射会在路由和 timer 注册前阻止插件启动。例外：monitor 同时显式提供 `usageBaseURL` 与 `credentialRef` 时视为自包含，会在 provider 注册可见前临时物化为 provider（适用于 Harness 设置页里后加载的 provider），此时不要求该 provider 已出现在注册表中。
 
 <details>
 <summary><strong>展开 monitor 配置示例</strong></summary>
@@ -158,7 +177,7 @@ New API 默认用 provider 推理 Token 查询 `/api/usage/token/`，并从 `/ap
 # ~/.dsh/profiles/web/cordis.patch.yml
 - insert:
     - id: usage-stats
-      name: dsh-usage-stats
+      name: "@ychris12138/dsh-usage-stats"
       config:
         monitors:
           relay-a:                 # Harness provider id
@@ -264,7 +283,7 @@ Constraints:
 
 Procedure:
 1. Confirm node, npx, and dsh are available.
-2. Prefer `dsh plugin --profile web update dsh-usage-stats` when already installed; otherwise use `dsh plugin --profile web add "github:Ychris12138/dsh-usage-stats"`.
+2. Prefer `dsh plugin --profile web update "@ychris12138/dsh-usage-stats"` when already installed; otherwise use `dsh plugin --profile web add "github:Ychris12138/dsh-usage-stats"`.
 3. If unavailable, use: npx --yes github:Ychris12138/dsh-usage-stats
 4. Do not combine bundle installation with an existing manual dsh-usage-stats Cordis entry.
 5. For npx, require a verified package and exactly one Cordis entry, then run again with --check.

package/lib/accounts.js

@@ -52,6 +52,7 @@ const ADAPTERS = new Set([
 	"zai-token-plan",
 	"kimi-token-plan",
 	"minimax-token-plan",
+	"ollama",
 	"declarative"
 ]);
 const SENSITIVE_HEADERS = new Set([
@@ -189,6 +190,15 @@ function defaultAdapter(provider) {
 	try {
 		const hostname = new URL(provider.baseURL).hostname.toLowerCase();
 		if (hostname === "passionapi.com" || hostname.endsWith(".passionapi.com")) return "sub2api";
+		// Ollama Cloud is detected by its canonical host so a user-configured
+		// provider with a custom id still gets the quota adapter; local Ollama
+		// (localhost:11434) never matches and stays without an account adapter.
+		// The id check is gated on the hostname so a local install that happens
+		// to use the canonical "ollama" id is not misread as a cloud account.
+		// Subdomains (e.g. api.ollama.com) are recognized for identification
+		// only: the usage query always targets the canonical ollama.com host,
+		// which is where the /api/usage endpoint is served.
+		if ((providerId === "ollama" || hostname === "ollama.com" || hostname.endsWith(".ollama.com")) && !privateHostname(hostname)) return "ollama";
 	} catch {
 		// A malformed provider URL is handled by the adapter when it is queried.
 	}
@@ -198,7 +208,7 @@ function defaultAdapter(provider) {
 
 function adapterMode(adapter, monitor) {
 	if (adapter === "declarative") return monitor.mode;
-	if (["opencode-go", "zai-token-plan", "kimi-token-plan", "minimax-token-plan"].includes(adapter)) return "subscription";
+	if (["opencode-go", "zai-token-plan", "kimi-token-plan", "minimax-token-plan", "ollama"].includes(adapter)) return "subscription";
 	return "balance";
 }
 
@@ -1118,7 +1128,8 @@ export async function queryAccount(spec, credentials, deps = {}) {
 		const subscriptionId = spec.adapter === "zai-token-plan" ? "zai"
 			: spec.adapter === "kimi-token-plan" ? "kimi"
 				: spec.adapter === "minimax-token-plan" ? "minimax"
-					: "opencode-go";
+					: spec.adapter === "ollama" ? "ollama"
+						: "opencode-go";
 		const provider = await collectSubscription(subscriptionId, credentials, {
 			apiKeyRef: spec.apiKeyRef,
 			region: spec.monitor.region

package/lib/client.js

@@ -62,6 +62,7 @@ window.__ModuleLoader__.load({
 			".usg_accountCard{--usg-providerAccent:#1f6feb;box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);background:linear-gradient(135deg,color-mix(in srgb,var(--usg-providerAccent) 8%,transparent),transparent 42%);border-radius:12px;padding:10px 11px;display:flex;flex-direction:column;gap:9px}",
 			".usg_accountCard[data-provider=deepseek],.usg_accountCard[data-provider=deepseek-official]{--usg-providerAccent:#1f6feb}",
 			".usg_accountCard[data-provider=opencode-go]{--usg-providerAccent:#00a67d}",
+			".usg_accountCard[data-provider=ollama],.usg_accountCard[data-adapter=ollama]{--usg-providerAccent:#d97706}",
 			".usg_accountCard[data-provider=zai],.usg_accountCard[data-provider=zai-coding-cn]{--usg-providerAccent:#7656e8}",
 			".usg_accountCard[data-provider=openrouter]{--usg-providerAccent:#6366f1}",
 			".usg_accountCard[data-provider=moonshotai],.usg_accountCard[data-provider=moonshotai-cn],.usg_accountCard[data-provider=kimi],.usg_accountCard[data-provider=kimi-coding]{--usg-providerAccent:#e07a1f}",
@@ -139,7 +140,7 @@ window.__ModuleLoader__.load({
 		const tagId = "dsh-usage-stats/UsageStats.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
-			tag.dataset.plugin = "dsh-usage-stats";
+			tag.dataset.plugin = "@ychris12138/dsh-usage-stats";
 			tag.dataset.pluginCss = tagId;
 			tag.textContent = css;
 			document.head.appendChild(tag);
@@ -960,6 +961,7 @@ window.__ModuleLoader__.load({
 				"deepseek-official": "DS",
 				deepseek: "DS",
 				"opencode-go": "GO",
+				ollama: "OL",
 				openrouter: "OR",
 				moonshotai: "K",
 				"moonshotai-cn": "K",
@@ -968,7 +970,7 @@ window.__ModuleLoader__.load({
 				zai: "Z",
 				"zai-coding-cn": "Z"
 			};
-			return known[provider.id] ?? String(provider.displayName ?? provider.id).replace(/[^A-Za-z0-9]/g, "").slice(0, 2).toUpperCase();
+			return known[provider.id] ?? known[provider.adapter] ?? String(provider.displayName ?? provider.id).replace(/[^A-Za-z0-9]/g, "").slice(0, 2).toUpperCase();
 		}
 
 		/** Balance-mode body rendered inside the shared provider account frame. */
@@ -1129,6 +1131,7 @@ window.__ModuleLoader__.load({
 			return react_jsx_runtime.jsxs("article", {
 				className: S.accountCard,
 				"data-provider": provider.id,
+				"data-adapter": provider.adapter ?? provider.accountMode ?? "",
 				"data-account-mode": mode,
 				children: [
 					react_jsx_runtime.jsxs("div", {

package/lib/subscriptions.js

@@ -38,6 +38,7 @@ const MINIMAX_LEGACY_HOSTS = {
 };
 const MINIMAX_USAGE_PATH = "/v1/api/openplatform/coding_plan/remains";
 const MINIMAX_TOKEN_PLAN_PATH = "/v1/token_plan/remains";
+const OLLAMA_USAGE_URL = "https://ollama.com/api/usage";
 const DEFAULT_TIMEOUT_MS = 15000;
 
 const REFS = {
@@ -48,7 +49,8 @@ const REFS = {
 	zaiRegion: "ZAI_API_REGION",
 	kimiApiKey: "KIMI_API_KEY",
 	minimaxApiKey: "MINIMAX_API_KEY",
-	minimaxRegion: "MINIMAX_API_REGION"
+	minimaxRegion: "MINIMAX_API_REGION",
+	ollamaApiKey: "OLLAMA_API_KEY"
 };
 
 function numberOrNull(value) {
@@ -576,6 +578,61 @@ async function collectMiniMax(credentials, deps) {
 	}
 }
 
+/**
+ * Ollama Cloud usage monitor.
+ *
+ * Ollama's cloud /api/usage endpoint reports consumed usage ratios for two
+ * limit windows (a 5-hour session window and a weekly window), plus an
+ * activity cost. There is no monetary balance, so this adapter presents the
+ * two windows as subscription-style progress bars, mirroring OpenCode Go.
+ */
+function ollamaWindowFromObject(limit, kind) {
+	if (limit === null || typeof limit !== "object") return null;
+	// limits.session.usage / limits.weekly.usage are 0..1 consumed ratios
+	// (observed 0.0x..0.3x on live data). clampPercent maps any numeric ratio
+	// onto 0..100, so an over-quota window renders as a fully-used bar rather
+	// than silently disappearing, mirroring the OpenCode Go adapter.
+	const ratio = numberOrNull(limit.usage);
+	if (ratio === null) return null;
+	const usedPercent = round1(clampPercent(ratio * 100));
+	return {
+		kind,
+		usedPercent,
+		remainingPercent: round1(100 - usedPercent)
+	};
+}
+
+function parseOllama(body) {
+	const limits = body?.limits;
+	if (limits === null || typeof limits !== "object") return [];
+	return [
+		ollamaWindowFromObject(limits.session, "session"),
+		ollamaWindowFromObject(limits.weekly, "weekly")
+	].filter(Boolean);
+}
+
+async function collectOllama(credentials, deps) {
+	const apiKeyRef = deps.apiKeyRef ?? REFS.ollamaApiKey;
+	const apiKey = await resolveCredential(credentials, apiKeyRef);
+	if (apiKey === "") return { id: "ollama", displayName: "Ollama", mode: "subscription", status: "not-configured", plan: "Ollama", missingCredentials: [apiKeyRef], windows: [] };
+	try {
+		const body = await request(nonEmptyUrl(deps.baseURL, "/api/usage") ?? OLLAMA_USAGE_URL, {
+			headers: { authorization: `Bearer ${apiKey}`, accept: "application/json" }
+		}, deps, "json");
+		const windows = parseOllama(body);
+		return {
+			id: "ollama",
+			displayName: "Ollama",
+			mode: "subscription",
+			status: windows.length > 0 ? "ok" : "invalid-response",
+			plan: "Ollama",
+			windows
+		};
+	} catch (error) {
+		return { id: "ollama", displayName: "Ollama", mode: "subscription", status: normalizedStatus(error), plan: "Ollama", windows: [] };
+	}
+}
+
 /** Query one subscription/token-plan adapter. */
 export async function collectSubscription(providerId, credentials, options = {}, deps = {}) {
 	const shared = {
@@ -596,6 +653,7 @@ export async function collectSubscription(providerId, credentials, options = {},
 	});
 	if (providerId === "kimi") return collectKimi(credentials, shared);
 	if (providerId === "minimax") return collectMiniMax(credentials, shared);
+	if (providerId === "ollama") return collectOllama(credentials, shared);
 	return { id: providerId, displayName: providerId, mode: "subscription", status: "unavailable", windows: [] };
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ychris12138/dsh-usage-stats",
   "description": "Token usage heatmap, provider balances, and subscription quotas for the dsh web GUI",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Ychris12138/dsh-usage-stats.git"

package/scripts/install.mjs

@@ -33,13 +33,24 @@ Set DSH_HOME to override the default ~/.dsh location.`);
 const sourceRoot = dirname(dirname(fileURLToPath(import.meta.url)));
 const sourcePackage = JSON.parse(await readFile(join(sourceRoot, "package.json"), "utf8"));
 const dshHome = process.env.DSH_HOME ?? join(homedir(), ".dsh");
-const target = join(dshHome, "profiles", "node_modules", "dsh-usage-stats");
+const packagePath = sourcePackage.name.split("/");
+if (packagePath.some((part) => part === "" || part === "." || part === "..")) {
+	throw new Error(`invalid package name: ${sourcePackage.name}`);
+}
+const target = join(dshHome, "profiles", "node_modules", ...packagePath);
 const patchPath = join(dshHome, "profiles", "web", "cordis.patch.yml");
-const pluginLine = /^\s+name:\s*dsh-usage-stats\s*$/gm;
+const legacyPackageName = sourcePackage.name.split("/").at(-1);
+const quotedPackageName = JSON.stringify(sourcePackage.name);
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const scopedNamePattern = escapeRegExp(sourcePackage.name);
+const legacyNamePattern = escapeRegExp(legacyPackageName);
+const pluginLine = new RegExp(`^\\s+name:\\s*(?:"${scopedNamePattern}"|'${scopedNamePattern}')\\s*$`, "gm");
+const unquotedScopedPluginLine = new RegExp(`^(\\s+name:\\s*)${scopedNamePattern}\\s*$`, "gm");
+const legacyPluginLine = new RegExp(`^(\\s+name:\\s*)(?:"${legacyNamePattern}"|'${legacyNamePattern}'|${legacyNamePattern})\\s*$`, "gm");
 const patchBlock = `# dsh-usage-stats: token usage heatmap + DeepSeek balance
 - insert:
     - id: usage-stats
-      name: dsh-usage-stats
+      name: ${quotedPackageName}
 `;
 const emptySequenceRoot = /^\[\](?:[ \t]+#.*)?$/;
 
@@ -76,10 +87,26 @@ function assertNoEmptyRootConflict(text) {
 	}
 }
 
+function countMatches(text, pattern) {
+	return [...String(text).matchAll(pattern)].length;
+}
+
+/** Migrate the pre-scope entry and repair an invalid unquoted scoped YAML value. */
+function normalizePluginIdentity(text) {
+	const scopedCount = countMatches(text, pluginLine);
+	const legacyCount = countMatches(text, legacyPluginLine) + countMatches(text, unquotedScopedPluginLine);
+	if (scopedCount + legacyCount > 1) {
+		throw new Error(`multiple dsh-usage-stats entries in ${patchPath}; keep one ${quotedPackageName} entry`);
+	}
+	return String(text)
+		.replace(legacyPluginLine, (_, prefix) => `${prefix}${quotedPackageName}`)
+		.replace(unquotedScopedPluginLine, (_, prefix) => `${prefix}${quotedPackageName}`);
+}
+
 /** Preserve existing YAML/comments while adding exactly one plugin patch entry. */
 function enablePluginInPatch(text) {
-	const base = withoutEmptySequenceRoot(text);
-	if ([...base.matchAll(pluginLine)].length > 0) return base;
+	const base = normalizePluginIdentity(withoutEmptySequenceRoot(text));
+	if (countMatches(base, pluginLine) > 0) return base;
 	return base.trim() === "" ? patchBlock : `${base.trimEnd()}\n\n${patchBlock}`;
 }
 
@@ -100,10 +127,12 @@ async function verify(expectEnabled) {
 		throw new Error(`installed package is ${installed.name ?? "unknown"}@${installed.version ?? "unknown"}; expected ${sourcePackage.name}@${sourcePackage.version}`);
 	}
 	if (expectEnabled) {
-		const patch = await readOptional(patchPath);
-		const count = patch === null ? 0 : [...patch.matchAll(pluginLine)].length;
-		if (count !== 1) throw new Error(`expected exactly one dsh-usage-stats entry in ${patchPath}; found ${count}`);
+		const patch = await readOptional(patchPath) ?? "";
 		assertNoEmptyRootConflict(patch);
+		const count = countMatches(patch, pluginLine);
+		if (count !== 1) throw new Error(`expected exactly one dsh-usage-stats entry in ${patchPath}; found ${count}`);
+		if (countMatches(patch, legacyPluginLine) > 0) throw new Error(`legacy package name ${legacyPackageName} remains in ${patchPath}`);
+		if (countMatches(patch, unquotedScopedPluginLine) > 0) throw new Error(`scoped package name must be quoted in ${patchPath}`);
 	}
 	console.log(`Verified ${sourcePackage.name}@${sourcePackage.version}`);
 	console.log(`  package: ${target}`);
@@ -139,4 +168,4 @@ if (enable) {
 
 await verify(enable);
 console.log("Installation complete. Restart dsh web, then hard-refresh the browser.");
-console.log("Balance is optional: configure DEEPSEEK_API_KEY in <DSH_HOME>/.credentials.yaml.");
+console.log("Balance is optional: configure DEEPSEEK_API_KEY in <DSH_HOME>/.credentials.yaml.");