@amerged/ohmyhost-cli 0.1.39 → 0.1.41

package/README.md

@@ -1,6 +1,6 @@
 # @amerged/ohmyhost-cli
 
-ohmyho.st cli client, version 0.1.39.
+ohmyho.st cli client, version 0.1.41.
 
 ```sh
 npm install --global @amerged/ohmyhost-cli

package/dist/bin.js

@@ -2,7 +2,7 @@
 import { createRequire as __ohmyhostCreateRequire } from "node:module"; const require = __ohmyhostCreateRequire(import.meta.url);
 import {
   runProductionCli
-} from "./chunk-R2BC42EW.js";
+} from "./chunk-SB6RMO3M.js";
 import "./chunk-7D2RFLWM.js";
 
 // apps/product-cli/dist/bin.js

package/dist/{chunk-R2BC42EW.js → chunk-SB6RMO3M.js}

@@ -38593,7 +38593,7 @@ var FRAMEWORK_CONVERSION_DETAILS = Object.freeze({
   },
   better_auth_version_required: {
     paths: ["manifest"],
-    template: '"{{path}}" must declare better-auth at exactly 1.7.1 in dependencies because ohmyhost.yaml sets auth.provider: better-auth. Pin that version or set auth.provider: none, commit and push the change, then plan the new commit.'
+    template: '"{{path}}" must declare better-auth at exactly 1.7.7 in dependencies because ohmyhost.yaml sets auth.provider: better-auth. Pin that version or set auth.provider: none, commit and push the change, then plan the new commit.'
   },
   package_manifest_invalid: {
     paths: ["manifest"],
@@ -40064,31 +40064,41 @@ function assertOrganizationCreditUsage(value) {
   };
   const identifier2 = (input) => typeof input === "string" && /^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u.test(input);
   const amount = (input) => typeof input === "string" && /^(0|[1-9][0-9]{0,37})$/u.test(input);
-  const report = record6(value, "organization_id,month,as_of,unit,data,next_cursor");
-  if (!identifier2(report["organization_id"]) || typeof report["month"] !== "string" || !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["month"]) || typeof report["as_of"] !== "string" || !Number.isFinite(Date.parse(report["as_of"])) || new Date(report["as_of"]).toISOString() !== report["as_of"] || report["unit"] !== "microcredits" || !Array.isArray(report["data"]) || report["data"].length > 20 || report["next_cursor"] !== null && !identifier2(report["next_cursor"]))
+  const instant2 = (input) => typeof input === "string" && Number.isFinite(Date.parse(input)) && new Date(input).toISOString() === input;
+  const report = record6(value, "organization_id,as_of,unit,period,from,projects,days");
+  if (!identifier2(report["organization_id"]) || !instant2(report["as_of"]) || !instant2(report["from"]) || report["unit"] !== "microcredits" || typeof report["period"] !== "string" || !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["period"]) || !Array.isArray(report["projects"]) || report["projects"].length > 1e3 || !Array.isArray(report["days"]) || report["days"].length > 15)
     throw new TypeError("Invalid usage report");
   let previous = "";
-  for (const input of report["data"]) {
-    const project = record6(input, "project_id,reserved_micros,meters");
-    if (!identifier2(project["project_id"]) || String(project["project_id"]) <= previous || !amount(project["reserved_micros"]) || !Array.isArray(project["meters"]) || project["meters"].length > 1e3)
+  for (const input of report["projects"]) {
+    const project = record6(input, "project_id,used_micros");
+    if (!identifier2(project["project_id"]) || String(project["project_id"]) <= previous || !amount(project["used_micros"]))
       throw new TypeError("Invalid usage project");
     previous = String(project["project_id"]);
-    for (const input2 of project["meters"]) {
-      const meter = record6(input2, "environment_id,meter,unit,rate_card_id,quantity,charged_micros,funded_micros,platform_overrun_micros");
-      if (meter["environment_id"] !== null && !identifier2(meter["environment_id"]))
-        throw new TypeError("Invalid usage environment");
-      for (const key of ["meter", "unit", "rate_card_id"])
-        if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
-          throw new TypeError("Invalid usage meter");
-      for (const key of ["quantity", "charged_micros", "funded_micros", "platform_overrun_micros"])
-        if (!amount(meter[key]))
+  }
+  let previousDay = "";
+  for (const input of report["days"]) {
+    const day = record6(input, "day,projects");
+    if (typeof day["day"] !== "string" || !/^20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/u.test(day["day"]) || day["day"] <= previousDay || !Array.isArray(day["projects"]) || day["projects"].length > 1e3)
+      throw new TypeError("Invalid usage day");
+    previousDay = day["day"];
+    previous = "";
+    for (const projectInput of day["projects"]) {
+      const project = record6(projectInput, "project_id,meters");
+      if (!identifier2(project["project_id"]) || String(project["project_id"]) <= previous || !Array.isArray(project["meters"]) || project["meters"].length > 1e3)
+        throw new TypeError("Invalid usage project");
+      previous = String(project["project_id"]);
+      for (const meterInput of project["meters"]) {
+        const meter = record6(meterInput, "environment_id,meter,unit,rate_card_id,quantity,charged_micros");
+        if (meter["environment_id"] !== null && !identifier2(meter["environment_id"]))
+          throw new TypeError("Invalid usage environment");
+        for (const key of ["meter", "unit", "rate_card_id"])
+          if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
+            throw new TypeError("Invalid usage meter");
+        if (typeof meter["quantity"] !== "string" || !/^(0|[1-9][0-9]{0,29})(\.[0-9]{1,12})?$/u.test(meter["quantity"]) || !amount(meter["charged_micros"]))
           throw new TypeError("Invalid usage amount");
-      if (BigInt(String(meter["charged_micros"])) !== BigInt(String(meter["funded_micros"])) + BigInt(String(meter["platform_overrun_micros"])))
-        throw new TypeError("Inconsistent usage charge");
+      }
     }
   }
-  if (report["next_cursor"] !== null && report["next_cursor"] !== previous)
-    throw new TypeError("Invalid usage cursor");
 }
 function assertPublishedCreditRateCards(value) {
   if (!Array.isArray(value) || value.length > 4)
@@ -40139,7 +40149,9 @@ function assertOrganizationAccount(value) {
   for (const field of ["available_micros", "monthly_micros", "one_time_micros", "reserved_micros"])
     if (typeof v[field] !== "string" || !/^(0|[1-9][0-9]{0,18})$/u.test(v[field]))
       throw new TypeError("Invalid account credits");
-  if (BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"])) !== BigInt(String(v["available_micros"])))
+  const held = BigInt(String(v["reserved_micros"]));
+  const balance = BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"]));
+  if (BigInt(String(v["available_micros"])) !== (balance > held ? balance - held : 0n))
     throw new TypeError("Account credit buckets do not balance");
   for (const field of ["as_of", "paid_until", "next_expiry"]) {
     if (field !== "as_of" && v[field] === null)
@@ -40869,9 +40881,6 @@ function parseOrganizationCredits(value) {
     "as_of",
     "available_micros",
     "reserved_micros",
-    "spent_micros",
-    "expired_micros",
-    "platform_overrun_micros",
     "grace_started_at",
     "grace_expires_at",
     "active_meters",
@@ -40887,13 +40896,7 @@ function parseOrganizationCredits(value) {
     throw new ResponseContractError();
   if (!isUlid(input["organization_id"]) || input["unit"] !== "microcredits" || !isIsoInstant(input["as_of"]) || !Array.isArray(input["active_meters"]) || input["active_meters"].some((m) => typeof m !== "string" || !/^[a-z0-9_.-]{1,128}$/u.test(m)))
     throw new ResponseContractError();
-  for (const field of [
-    "available_micros",
-    "reserved_micros",
-    "spent_micros",
-    "expired_micros",
-    "platform_overrun_micros"
-  ]) {
+  for (const field of ["available_micros", "reserved_micros"]) {
     const amount = input[field];
     if (typeof amount !== "string" || !/^(0|[1-9][0-9]{0,18})$/u.test(amount) || BigInt(amount) > 9223372036854775807n)
       throw new ResponseContractError();
@@ -43160,16 +43163,8 @@ var parseProductCliCommand = (argv) => {
     values.shift();
     if (yes || wait || follow || stdin)
       throw new InvalidCommandError();
-    const options = parseOptionalOptions(values, ["--organization", "--month", "--cursor"]);
-    if (!options["--organization"] || !options["--month"] || !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(options["--month"]))
-      throw new InvalidCommandError();
-    return {
-      kind: "credits-usage",
-      organizationId: options["--organization"],
-      month: options["--month"],
-      ...options["--cursor"] ? { cursor: options["--cursor"] } : {},
-      credentialStore
-    };
+    const options = parseOptions(values, ["--organization"]);
+    return { kind: "credits-usage", organizationId: options["--organization"], credentialStore };
   }
   if (first === "credits" && values[0] === "account") {
     values.shift();
@@ -44714,7 +44709,7 @@ function exact3(v, keys) {
 // apps/product-cli/package.json
 var package_default = {
   name: "@ohmyhost/product-cli",
-  version: "0.1.39",
+  version: "0.1.41",
   private: true,
   ohmyhost: {
     deployment: "production",
@@ -45023,7 +45018,7 @@ var HELP_USAGE = Object.freeze({
   "billing checkout": "ohmyhost billing checkout --organization ULID --offer topup|paid [--packs 1] --idempotency-key KEY --json (returns a human payment URL; never auto-pays)",
   "billing status": "ohmyhost billing status --organization ULID --checkout ULID --json",
   "billing portal": "ohmyhost billing portal --organization ULID --json (short-lived human URL; request fresh after expiry)",
-  "credits usage": "ohmyhost credits usage --organization ULID --month YYYY-MM [--cursor ULID] --json",
+  "credits usage": "ohmyhost credits usage --organization ULID --json (billed usage of the last up to 14 UTC days by day, project and meter, and each project's use this UTC month)",
   "budget get": "ohmyhost budget get --project ULID --json",
   "budget set": "ohmyhost budget set --project ULID --credits NUMBER|none [--mode continue|stop] --idempotency-key KEY --json",
   "organization create": "ohmyhost organization create --name NAME --idempotency-key KEY [--source SOURCE] --json (SOURCE is optional attribution from a link's r value; a login without organization is bound to the new workspace, another login keeps its own)",
@@ -45312,7 +45307,7 @@ var ProductCli = class {
       }
       if (command.kind === "credits-usage") {
         const api = await this.authenticatedApi(command.credentialStore, signal);
-        const usage = await api.getOrganizationCreditUsage(command);
+        const usage = await api.getOrganizationCreditUsage(command.organizationId);
         try {
           assertOrganizationCreditUsage(usage);
         } catch {
@@ -48563,9 +48558,7 @@ var getOrganizationCreditUsage = (parameters, options) => {
     {
       args: [
         { in: "headers", key: "X-Request-Id" },
-        { in: "path", key: "organization_id" },
-        { in: "query", key: "month" },
-        { in: "query", key: "cursor" }
+        { in: "path", key: "organization_id" }
       ]
     }
   ]);
@@ -50897,12 +50890,8 @@ var GeneratedSdkProductApi = class {
   createBillingPortal(organizationId) {
     return createBillingPortal({ organization_id: organizationId, body: {} }, { client: this.#client });
   }
-  getOrganizationCreditUsage(input) {
-    return getOrganizationCreditUsage({
-      organization_id: input.organizationId,
-      month: input.month,
-      ...input.cursor ? { cursor: input.cursor } : {}
-    }, { client: this.#client });
+  getOrganizationCreditUsage(organizationId) {
+    return getOrganizationCreditUsage({ organization_id: organizationId }, { client: this.#client });
   }
   getProjectCreditBudget(projectId) {
     return getProjectCreditBudget({ project_id: projectId }, { client: this.#client });
@@ -51956,7 +51945,7 @@ function classifyFrameworkFamily(dependencies) {
 }
 
 // packages/contracts/dist/framework-source-rules.js
-var MANAGED_BETTER_AUTH_VERSION = "1.7.1";
+var MANAGED_BETTER_AUTH_VERSION = "1.7.7";
 var MAXIMUM_FRAMEWORK_CONFIG_BYTES = 256 * 1024;
 var WORKER_MODULE_PATH = "src/ohmyhost/worker.ts";
 var VITE_COMPANION_ENTRY_PATH = "src/ohmyhost/companion.ts";

package/dist/index.js

@@ -99,7 +99,7 @@ import {
   selectWorkspace,
   verifiedUserId,
   workspaceOf
-} from "./chunk-R2BC42EW.js";
+} from "./chunk-SB6RMO3M.js";
 import {
   CredentialStoreIntegrityError,
   CredentialStoreUnavailableError,

package/dist/licenses/pgcf-bridge-NOTICE

@@ -1 +1 @@
-PostgreSQL WebSocket bridge and authentication prelude handling adapted from cloudflare-postgres packages/cli, commit e05d9102c840e283602272ed0e16a95be3e3b8ea. Upstream license: Apache-2.0.
+PostgreSQL WebSocket bridge and authentication prelude handling adapted from cloudflare-postgres (https://github.com/amerged-org/cloudflare-postgres) packages/cli, commit e05d9102c840e283602272ed0e16a95be3e3b8ea. Upstream license: Apache-2.0.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amerged/ohmyhost-cli",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "type": "module",
   "engines": {
     "node": ">=22"

package/src/apps/product-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohmyhost/product-cli",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "private": true,
   "ohmyhost": {
     "deployment": "production",

package/src/apps/product-cli/src/cli.ts

@@ -351,7 +351,7 @@ const HELP_USAGE = Object.freeze({
   "billing portal":
     "ohmyhost billing portal --organization ULID --json (short-lived human URL; request fresh after expiry)",
   "credits usage":
-    "ohmyhost credits usage --organization ULID --month YYYY-MM [--cursor ULID] --json",
+    "ohmyhost credits usage --organization ULID --json (billed usage of the last up to 14 UTC days by day, project and meter, and each project's use this UTC month)",
   "budget get": "ohmyhost budget get --project ULID --json",
   "budget set":
     "ohmyhost budget set --project ULID --credits NUMBER|none [--mode continue|stop] --idempotency-key KEY --json",
@@ -844,7 +844,7 @@ export class ProductCli {
       }
       if (command.kind === "credits-usage") {
         const api = await this.authenticatedApi(command.credentialStore, signal);
-        const usage = await api.getOrganizationCreditUsage(command);
+        const usage = await api.getOrganizationCreditUsage(command.organizationId);
         try {
           assertOrganizationCreditUsage(usage);
         } catch {

package/src/apps/product-cli/src/command.ts

@@ -199,8 +199,6 @@ export type ProductCliCommand =
   | {
       readonly kind: "credits-usage";
       readonly organizationId: string;
-      readonly month: string;
-      readonly cursor?: string;
       readonly credentialStore: "native";
     }
   | {
@@ -1407,20 +1405,8 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
   if (first === "credits" && values[0] === "usage") {
     values.shift();
     if (yes || wait || follow || stdin) throw new InvalidCommandError();
-    const options = parseOptionalOptions(values, ["--organization", "--month", "--cursor"]);
-    if (
-      !options["--organization"] ||
-      !options["--month"] ||
-      !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(options["--month"])
-    )
-      throw new InvalidCommandError();
-    return {
-      kind: "credits-usage",
-      organizationId: options["--organization"],
-      month: options["--month"],
-      ...(options["--cursor"] ? { cursor: options["--cursor"] } : {}),
-      credentialStore,
-    };
+    const options = parseOptions(values, ["--organization"]);
+    return { kind: "credits-usage", organizationId: options["--organization"], credentialStore };
   }
   if (first === "credits" && values[0] === "account") {
     values.shift();

package/src/apps/product-cli/src/product-api.ts

@@ -230,11 +230,7 @@ export interface ProductApi {
     organizationId: string,
   ): Promise<import("@ohmyhost/sdk-ts").OrganizationReferral>;
   getOrganizationCredits(organizationId: string): Promise<OrganizationCredits>;
-  getOrganizationCreditUsage(input: {
-    organizationId: string;
-    month: string;
-    cursor?: string;
-  }): Promise<OrganizationCreditUsage>;
+  getOrganizationCreditUsage(organizationId: string): Promise<OrganizationCreditUsage>;
   getProjectCreditBudget(projectId: string): Promise<ProjectCreditBudget>;
   setProjectCreditBudget(input: {
     projectId: string;
@@ -614,15 +610,9 @@ export class GeneratedSdkProductApi implements ProductApi {
       { client: this.#client },
     );
   }
-  public getOrganizationCreditUsage(
-    input: Parameters<ProductApi["getOrganizationCreditUsage"]>[0],
-  ) {
+  public getOrganizationCreditUsage(organizationId: string) {
     return getOrganizationCreditUsage(
-      {
-        organization_id: input.organizationId,
-        month: input.month,
-        ...(input.cursor ? { cursor: input.cursor } : {}),
-      },
+      { organization_id: organizationId },
       { client: this.#client },
     );
   }

package/src/apps/product-cli/src/runtime-contract.ts

@@ -552,9 +552,6 @@ export function parseOrganizationCredits(value: unknown): OrganizationCredits {
     "as_of",
     "available_micros",
     "reserved_micros",
-    "spent_micros",
-    "expired_micros",
-    "platform_overrun_micros",
     "grace_started_at",
     "grace_expires_at",
     "active_meters",
@@ -586,13 +583,7 @@ export function parseOrganizationCredits(value: unknown): OrganizationCredits {
     )
   )
     throw new ResponseContractError();
-  for (const field of [
-    "available_micros",
-    "reserved_micros",
-    "spent_micros",
-    "expired_micros",
-    "platform_overrun_micros",
-  ]) {
+  for (const field of ["available_micros", "reserved_micros"]) {
     const amount = input[field];
     if (
       typeof amount !== "string" ||

package/src/packages/contracts/src/credit-pricing.ts

@@ -1,23 +1,28 @@
 export interface OrganizationCreditUsage {
   organization_id: string;
-  month: string;
   as_of: string;
   unit: "microcredits";
-  data: {
-    project_id: string;
-    reserved_micros: string;
-    meters: {
-      environment_id: string | null;
-      meter: string;
-      unit: string;
-      rate_card_id: string;
-      quantity: string;
-      charged_micros: string;
-      funded_micros: string;
-      platform_overrun_micros: string;
+  /** The UTC month (`YYYY-MM`) that `projects[].used_micros` counts. */
+  period: string;
+  /** The first instant of the daily lines: the start of the oldest UTC day that is reported. */
+  from: string;
+  /** What each project has used so far in `period`. */
+  projects: { project_id: string; used_micros: string }[];
+  /** The credit-log lines of the last up to 14 UTC days, grouped by day, project and meter, oldest day first. */
+  days: {
+    day: string;
+    projects: {
+      project_id: string;
+      meters: {
+        environment_id: string | null;
+        meter: string;
+        unit: string;
+        rate_card_id: string;
+        quantity: string;
+        charged_micros: string;
+      }[];
     }[];
   }[];
-  next_cursor: string | null;
 }
 
 /** A bounded read model, not a new source of accounting or billing authorization. */
@@ -38,53 +43,77 @@ export function assertOrganizationCreditUsage(
     typeof input === "string" && /^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u.test(input);
   const amount = (input: unknown) =>
     typeof input === "string" && /^(0|[1-9][0-9]{0,37})$/u.test(input);
-  const report = record(value, "organization_id,month,as_of,unit,data,next_cursor");
+  const instant = (input: unknown) =>
+    typeof input === "string" &&
+    Number.isFinite(Date.parse(input)) &&
+    new Date(input).toISOString() === input;
+  const report = record(value, "organization_id,as_of,unit,period,from,projects,days");
   if (
     !identifier(report["organization_id"]) ||
-    typeof report["month"] !== "string" ||
-    !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["month"]) ||
-    typeof report["as_of"] !== "string" ||
-    !Number.isFinite(Date.parse(report["as_of"])) ||
-    new Date(report["as_of"]).toISOString() !== report["as_of"] ||
+    !instant(report["as_of"]) ||
+    !instant(report["from"]) ||
     report["unit"] !== "microcredits" ||
-    !Array.isArray(report["data"]) ||
-    report["data"].length > 20 ||
-    (report["next_cursor"] !== null && !identifier(report["next_cursor"]))
+    typeof report["period"] !== "string" ||
+    !/^20[0-9]{2}-(0[1-9]|1[0-2])$/u.test(report["period"]) ||
+    !Array.isArray(report["projects"]) ||
+    report["projects"].length > 1000 ||
+    !Array.isArray(report["days"]) ||
+    report["days"].length > 15
   )
     throw new TypeError("Invalid usage report");
   let previous = "";
-  for (const input of report["data"]) {
-    const project = record(input, "project_id,reserved_micros,meters");
+  for (const input of report["projects"]) {
+    const project = record(input, "project_id,used_micros");
     if (
       !identifier(project["project_id"]) ||
       String(project["project_id"]) <= previous ||
-      !amount(project["reserved_micros"]) ||
-      !Array.isArray(project["meters"]) ||
-      project["meters"].length > 1000
+      !amount(project["used_micros"])
     )
       throw new TypeError("Invalid usage project");
     previous = String(project["project_id"]);
-    for (const input of project["meters"]) {
-      const meter = record(
-        input,
-        "environment_id,meter,unit,rate_card_id,quantity,charged_micros,funded_micros,platform_overrun_micros",
-      );
-      if (meter["environment_id"] !== null && !identifier(meter["environment_id"]))
-        throw new TypeError("Invalid usage environment");
-      for (const key of ["meter", "unit", "rate_card_id"])
-        if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
-          throw new TypeError("Invalid usage meter");
-      for (const key of ["quantity", "charged_micros", "funded_micros", "platform_overrun_micros"])
-        if (!amount(meter[key])) throw new TypeError("Invalid usage amount");
+  }
+  let previousDay = "";
+  for (const input of report["days"]) {
+    const day = record(input, "day,projects");
+    if (
+      typeof day["day"] !== "string" ||
+      !/^20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/u.test(day["day"]) ||
+      day["day"] <= previousDay ||
+      !Array.isArray(day["projects"]) ||
+      day["projects"].length > 1000
+    )
+      throw new TypeError("Invalid usage day");
+    previousDay = day["day"];
+    previous = "";
+    for (const projectInput of day["projects"]) {
+      const project = record(projectInput, "project_id,meters");
       if (
-        BigInt(String(meter["charged_micros"])) !==
-        BigInt(String(meter["funded_micros"])) + BigInt(String(meter["platform_overrun_micros"]))
+        !identifier(project["project_id"]) ||
+        String(project["project_id"]) <= previous ||
+        !Array.isArray(project["meters"]) ||
+        project["meters"].length > 1000
       )
-        throw new TypeError("Inconsistent usage charge");
+        throw new TypeError("Invalid usage project");
+      previous = String(project["project_id"]);
+      for (const meterInput of project["meters"]) {
+        const meter = record(
+          meterInput,
+          "environment_id,meter,unit,rate_card_id,quantity,charged_micros",
+        );
+        if (meter["environment_id"] !== null && !identifier(meter["environment_id"]))
+          throw new TypeError("Invalid usage environment");
+        for (const key of ["meter", "unit", "rate_card_id"])
+          if (typeof meter[key] !== "string" || !/^[A-Za-z0-9_.:/-]{1,128}$/u.test(meter[key]))
+            throw new TypeError("Invalid usage meter");
+        if (
+          typeof meter["quantity"] !== "string" ||
+          !/^(0|[1-9][0-9]{0,29})(\.[0-9]{1,12})?$/u.test(meter["quantity"]) ||
+          !amount(meter["charged_micros"])
+        )
+          throw new TypeError("Invalid usage amount");
+      }
     }
   }
-  if (report["next_cursor"] !== null && report["next_cursor"] !== previous)
-    throw new TypeError("Invalid usage cursor");
 }
 
 export interface PublishedCreditRateCard {
@@ -177,7 +206,7 @@ export function assertPublishedCreditRateCards(
   }
 }
 
-/** Effective feature access and credit buckets from the existing ledger. */
+/** Effective feature access and the credit account: the monthly and one-time credit and what the open reservations hold. */
 export function assertOrganizationAccount(value: unknown): void {
   if (
     !value ||
@@ -203,10 +232,9 @@ export function assertOrganizationAccount(value: unknown): void {
   for (const field of ["available_micros", "monthly_micros", "one_time_micros", "reserved_micros"])
     if (typeof v[field] !== "string" || !/^(0|[1-9][0-9]{0,18})$/u.test(v[field] as string))
       throw new TypeError("Invalid account credits");
-  if (
-    BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"])) !==
-    BigInt(String(v["available_micros"]))
-  )
+  const held = BigInt(String(v["reserved_micros"]));
+  const balance = BigInt(String(v["monthly_micros"])) + BigInt(String(v["one_time_micros"]));
+  if (BigInt(String(v["available_micros"])) !== (balance > held ? balance - held : 0n))
     throw new TypeError("Account credit buckets do not balance");
   for (const field of ["as_of", "paid_until", "next_expiry"]) {
     if (field !== "as_of" && v[field] === null) continue;

package/src/packages/contracts/src/feedback.ts

@@ -214,11 +214,6 @@ export function parseFeedbackStatus(value: unknown): FeedbackStatus {
   return v as unknown as FeedbackStatus;
 }
 
-/** Bounded, trimmed text without control characters other than tab and line breaks. */
-export function validFeedbackText(value: unknown, max: number): value is string {
-  return validText(value, max, true);
-}
-
 function validUpdate(value: unknown): boolean {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
   const v = value as Record<string, unknown>;

package/src/packages/contracts/src/framework-admission.ts

@@ -450,7 +450,7 @@ const FRAMEWORK_CONVERSION_DETAILS = Object.freeze({
   better_auth_version_required: {
     paths: ["manifest"],
     template:
-      '"{{path}}" must declare better-auth at exactly 1.7.1 in dependencies because ohmyhost.yaml sets auth.provider: better-auth. Pin that version or set auth.provider: none, commit and push the change, then plan the new commit.',
+      '"{{path}}" must declare better-auth at exactly 1.7.7 in dependencies because ohmyhost.yaml sets auth.provider: better-auth. Pin that version or set auth.provider: none, commit and push the change, then plan the new commit.',
   },
   package_manifest_invalid: {
     paths: ["manifest"],

package/src/packages/contracts/src/framework-source-rules.ts

@@ -32,7 +32,7 @@ import { classifyFrameworkFamily } from "./framework-family.js";
 import { parseOhmyhostConfigYaml, type OhmyhostConfig } from "./index.js";
 
 /** The only better-auth release the managed auth bridge installs. */
-export const MANAGED_BETTER_AUTH_VERSION = "1.7.1" as const;
+export const MANAGED_BETTER_AUTH_VERSION = "1.7.7" as const;
 /** The largest framework config the rules inspect, in UTF-8 bytes. */
 export const MAXIMUM_FRAMEWORK_CONFIG_BYTES = 256 * 1024;
 /** The customer Worker module of the functions runtime and of Next.js or TanStack Start crons. */

package/src/packages/postgres-bridge/NOTICE

@@ -1 +1 @@
-PostgreSQL WebSocket bridge and authentication prelude handling adapted from cloudflare-postgres packages/cli, commit e05d9102c840e283602272ed0e16a95be3e3b8ea. Upstream license: Apache-2.0.
+PostgreSQL WebSocket bridge and authentication prelude handling adapted from cloudflare-postgres (https://github.com/amerged-org/cloudflare-postgres) packages/cli, commit e05d9102c840e283602272ed0e16a95be3e3b8ea. Upstream license: Apache-2.0.

package/src/packages/sdk-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohmyhost/sdk-ts",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "private": true,
   "type": "module",
   "exports": {

package/src/packages/sdk-ts/src/generated/sdk.gen.ts

@@ -1930,7 +1930,7 @@ export const createOrganization = <ThrowOnError extends boolean = true>(
 /**
  * Create or resume an owner's hosted Stripe Checkout
  *
- * Returns a human payment URL, never charges a saved card. Paid is USD 10/month; each top-up pack is USD 10 before tax; a purchase grants 100 credits per dollar up to USD 100 and 125 credits per dollar for the part above, so 10 packs grant 10000 and 20 packs grant 22500 credits. Top-ups require active Paid access and have no time limit during uninterrupted Paid membership; remaining top-ups expire when the workspace returns to Free. Monthly Paid credits expire at billing-period end without rollover. Retry the same offer, packs and Idempotency-Key after uncertainty. Browser return is not payment proof; read this checkout and the organization balance. A conflicting or existing subscription returns billing_purchase_conflict (409); read the original checkout or request an owner billing portal URL instead of another purchase. Works at zero credits.
+ * Returns a human payment URL, never charges a saved card. Paid is USD 10/month; each top-up pack is USD 10 before tax; a purchase grants 100 credits per dollar up to USD 100 and 125 credits per dollar for the part above, so 10 packs grant 10000 and 20 packs grant 22500 credits. Top-ups require active Paid access and never expire, also after the workspace returns to Free. Monthly Paid credits expire at billing-period end without rollover. Retry the same offer, packs and Idempotency-Key after uncertainty. Browser return is not payment proof; read this checkout and the organization balance. A conflicting or existing subscription returns billing_purchase_conflict (409); read the original checkout or request an owner billing portal URL instead of another purchase. Works at zero credits.
  */
 export const createBillingCheckout = <ThrowOnError extends boolean = true>(
   parameters: {
@@ -1983,7 +1983,7 @@ export const createBillingCheckout = <ThrowOnError extends boolean = true>(
 /**
  * Observe and reconcile an owner's original checkout
  *
- * Reads Stripe and reconciles confirmed credits/refunds idempotently. payment_confirmed describes the original Checkout, not spendable credit or current Paid entitlement. Read organization credits for available funding and the organization account's effective plan for Paid coverage; paid_until is the paid Stripe period end, not the end of renewal grace. No new purchase intent or payment is created; an uncertain original Checkout can resume using its stored identity.
+ * Reads Stripe and reconciles confirmed credits/refunds idempotently. payment_confirmed describes the original Checkout, not spendable credit or current Paid entitlement. Read organization credits for available funding and the organization account's effective plan for Paid coverage; paid_until is the end of paid coverage, the paid Stripe period end plus its 14-day renewal grace. No new purchase intent or payment is created; an uncertain original Checkout can resume using its stored identity.
  */
 export const getBillingCheckout = <ThrowOnError extends boolean = true>(
   parameters: {
@@ -2105,7 +2105,7 @@ export const getBillingRecharge = <ThrowOnError extends boolean = true>(
 /**
  * Enable or disable explicitly authorized auto-recharge
  *
- * Owner-only. An agent must obtain explicit approval for off-session charges and the gross monthly spending cap before enabling. Each refill costs USD 9 before tax for 1000 top-up credits when available credits fall below 100. Active Paid access is required to enable recharge and initiate a payment; remaining refill credits expire on downgrade to Free. A saved Stripe card is required; follow setup_url if returned. Current revision prevents stale edits; retry the original Idempotency-Key and payload after uncertainty. Disable prevents new charge initiation; already initiated payments may complete. No subscription or Paid features are created.
+ * Owner-only. An agent must obtain explicit approval for off-session charges and the gross monthly spending cap before enabling. Each refill costs USD 9 before tax for 1000 top-up credits when available credits fall below 100. Active Paid access is required to enable recharge and initiate a payment; bought credits never expire, also after a downgrade to Free. A saved Stripe card is required; follow setup_url if returned. Current revision prevents stale edits; retry the original Idempotency-Key and payload after uncertainty. Disable prevents new charge initiation; already initiated payments may complete. No subscription or Paid features are created.
  */
 export const configureBillingRecharge = <ThrowOnError extends boolean = true>(
   parameters: {
@@ -2162,7 +2162,7 @@ export const configureBillingRecharge = <ThrowOnError extends boolean = true>(
 /**
  * Read the owner's shared organization credit pool
  *
- * Returns posted credits and reservations, in microcredits (one credit is 1000000 microcredits). Monthly entitlement posting is idempotent. Only the organization Owner may read this balance. active_meters names the currently billed sources; unreported usage is not included. platform_overrun_micros is recorded platform exposure, not customer debt. Remains available at zero credit.
+ * Returns the spendable credit and the open reservations, in microcredits (one credit is 1000000 microcredits). available_micros is the monthly credit plus the one-time credit minus the reservations, never below zero. Only the organization Owner may read this balance. active_meters names the currently billed sources; usage that is not billed yet is not included. When the credit is used up, grace_started_at and grace_expires_at name the seven days that keep existing services running. Remains available at zero credit.
  */
 export const getOrganizationCredits = <ThrowOnError extends boolean = true>(
   parameters: {
@@ -2202,16 +2202,14 @@ export const getOrganizationCredits = <ThrowOnError extends boolean = true>(
 };
 
 /**
- * Read monthly measured usage by project and meter
+ * Read recent measured usage by day, project and meter
  *
- * Owner-only event-month ledger totals, including signed corrections posted by as_of. Returns up to 20 projects per page in ID order; use next_cursor with the same month. Current unresolved reservations are separate from measured consumption. Null environment_id means project-shared cost, never guessed Dev allocation. Only posted measurements are included; this is not a complete provider invoice or zero-usage guarantee. Billing may arrive later. No credit is granted or charged by this read; it remains usable at zero credits.
+ * Owner-only. days holds the credit-log charges of the last up to 14 UTC days (today included, oldest first), grouped by day, project and meter. projects holds what each project has used so far in the current UTC month. A null environment_id means a project-shared cost, never a guessed Dev allocation. Only billed usage is included; charges may arrive later, so this is not a complete provider invoice or a zero-usage guarantee. No credit is granted or charged by this read; it remains usable at zero credits.
  */
 export const getOrganizationCreditUsage = <ThrowOnError extends boolean = true>(
   parameters: {
     "X-Request-Id"?: string;
     organization_id: Ulid;
-    month: string;
-    cursor?: Ulid;
   },
   options?: Options<never, ThrowOnError>,
 ): RequestResult<
@@ -2227,8 +2225,6 @@ export const getOrganizationCreditUsage = <ThrowOnError extends boolean = true>(
         args: [
           { in: "headers", key: "X-Request-Id" },
           { in: "path", key: "organization_id" },
-          { in: "query", key: "month" },
-          { in: "query", key: "cursor" },
         ],
       },
     ],

package/src/packages/sdk-ts/src/generated/types.gen.ts

@@ -321,15 +321,12 @@ export type OrganizationCredits = {
   as_of: string;
   available_micros: CreditMicros;
   reserved_micros: CreditMicros;
-  spent_micros: CreditMicros;
-  expired_micros: CreditMicros;
-  platform_overrun_micros: CreditMicros;
   /**
-   * First confirmed exhaustion in this continuous period; null while funded.
+   * When the credit was used up; null while funded or after the monthly credit renewed.
    */
   grace_started_at: string | null;
   /**
-   * Seven days after first confirmed exhaustion. Existing services and domains are retained during this grace; no automatic data deletion. Explicit project stop budgets are separate.
+   * Seven days after the credit was used up. Existing services and domains are retained during this grace; no automatic data deletion. Explicit project stop budgets are separate.
    */
   grace_expires_at: string | null;
   active_meters: Array<string>;
@@ -346,22 +343,38 @@ export type UsageTotal = string;
 
 export type OrganizationCreditUsage = {
   organization_id: Ulid;
-  month: string;
   as_of: string;
   unit: "microcredits";
-  next_cursor: Ulid | null;
-  data: Array<{
+  /**
+   * The UTC month that projects[].used_micros counts.
+   */
+  period: string;
+  /**
+   * The start of the oldest UTC day in days.
+   */
+  from: string;
+  /**
+   * What each project has used so far in period, in ID order; projects without use are left out.
+   */
+  projects: Array<{
     project_id: Ulid;
-    reserved_micros: UsageTotal;
-    meters: Array<{
-      environment_id: Ulid | null;
-      meter: string;
-      unit: string;
-      rate_card_id: string;
-      quantity: UsageTotal;
-      charged_micros: UsageTotal;
-      funded_micros: UsageTotal;
-      platform_overrun_micros: UsageTotal;
+    used_micros: UsageTotal;
+  }>;
+  /**
+   * Billed charges of the last up to 14 UTC days, oldest first.
+   */
+  days: Array<{
+    day: string;
+    projects: Array<{
+      project_id: Ulid;
+      meters: Array<{
+        environment_id: Ulid | null;
+        meter: string;
+        unit: string;
+        rate_card_id: string;
+        quantity: string;
+        charged_micros: UsageTotal;
+      }>;
     }>;
   }>;
 };
@@ -384,6 +397,9 @@ export type PublishedCreditRateCard = {
 };
 
 export type SetProjectCreditBudgetRequest = {
+  /**
+   * The monthly budget, at most 9007199254740991 microcredits (about 9 billion credits); null removes it.
+   */
   amount_micros: CreditMicros | null;
   mode: "continue" | "stop";
 };
@@ -1264,13 +1280,28 @@ export type OrganizationAccount = {
   plan: "free" | "paid";
   plan_source: "free" | "stripe" | "granted" | "manual";
   /**
-   * End of the paid Stripe billing period or the applicable grant; null on Free or for an unbounded grant. During an unpaid renewal the effective Paid plan may remain available for up to 14 days after this Stripe period end, without new monthly credits.
+   * End of the paid coverage: the Stripe billing period plus its 14-day renewal grace, or the end of the grant; null on Free. Paid features stay available until this instant.
    */
   paid_until: string | null;
+  /**
+   * Spendable credit: monthly plus one-time credit minus the open reservations, never below zero.
+   */
   available_micros: CreditMicros;
+  /**
+   * The monthly credit, which ends at next_expiry; the Free allowance is 200 credits and the Paid allowance 1000 credits per period.
+   */
   monthly_micros: CreditMicros;
+  /**
+   * Top-up, bonus and referral credit. It does not expire.
+   */
   one_time_micros: CreditMicros;
+  /**
+   * Credit held for open builds; it is part of the monthly and one-time credit until the build settles.
+   */
   reserved_micros: CreditMicros;
+  /**
+   * When the monthly credit ends and renews; null when none is left.
+   */
   next_expiry: string | null;
   as_of: string;
 };
@@ -4396,10 +4427,7 @@ export type GetOrganizationCreditUsageData = {
   path: {
     organization_id: Ulid;
   };
-  query: {
-    month: string;
-    cursor?: Ulid;
-  };
+  query?: never;
   url: "/v1/organizations/{organization_id}/credit-usage";
 };
 
@@ -4431,7 +4459,7 @@ export type GetOrganizationCreditUsageError =
 
 export type GetOrganizationCreditUsageResponses = {
   /**
-   * Current posted usage for the selected UTC month and project page.
+   * Recent billed usage of the organization.
    */
   200: OrganizationCreditUsage;
 };