@usesocial/cli 0.10.2 → 0.11.1

package/dist/index.mjs

@@ -151,6 +151,24 @@ var CancelledError = class extends Error {
 };
 /** True for any of the typed errors above (single-instance instanceof is safe within this package graph). */
 const isTypedCLIError = (error) => error instanceof UsageError || error instanceof AuthError || error instanceof NotFoundError || error instanceof CancelledError;
+const MARKUP_BPS = 5e3;
+//#endregion
+//#region ../../packages/billing/src/markup.ts
+const billedBPSFor = (costBPS) => costBPS + Math.floor(costBPS * MARKUP_BPS / 1e4);
+const creditsForBPS = (billedBPS) => Math.ceil(billedBPS / 10);
+//#endregion
+//#region ../../packages/billing/src/usage-price.ts
+const priceUsage = (costBPS) => {
+	const billedBPS = billedBPSFor(costBPS);
+	const credits = creditsForBPS(billedBPS);
+	return {
+		costBPS,
+		billedBPS,
+		credits,
+		customerUSD: creditsToUsageUSD(credits)
+	};
+};
+const creditsToUsageUSD = (credits) => credits * 10 / 1e4;
 //#endregion
 //#region ../../node_modules/.bun/es-toolkit@1.47.0/node_modules/es-toolkit/dist/string/words.mjs
 /**
@@ -511,10 +529,10 @@ const costFor = (adapter, op) => {
 		metered: true,
 		cacheable,
 		...cacheable ? { cacheHitCost: 0 } : {},
-		unit: "usage_credit",
+		unit: "usage_usd",
 		estimate: {
 			kind: op.endpoint.maxUsageUnits === 1 ? "per_call" : "per_page",
-			credits: adapter.priceUsage(op.endpoint.costBPS * op.endpoint.maxUsageUnits).credits,
+			usageUSD: adapter.priceUsage(op.endpoint.costBPS * op.endpoint.maxUsageUnits).customerUSD,
 			basis: op.endpoint.maxUsageUnits === 1 ? "successful upstream read" : "limit/cursor page"
 		},
 		notes
@@ -522,10 +540,10 @@ const costFor = (adapter, op) => {
 	if (op.endpoint.method !== "GET") return {
 		metered: true,
 		cacheable,
-		unit: "usage_credit",
+		unit: "usage_usd",
 		estimate: {
 			kind: "per_call",
-			credits: adapter.priceUsage(op.endpoint.costBPS).credits,
+			usageUSD: adapter.priceUsage(op.endpoint.costBPS).customerUSD,
 			basis: "successful upstream write"
 		},
 		notes
@@ -535,10 +553,10 @@ const costFor = (adapter, op) => {
 		metered: true,
 		cacheable,
 		...cacheable ? { cacheHitCost: 0 } : {},
-		unit: "usage_credit",
+		unit: "usage_usd",
 		estimate: {
 			kind: "per_item",
-			creditsPerItem: adapter.priceUsage(op.endpoint.costBPS).credits,
+			usageUSDPerItem: adapter.priceUsage(op.endpoint.costBPS).customerUSD,
 			basis: "successful returned resource",
 			...maximumItemsHint === void 0 ? {} : { maximumItemsHint }
 		},
@@ -10271,7 +10289,7 @@ const LINKEDIN_OPERATIONS = [
 			command: "list",
 			group: "messages",
 			root: false,
-			summary: "List LinkedIn inbox conversations. Costs 150 usage credits per page when not served from cache",
+			summary: "List LinkedIn inbox conversations. Costs $0.150 usage per page when not served from cache",
 			expose: false
 		},
 		endpoint: {
@@ -10332,7 +10350,7 @@ const LINKEDIN_OPERATIONS = [
 			command: "read",
 			group: "messages",
 			root: false,
-			summary: "List messages in a LinkedIn inbox conversation. Costs 75 usage credits per page when not served from cache",
+			summary: "List messages in a LinkedIn inbox conversation. Costs $0.075 usage per page when not served from cache",
 			expose: false,
 			paramLabels: { chat_id: "target" },
 			targetKind: "chat"
@@ -11420,23 +11438,6 @@ const LINKEDIN_OPERATIONS = [
 		}]
 	}
 ];
-const MARKUP_BPS = 5e3;
-//#endregion
-//#region ../../packages/billing/src/markup.ts
-const billedBPSFor = (costBPS) => costBPS + Math.floor(costBPS * MARKUP_BPS / 1e4);
-const creditsForBPS = (billedBPS) => Math.ceil(billedBPS / 10);
-//#endregion
-//#region ../../packages/billing/src/usage-price.ts
-const priceUsage = (costBPS) => {
-	const billedBPS = billedBPSFor(costBPS);
-	const credits = creditsForBPS(billedBPS);
-	return {
-		costBPS,
-		billedBPS,
-		credits,
-		customerUSD: credits * 10 / 1e4
-	};
-};
 //#endregion
 //#region ../../packages/lib/src/social-values.ts
 const UNSAFE_RESOURCE_CHARACTER_PATTERN = /[/?#%]/;
@@ -12475,6 +12476,13 @@ const syncOutput$1 = (data, migration) => ({
 	data,
 	meta: migration === void 0 ? {} : { cache: { migration } }
 });
+const syncSummaryForOutput$1 = (summary) => {
+	const { creditsSpent, ...rest } = summary;
+	return {
+		...rest,
+		usageUSDSpent: creditsToUsageUSD(creditsSpent)
+	};
+};
 const quoteIdentifier$1 = (identifier) => `\`${identifier.replaceAll("`", "``")}\``;
 const syncTotalRowsFor$1 = (cache, collection) => {
 	const totalRows = cache.query(`SELECT count(*) AS totalRows FROM ${quoteIdentifier$1(collection.key)}`)[0]?.totalRows;
@@ -12492,8 +12500,8 @@ const syncListRowFor$1 = (collection, shortName, state, totalRows) => {
 		totalRows
 	};
 };
-const syncProgressMessage = (progress) => `${progress.collectionKey}: ${progress.pagesCompleted} page(s), ${progress.objectsUpserted} object(s), ${progress.creditsSpent} credits.`;
-const syncCompleteMessage = (summary) => `Synced ${summary.collection}: ${summary.pages} page(s), ${summary.objectsUpserted} object(s), ${summary.creditsSpent} credits.`;
+const syncProgressMessage = (progress) => `${progress.collectionKey}: ${progress.pagesCompleted} page(s), ${progress.objectsUpserted} object(s), $${creditsToUsageUSD(progress.creditsSpent).toFixed(3)} usage.`;
+const syncCompleteMessage = (summary) => `Synced ${summary.collection}: ${summary.pages} page(s), ${summary.objectsUpserted} object(s), $${summary.usageUSDSpent.toFixed(3)} usage.`;
 const createSyncProgressReporter = (deps, collectionKey) => {
 	if ((deps.isInteractiveTerminal?.() ?? process.stdout.isTTY === true) && deps.ui) {
 		const spinner = deps.ui.spinner();
@@ -12567,7 +12575,7 @@ const syncRateLimitOptions$1 = (timeoutSeconds) => ({
 const buildSync$1 = (deps, platform) => defineCommand({
 	meta: commandMeta$2({
 		name: "sync",
-		description: "Sync a collection into the local cache (spends credits)",
+		description: "Sync a collection into the local cache (spends usage)",
 		method: "GET",
 		capability: "read",
 		mutates: true,
@@ -12579,13 +12587,13 @@ const buildSync$1 = (deps, platform) => defineCommand({
 			},
 			capability: "read",
 			hazard: {
-				kind: "spends_credits",
+				kind: "spends_usage",
 				confirm: "advisory"
 			},
 			idempotency: {
 				safe: false,
 				retry: "never",
-				reason: "Repeated syncs can spend additional usage credits and update local rows."
+				reason: "Repeated syncs can spend additional usage dollars and update local rows."
 			},
 			method: "GET",
 			mutates: true,
@@ -12599,15 +12607,15 @@ const buildSync$1 = (deps, platform) => defineCommand({
 			examples: [{ command: "social linkedin sync connections" }],
 			cost: {
 				metered: true,
-				unit: "usage_credit",
+				unit: "usage_usd",
 				notes: ["Upstream reads during sync are metered."]
 			},
 			hazards: [{
 				code: "local_cache_write",
 				message: "Writes synced LinkedIn rows and cursor state to the local cache."
 			}, {
-				code: "usage_credit_spend",
-				message: "May spend usage credits while reading upstream LinkedIn data."
+				code: "usage_usd_spend",
+				message: "May spend usage dollars while reading upstream LinkedIn data."
 			}]
 		}
 	}),
@@ -12712,7 +12720,7 @@ const buildSync$1 = (deps, platform) => defineCommand({
 		const onProgress = (message) => process.stderr.write(`${message}\n`);
 		const progress = createSyncProgressReporter(deps, collection.key);
 		try {
-			const summary = await runSync({
+			const outputSummary = syncSummaryForOutput$1(await runSync({
 				api: deps.api,
 				cache,
 				platform,
@@ -12726,9 +12734,9 @@ const buildSync$1 = (deps, platform) => defineCommand({
 				onPage: progress.onPage,
 				onProgress,
 				rateLimit: syncRateLimitOptions$1(timeoutSeconds)
-			});
-			progress.stop(summary);
-			deps.printData(syncOutput$1(summary, cacheMigration));
+			}));
+			progress.stop(outputSummary);
+			deps.printData(syncOutput$1(outputSummary, cacheMigration));
 		} catch (error) {
 			progress.error();
 			const rateLimitError = enrichRateLimitSyncError$1({
@@ -12879,10 +12887,10 @@ const buildMark = (deps) => {
 				cost: {
 					metered: true,
 					cacheable: false,
-					unit: "usage_credit",
+					unit: "usage_usd",
 					estimate: {
 						kind: "per_call",
-						credits: creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS),
+						usageUSD: creditsToUsageUSD(creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS)),
 						basis: "successful upstream write"
 					},
 					notes: ["Fresh upstream calls are metered."]
@@ -12953,13 +12961,13 @@ const messageIdFrom = (deps, value) => {
 	if (token === void 0 || !token.startsWith(prefix)) throw new UsageError("Pass message_id:<id>.");
 	return deps.parseResourceId("message_id", token.slice(11));
 };
-const writeCost = (credits) => ({
+const writeCost = (usageUSD) => ({
 	metered: true,
 	cacheable: false,
-	unit: "usage_credit",
+	unit: "usage_usd",
 	estimate: {
 		kind: "per_call",
-		credits,
+		usageUSD,
 		basis: "successful upstream write"
 	},
 	notes: ["Fresh upstream calls are metered."]
@@ -13180,7 +13188,7 @@ const buildMessageDelete = (deps) => {
 					formats: ["json"],
 					projection: true
 				},
-				cost: writeCost(creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS)),
+				cost: writeCost(creditsToUsageUSD(creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS))),
 				examples: [{ command: "linkedin message <target> delete message_id:<id>" }],
 				hazards: [{
 					code: "remote_delete",
@@ -13273,7 +13281,7 @@ const buildMessageEdit = (deps) => {
 					formats: ["json"],
 					projection: true
 				},
-				cost: writeCost(creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS)),
+				cost: writeCost(creditsToUsageUSD(creditsForCostBPS(DM_INTERACTION_ENDPOINT_BILLING.costBPS))),
 				examples: [{ command: "echo \"fixed text\" | linkedin message <target> edit message_id:<id>" }],
 				hazards: [{
 					code: "remote_write",
@@ -16913,6 +16921,13 @@ const syncOutput = (data, migration) => ({
 	data,
 	meta: migration === void 0 ? {} : { cache: { migration } }
 });
+const syncSummaryForOutput = (summary) => {
+	const { creditsSpent, ...rest } = summary;
+	return {
+		...rest,
+		usageUSDSpent: creditsToUsageUSD(creditsSpent)
+	};
+};
 const quoteIdentifier = (identifier) => `\`${identifier.replaceAll("`", "``")}\``;
 const syncTotalRowsFor = (cache, collection) => {
 	const totalRows = cache.query(`SELECT count(*) AS totalRows FROM ${quoteIdentifier(collection.key)}`)[0]?.totalRows;
@@ -16977,7 +16992,7 @@ const syncRateLimitOptions = () => ({
 const buildSync = (deps, platform) => defineCommand({
 	meta: commandMeta$1({
 		name: "sync",
-		description: "Sync a collection into the local cache (spends credits)",
+		description: "Sync a collection into the local cache (spends usage)",
 		method: "GET",
 		capability: "read",
 		mutates: true,
@@ -16988,12 +17003,12 @@ const buildSync = (deps, platform) => defineCommand({
 			},
 			capability: "read",
 			hazard: {
-				kind: "spends_credits",
+				kind: "spends_usage",
 				confirm: "advisory"
 			},
 			idempotency: {
 				kind: "non-idempotent",
-				description: "Repeated syncs can spend additional usage credits and update local rows."
+				description: "Repeated syncs can spend additional usage dollars and update local rows."
 			},
 			method: "GET",
 			mutates: true,
@@ -17003,15 +17018,15 @@ const buildSync = (deps, platform) => defineCommand({
 			examples: [{ command: "social x sync followers" }],
 			cost: {
 				metered: true,
-				unit: "usage_credit",
+				unit: "usage_usd",
 				notes: ["Upstream reads during sync are metered."]
 			},
 			hazards: [{
 				code: "local_cache_write",
 				message: "Writes synced X rows and cursor state to the local cache."
 			}, {
-				code: "usage_credit_spend",
-				message: "May spend usage credits while reading upstream X data."
+				code: "usage_usd_spend",
+				message: "May spend usage dollars while reading upstream X data."
 			}]
 		}
 	}),
@@ -17116,7 +17131,7 @@ const buildSync = (deps, platform) => defineCommand({
 				onProgress,
 				rateLimit: syncRateLimitOptions()
 			});
-			deps.printData(syncOutput(summary, cacheMigration));
+			deps.printData(syncOutput(syncSummaryForOutput(summary), cacheMigration));
 		} catch (error) {
 			const rateLimitError = enrichRateLimitSyncError({
 				error,
@@ -21399,7 +21414,7 @@ function createEnv(opts) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.10.2";
+var version$1 = "0.11.1";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -22006,21 +22021,44 @@ const numberFromHeader = (headers, name) => {
 	const number = Number(value);
 	return Number.isFinite(number) ? number : void 0;
 };
+const usageUSDFromCredits = (credits) => creditsToUsageUSD(credits);
 const costFromContract = (contract, itemCount, cached, headers) => {
 	const cost = isRecord$6(contract) && isRecord$6(contract.cost) ? contract.cost : void 0;
 	const billedCredits = numberFromHeader(headers, "social-x-credits-used");
 	if (billedCredits !== void 0) return {
-		credits: billedCredits,
+		usageUSD: usageUSDFromCredits(billedCredits),
 		metered: cost?.metered === true && billedCredits > 0
 	};
 	const estimate = isRecord$6(cost?.estimate) ? cost.estimate : void 0;
-	const credits = cached && cost?.cacheHitCost === 0 ? 0 : typeof estimate?.credits === "number" ? estimate.credits : typeof estimate?.creditsPerItem === "number" ? estimate.creditsPerItem * itemCount : void 0;
+	const usageUSD = cached && cost?.cacheHitCost === 0 ? 0 : typeof estimate?.usageUSD === "number" ? estimate.usageUSD : typeof estimate?.usageUSDPerItem === "number" ? estimate.usageUSDPerItem * itemCount : void 0;
 	return {
-		...credits === void 0 ? {} : { credits },
-		metered: cost?.metered === true && !(cached && credits === 0),
+		...usageUSD === void 0 ? {} : { usageUSD },
+		metered: cost?.metered === true && !(cached && usageUSD === 0),
 		estimated: true
 	};
 };
+const usageSummaryForOutput = (usage) => {
+	if (!(isRecord$6(usage) && isRecord$6(usage.credits))) return usage;
+	const included = typeof usage.credits.included === "number" ? usageUSDFromCredits(usage.credits.included) : usage.credits.included;
+	const used = typeof usage.credits.used === "number" ? usageUSDFromCredits(usage.credits.used) : usage.credits.used;
+	const { credits: _credits, ...rest } = usage;
+	return {
+		...rest,
+		usageUSD: {
+			included,
+			used
+		}
+	};
+};
+const errorBodyForOutput = (body) => {
+	if (Array.isArray(body)) return body.map(errorBodyForOutput);
+	if (!isRecord$6(body)) return body;
+	const entries = Object.entries(body).flatMap(([key, value]) => {
+		if (key === "requiredCredits" && typeof value === "number") return [["requiredUsageUSD", usageUSDFromCredits(value)]];
+		return [[key, errorBodyForOutput(value)]];
+	});
+	return Object.fromEntries(entries);
+};
 const cacheFromHeaders = (headers) => {
 	const status = headers?.get("x-social-cache-status");
 	const age = headers?.get("age");
@@ -22069,13 +22107,13 @@ const resultEnvelope = ({ account, contract, data, local, resolved = [], respons
 		meta: {
 			resolved,
 			cost: local === void 0 ? costFromContract(contract, itemCount, cache.hit, responseHeaders) : {
-				credits: 0,
+				usageUSD: 0,
 				metered: false
 			},
 			cache,
 			...cursor === void 0 ? {} : { cursor },
 			...totalCount === void 0 ? {} : { totalCount },
-			...usage === void 0 ? {} : { usage }
+			...usage === void 0 ? {} : { usage: usageSummaryForOutput(usage) }
 		}
 	};
 };
@@ -22094,7 +22132,7 @@ const errorPayload = (error) => {
 		status: error.status,
 		code: error.code,
 		requestId: error.requestId,
-		body: error.body,
+		body: errorBodyForOutput(error.body),
 		retryAfterSeconds: error.retryAfterSeconds,
 		resumeAt: error.resumeAt,
 		retryCommand: error.retryCommand,
@@ -22112,19 +22150,29 @@ const errorPayload = (error) => {
 		type: "Error"
 	};
 };
-const errorDetails = (error) => Object.fromEntries(Object.entries(error).filter(([key, value]) => ![
-	"name",
-	"message",
-	"stack",
-	"cause"
-].includes(key) && value !== void 0));
+const errorDetails = (error) => {
+	const details = Object.fromEntries(Object.entries(error).filter(([key, value]) => ![
+		"name",
+		"message",
+		"stack",
+		"cause"
+	].includes(key) && value !== void 0));
+	if (typeof details.creditsSpent === "number") {
+		const { creditsSpent, ...rest } = details;
+		return {
+			...rest,
+			usageUSDSpent: usageUSDFromCredits(creditsSpent)
+		};
+	}
+	return details;
+};
 const apiErrorCause = (error) => ({
 	type: error.name,
 	error: error.message,
 	status: error.status,
 	code: error.code,
 	requestId: error.requestId,
-	body: error.body,
+	body: errorBodyForOutput(error.body),
 	retryAfterSeconds: error.retryAfterSeconds,
 	resumeAt: error.resumeAt,
 	retryCommand: error.retryCommand,
@@ -22530,7 +22578,7 @@ const BillingOutput = object({
 	}).nullable(),
 	usage: object({
 		calls: object({ total: number().int().nonnegative() }),
-		credits: object({
+		usageUSD: object({
 			included: number().nonnegative(),
 			used: number().nonnegative()
 		})
@@ -22593,7 +22641,7 @@ const createBillingCommand = (deps = {}) => {
 			await writeOutput$2(deps, {
 				seats: status.seats,
 				subscription: status.subscription,
-				usage
+				usage: usageSummaryForOutput(usage)
 			});
 		}
 	});
@@ -28735,13 +28783,16 @@ const errorOutput = (error) => ({
 const isInteractiveTerminal = () => process.stdin.isTTY === true && process.stdout.isTTY === true;
 const nextCommands = ["social account connect linkedin", "social account connect x"];
 const deviceExpiredMessage = "Sign-in expired before approval. Run `social account login` again to restart.";
+const scopeUpgradeRequiresReauthorization = "Existing CLI session is read-only. Run `social account logout`, then `social account login` to approve a new write-capable session.";
+const scopeAliasIncludes = (granted, requested) => granted === requested || granted === "read,write";
 /**
 * Drive one step of the non-TTY device-authorization login and map it onto the
 * login output union. The first call starts the device flow and returns
 * `pending_approval`; later calls poll until `logged_in` or `expired`.
 */
