@deslop/workbench 0.0.390 → 0.0.391

package/dist/server.js

@@ -252616,7 +252616,11 @@ var Portless = class Portless extends Service()("@deslop/portless/service/Portle
 	});
 };
 //#endregion
-//#region ../../packages/usage/src/service.ts
+//#region ../../packages/usage/src/system.ts
+function percentage(input) {
+	if (input.total <= 0) return 0;
+	return Math.max(0, Math.min(100, input.used / input.total * 100));
+}
 function cpuTimes() {
 	return reduce(cpus(), {
 		idle: 0,
@@ -252626,6 +252630,40 @@ function cpuTimes() {
 		total: total.total + cpu.times.idle + cpu.times.irq + cpu.times.nice + cpu.times.sys + cpu.times.user
 	}));
 }
+function cpuUtilization(input) {
+	const total = input.after.total - input.before.total;
+	return percentage({
+		total,
+		used: total - (input.after.idle - input.before.idle)
+	});
+}
+function nodeMemoryUtilization() {
+	return percentage({
+		total: totalmem(),
+		used: totalmem() - freemem()
+	});
+}
+function darwinPageCount(input) {
+	return Number(new RegExp(`${input.label}:\\s+(\\d+)\\.`, "u").exec(input.vmStatOutput)?.[1] ?? 0);
+}
+function darwinMemoryUtilization(input) {
+	const pageSize = Number(/page size of (\d+) bytes/u.exec(input.vmStatOutput)?.[1] ?? 0);
+	return percentage({
+		total: Number(/(\d+)/u.exec(input.memsizeOutput)?.[1] ?? 0),
+		used: (darwinPageCount({
+			label: "Pages active",
+			vmStatOutput: input.vmStatOutput
+		}) + darwinPageCount({
+			label: "Pages wired down",
+			vmStatOutput: input.vmStatOutput
+		}) + darwinPageCount({
+			label: "Pages occupied by compressor",
+			vmStatOutput: input.vmStatOutput
+		})) * pageSize
+	});
+}
+//#endregion
+//#region ../../packages/usage/src/service.ts
 var Usage = class extends Service()("@deslop/usage/service/Usage", { make: gen(function* () {
 	const client = yield* HttpClient;
 	const fs = yield* FileSystem;
@@ -252654,15 +252692,20 @@ var Usage = class extends Service()("@deslop/usage/service/Usage", { make: gen(f
 	const claudeCredentialsFile = fs.readFileString(`${home}/.claude/.credentials.json`);
 	const claudeToken = pipe(process.platform === "darwin" ? pipe(claudeCredentialsFile, catch_$2(() => keychainCredentials)) : claudeCredentialsFile, flatMap$2(decodeEffect(ClaudeCredentials)), map$4((credentials) => credentials.claudeAiOauth.accessToken), catch_$2(() => new UsageError({ message: "not signed in" })));
 	const codexToken = pipe(fs.readFileString(`${codexHome}/auth.json`), flatMap$2(decodeEffect(CodexCredentials)), map$4((credentials) => credentials.tokens.access_token), catch_$2(() => new UsageError({ message: "not signed in" })));
+	const memoryUtilization = process.platform === "darwin" ? pipe(all({
+		memsizeOutput: commandOutput("sysctl", ["-n", "hw.memsize"]),
+		vmStatOutput: commandOutput("vm_stat", [])
+	}, { concurrency: 2 }), map$4((output) => darwinMemoryUtilization(output)), catch_$2(() => sync(nodeMemoryUtilization))) : sync(nodeMemoryUtilization);
 	const system = pipe(gen(function* () {
 		const before = cpuTimes();
 		yield* sleep$1("250 millis");
 		const after = cpuTimes();
-		const total = after.total - before.total;
-		const idle = after.idle - before.idle;
 		return SystemUsage.make({
-			cpuUtilization: total <= 0 ? 0 : (total - idle) / total * 100,
-			memoryUtilization: (totalmem() - freemem()) / totalmem() * 100
+			cpuUtilization: cpuUtilization({
+				after,
+				before
+			}),
+			memoryUtilization: yield* memoryUtilization
 		});
 	}), withSpan("Usage.system"));
 	return {

package/package.json

@@ -2,7 +2,7 @@
 	"type": "module",
 	"sideEffects": false,
 	"name": "@deslop/workbench",
-	"version": "0.0.390",
+	"version": "0.0.391",
 	"files": [
 		"dist"
 	],