@ychris12138/dsh-usage-stats 0.2.7 → 0.2.9

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 注册，否则会重复挂载。
 
@@ -147,7 +147,7 @@ Z.ai 全球区使用 `api.z.ai`，中国区使用 `open.bigmodel.cn`。MiniMax
 
 ### 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 +158,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 +264,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/client.js

@@ -8,7 +8,7 @@
  * half's loopback-only endpoints via same-origin fetch.
  */
 window.__ModuleLoader__.load({
-	id: "dsh-usage-stats",
+	id: "@ychris12138/dsh-usage-stats",
 	factory: (require) => {
 		var module = { exports: {} };
 		var exports = module.exports;
@@ -139,7 +139,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);

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.7",
+  "version": "0.2.9",
   "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.");