offsite 0.0.80 → 0.0.82

package/apps/server/dist/main.mjs

@@ -88,6 +88,208 @@ function publish$2(sessionId, event) {
 function broadcast(event) {
 	for (const client of clients) client.send(event);
 }
+// src/services/usage.ts
+const freshFor = 6e4;
+const forcedFreshFor = 1e4;
+const entries = /* @__PURE__ */ new Map();
+const fetching = /* @__PURE__ */ new Map();
+function cachedUsage(accountId) {
+	return entries.get(accountId) ?? {
+		limits: [],
+		fetchedAt: null,
+		updatedAt: null,
+		error: null
+	};
+}
+function recordLimits(accountId, limits) {
+	const current = cachedUsage(accountId);
+	entries.set(accountId, {
+		...current,
+		limits: [...current.limits.map((limit) => limits.find((item) => item.window === limit.window) ?? limit), ...limits.filter((item) => !current.limits.some((limit) => limit.window === item.window))],
+		updatedAt: Date.now()
+	});
+	broadcast({
+		type: "limits",
+		accountId,
+		limits
+	});
+}
+async function readUsage(accountId, force) {
+	const current = cachedUsage(accountId);
+	if (current.fetchedAt !== null && Date.now() - current.fetchedAt < (force ? forcedFreshFor : freshFor)) return current;
+	const pending = fetching.get(accountId);
+	if (pending !== void 0) return pending;
+	const next = fetchUsage(accountId);
+	fetching.set(accountId, next);
+	try {
+		return await next;
+	} finally {
+		fetching.delete(accountId);
+	}
+}
+function forgetUsage(accountId) {
+	entries.delete(accountId);
+}
+async function fetchUsage(accountId) {
+	const account = storedAccounts().find((item) => item.id === accountId);
+	if (account === void 0) throw new Error("That account was removed");
+	let usage;
+	try {
+		usage = {
+			limits: await providerLimits(account),
+			fetchedAt: Date.now(),
+			updatedAt: Date.now(),
+			error: null
+		};
+	} catch (error) {
+		console.warn(`could not read usage limits for ${account.name}: ${error}`);
+		usage = {
+			...cachedUsage(accountId),
+			fetchedAt: Date.now(),
+			error: error instanceof Error ? error.message : String(error)
+		};
+	}
+	entries.set(accountId, usage);
+	broadcast({
+		type: "usage",
+		accountId,
+		usage
+	});
+	return usage;
+}
+function providerLimits(account) {
+	switch (account.provider) {
+		case "claude": return claudeLimits(account);
+		case "codex": return codexLimits(account);
+	}
+}
+// src/lib/claude/content.ts
+const imageTypes = [
+	"image/png",
+	"image/jpeg",
+	"image/gif",
+	"image/webp"
+];
+function toMessage(type, item, time) {
+	return {
+		type,
+		uuid: item.uuid,
+		time,
+		content: isRecord(item.message) ? toBlocks(item.message.content, answersOf(item.tool_use_result)) : [],
+		parent: item.parent_tool_use_id
+	};
+}
+function toUserInput(prompt, uuid, priority) {
+	for (const image of prompt.images) if (!imageTypes.includes(image.mediaType)) throw new Error(`${image.mediaType} images are not supported`);
+	return {
+		type: "user",
+		message: {
+			role: "user",
+			content: [...prompt.text === "" ? [] : [{
+				type: "text",
+				text: prompt.text
+			}], ...prompt.images.map((image) => ({
+				type: "image",
+				source: {
+					type: "base64",
+					media_type: image.mediaType,
+					data: image.data
+				}
+			}))]
+		},
+		parent_tool_use_id: null,
+		uuid,
+		...priority === void 0 ? {} : { priority }
+	};
+}
+function promptMessage(prompt, uuid) {
+	return {
+		type: "user",
+		uuid,
+		time: Date.now(),
+		content: [...prompt.text === "" ? [] : [{
+			type: "text",
+			text: prompt.text
+		}], ...prompt.images.map((image) => ({
+			type: "image",
+			...image
+		}))],
+		parent: null
+	};
+}
+function notice(text) {
+	return {
+		type: "notice",
+		uuid: randomUUID(),
+		time: Date.now(),
+		text,
+		isError: true
+	};
+}
+function contextTokens(message) {
+	if (!isRecord(message) || !isRecord(message.usage)) return null;
+	const usage = message.usage;
+	return [
+		usage.input_tokens,
+		usage.cache_creation_input_tokens,
+		usage.cache_read_input_tokens,
+		usage.output_tokens
+	].reduce((total, value) => total + (typeof value === "number" ? value : 0), 0);
+}
+function answersOf(output) {
+	if (!isRecord(output) || !isRecord(output.answers)) return null;
+	const answers = {};
+	for (const [question, answer] of Object.entries(output.answers)) {
+		if (typeof answer !== "string") return null;
+		answers[question] = answer;
+	}
+	return answers;
+}
+function toBlocks(content, answers) {
+	if (typeof content === "string") return [{
+		type: "text",
+		text: content
+	}];
+	if (!Array.isArray(content)) return [];
+	return content.flatMap((block) => {
+		if (!isRecord(block)) return [];
+		switch (block.type) {
+			case "text": return typeof block.text === "string" && !block.text.startsWith("<system-reminder>") && !block.text.startsWith("<local-command-caveat>") ? [{
+				type: "text",
+				text: block.text
+			}] : [];
+			case "thinking": return typeof block.thinking === "string" && block.thinking !== "" ? [{
+				type: "thinking",
+				thinking: block.thinking
+			}] : [];
+			case "image": {
+				const source = block.source;
+				return isRecord(source) && source.type === "base64" && typeof source.media_type === "string" && typeof source.data === "string" ? [{
+					type: "image",
+					mediaType: source.media_type,
+					data: source.data
+				}] : [];
+			}
+			case "tool_use": return typeof block.id === "string" && typeof block.name === "string" && isRecord(block.input) ? [{
+				type: "tool_use",
+				id: block.id,
+				name: block.name,
+				input: block.input
+			}] : [];
+			case "tool_result": return typeof block.tool_use_id === "string" ? [{
+				type: "tool_result",
+				toolUseId: block.tool_use_id,
+				content: toBlocks(block.content, null).filter((item) => item.type === "text"),
+				isError: block.is_error === true,
+				answers
+			}] : [];
+			default: return [];
+		}
+	});
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 // src/args.ts
 let command = "web";
 let name = null;
@@ -478,13 +680,13 @@ async function codexAccount(account) {
 	const base = {
 		...account,
 		email: null,
+		displayName: null,
+		organization: null,
 		plan: null,
-		limits: [],
 		linked
 	};
 	try {
-		const server = appServer(configDir);
-		const result = await server.request("account/read", {});
+		const result = await appServer(configDir).request("account/read", {});
 		if (result.account === null) return {
 			...base,
 			error: `Not logged in. Run CODEX_HOME=${configDir} codex login in a terminal`,
@@ -494,9 +696,10 @@ async function codexAccount(account) {
 			case "chatgpt": return {
 				...base,
 				email: result.account.email,
+				displayName: codexDisplayName(configDir),
+				organization: result.account.workspaceName,
 				plan: result.account.planType,
 				error: null,
-				limits: await rateLimits(server),
 				valid: linked
 			};
 			case "apiKey": return {
@@ -552,19 +755,10 @@ async function skills(server, cwd) {
 	return (await server.request("skills/list", { cwds: [cwd] })).data.flatMap((entry) => entry.skills.filter((skill) => skill.enabled));
 }
 function publishCodexLimits(home, snapshot) {
-	for (const account of storedAccounts()) if (account.provider === "codex" && (account.configDir ?? codexBaseDir) === home) broadcast({
-		type: "limits",
-		accountId: account.id,
-		limits: toLimits(snapshot)
-	});
+	for (const account of storedAccounts()) if (account.provider === "codex" && (account.configDir ?? codexBaseDir) === home) recordLimits(account.id, toLimits(snapshot));
 }
-async function rateLimits(server) {
-	try {
-		return toLimits((await server.request("account/rateLimits/read", {})).rateLimits);
-	} catch (error) {
-		console.warn(`could not read Codex usage limits: ${error}`);
-		return [];
-	}
+async function codexLimits(account) {
+	return toLimits((await appServer(account.configDir ?? codexBaseDir).request("account/rateLimits/read", {})).rateLimits);
 }
 function toLimits(snapshot) {
 	return [snapshot.primary, snapshot.secondary].flatMap((window) => window === null ? [] : [{
@@ -574,6 +768,22 @@ function toLimits(snapshot) {
 		rejected: window.usedPercent >= 100
 	}]);
 }
+function codexDisplayName(home) {
+	let raw;
+	try {
+		raw = JSON.parse(readFileSync(path.join(home, "auth.json"), "utf8"));
+	} catch (error) {
+		if (error.code !== "ENOENT") console.warn(`could not read the Codex account name: ${error}`);
+		return null;
+	}
+	if (!isRecord(raw) || !isRecord(raw.tokens) || typeof raw.tokens.id_token !== "string") return null;
+	const payload = raw.tokens.id_token.split(".").at(1);
+	if (payload === void 0) return null;
+	const claims = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+	if (!isRecord(claims) || typeof claims.name !== "string") return null;
+	const name = claims.name.trim();
+	return name === "" ? null : name;
+}
 function isMirror(dir) {
 	try {
 		if (realpathSync(dir) === realpathSync(codexBaseDir)) return true;
@@ -583,133 +793,6 @@ function isMirror(dir) {
 		throw error;
 	}
 }
-// src/lib/claude/content.ts
-const imageTypes = [
-	"image/png",
-	"image/jpeg",
-	"image/gif",
-	"image/webp"
-];
-function toMessage(type, item, time) {
-	return {
-		type,
-		uuid: item.uuid,
-		time,
-		content: isRecord(item.message) ? toBlocks(item.message.content, answersOf(item.tool_use_result)) : [],
-		parent: item.parent_tool_use_id
-	};
-}
-function toUserInput(prompt, uuid, priority) {
-	for (const image of prompt.images) if (!imageTypes.includes(image.mediaType)) throw new Error(`${image.mediaType} images are not supported`);
-	return {
-		type: "user",
-		message: {
-			role: "user",
-			content: [...prompt.text === "" ? [] : [{
-				type: "text",
-				text: prompt.text
-			}], ...prompt.images.map((image) => ({
-				type: "image",
-				source: {
-					type: "base64",
-					media_type: image.mediaType,
-					data: image.data
-				}
-			}))]
-		},
-		parent_tool_use_id: null,
-		uuid,
-		...priority === void 0 ? {} : { priority }
-	};
-}
-function promptMessage(prompt, uuid) {
-	return {
-		type: "user",
-		uuid,
-		time: Date.now(),
-		content: [...prompt.text === "" ? [] : [{
-			type: "text",
-			text: prompt.text
-		}], ...prompt.images.map((image) => ({
-			type: "image",
-			...image
-		}))],
-		parent: null
-	};
-}
-function notice(text) {
-	return {
-		type: "notice",
-		uuid: randomUUID(),
-		time: Date.now(),
-		text,
-		isError: true
-	};
-}
-function contextTokens(message) {
-	if (!isRecord(message) || !isRecord(message.usage)) return null;
-	const usage = message.usage;
-	return [
-		usage.input_tokens,
-		usage.cache_creation_input_tokens,
-		usage.cache_read_input_tokens,
-		usage.output_tokens
-	].reduce((total, value) => total + (typeof value === "number" ? value : 0), 0);
-}
-function answersOf(output) {
-	if (!isRecord(output) || !isRecord(output.answers)) return null;
-	const answers = {};
-	for (const [question, answer] of Object.entries(output.answers)) {
-		if (typeof answer !== "string") return null;
-		answers[question] = answer;
-	}
-	return answers;
-}
-function toBlocks(content, answers) {
-	if (typeof content === "string") return [{
-		type: "text",
-		text: content
-	}];
-	if (!Array.isArray(content)) return [];
-	return content.flatMap((block) => {
-		if (!isRecord(block)) return [];
-		switch (block.type) {
-			case "text": return typeof block.text === "string" && !block.text.startsWith("<system-reminder>") && !block.text.startsWith("<local-command-caveat>") ? [{
-				type: "text",
-				text: block.text
-			}] : [];
-			case "thinking": return typeof block.thinking === "string" && block.thinking !== "" ? [{
-				type: "thinking",
-				thinking: block.thinking
-			}] : [];
-			case "image": {
-				const source = block.source;
-				return isRecord(source) && source.type === "base64" && typeof source.media_type === "string" && typeof source.data === "string" ? [{
-					type: "image",
-					mediaType: source.media_type,
-					data: source.data
-				}] : [];
-			}
-			case "tool_use": return typeof block.id === "string" && typeof block.name === "string" && isRecord(block.input) ? [{
-				type: "tool_use",
-				id: block.id,
-				name: block.name,
-				input: block.input
-			}] : [];
-			case "tool_result": return typeof block.tool_use_id === "string" ? [{
-				type: "tool_result",
-				toolUseId: block.tool_use_id,
-				content: toBlocks(block.content, null).filter((item) => item.type === "text"),
-				isError: block.is_error === true,
-				answers
-			}] : [];
-			default: return [];
-		}
-	});
-}
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 // src/lib/images.ts
 const extensions = {
 	"image/png": "png",
@@ -4404,9 +4487,10 @@ function disabledAccount(account) {
 	return {
 		...account,
 		email: null,
+		displayName: null,
+		organization: null,
 		plan: null,
 		error: null,
-		limits: [],
 		linked: true,
 		valid: false
 	};
@@ -4490,6 +4574,7 @@ async function updateAccount(update) {
 		} : item)
 	});
 	forgetClaude(update.id);
+	forgetUsage(update.id);
 	if (before.enabled && !update.enabled) await stopAccount(before);
 }
 function removeAccount(id) {
@@ -4500,6 +4585,7 @@ function removeAccount(id) {
 		codexAccounts: config.codexAccounts.filter((item) => item.id !== id)
 	});
 	forgetClaude(id);
+	forgetUsage(id);
 }
 function validAccount(name, configDir) {
 	if (name.trim() === "") throw new Error("Give the account a name");
@@ -4649,7 +4735,6 @@ const modes = [
 	"auto"
 ];
 const probes = /* @__PURE__ */ new Map();
-const limits = /* @__PURE__ */ new Map();
 let executable$1 = "";
 function findClaude() {
 	const name = process.platform === "win32" ? "claude.exe" : "claude";
@@ -4765,15 +4850,17 @@ async function claudeCapabilities(account, cwd) {
 	};
 }
 async function claudeAccount(account) {
-	const linked = isLinked(account.configDir ?? claudeBaseDir());
+	const configDir = account.configDir ?? claudeBaseDir();
+	const linked = isLinked(configDir);
 	try {
 		const info = (await initialization(account.id, os.homedir())).account;
 		return {
 			...account,
 			email: info.email ?? null,
+			displayName: claudeDisplayName(configDir),
+			organization: info.organization ?? null,
 			plan: info.subscriptionType ?? null,
 			error: null,
-			limits: accountLimits(account.id),
 			linked,
 			valid: linked
 		};
@@ -4781,9 +4868,10 @@ async function claudeAccount(account) {
 		return {
 			...account,
 			email: null,
+			displayName: null,
+			organization: null,
 			plan: null,
 			error: error instanceof Error ? error.message : String(error),
-			limits: accountLimits(account.id),
 			linked,
 			valid: linked
 		};
@@ -4791,52 +4879,87 @@ async function claudeAccount(account) {
 }
 function forgetClaude(accountId) {
 	for (const key of probes.keys()) if (key.startsWith(`${accountId}\n`)) probes.delete(key);
-	limits.delete(accountId);
 }
-function recordLimit(accountId, info) {
-	const current = limits.get(accountId) ?? /* @__PURE__ */ new Map();
+function eventLimits(info, current) {
+	const changed = /* @__PURE__ */ new Map();
 	const windows = info.unifiedWindows;
 	if (isRecord(windows)) {
-		for (const [name, value] of Object.entries(windows)) if (isRecord(value)) current.set(name, {
+		for (const [name, value] of Object.entries(windows)) if (isRecord(value)) changed.set(name, {
 			window: name,
 			utilization: typeof value.utilization === "number" ? value.utilization : null,
 			resetsAt: typeof value.resetsAt === "number" ? value.resetsAt : null,
-			rejected: current.get(name)?.rejected ?? false
+			rejected: current.find((limit) => limit.window === name)?.rejected ?? false
 		});
 	}
 	if (info.rateLimitType !== void 0) {
-		const existing = current.get(info.rateLimitType);
-		current.set(info.rateLimitType, {
+		const existing = changed.get(info.rateLimitType) ?? current.find((limit) => limit.window === info.rateLimitType);
+		changed.set(info.rateLimitType, {
 			window: info.rateLimitType,
 			utilization: info.utilization ?? existing?.utilization ?? null,
 			resetsAt: info.resetsAt ?? existing?.resetsAt ?? null,
 			rejected: info.status === "rejected"
 		});
 	}
-	limits.set(accountId, current);
-	return accountLimits(accountId);
+	return [...changed.values()];
 }
-async function recordUsage(accountId, probe) {
+async function claudeLimits(account) {
+	const closed = Promise.withResolvers();
+	const probe = query({
+		prompt: idle(closed.promise),
+		options: claudeOptions(account.id, os.homedir())
+	});
 	try {
+		await probe.initializationResult();
 		const usage = await probe.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET({ skipBehaviors: true });
-		if (usage.rate_limits === null) return;
-		const current = limits.get(accountId) ?? /* @__PURE__ */ new Map();
-		const windows = {
-			five_hour: usage.rate_limits.five_hour,
-			seven_day: usage.rate_limits.seven_day,
-			seven_day_opus: usage.rate_limits.seven_day_opus,
-			seven_day_sonnet: usage.rate_limits.seven_day_sonnet
-		};
-		for (const [name, window] of Object.entries(windows)) if (window !== void 0 && window !== null) current.set(name, {
-			window: name,
-			utilization: window.utilization === null ? null : window.utilization / 100,
-			resetsAt: window.resets_at === null ? null : Date.parse(window.resets_at) / 1e3,
-			rejected: window.utilization !== null && window.utilization >= 100
+		if (usage.rate_limits === null) return [];
+		return [
+			{
+				name: "five_hour",
+				window: usage.rate_limits.five_hour
+			},
+			{
+				name: "seven_day",
+				window: usage.rate_limits.seven_day
+			},
+			{
+				name: "seven_day_opus",
+				window: usage.rate_limits.seven_day_opus
+			},
+			{
+				name: "seven_day_sonnet",
+				window: usage.rate_limits.seven_day_sonnet
+			},
+			...(usage.rate_limits.model_scoped ?? []).map((row) => ({
+				name: row.display_name,
+				window: row
+			}))
+		].flatMap((entry) => {
+			const window = entry.window;
+			if (window === void 0 || window === null) return [];
+			return [{
+				window: entry.name,
+				utilization: window.utilization === null ? null : window.utilization / 100,
+				resetsAt: window.resets_at === null ? null : Date.parse(window.resets_at) / 1e3,
+				rejected: window.utilization !== null && window.utilization >= 100
+			}];
 		});
-		limits.set(accountId, current);
+	} finally {
+		closed.resolve();
+		probe.close();
+	}
+}
+function claudeDisplayName(configDir) {
+	const file = path.resolve(configDir) === path.join(os.homedir(), ".claude") ? path.join(os.homedir(), ".claude.json") : path.join(configDir, ".claude.json");
+	let raw;
+	try {
+		raw = JSON.parse(readFileSync(file, "utf8"));
 	} catch (error) {
-		console.warn(`could not read Claude usage limits: ${error}`);
+		if (error.code !== "ENOENT") console.warn(`could not read the Claude account name: ${error}`);
+		return null;
 	}
+	if (!isRecord(raw) || !isRecord(raw.oauthAccount) || typeof raw.oauthAccount.displayName !== "string") return null;
+	const name = raw.oauthAccount.displayName.trim();
+	return name === "" ? null : name;
 }
 function isLinked(configDir) {
 	const base = claudeBaseDir();
@@ -4848,9 +4971,6 @@ function isLinked(configDir) {
 		throw error;
 	}
 }
-function accountLimits(accountId) {
-	return [...limits.get(accountId)?.values() ?? []];
-}
 function initialization(accountId, cwd) {
 	const key = `${accountId}\n${cwd}`;
 	const existing = probes.get(key);
@@ -4867,9 +4987,7 @@ async function runProbe(accountId, cwd) {
 		options: claudeOptions(accountId, cwd)
 	});
 	try {
-		const result = await probe.initializationResult();
-		await recordUsage(accountId, probe);
-		return result;
+		return await probe.initializationResult();
 	} finally {
 		closed.resolve();
 		probe.close();
@@ -5664,11 +5782,7 @@ var Run = class {
 			case "rate_limit_event": {
 				const accountId = this.settings.accountId;
 				if (accountId === null) throw new Error("Rate limit event for a run without an account");
-				broadcast({
-					type: "limits",
-					accountId,
-					limits: recordLimit(accountId, message.rate_limit_info)
-				});
+				recordLimits(accountId, eventLimits(message.rate_limit_info, cachedUsage(accountId).limits));
 				return;
 			}
 			case "result": {
@@ -7926,6 +8040,7 @@ const handlers = {
 		publishAccounts();
 		return null;
 	},
+	"accounts.usage": (params) => readUsage(params.id, params.force),
 	capabilities: (params) => capabilities(params.provider, params.accountId, params.projectId === null || params.projectId === "no-project" ? os.homedir() : projectPath(params.projectId)),
 	"files.list": (params) => params.projectId === "no-project" ? [] : listFiles(projectPath(params.projectId)),
 	"files.entries": (params) => listEntries(projectPath(params.projectId)),