@jxgame2020/dsh-token-quota 0.1.17 → 0.1.18

package/lib/client.js

@@ -79,7 +79,7 @@ window.__ModuleLoader__.load({
 						d.dimWhenIdle = dimWhenIdle;
 					},
 					setUpgrade: (d, upgrade) => {
-						const normalized = upgrade !== null && upgrade.latestVersion !== "" && upgrade.latestVersion !== "0.1.17" ? upgrade : null;
+						const normalized = upgrade !== null && upgrade.latestVersion !== "" && upgrade.latestVersion !== "0.1.18" ? upgrade : null;
 						if (d.upgrade === null || d.upgrade.latestVersion !== normalized?.latestVersion) d.upgradeDismissed = false;
 						d.upgrade = normalized;
 					},
@@ -185,91 +185,91 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var TokenQuotaPanel_module_css_default = {
-			"logPager": "NPLLIq_logPager",
-			"logToolbar": "NPLLIq_logToolbar",
-			"radioRow": "NPLLIq_radioRow",
-			"dialogClose": "NPLLIq_dialogClose",
-			"gearBtn": "NPLLIq_gearBtn",
+			"tabIcon": "NPLLIq_tabIcon",
+			"upgradeCommands": "NPLLIq_upgradeCommands",
+			"versionNew": "NPLLIq_versionNew",
+			"checkErrorHint": "NPLLIq_checkErrorHint",
+			"collapse": "NPLLIq_collapse",
+			"rowName": "NPLLIq_rowName",
+			"upgradeBannerFlash": "NPLLIq_upgradeBannerFlash",
+			"dialogHint": "NPLLIq_dialogHint",
 			"panelDim": "NPLLIq_panelDim",
-			"fillIdle": "NPLLIq_fillIdle",
-			"monitorHint": "NPLLIq_monitorHint",
-			"logPagerControls": "NPLLIq_logPagerControls",
-			"currentBadge": "NPLLIq_currentBadge",
-			"tabLabel": "NPLLIq_tabLabel",
-			"dialogTitle": "NPLLIq_dialogTitle",
+			"upgradeHint": "NPLLIq_upgradeHint",
+			"logPagerInfo": "NPLLIq_logPagerInfo",
+			"resetSelect": "NPLLIq_resetSelect",
 			"logClearDialog": "NPLLIq_logClearDialog",
-			"checkUpdatesLabel": "NPLLIq_checkUpdatesLabel",
-			"settingsBtn": "NPLLIq_settingsBtn",
-			"dialogActions": "NPLLIq_dialogActions",
-			"logPageSizeSelect": "NPLLIq_logPageSizeSelect",
-			"rowName": "NPLLIq_rowName",
-			"logHeader": "NPLLIq_logHeader",
-			"row": "NPLLIq_row",
-			"checkUpdatesRow": "NPLLIq_checkUpdatesRow",
-			"panel": "NPLLIq_panel",
-			"copyBtn": "NPLLIq_copyBtn",
-			"dialogLabel": "NPLLIq_dialogLabel",
-			"upgradeCommand": "NPLLIq_upgradeCommand",
-			"logSearch": "NPLLIq_logSearch",
-			"version": "NPLLIq_version",
-			"logDialog": "NPLLIq_logDialog",
-			"rowMeta": "NPLLIq_rowMeta",
+			"dialogClose": "NPLLIq_dialogClose",
 			"selectBtn": "NPLLIq_selectBtn",
-			"dialogOverlay": "NPLLIq_dialogOverlay",
-			"controls": "NPLLIq_controls",
-			"fullNotice": "NPLLIq_fullNotice",
-			"upgradeBannerFlash": "NPLLIq_upgradeBannerFlash",
-			"dialog": "NPLLIq_dialog",
-			"upgradeCommands": "NPLLIq_upgradeCommands",
-			"copyBtnDone": "NPLLIq_copyBtnDone",
-			"input": "NPLLIq_input",
+			"logClearDate": "NPLLIq_logClearDate",
+			"rowMeta": "NPLLIq_rowMeta",
+			"tabLabel": "NPLLIq_tabLabel",
+			"dialogSection": "NPLLIq_dialogSection",
+			"copyBtn": "NPLLIq_copyBtn",
+			"resetRow": "NPLLIq_resetRow",
+			"dialogActions": "NPLLIq_dialogActions",
+			"fillOver": "NPLLIq_fillOver",
+			"save": "NPLLIq_save",
+			"logModelCol": "NPLLIq_logModelCol",
+			"fillIdle": "NPLLIq_fillIdle",
 			"header": "NPLLIq_header",
-			"tabIcon": "NPLLIq_tabIcon",
+			"logUsedCol": "NPLLIq_logUsedCol",
+			"radioRow": "NPLLIq_radioRow",
+			"dialogBtn": "NPLLIq_dialogBtn",
+			"body": "NPLLIq_body",
 			"monitorName": "NPLLIq_monitorName",
-			"checkBtn": "NPLLIq_checkBtn",
-			"rowHeader": "NPLLIq_rowHeader",
-			"panelDimStrong": "NPLLIq_panelDimStrong",
-			"bar": "NPLLIq_bar",
-			"save": "NPLLIq_save",
-			"upgradeClose": "NPLLIq_upgradeClose",
-			"dialogHeader": "NPLLIq_dialogHeader",
-			"upgradeBanner": "NPLLIq_upgradeBanner",
-			"resetRow": "NPLLIq_resetRow",
-			"notice": "NPLLIq_notice",
-			"logClearDate": "NPLLIq_logClearDate",
+			"dialog": "NPLLIq_dialog",
 			"switch": "NPLLIq_switch",
-			"headerActions": "NPLLIq_headerActions",
-			"logModelCol": "NPLLIq_logModelCol",
-			"dialogBtnPrimary": "NPLLIq_dialogBtnPrimary",
-			"checkErrorHint": "NPLLIq_checkErrorHint",
-			"logPagerPages": "NPLLIq_logPagerPages",
-			"dialogSection": "NPLLIq_dialogSection",
-			"monitorRow": "NPLLIq_monitorRow",
+			"currentBadge": "NPLLIq_currentBadge",
+			"subtitle": "NPLLIq_subtitle",
+			"upgradeBanner": "NPLLIq_upgradeBanner",
+			"copyBtnDone": "NPLLIq_copyBtnDone",
+			"checkUpdatesRow": "NPLLIq_checkUpdatesRow",
 			"logScroll": "NPLLIq_logScroll",
-			"logTable": "NPLLIq_logTable",
-			"logClearBtn": "NPLLIq_logClearBtn",
-			"headerText": "NPLLIq_headerText",
-			"fillWarn": "NPLLIq_fillWarn",
+			"logToolbar": "NPLLIq_logToolbar",
+			"logPagerControls": "NPLLIq_logPagerControls",
+			"logPageSizeSelect": "NPLLIq_logPageSizeSelect",
+			"logDialog": "NPLLIq_logDialog",
 			"logDayCol": "NPLLIq_logDayCol",
-			"logPagerBtn": "NPLLIq_logPagerBtn",
-			"collapse": "NPLLIq_collapse",
-			"dialogHint": "NPLLIq_dialogHint",
 			"monitorList": "NPLLIq_monitorList",
-			"logPagerInfo": "NPLLIq_logPagerInfo",
-			"title": "NPLLIq_title",
-			"subtitle": "NPLLIq_subtitle",
-			"logUsedCol": "NPLLIq_logUsedCol",
+			"panelDimStrong": "NPLLIq_panelDimStrong",
+			"monitorHint": "NPLLIq_monitorHint",
+			"logTable": "NPLLIq_logTable",
+			"logPager": "NPLLIq_logPager",
+			"dialogOverlay": "NPLLIq_dialogOverlay",
 			"noticeError": "NPLLIq_noticeError",
-			"dialogBody": "NPLLIq_dialogBody",
-			"body": "NPLLIq_body",
-			"dialogBtn": "NPLLIq_dialogBtn",
-			"fillOver": "NPLLIq_fillOver",
-			"upgradeCommandRow": "NPLLIq_upgradeCommandRow",
-			"upgradeHint": "NPLLIq_upgradeHint",
 			"tab": "NPLLIq_tab",
 			"upgradeBannerText": "NPLLIq_upgradeBannerText",
-			"resetSelect": "NPLLIq_resetSelect",
-			"versionNew": "NPLLIq_versionNew"
+			"logClearBtn": "NPLLIq_logClearBtn",
+			"notice": "NPLLIq_notice",
+			"fillWarn": "NPLLIq_fillWarn",
+			"upgradeCommand": "NPLLIq_upgradeCommand",
+			"dialogHeader": "NPLLIq_dialogHeader",
+			"title": "NPLLIq_title",
+			"logSearch": "NPLLIq_logSearch",
+			"controls": "NPLLIq_controls",
+			"input": "NPLLIq_input",
+			"logHeader": "NPLLIq_logHeader",
+			"settingsBtn": "NPLLIq_settingsBtn",
+			"upgradeCommandRow": "NPLLIq_upgradeCommandRow",
+			"dialogBtnPrimary": "NPLLIq_dialogBtnPrimary",
+			"logPagerBtn": "NPLLIq_logPagerBtn",
+			"panel": "NPLLIq_panel",
+			"version": "NPLLIq_version",
+			"upgradeClose": "NPLLIq_upgradeClose",
+			"headerText": "NPLLIq_headerText",
+			"fullNotice": "NPLLIq_fullNotice",
+			"logPagerPages": "NPLLIq_logPagerPages",
+			"headerActions": "NPLLIq_headerActions",
+			"rowHeader": "NPLLIq_rowHeader",
+			"bar": "NPLLIq_bar",
+			"dialogTitle": "NPLLIq_dialogTitle",
+			"checkUpdatesLabel": "NPLLIq_checkUpdatesLabel",
+			"gearBtn": "NPLLIq_gearBtn",
+			"monitorRow": "NPLLIq_monitorRow",
+			"checkBtn": "NPLLIq_checkBtn",
+			"dialogLabel": "NPLLIq_dialogLabel",
+			"dialogBody": "NPLLIq_dialogBody",
+			"row": "NPLLIq_row"
 		};
 		//#endregion
 		//#region lib/types/client/TokenQuotaPanel.js
@@ -572,13 +572,13 @@ window.__ModuleLoader__.load({
 									title: t("upgradeAvailableHint"),
 									children: [
 										"v",
-										"0.1.17",
+										"0.1.18",
 										" → v",
 										upgrade.latestVersion
 									]
 								}) : (0, react_jsx_runtime.jsxs)("span", {
 									className: TokenQuotaPanel_module_css_default.version,
-									children: ["v", "0.1.17"]
+									children: ["v", "0.1.18"]
 								})]
 							}), (0, react_jsx_runtime.jsx)("div", {
 								className: TokenQuotaPanel_module_css_default.subtitle,

package/lib/index.js

@@ -1,5 +1,5 @@
 import { assertTokenQuotaLimit, splitTokenQuotaKey } from "./invariant.js";
-import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { Service } from "@deepseek-ai/cordis";
@@ -91,13 +91,54 @@ function registryUpgradeCommands(profileDir, manager) {
 function linkUpgradeCommands(linkPath) {
 	return [`git -C "${linkPath}" pull`];
 }
-/** Detect the profile's package manager from its lockfiles; defaults to npm. */
+/**
+* Detect the profile's package manager; defaults to npm.
+*
+* Lockfiles alone are unreliable: a profile can accumulate several of them over
+* time (e.g. a leftover `pnpm-lock.yaml` next to a fresh `package-lock.json`
+* after switching from pnpm to npm), and a bare existence check then reports
+* the WRONG manager. Instead, look at the installer fingerprints inside
+* `node_modules` — each manager leaves a marker when it actually installs —
+* and pick the most recently touched one. Only if no marker exists fall back
+* to comparing lockfile mtimes.
+*/
 function detectManager(dir) {
-	if (existsSync(join(dir, "pnpm-lock.yaml"))) return "pnpm";
-	if (existsSync(join(dir, "yarn.lock"))) return "yarn";
-	if (existsSync(join(dir, "package-lock.json"))) return "npm";
-	if (existsSync(join(dir, "bun.lockb")) || existsSync(join(dir, "bun.lock"))) return "bun";
-	return "npm";
+	const stat = (path) => {
+		try {
+			return statSync(path).mtimeMs;
+		} catch {
+			return;
+		}
+	};
+	const fingerprints = [
+		["node_modules/.pnpm", "pnpm"],
+		["node_modules/.bun", "bun"],
+		["node_modules/.package-lock.json", "npm"],
+		["node_modules/.yarn-integrity", "yarn"]
+	];
+	let best;
+	for (const [rel, manager] of fingerprints) {
+		const mtime = stat(join(dir, rel));
+		if (mtime !== void 0 && (best === void 0 || mtime > best.mtime)) best = {
+			manager,
+			mtime
+		};
+	}
+	if (best !== void 0) return best.manager;
+	for (const [rel, manager] of [
+		["pnpm-lock.yaml", "pnpm"],
+		["yarn.lock", "yarn"],
+		["package-lock.json", "npm"],
+		["bun.lockb", "bun"],
+		["bun.lock", "bun"]
+	]) {
+		const mtime = stat(join(dir, rel));
+		if (mtime !== void 0 && (best === void 0 || mtime > best.mtime)) best = {
+			manager,
+			mtime
+		};
+	}
+	return best?.manager ?? "npm";
 }
 /**
 * Locate the profile directory that declares this plugin as a dependency, along
@@ -116,7 +157,11 @@ function findProfile() {
 	for (const name of names) {
 		const dir = join(profilesDir, name);
 		const manifestPath = join(dir, "package.json");
-		if (!existsSync(manifestPath)) continue;
+		try {
+			if (!statSync(manifestPath).isFile()) continue;
+		} catch {
+			continue;
+		}
 		let manifest;
 		try {
 			manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
@@ -409,7 +454,7 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 		return this.upgradeCheck;
 	}
 	async doRefreshUpgrade() {
-		const current = "0.1.17";
+		const current = "0.1.18";
 		let latest;
 		try {
 			const response = await fetch(REGISTRY_LATEST_URL, {

package/lib/types/index.js

@@ -29,7 +29,7 @@
  *
  * @module @jxgame2020/dsh-token-quota
  */
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { Service } from '@deepseek-ai/cordis';
@@ -76,17 +76,57 @@ function registryUpgradeCommands(profileDir, manager) {
 function linkUpgradeCommands(linkPath) {
     return [`git -C "${linkPath}" pull`];
 }
-/** Detect the profile's package manager from its lockfiles; defaults to npm. */
+/**
+ * Detect the profile's package manager; defaults to npm.
+ *
+ * Lockfiles alone are unreliable: a profile can accumulate several of them over
+ * time (e.g. a leftover `pnpm-lock.yaml` next to a fresh `package-lock.json`
+ * after switching from pnpm to npm), and a bare existence check then reports
+ * the WRONG manager. Instead, look at the installer fingerprints inside
+ * `node_modules` — each manager leaves a marker when it actually installs —
+ * and pick the most recently touched one. Only if no marker exists fall back
+ * to comparing lockfile mtimes.
+ */
 function detectManager(dir) {
-    if (existsSync(join(dir, 'pnpm-lock.yaml')))
-        return 'pnpm';
-    if (existsSync(join(dir, 'yarn.lock')))
-        return 'yarn';
-    if (existsSync(join(dir, 'package-lock.json')))
-        return 'npm';
-    if (existsSync(join(dir, 'bun.lockb')) || existsSync(join(dir, 'bun.lock')))
-        return 'bun';
-    return 'npm';
+    const stat = (path) => {
+        try {
+            return statSync(path).mtimeMs;
+        }
+        catch {
+            return undefined;
+        }
+    };
+    // Installer fingerprints inside node_modules, by manager.
+    const fingerprints = [
+        ['node_modules/.pnpm', 'pnpm'],
+        ['node_modules/.bun', 'bun'],
+        ['node_modules/.package-lock.json', 'npm'],
+        ['node_modules/.yarn-integrity', 'yarn'],
+    ];
+    let best;
+    for (const [rel, manager] of fingerprints) {
+        const mtime = stat(join(dir, rel));
+        if (mtime !== undefined && (best === undefined || mtime > best.mtime)) {
+            best = { manager, mtime };
+        }
+    }
+    if (best !== undefined)
+        return best.manager;
+    // Fallback: the most recently modified lockfile.
+    const lockfiles = [
+        ['pnpm-lock.yaml', 'pnpm'],
+        ['yarn.lock', 'yarn'],
+        ['package-lock.json', 'npm'],
+        ['bun.lockb', 'bun'],
+        ['bun.lock', 'bun'],
+    ];
+    for (const [rel, manager] of lockfiles) {
+        const mtime = stat(join(dir, rel));
+        if (mtime !== undefined && (best === undefined || mtime > best.mtime)) {
+            best = { manager, mtime };
+        }
+    }
+    return best?.manager ?? 'npm';
 }
 /**
  * Locate the profile directory that declares this plugin as a dependency, along
@@ -108,8 +148,13 @@ function findProfile() {
     for (const name of names) {
         const dir = join(profilesDir, name);
         const manifestPath = join(dir, 'package.json');
-        if (!existsSync(manifestPath))
+        try {
+            if (!statSync(manifestPath).isFile())
+                continue;
+        }
+        catch {
             continue;
+        }
         let manifest;
         try {
             manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jxgame2020/dsh-token-quota",
   "description": "Daily per-model token quota accounting, enforcement, and a floating quota panel for the DeepSeek Harness — a fully self-contained plugin (no core-Harness wiring, no generated RPC contract)",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "publishConfig": {
     "access": "public"
   },