-const deviceLoginOutput = async (loginArgs) => {
-	const state = await advanceDeviceLogin(parseScopeAlias(loginArgs.scope));
+const deviceLoginOutput = async (client, loginArgs) => {
+	const scope = parseScopeAlias(loginArgs.scope);
+	const state = await advanceDeviceLogin(scope);
 	switch (state.status) {
 		case "pending_approval": return {
 			status: "pending_approval",
@@ -28753,7 +28804,10 @@ const deviceLoginOutput = async (loginArgs) => {
 		};
 		case "logged_in": return {
 			status: "logged_in",
-			account: state.account,
+			account: {
+				...state.account,
+				scope: (await client.cli.session.upsert({ scopeAlias: scope })).scopeAlias
+			},
 			nextCommands
 		};
 		case "expired": return {
@@ -28843,23 +28897,30 @@ const loginCommand = defineCommand({
 		try {
 			const client = createORPCAPIClient();
 			const existing = await readExistingAuthSession(client);
-			if (existing.kind === "existing") if (billingReady(await client.billing.status())) output = alreadyLoggedInOutput(existing.session);
-			else if (isInteractiveTerminal()) output = await runLogin({
-				ui: createUI(true),
-				client,
-				args: loginArgs
-			}, [{
-				name: "seat",
-				run: seatPhase
-			}], { authenticated: true });
-			else output = alreadyLoggedInOutput(existing.session);
-			else if (existing.kind === "offline") output = offlineOutput();
+			if (existing.kind === "existing") {
+				const requestedScope = parseScopeAlias(loginArgs.scope);
+				if (!scopeAliasIncludes(existing.session.session.scope, requestedScope)) output = {
+					status: "error",
+					code: "scope_upgrade_requires_reauthorization",
+					message: scopeUpgradeRequiresReauthorization
+				};
+				else if (billingReady(await client.billing.status())) output = alreadyLoggedInOutput(existing.session);
+				else if (isInteractiveTerminal()) output = await runLogin({
+					ui: createUI(true),
+					client,
+					args: loginArgs
+				}, [{
+					name: "seat",
+					run: seatPhase
+				}], { authenticated: true });
+				else output = alreadyLoggedInOutput(existing.session);
+			} else if (existing.kind === "offline") output = offlineOutput();
 			else if (isInteractiveTerminal()) output = await runLogin({
 				ui: createUI(true),
 				client,
 				args: loginArgs
 			});
-			else output = await deviceLoginOutput(loginArgs);
+			else output = await deviceLoginOutput(client, loginArgs);
 		} catch (error) {
 			output = errorOutput(error);
 			exitCode = exitCodeFor(error);
@@ -28992,7 +29053,7 @@ const UsageLogOutput = object({
 		"n/a"
 	]),
 	errorCode: string().nullable(),
-	credits: number().int().nonnegative(),
+	usageUSD: number().nonnegative(),
 	latencyMs: number().int().nonnegative(),
 	createdAt: ISODateString
 });
@@ -29019,7 +29080,7 @@ const UsageLogsCommandOutput = union([object({
 			"n/a"
 		]).optional(),
 		calls: number().int().nonnegative(),
-		credits: number().nonnegative(),
+		usageUSD: number().nonnegative(),
 		errors: number().int().nonnegative()
 	})),
 	meta: object({
@@ -29030,7 +29091,7 @@ const UsageLogsCommandOutput = union([object({
 })]);
 const UsageSummaryOutput = object({
 	calls: object({ total: number().int().nonnegative() }),
-	credits: object({
+	usageUSD: object({
 		included: number().nonnegative(),
 		used: number().nonnegative()
 	})
@@ -29038,11 +29099,22 @@ const UsageSummaryOutput = object({
 const USAGE_LOG_PAGE_LIMIT = 100;
 const USAGE_LOG_MAX_AUTO_PAGES = 50;
 const cursorFrom = (usage) => usage.nextCursor ?? null;
-const normalizeUsageLogCreatedAt = (item) => {
-	if (typeof item === "object" && item !== null && "createdAt" in item && item.createdAt instanceof Date) return {
-		...item,
-		createdAt: item.createdAt.toISOString()
-	};
+const normalizeUsageLogForOutput = (item) => {
+	if (typeof item === "object" && item !== null && "createdAt" in item && item.createdAt instanceof Date) {
+		const { credits, ...rest } = item;
+		return {
+			...rest,
+			createdAt: item.createdAt.toISOString(),
+			...typeof credits === "number" ? { usageUSD: creditsToUsageUSD(credits) } : {}
+		};
+	}
+	if (typeof item === "object" && item !== null && "credits" in item) {
+		const { credits, ...rest } = item;
+		return {
+			...rest,
+			...typeof credits === "number" ? { usageUSD: creditsToUsageUSD(credits) } : {}
+		};
+	}
 	return item;
 };
 const sumByFrom = (value) => {
@@ -29072,7 +29144,7 @@ const fetchUsageLogs = async (client, input) => {
 			from: input.from,
 			to: input.to
 		});
-		items.push(...UsageLogOutput.array().parse(usage.items.map(normalizeUsageLogCreatedAt)));
+		items.push(...UsageLogOutput.array().parse(usage.items.map(normalizeUsageLogForOutput)));
 		nextCursor = cursorFrom(usage);
 		cursor = nextCursor ?? void 0;
 		pages += 1;
@@ -29090,15 +29162,15 @@ const aggregateLogs = (logs, fields) => {
 		const current = groups.get(key) ?? {
 			...keyFields,
 			calls: 0,
-			credits: 0,
+			usageUSD: 0,
 			errors: 0
 		};
 		current.calls = Number(current.calls) + 1;
-		current.credits = Number(current.credits) + log.credits;
+		current.usageUSD = Number(current.usageUSD) + log.usageUSD;
 		current.errors = Number(current.errors) + (log.responseStatus >= 400 ? 1 : 0);
 		groups.set(key, current);
 	}
-	return [...groups.values()].sort((left, right) => Number(right.credits) - Number(left.credits));
+	return [...groups.values()].sort((left, right) => Number(right.usageUSD) - Number(left.usageUSD));
 };
 const createUsageLogsCommand = (deps = {}) => defineCommand({
 	meta: commandMeta({
@@ -29192,7 +29264,7 @@ const createUsageCommand = (deps = {}) => defineCommand({
 	}),
 	args: {},
 	run: async () => {
-		await writeOutput$1(deps, await (deps.client ?? createORPCAPIClient()).usage.summary({}));
+		await writeOutput$1(deps, usageSummaryForOutput(await (deps.client ?? createORPCAPIClient()).usage.summary({})));
 	}
 });
 //#endregion
@@ -34787,7 +34859,7 @@ const CLIHazardMetadata = object({
 }).strict();
 const CLIAdvisoryHazardMetadata = object({
 	kind: _enum([
-		"spends_credits",
+		"spends_usage",
 		"destructive",
 		"outbound_write"
 	]),
@@ -35134,7 +35206,7 @@ const schemaCommand = defineCommand({
 				path: []
 			} : commandAtPath(rootCommand, parts);
 			printData({
-				schemaVersion: "1.0",
+				schemaVersion: "2.0",
 				commands: Object.fromEntries(leafSchemasForCommand(command, path))
 			});
 			return;
@@ -35145,28 +35217,28 @@ const schemaCommand = defineCommand({
 				path: []
 			} : commandAtPath(rootCommand, parts);
 			printData({
-				schemaVersion: "1.0",
+				schemaVersion: "2.0",
 				commands: Object.fromEntries(compactLeafSchemasForCommand(command, path))
 			});
 			return;
 		}
 		if (parts.length === 0) {
 			printData({
-				schemaVersion: "1.0",
+				schemaVersion: "2.0",
 				...treeForCommand(rootCommand)
 			});
 			return;
 		}
 		const { command, path, positionalMatch } = commandAtPath(rootCommand, parts);
 		printData(positionalMatch ? {
-			schemaVersion: "1.0",
+			schemaVersion: "2.0",
 			...schemaForCommand(command, path),
 			...positionalMatch
 		} : command.subCommands && typeof command.run !== "function" ? {
-			schemaVersion: "1.0",
+			schemaVersion: "2.0",
 			...treeForCommand(command, path)
 		} : {
-			schemaVersion: "1.0",
+			schemaVersion: "2.0",
 			...schemaForCommand(command, path)
 		});
 	}