@maxceem/agw 0.15.0 → 0.16.0

package/dist/agw.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 };
 
 // <define:__AGW_MANIFEST__>
-var define_AGW_MANIFEST_default = { version: "0.15.0", wrangler: "4.96.0", upgradeFrom: ["0.15.0", "0.14.0", "0.13.1", "0.13.0", "0.12.1", "0.12.0", "0.11.2", "0.11.1", "0.11.0", "0.10.11", "0.10.10", "0.10.9", "0.10.8", "0.10.7", "0.10.6", "0.10.5", "0.10.4", "0.10.3", "0.10.2", "0.10.1", "0.10.0", "0.9.3", "0.9.2", "0.9.1", "0.9.0", "0.8.3", "0.8.2", "0.8.1", "0.8.0", "0.7.2", "0.7.1", "0.7.0", "0.6.4", "0.6.3", "0.6.2", "0.6.1", "0.6.0", "0.5.2", "0.5.1", "0.5.0", "0.4.0"], release: { url: "https://github.com/maxceem/app-ai-gateway/releases/download/v0.15.0/gateway-0.15.0.tar.gz", sha256: "a16f9357ee510e03ba06f1d9ddc531057d00fef1750a0318969da72b8c3ef282", manifest: "48e6067ef1475bf894a3f00021c5caf3ee2140fae57f64d487f32e2f93e2553f" } };
+var define_AGW_MANIFEST_default = { version: "0.16.0", wrangler: "4.96.0", upgradeFrom: ["0.16.0", "0.15.1", "0.15.0", "0.14.0", "0.13.1", "0.13.0", "0.12.1", "0.12.0", "0.11.2", "0.11.1", "0.11.0", "0.10.11", "0.10.10", "0.10.9", "0.10.8", "0.10.7", "0.10.6", "0.10.5", "0.10.4", "0.10.3", "0.10.2", "0.10.1", "0.10.0", "0.9.3", "0.9.2", "0.9.1", "0.9.0", "0.8.3", "0.8.2", "0.8.1", "0.8.0", "0.7.2", "0.7.1", "0.7.0", "0.6.4", "0.6.3", "0.6.2", "0.6.1", "0.6.0", "0.5.2", "0.5.1", "0.5.0", "0.4.0"], release: { url: "https://github.com/maxceem/app-ai-gateway/releases/download/v0.16.0/gateway-0.16.0.tar.gz", sha256: "222ce0c030268e5b1468c5d1755d8ea7d6da0ce86d9a0229e0adf5eb5eab4850", manifest: "1ecdc82e5705b259f5eed20bc58348fa9bcd36686f177d5040b3544ea09ba920" } };
 
 // src/main.ts
 import { Writable as Writable2 } from "node:stream";
