@narumitw/pi-usage 0.54.0 → 0.58.0

package/src/query.ts

@@ -6,6 +6,12 @@ import {
 	type OAuthCredentialCandidateReader,
 } from "./oauth-credential-source.js";
 import { normalizeCodexBackendPayload } from "./providers/codex.js";
+import { normalizeDeepSeekBalancePayload } from "./providers/deepseek.js";
+import {
+	isFireworksAccountId,
+	normalizeFireworksAccountsPayload,
+	normalizeFireworksBillingSummaryPayload,
+} from "./providers/fireworks.js";
 import { normalizeGitHubCopilotUsagePayload } from "./providers/github-copilot.js";
 import { normalizeKimiCodingUsagePayload } from "./providers/kimi-coding.js";
 import { normalizeOpenCodeZenPayload } from "./providers/opencode-zen.js";
@@ -14,6 +20,9 @@ import { normalizeXaiBillingPayload } from "./providers/xai.js";
 import { normalizeZaiQuotaPayload } from "./providers/zai.js";
 import type {
 	CodexBackendPayload,
+	DeepSeekBalancePayload,
+	FireworksAccountsPayload,
+	FireworksBillingSummaryPayload,
 	GitHubCopilotUsagePayload,
 	KimiCodingUsagePayload,
 	OpenCodeZenPayload,
@@ -21,6 +30,7 @@ import type {
 	PiModel,
 	ResolvedUsageAuth,
 	UsageProviderAdapter,
+	UsageQuerySettings,
 	UsageReport,
 	XaiBillingPayload,
 	XaiUserPayload,
@@ -28,6 +38,10 @@ import type {
 } from "./types.js";
 
 const CODEX_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
+const DEEPSEEK_BALANCE_URL = "https://api.deepseek.com/user/balance";
+const FIREWORKS_BILLING_SUMMARY_ORIGIN = "https://api.fireworks.ai";
+const FIREWORKS_SPEND_WINDOW_DAYS = 30;
+const FIREWORKS_MAX_ACCOUNT_PAGES = 5;
 const GITHUB_COPILOT_USAGE_URL = "https://api.github.com/copilot_internal/user";
 const OPENROUTER_KEY_URL = "https://openrouter.ai/api/v1/key";
 const OPENCODE_GO_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
@@ -65,6 +79,27 @@ export const SUPPORTED_ADAPTERS: readonly UsageProviderAdapter[] = [
 			return normalizeCodexBackendPayload(payload as CodexBackendPayload, Date.now());
 		},
 	},
+	{
+		id: "deepseek",
+		displayName: "DeepSeek",
+		semantics: { kind: "api-key", label: "DeepSeek API balance" },
+		async query(auth, signal, timeoutMs, guard) {
+			if (!guard) throw new Error("DeepSeek API balance requires request-boundary revalidation.");
+			const startedAt = Date.now();
+			await guard();
+			const remainingMs = timeoutMs - (Date.now() - startedAt);
+			if (remainingMs <= 0) throw new Error("Timed out while revalidating DeepSeek runtime auth.");
+			const payload = await fetchProviderJson(
+				DEEPSEEK_BALANCE_URL,
+				auth,
+				signal,
+				remainingMs,
+				"DeepSeek API balance endpoint",
+				{ redirect: "error" },
+			);
+			return normalizeDeepSeekBalancePayload(payload as DeepSeekBalancePayload, Date.now());
+		},
+	},
 	{
 		id: "github-copilot",
 		displayName: "GitHub Copilot",
@@ -98,6 +133,35 @@ export const SUPPORTED_ADAPTERS: readonly UsageProviderAdapter[] = [
 			return normalizeOpenRouterKeyPayload(payload as OpenRouterKeyPayload, Date.now());
 		},
 	},
+	{
+		id: "fireworks",
+		displayName: "Fireworks",
+		semantics: { kind: "api-key", label: "Fireworks API spend" },
+		async query(auth, signal, timeoutMs, guard, settings) {
+			if (!guard) throw new Error("Fireworks API spend requires request-boundary revalidation.");
+			const startedAt = Date.now();
+			await guard();
+			const accountId = await resolveFireworksAccountId(
+				auth,
+				signal,
+				remainingTimeout(timeoutMs, startedAt, "resolving the Fireworks account"),
+				guard,
+				settings?.fireworksAccountId,
+			);
+			await guard();
+			const billingWindowAt = Date.now();
+			const payload = (await fetchProviderJson(
+				fireworksBillingSummaryUrl(accountId, billingWindowAt),
+				auth,
+				signal,
+				remainingTimeout(timeoutMs, startedAt, "fetching Fireworks rated spend"),
+				"Fireworks billing summary endpoint",
+				{ redirect: "error" },
+			)) as FireworksBillingSummaryPayload;
+			await guard();
+			return normalizeFireworksBillingSummaryPayload(payload, accountId, Date.now());
+		},
+	},
 	{
 		id: "opencode-go",
 		displayName: "OpenCode Go",
@@ -133,7 +197,6 @@ export const SUPPORTED_ADAPTERS: readonly UsageProviderAdapter[] = [
 		id: "zai",
 		displayName: "Z.AI",
 		semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-		publishesStatusline: false,
 		async query(auth, signal, timeoutMs) {
 			const payload = await fetchProviderJson(
 				zaiMonitorUrl(auth.model.baseUrl),
@@ -149,7 +212,6 @@ export const SUPPORTED_ADAPTERS: readonly UsageProviderAdapter[] = [
 		id: "zai-coding-cn",
 		displayName: "Z.AI Coding CN",
 		semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-		publishesStatusline: false,
 		async query(auth, signal, timeoutMs) {
 			const payload = await fetchProviderJson(
 				zaiMonitorUrl(auth.model.baseUrl),
@@ -223,15 +285,14 @@ export const XAI_ADAPTER: UsageProviderAdapter = {
 	},
 };
 
-export function usageAdapters(xaiUsage = true): readonly UsageProviderAdapter[] {
-	return xaiUsage ? [...SUPPORTED_ADAPTERS, XAI_ADAPTER] : SUPPORTED_ADAPTERS;
+export function usageAdapters(): readonly UsageProviderAdapter[] {
+	return [...SUPPORTED_ADAPTERS, XAI_ADAPTER];
 }
 
 export function adapterForProvider(
 	providerId: string | undefined,
-	xaiUsage = true,
 ): UsageProviderAdapter | undefined {
-	return usageAdapters(xaiUsage).find((adapter) => adapter.id === providerId);
+	return usageAdapters().find((adapter) => adapter.id === providerId);
 }
 
 export function isStaleExtensionContextError(error: unknown): boolean {
@@ -261,11 +322,14 @@ export async function resolveUsageAuth(
 	// SAFETY: Pi exposes the required auth methods at runtime, and checks below narrow them before use.
 	const registry = ctx.modelRegistry as unknown as UsageAuthRegistry;
 	let modelAuth: RequestAuth | undefined;
-	if (ctx.model?.provider === adapter.id && typeof registry.getApiKeyAndHeaders === "function") {
-		const result = await registry.getApiKeyAndHeaders(ctx.model);
+	const currentModel = ctx.model?.provider === adapter.id ? ctx.model : undefined;
+	const resolveCurrentModelAuth = async (): Promise<RequestAuth | undefined> => {
+		if (!currentModel || typeof registry.getApiKeyAndHeaders !== "function") return undefined;
+		const result = await registry.getApiKeyAndHeaders(currentModel);
 		if (!result.ok) throw new Error(redactUsageError(result.error));
-		if (authorizationFrom(result)) modelAuth = result;
-	}
+		return authorizationFrom(result) ? result : undefined;
+	};
+	if (adapter.id !== "deepseek") modelAuth = await resolveCurrentModelAuth();
 	if (typeof registry.getProviderAuth !== "function") {
 		throw new Error("pi-usage requires Pi 0.81.0 or newer to validate resolved provider auth.");
 	}
@@ -278,6 +342,9 @@ export async function resolveUsageAuth(
 			`${adapter.displayName} usage cannot send a proxy-resolved credential to the official usage endpoint.`,
 		);
 	}
+	// DeepSeek reads selected-model auth last so a rotation during provider-origin validation
+	// cannot leave the earlier credential queued for the balance request.
+	if (adapter.id === "deepseek") modelAuth = await resolveCurrentModelAuth();
 	const auth = modelAuth ?? providerResult?.auth;
 	if (!auth) return undefined;
 	if (adapter.id === "github-copilot") {
@@ -302,6 +369,26 @@ export async function resolveUsageAuth(
 		if (!offered.ok) throw new Error("xAI OAuth credential discovery failed closed.");
 		return resolveXaiUsageAuth(auth, model, salt, offered.candidates);
 	}
+	if (adapter.id === "deepseek") {
+		const resolvedAuthorization = authorizationFrom(auth);
+		const access = bearerToken(resolvedAuthorization);
+		if (!access) throw new Error("DeepSeek API balance requires Bearer authentication.");
+		const authorization = `Bearer ${access}`;
+		const headers = { Authorization: authorization };
+		return {
+			apiKey: access,
+			headers,
+			fingerprint: fingerprintResolvedAuth({ headers }, salt),
+			secrets: [
+				access,
+				auth.apiKey,
+				headerValue(auth.headers, "Authorization"),
+				resolvedAuthorization,
+				authorization,
+			].filter((value): value is string => Boolean(value)),
+			model,
+		};
+	}
 	const authorization = authorizationFrom(auth);
 	if (!authorization) return undefined;
 	const headers = { Authorization: authorization };
@@ -323,9 +410,10 @@ export async function queryProviderUsage(
 	signal: AbortSignal,
 	timeoutMs: number,
 	guard?: UsageRequestGuard,
+	settings?: Readonly<UsageQuerySettings>,
 ): Promise<UsageReport> {
 	try {
-		return await adapter.query(auth, signal, timeoutMs, guard);
+		return await adapter.query(auth, signal, timeoutMs, guard, settings);
 	} catch (error) {
 		if (isStaleExtensionContextError(error) || isAbortError(error)) throw error;
 		throw new Error(redactUsageError(errorMessage(error), auth.secrets));
@@ -685,6 +773,8 @@ function hasOfficialUrlOrigin(value: string, providerId: string): boolean {
 	try {
 		const url = new URL(value);
 		if (providerId === "openai-codex") return url.origin === "https://chatgpt.com";
+		if (providerId === "deepseek") return url.origin === "https://api.deepseek.com";
+		if (providerId === "fireworks") return url.origin === FIREWORKS_BILLING_SUMMARY_ORIGIN;
 		if (providerId === "openrouter") return url.origin === "https://openrouter.ai";
 		if (providerId === "opencode-go") return url.origin === "https://opencode.ai";
 		if (providerId === "kimi-coding") return url.origin === "https://api.kimi.com";
@@ -723,12 +813,108 @@ function validatedXaiUserId(value: unknown): string {
 	return value;
 }
 
-function remainingTimeout(timeoutMs: number, startedAt: number): number {
+function remainingTimeout(
+	timeoutMs: number,
+	startedAt: number,
+	description = "fetching xAI consumer usage",
+): number {
 	const remaining = timeoutMs - (Date.now() - startedAt);
-	if (remaining <= 0) throw new Error("Timed out while fetching xAI consumer usage.");
+	if (remaining <= 0) throw new Error(`Timed out while ${description}.`);
 	return remaining;
 }
 
+// Fireworks requires an account slug for its billing endpoints; discover it through the
+// documented account listing, requiring an explicit slug when a key can see several accounts.
+async function resolveFireworksAccountId(
+	auth: ResolvedUsageAuth,
+	signal: AbortSignal,
+	timeoutMs: number,
+	guard: () => Promise<void>,
+	configuredAccountId: string | undefined,
+): Promise<string> {
+	if (configuredAccountId !== undefined && !isFireworksAccountId(configuredAccountId)) {
+		throw new Error("The Fireworks account setting was not a safe account slug.");
+	}
+	const startedAt = Date.now();
+	const accounts: string[] = [];
+	let pageToken: string | undefined;
+	for (let page = 0; page < FIREWORKS_MAX_ACCOUNT_PAGES; page += 1) {
+		await guard();
+		const payload = (await fetchProviderJson(
+			fireworksAccountsUrl(pageToken),
+			auth,
+			signal,
+			remainingTimeout(timeoutMs, startedAt, "fetching Fireworks accounts"),
+			"Fireworks accounts endpoint",
+			{ redirect: "error" },
+		)) as FireworksAccountsPayload;
+		for (const accountId of normalizeFireworksAccountsPayload(
+			payload as FireworksAccountsPayload,
+		)) {
+			if (accounts.includes(accountId)) {
+				throw new Error(`Fireworks accounts listing repeated ${accountId}.`);
+			}
+			accounts.push(accountId);
+			if (configuredAccountId === accountId) return accountId;
+		}
+		pageToken = fireworksNextPageToken(payload.nextPageToken);
+		if (!pageToken) break;
+	}
+	if (pageToken) {
+		throw new Error(
+			configuredAccountId
+				? `The configured Fireworks account was not found within the first ${FIREWORKS_MAX_ACCOUNT_PAGES} listing pages.`
+				: `Fireworks account listing exceeded ${FIREWORKS_MAX_ACCOUNT_PAGES} pages; set fireworksAccountId in pi-usage.json to an account returned in those pages.`,
+		);
+	}
+	if (accounts.length === 0) {
+		throw new Error("Fireworks account discovery returned no accounts for this API key.");
+	}
+	if (configuredAccountId) {
+		throw new Error(
+			"The configured Fireworks account does not match an account visible to this API key.",
+		);
+	}
+	if (accounts.length === 1) return accounts[0] as string;
+	const preview = accounts.slice(0, 8).join(", ");
+	const suffix = accounts.length > 8 ? ` …and ${accounts.length - 8} more` : "";
+	throw new Error(
+		`The Fireworks key can see ${accounts.length} accounts (${preview}${suffix}); set fireworksAccountId in pi-usage.json to one of them.`,
+	);
+}
+
+function fireworksAccountsUrl(pageToken: string | undefined): string {
+	const url = new URL("/v1/accounts", FIREWORKS_BILLING_SUMMARY_ORIGIN);
+	url.searchParams.set("pageSize", "200");
+	if (pageToken !== undefined) url.searchParams.set("pageToken", pageToken);
+	return url.toString();
+}
+
+function fireworksNextPageToken(value: unknown): string | undefined {
+	if (value === undefined || value === null) return undefined;
+	if (typeof value !== "string" || !value || value.length > 512) {
+		throw new Error("Fireworks accounts listing returned an invalid page token.");
+	}
+	return value;
+}
+
+function fireworksBillingSummaryUrl(accountId: string, startedAt: number): string {
+	const dayMs = 24 * 60 * 60 * 1000;
+	const dayFloor = (time: number) => `${new Date(time).toISOString().slice(0, 10)}T00:00:00Z`;
+	const url = new URL(
+		`/v1/accounts/${accountId}/billing/summary`,
+		FIREWORKS_BILLING_SUMMARY_ORIGIN,
+	);
+	// The endpoint aggregates by UTC date; endTime is exclusive, so the window includes today
+	// plus the preceding 29 dates.
+	url.searchParams.set(
+		"startTime",
+		dayFloor(startedAt - (FIREWORKS_SPEND_WINDOW_DAYS - 1) * dayMs),
+	);
+	url.searchParams.set("endTime", dayFloor(startedAt + dayMs));
+	return url.toString();
+}
+
 function zaiMonitorUrl(baseUrl: string | undefined): string {
 	const base = baseUrl?.trim();
 	if (!base) throw new Error("Z.AI model base URL is unavailable.");

package/src/settings.ts

@@ -3,18 +3,20 @@ import { constants } from "node:fs";
 import { chmod, mkdir, open, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { isFireworksAccountId } from "./providers/fireworks.js";
 
 export const USAGE_SETTINGS_FILE = "pi-usage.json";
 export const MAX_USAGE_SETTINGS_BYTES = 64 * 1024;
 
 export interface UsageSettings {
 	codexFastMode: boolean;
-	xaiUsage: boolean;
+	codexStatusResetCountdown: boolean;
+	fireworksAccountId?: string;
 }
 
 export const DEFAULT_USAGE_SETTINGS: Readonly<UsageSettings> = Object.freeze({
 	codexFastMode: false,
-	xaiUsage: true,
+	codexStatusResetCountdown: true,
 });
 
 export interface UsageSettingsState {
@@ -54,7 +56,16 @@ export function normalizeUsageSettings(value: unknown): UsageSettings | undefine
 	if (Object.hasOwn(value, "codexFastMode") && typeof value.codexFastMode !== "boolean") {
 		return undefined;
 	}
-	if (Object.hasOwn(value, "xaiUsage") && typeof value.xaiUsage !== "boolean") {
+	if (
+		Object.hasOwn(value, "codexStatusResetCountdown") &&
+		typeof value.codexStatusResetCountdown !== "boolean"
+	) {
+		return undefined;
+	}
+	if (
+		Object.hasOwn(value, "fireworksAccountId") &&
+		!isFireworksAccountId(value.fireworksAccountId)
+	) {
 		return undefined;
 	}
 	return {
@@ -62,8 +73,13 @@ export function normalizeUsageSettings(value: unknown): UsageSettings | undefine
 			typeof value.codexFastMode === "boolean"
 				? value.codexFastMode
 				: DEFAULT_USAGE_SETTINGS.codexFastMode,
-		xaiUsage:
-			typeof value.xaiUsage === "boolean" ? value.xaiUsage : DEFAULT_USAGE_SETTINGS.xaiUsage,
+		codexStatusResetCountdown:
+			typeof value.codexStatusResetCountdown === "boolean"
+				? value.codexStatusResetCountdown
+				: DEFAULT_USAGE_SETTINGS.codexStatusResetCountdown,
+		...(isFireworksAccountId(value.fireworksAccountId)
+			? { fireworksAccountId: value.fireworksAccountId }
+			: {}),
 	};
 }
 
@@ -167,7 +183,11 @@ async function saveUsageSettingsPatch(
 	if (latest.kind === "invalid") {
 		throw new Error("Cannot overwrite an invalid pi-usage.json; repair it and reload first");
 	}
-	const document = { ...latest.document, ...patch };
+	const document = { ...latest.document };
+	for (const [key, value] of Object.entries(patch)) {
+		if (value === undefined) delete document[key];
+		else document[key] = value;
+	}
 	const settings = normalizeUsageSettings(document);
 	if (!settings) throw new Error("Refusing to save invalid pi-usage settings");
 	const directory = dirname(path);

package/src/types.ts

@@ -55,6 +55,10 @@ export interface ResolvedUsageAuth {
 	model: PiModel;
 }
 
+export interface UsageQuerySettings {
+	fireworksAccountId?: string;
+}
+
 export interface UsageProviderAdapter {
 	id: string;
 	displayName: string;
@@ -65,6 +69,7 @@ export interface UsageProviderAdapter {
 		signal: AbortSignal,
 		timeoutMs: number,
 		guard?: () => Promise<void>,
+		settings?: Readonly<UsageQuerySettings>,
 	): Promise<UsageReport>;
 }
 
@@ -84,6 +89,20 @@ export type ProviderUsageState =
 			message: string;
 	  };
 
+export type DeepSeekBalancePayload = {
+	is_available?: unknown;
+	balance_infos?: unknown;
+};
+
+export type FireworksAccountsPayload = {
+	accounts?: unknown;
+	nextPageToken?: unknown;
+};
+
+export type FireworksBillingSummaryPayload = {
+	lineItems?: unknown;
+};
+
 export type GitHubCopilotUsagePayload = {
 	login?: unknown;
 	copilot_plan?: unknown;

package/src/usage-helpers.ts

@@ -3,8 +3,8 @@ import { sanitizeDisplayText } from "./core.js";
 import { providerIsConfigured, usageAdapters } from "./query.js";
 import type { PiModel, UsageProviderAdapter } from "./types.js";
 
-export function configuredAdapters(ctx: ExtensionContext, xaiUsage = true): UsageProviderAdapter[] {
-	return usageAdapters(xaiUsage).filter(
+export function configuredAdapters(ctx: ExtensionContext): UsageProviderAdapter[] {
+	return usageAdapters().filter(
 		(adapter) => adapter.id === ctx.model?.provider || providerIsConfigured(ctx, adapter.id),
 	);
 }

package/src/usage-settings-ui.ts

@@ -11,33 +11,60 @@ import {
 	Text,
 } from "@earendil-works/pi-tui";
 import { errorMessage } from "./core.js";
+import { isFireworksAccountId } from "./providers/fireworks.js";
 import type { UsageSettings, UsageSettingsRuntime } from "./settings.js";
 
+const AUTO = "Auto";
+const EDIT = "Edit…";
 const OFF = "Off";
 const ON = "On";
 
 type UsageSettingId = keyof UsageSettings;
+type SettingsScreenResult = { changed: boolean; editFireworksAccount: boolean };
 
 export async function showUsageSettings(
 	ctx: ExtensionCommandContext,
 	settingsRuntime: UsageSettingsRuntime,
 	parentSignal: AbortSignal,
 	isCurrent: () => boolean,
-	onApplied: (id: UsageSettingId, previous: boolean, next: boolean) => void,
+	onApplied: (id: UsageSettingId) => void,
 ): Promise<boolean> {
 	if (ctx.mode !== "tui") {
 		if (ctx.hasUI) ctx.ui.notify(`Edit settings manually: ${settingsRuntime.get().path}`, "info");
 		return false;
 	}
-	if (parentSignal.aborted || !isCurrent()) return false;
+	let changed = false;
+	while (!parentSignal.aborted && isCurrent()) {
+		const result = await showSettingsList(ctx, settingsRuntime, parentSignal, isCurrent, onApplied);
+		if (!result) return changed;
+		changed ||= result.changed;
+		if (!result.editFireworksAccount) return changed;
+		changed ||= await editFireworksAccount(
+			ctx,
+			settingsRuntime,
+			parentSignal,
+			isCurrent,
+			onApplied,
+		);
+	}
+	return changed;
+}
 
-	return ctx.ui.custom<boolean>((tui, theme, _keybindings, done) => {
+async function showSettingsList(
+	ctx: ExtensionCommandContext,
+	settingsRuntime: UsageSettingsRuntime,
+	parentSignal: AbortSignal,
+	isCurrent: () => boolean,
+	onApplied: (id: UsageSettingId) => void,
+): Promise<SettingsScreenResult | undefined> {
+	return ctx.ui.custom<SettingsScreenResult>((tui, theme, _keybindings, done) => {
 		const localController = new AbortController();
 		const signal = AbortSignal.any([parentSignal, localController.signal]);
 		let changed = false;
 		let closing = false;
 		let saveQueue = Promise.resolve();
 		const state = settingsRuntime.get();
+		const fireworksValue = state.settings.fireworksAccountId ?? AUTO;
 		const items: SettingItem[] = [
 			{
 				id: "codexFastMode",
@@ -47,12 +74,21 @@ export async function showUsageSettings(
 				values: [OFF, ON],
 			},
 			{
-				id: "xaiUsage",
-				label: "xAI usage",
-				description: "Report OAuth subscription allowance and credits.",
-				currentValue: state.kind !== "invalid" && state.settings.xaiUsage ? ON : OFF,
+				id: "codexStatusResetCountdown",
+				label: "Codex reset countdown",
+				description: "Show time remaining until each Codex usage limit resets.",
+				currentValue: state.settings.codexStatusResetCountdown ? ON : OFF,
 				values: [OFF, ON],
 			},
+			{
+				id: "fireworksAccountId",
+				label: "Fireworks account",
+				description: "Select Edit to enter a visible account slug, or submit blank to clear it.",
+				currentValue: fireworksValue,
+				values: state.settings.fireworksAccountId
+					? [state.settings.fireworksAccountId, EDIT]
+					: [AUTO, EDIT],
+			},
 		];
 		const container = new Container();
 		container.addChild(new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 1));
@@ -62,7 +98,40 @@ export async function showUsageSettings(
 			if (closing) return;
 			closing = true;
 			localController.abort();
-			done(changed);
+			done({ changed, editFireworksAccount: false });
+		};
+		const queueUpdate = (
+			id: UsageSettingId,
+			requested: UsageSettings[UsageSettingId],
+			display: string,
+		) => {
+			saveQueue = saveQueue.then(async () => {
+				const previous = settingsRuntime.get().settings[id];
+				if (settingsRuntime.get().kind === "invalid") {
+					settingsList.updateValue(id, displaySetting(id, previous));
+					if (!signal.aborted && isCurrent()) {
+						ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
+						tui.requestRender();
+					}
+					return;
+				}
+				try {
+					await settingsRuntime.update({ [id]: requested }, signal);
+				} catch (error) {
+					if (signal.aborted || !isCurrent()) return;
+					settingsList.updateValue(id, displaySetting(id, previous));
+					ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
+					tui.requestRender();
+					return;
+				}
+				if (previous !== requested) {
+					changed = true;
+					onApplied(id);
+				}
+				if (signal.aborted || !isCurrent()) return;
+				settingsList.updateValue(id, display);
+				tui.requestRender();
+			});
 		};
 		settingsList = new SettingsList(
 			items,
@@ -70,36 +139,18 @@ export async function showUsageSettings(
 			getSettingsListTheme(),
 			(id, value) => {
 				if (closing || signal.aborted || !isCurrent()) return;
-				const settingId = id as UsageSettingId;
-				const requested = value !== OFF;
-				saveQueue = saveQueue.then(async () => {
-					const previous = settingsRuntime.get().settings[settingId];
-					if (settingsRuntime.get().kind === "invalid") {
-						const effectivePrevious = settingId === "xaiUsage" ? false : previous;
-						settingsList.updateValue(id, displayValue(settingId, effectivePrevious));
-						if (!signal.aborted && isCurrent()) {
-							ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
-							tui.requestRender();
-						}
-						return;
+				if (id === "fireworksAccountId") {
+					if (value === EDIT) {
+						saveQueue = saveQueue.then(() => {
+							if (closing || signal.aborted || !isCurrent()) return;
+							closing = true;
+							done({ changed, editFireworksAccount: true });
+						});
 					}
-					try {
-						await settingsRuntime.update({ [settingId]: requested }, signal);
-					} catch (error) {
-						if (signal.aborted || !isCurrent()) return;
-						settingsList.updateValue(id, displayValue(settingId, previous));
-						ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
-						tui.requestRender();
-						return;
-					}
-					if (previous !== requested) {
-						changed = true;
-						onApplied(settingId, previous, requested);
-					}
-					if (signal.aborted || !isCurrent()) return;
-					settingsList.updateValue(id, displayValue(settingId, requested));
-					tui.requestRender();
-				});
+					return;
+				}
+				const settingId = id as "codexFastMode" | "codexStatusResetCountdown";
+				queueUpdate(settingId, value !== OFF, value);
 			},
 			cancel,
 		);
@@ -123,6 +174,46 @@ export async function showUsageSettings(
 	});
 }
 
-function displayValue(_id: UsageSettingId, enabled: boolean): string {
-	return enabled ? ON : OFF;
+async function editFireworksAccount(
+	ctx: ExtensionCommandContext,
+	settingsRuntime: UsageSettingsRuntime,
+	signal: AbortSignal,
+	isCurrent: () => boolean,
+	onApplied: (id: UsageSettingId) => void,
+): Promise<boolean> {
+	while (!signal.aborted && isCurrent()) {
+		const state = settingsRuntime.get();
+		if (state.kind === "invalid") {
+			ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
+			return false;
+		}
+		const entered = await ctx.ui.input(
+			"Fireworks account slug · submit blank for Auto",
+			state.settings.fireworksAccountId ?? "Example: acme",
+			{ signal },
+		);
+		if (signal.aborted || !isCurrent() || entered === undefined) return false;
+		const normalized = entered.trim();
+		const requested = normalized || undefined;
+		if (requested !== undefined && !isFireworksAccountId(requested)) {
+			ctx.ui.notify("Enter a URL-safe Fireworks account slug.", "warning");
+			continue;
+		}
+		if (requested === state.settings.fireworksAccountId) return false;
+		try {
+			await settingsRuntime.update({ fireworksAccountId: requested }, signal);
+		} catch (error) {
+			if (signal.aborted || !isCurrent()) return false;
+			ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
+			return false;
+		}
+		onApplied("fireworksAccountId");
+		return true;
+	}
+	return false;
+}
+
+function displaySetting(id: UsageSettingId, value: UsageSettings[UsageSettingId]): string {
+	if (id === "fireworksAccountId") return typeof value === "string" ? value : AUTO;
+	return value ? ON : OFF;
 }