@@ -20509,31 +20509,83 @@ var ENDPOINT_PROVIDER_TYPES = PROVIDER_TYPES.filter(
 var APP_STATUSES = ["active", "disabled"];
 
 // ../src/shared/token-rates.ts
-var TOKEN_RATE_FIELDS = [
-  "input",
-  "output",
-  "cached_input",
-  "cache_write",
-  "cache_write_1h",
-  "image_input",
-  "audio_input",
-  "video_input",
-  "image_output",
-  "long_input",
-  "long_output",
-  "long_cached_input",
-  "long_cache_write",
-  "long_cache_write_1h"
-];
-var LONG_RATE_FIELDS = TOKEN_RATE_FIELDS.filter(
-  (field) => field.startsWith("long_")
+var TOKEN_VARIANTS = {
+  cache_write: {
+    // Anthropic: a write kept for an hour bills at 2x input, against 1.25x for
+    // the default five minutes. `usage.cache_creation` splits the write by TTL.
+    "1h": {
+      label: "1h cache write",
+      description: "USD per 1M tokens written to a one-hour cache, where it costs more than the default cache write.",
+      reportedAt: ["cache_creation", "ephemeral_1h_input_tokens"]
+    },
+    // OpenAI (Responses API): a write kept for 12 hours bills at 2.5x input,
+    // against 1.25x for the default 30 minutes.
+    "12h": {
+      label: "12h cache write",
+      description: "USD per 1M tokens written to a 12-hour cache, where it costs more than the default cache write.",
+      reportedAt: ["input_tokens_details", "cache_write_tokens_details", "ttl_12h_tokens"]
+    }
+  }
+};
+var VARIANTS = Object.entries(TOKEN_VARIANTS).flatMap(
+  ([bucket, variants]) => Object.entries(variants).map(([name, spec]) => ({
+    ...spec,
+    bucket,
+    name,
+    field: `${bucket}_${name}`
+  }))
 );
+var BUCKETS = ["input", "cached_input", "cache_write", "output"];
+var MODALITY_RATES = ["image_input", "audio_input", "video_input", "image_output"];
+var BASE_RATES = {
+  input: { label: "input" },
+  cached_input: { label: "cached" },
+  cache_write: { label: "cache write" },
+  output: { label: "output" },
+  image_input: {
+    label: "image input",
+    description: "USD per 1M image input tokens, where they are priced apart from text input."
+  },
+  audio_input: {
+    label: "audio input",
+    description: "USD per 1M audio input tokens, where they are priced apart from text input."
+  },
+  video_input: {
+    label: "video input",
+    description: "USD per 1M video input tokens, where they are priced apart from text input."
+  },
+  image_output: {
+    label: "image output",
+    description: "USD per 1M generated image tokens, where they cost more than text output."
+  }
+};
+var BUCKET_FIELDS = BUCKETS.flatMap((bucket) => [
+  bucket,
+  ...VARIANTS.filter((variant) => variant.bucket === bucket).map((variant) => variant.field)
+]);
+var LONG_RATE_FIELDS = BUCKET_FIELDS.map((field) => `long_${field}`);
+var TOKEN_RATE_FIELDS = [...BUCKET_FIELDS, ...MODALITY_RATES, ...LONG_RATE_FIELDS];
+var SHORT_INFO = new Map([
+  ...Object.entries(BASE_RATES),
+  ...VARIANTS.map((variant) => [variant.field, variant])
+]);
+var RATE_LABELS = Object.fromEntries(
+  TOKEN_RATE_FIELDS.map((field) => {
+    const short = field.startsWith("long_") ? field.slice("long_".length) : field;
+    const label = SHORT_INFO.get(short)?.label ?? short;
+    return [field, short === field ? label : `long ${label}`];
+  })
+);
+function rateDescription(field) {
+  return SHORT_INFO.get(field)?.description;
+}
 
 // ../src/contracts/schemas.ts
 var ISSUER_PROVIDERS = ["firebase", "supabase", "auth0", "clerk", "custom"];
 var ENTITLEMENT_CHECKS = ["revenuecat", "custom"];
 var APP_ATTEST_ENVIRONMENTS = ["production", "development"];
 var APP_ATTEST_VERIFY_ON = ["every_request", "token_exchange"];
+var MAX_APP_TRANSACTION_LENGTH = 16384;
 var ENDPOINT_SLUG = /^[a-z0-9-]{1,64}$/;
 var PROVIDER_SLUG_PATTERN = /^[a-z0-9][a-z0-9-]{0,62}$/;
 var HTTP_FIELD_NAME = /^[A-Za-z0-9!#$%&'*+.^_`|~-]+$/;
@@ -20767,11 +20819,11 @@ var LimitScopeSchema = external_exports.object({
   }).strict(),
   spending: external_exports.object({ monthly_usd: NullableSpendLimit }).strict()
 }).strict();
-var BUDGET_SCOPES = ["install", "user"];
+var BUDGET_SCOPES = ["install", "user", "apple_account"];
 var PerUserLimitScopeSchema = LimitScopeSchema.extend({
   spending: LimitScopeSchema.shape.spending.extend({
     scope: external_exports.enum(BUDGET_SCOPES).optional().meta({
-      description: "Whose month monthly_usd is measured over: install (the default on App Attest applications) or user (the default, and the only value, on server applications). user on an App Attest application needs authentication.end_user.source issuer. Filled in on every parsed configuration."
+      description: "Whose month monthly_usd is measured over: apple_account (the default on App Attest applications), install, or user (the default, and the only value, on server applications). apple_account counts every install of one Apple Account together, across devices and reinstalls; an install whose client sent no verifiable App Store transaction is counted on its own, as under install. user on an App Attest application needs authentication.end_user.source issuer. Filled in on every parsed configuration."
     })
   }).strict()
 }).strict();
@@ -20850,25 +20902,25 @@ var AppConfigSchema = external_exports.object({
   }
   const budgetScope = perUser?.spending.scope;
   if (authentication !== void 0 && budgetScope !== void 0) {
-    if (authentication.type === "api_key" && budgetScope === "install") {
+    if (authentication.type === "api_key" && budgetScope !== "user") {
       context.addIssue({
         code: "custom",
         path: ["limits", "per_user", "spending", "scope"],
-        message: "cannot be install: server applications have no install; the budget is per user"
+        message: `cannot be ${budgetScope}: server applications have no install or Apple Account; the budget is per user`
       });
     }
     if (authentication.type === "apple_app_attest" && budgetScope === "user" && authentication.end_user.source !== "issuer") {
       context.addIssue({
         code: "custom",
         path: ["limits", "per_user", "spending", "scope"],
-        message: "can be user only when authentication.end_user.source is issuer: under app_install every install is its own user, so use install"
+        message: "can be user only when authentication.end_user.source is issuer: under app_install every install is its own user, so use apple_account to count one person's installs together, or install"
       });
     }
   }
 }).overwrite((config2) => {
   const spending = config2.limits.per_user.spending;
   if (spending.scope === void 0) {
-    spending.scope = config2.authentication.type === "apple_app_attest" ? "install" : "user";
+    spending.scope = config2.authentication.type === "apple_app_attest" ? "apple_account" : "user";
   }
   return config2;
 }).meta({ id: "AppConfig" });
@@ -20910,7 +20962,10 @@ var AppAttestTokenRequestSchema = external_exports.object({
   issuer_token: external_exports.string().min(1).optional(),
   key_id: AppAttestKeyIdSchema,
   assertion: external_exports.string().min(1),
-  challenge: ChallengeSchema
+  challenge: ChallengeSchema,
+  app_transaction: external_exports.string().min(1).max(MAX_APP_TRANSACTION_LENGTH).optional().meta({
+    description: "The App Store's signed AppTransaction (its JWS), which names the Apple Account the install belongs to. When present, the assertion signs client data that also carries app_transaction: the unpadded base64url SHA-256 of this string. One that does not verify against Apple's root names no account, and the install is counted on its own."
+  })
 }).meta({ id: "AppAttestTokenRequest" });
 var ApiKeyTokenRequestSchema = external_exports.object({
   issuer_token: external_exports.string().min(1),
@@ -22772,7 +22827,7 @@ var REJECTION_REASONS = [
   /** An App Attest assertion whose counter the install had already used. */
   "blocked_replay"
 ];
-var REJECTION_SCOPES = ["user", "install", "app", "account"];
+var REJECTION_SCOPES = ["user", "install", "apple_account", "app", "account"];
 
 // ../src/contracts/billing.ts
 var BillingSubscriptionStatusSchema = external_exports.enum([
@@ -22993,7 +23048,10 @@ var GoogleSignInResponseSchema = external_exports.object({
 });
 var AppAttestChallengeResponseSchema = external_exports.object({
   challenge: external_exports.string(),
-  expires_in: external_exports.number()
+  expires_in: external_exports.number(),
+  accepts_app_transaction: external_exports.boolean().optional().meta({
+    description: "True when the token exchange accepts app_transaction, the App Store's signed AppTransaction. A client sends one, and signs over its hash, only when this says so: a gateway that predates it would ignore the field and then refuse the assertion."
+  })
 });
 var AppAttestRegisterResponseSchema = external_exports.object({ user_id: external_exports.string() });
 var GatewayTokenResponseSchema = external_exports.object({
@@ -23013,8 +23071,9 @@ var CurrentUserResponseSchema = external_exports.object({
     requests_remaining: external_exports.number().int().nullable().meta({ description: "What is left of requests_per_day. Null when no daily limit is set." }),
     requests_per_minute: external_exports.number().nullable().meta({ description: "The per-minute limit this app sets on each install (App Attest) or user (server). Null means unlimited." }),
     requests_per_day: external_exports.number().nullable().meta({ description: "The per-day limit this app sets on each install (App Attest) or user (server). Null means unlimited." }),
-    monthly_cost_usd: external_exports.number().meta({ description: "What has been spent so far in the current UTC calendar month against the budget below: by this install, or by this user when the budget's scope is user." }),
-    monthly_budget_usd: external_exports.number().nullable().meta({ description: "The monthly spending budget this app sets on each install or user, per limits.per_user.spending.scope. Null means unlimited." }),
+    monthly_cost_usd: external_exports.number().meta({ description: "What has been spent so far in the current UTC calendar month against the budget below, by whoever budget_scope names." }),
+    monthly_budget_usd: external_exports.number().nullable().meta({ description: "The monthly spending budget this app sets on each Apple Account, install or user, per limits.per_user.spending.scope. Null means unlimited." }),
+    budget_scope: external_exports.enum(BUDGET_SCOPES).meta({ description: "Whose month monthly_cost_usd is: apple_account (every install of this person's Apple Account together), install (this install alone), or user (this signed-in or backend-named user). Usually the app's limits.per_user.spending.scope; install where that is apple_account but this install's client sent no verifiable App Store transaction." }),
     blocked: external_exports.boolean().meta({ description: "Whether this user has been blocked in the console." })
   }).meta({
     description: "The limits the app sets on this user, and where the user stands against them. The account's request allowance is not reported here: it is shared by all apps, and is reported on the rejection that spends it."
@@ -23693,40 +23752,23 @@ var UsageRepriceResponseSchema = external_exports.object({
   recalculated_cost_usd: external_exports.number(),
   delta_usd: external_exports.number()
 });
+var CATALOG_TOKEN_RATES = Object.fromEntries(
+  TOKEN_RATE_FIELDS.map((field) => {
+    const description = rateDescription(field);
+    return [field, description ? external_exports.number().optional().meta({ description }) : external_exports.number().optional()];
+  })
+);
 var ModelPriceSchema = external_exports.object({
   kind: external_exports.enum(MODEL_KINDS).meta({
     description: "What the model does: text, image (generation), speech (text to speech), transcription (speech to text), embedding, or realtime (served only over a realtime session). A custom endpoint serves models of its own kind only."
   }),
-  input: external_exports.number().optional(),
-  output: external_exports.number().optional(),
-  image_input: external_exports.number().optional().meta({
-    description: "USD per 1M image input tokens, where they are priced apart from text input."
-  }),
-  audio_input: external_exports.number().optional().meta({
-    description: "USD per 1M audio input tokens, where they are priced apart from text input."
-  }),
-  video_input: external_exports.number().optional().meta({
-    description: "USD per 1M video input tokens, where they are priced apart from text input."
-  }),
-  image_output: external_exports.number().optional().meta({
-    description: "USD per 1M generated image tokens, where they cost more than text output."
-  }),
-  cached_input: external_exports.number().optional(),
-  cache_write: external_exports.number().optional(),
-  cache_write_1h: external_exports.number().optional().meta({
-    description: "USD per 1M tokens written to a one-hour cache, where it costs more than the default cache write."
-  }),
+  ...CATALOG_TOKEN_RATES,
   per_minute: external_exports.number().optional(),
   per_hour: external_exports.number().optional(),
   per_image: external_exports.number().optional().meta({
     description: "USD per generated image, for a model billed per image rather than per token."
   }),
   long_context_threshold: external_exports.number().optional(),
-  long_input: external_exports.number().optional(),
-  long_output: external_exports.number().optional(),
-  long_cached_input: external_exports.number().optional(),
-  long_cache_write: external_exports.number().optional(),
-  long_cache_write_1h: external_exports.number().optional(),
   retirement_date: external_exports.string().optional().meta({
     description: "The day (YYYY-MM-DD) the provider stops, or stopped, serving this model. The model stays priced after it."
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maxceem/agw",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "type": "module",
   "description": "Manage App AI Gateway from a terminal or coding agent: providers, iOS and server apps, usage, and self-hosted deployment on Cloudflare",
   "keywords": [
@@ -26,6 +26,8 @@
   },
   "bugs": "https://github.com/maxceem/app-ai-gateway/issues",
   "upgradeFrom": [
+    "0.15.1",
+    "0.15.0",
     "0.14.0",
     "0.13.1",
     "0.13.0",