@amerged/ohmyhost-mcp 0.1.39 → 0.1.41

package/dist/index.js

@@ -2,7 +2,7 @@ import { createRequire as __ohmyhostCreateRequire } from "node:module"; const re
 import {
   createOhmyhostMcpServer,
   ohmyhostMcpHandler
-} from "./chunk-KQS5IMSO.js";
+} from "./chunk-6HQPHICK.js";
 export {
   createOhmyhostMcpServer,
   ohmyhostMcpHandler

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/dist/stdio-main.js

@@ -30,7 +30,7 @@ import {
   serverIdentityOf,
   setNegotiatedProtocolVersion,
   validateEnvelopeMeta
-} from "./chunk-KQS5IMSO.js";
+} from "./chunk-6HQPHICK.js";
 
 // node_modules/.pnpm/ignore@7.0.12/node_modules/ignore/index.js
 var require_ignore = __commonJS({
@@ -24110,7 +24110,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"],
@@ -25417,31 +25417,41 @@ function assertOrganizationCreditUsage(value) {
   };
   const identifier3 = (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 = record7(value, "organization_id,month,as_of,unit,data,next_cursor");
-  if (!identifier3(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 && !identifier3(report["next_cursor"]))
+  const instant2 = (input) => typeof input === "string" && Number.isFinite(Date.parse(input)) && new Date(input).toISOString() === input;
+  const report = record7(value, "organization_id,as_of,unit,period,from,projects,days");
+  if (!identifier3(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 = record7(input, "project_id,reserved_micros,meters");
-    if (!identifier3(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 = record7(input, "project_id,used_micros");
+    if (!identifier3(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 = record7(input2, "environment_id,meter,unit,rate_card_id,quantity,charged_micros,funded_micros,platform_overrun_micros");
-      if (meter["environment_id"] !== null && !identifier3(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 = record7(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 = record7(projectInput, "project_id,meters");
+      if (!identifier3(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 = record7(meterInput, "environment_id,meter,unit,rate_card_id,quantity,charged_micros");
+        if (meter["environment_id"] !== null && !identifier3(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 assertOrganizationAccount(value) {
   if (!value || typeof value !== "object" || Array.isArray(value) || Object.keys(value).sort().join(",") !== "as_of,available_micros,monthly_micros,name,next_expiry,one_time_micros,organization_id,paid_until,plan,plan_source,reserved_micros,workos_organization_id")
@@ -25452,7 +25462,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)
@@ -27050,7 +27062,7 @@ function exact3(v, keys) {
 // apps/product-cli/package.json
 var package_default2 = {
   name: "@ohmyhost/product-cli",
-  version: "0.1.39",
+  version: "0.1.41",
   private: true,
   ohmyhost: {
     deployment: "production",
@@ -28128,7 +28140,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)",
@@ -29791,9 +29803,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" }
       ]
     }
   ]);
@@ -32175,12 +32185,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 });
@@ -33209,12 +33215,8 @@ var GeneratedSdkLocalMcpClient = class {
     assertBillingPortal(value);
     return value;
   }
-  async getOrganizationCreditUsage(input) {
-    const value = await getOrganizationCreditUsage({
-      organization_id: input.organizationId,
-      month: input.month,
-      ...input.cursor ? { cursor: input.cursor } : {}
-    }, { client: this.#client });
+  async getOrganizationCreditUsage(organizationId) {
+    const value = await getOrganizationCreditUsage({ organization_id: organizationId }, { client: this.#client });
     assertOrganizationCreditUsage(value);
     return value;
   }
@@ -33804,7 +33806,7 @@ function createLocalOhmyhostMcpServer(dependencies) {
     hostname: input.hostname,
     idempotencyKey: input.idempotency_key
   }), destructiveAnnotations());
-  registerProductTool(server, dependencies, "billing_checkout_create", "Owner-only: create or resume a hosted Checkout. 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 top-up credits. Monthly Paid credits expire at billing-period end; top-ups carry over while Paid and expire on downgrade to Free. Return the URL to the human to review/pay; never auto-pay or treat browser return as confirmation. Preserve the same offer/packs/idempotency key after uncertainty. An existing active, overdue, unpaid or paused subscription must be managed through billing_portal_create, not replaced with another Paid purchase. Then read checkout status and organization credits. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.", external_exports.object({
+  registerProductTool(server, dependencies, "billing_checkout_create", "Owner-only: create or resume a hosted Checkout. 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 top-up credits. Monthly Paid credits expire at billing-period end; top-ups never expire, also after a downgrade to Free. Return the URL to the human to review/pay; never auto-pay or treat browser return as confirmation. Preserve the same offer/packs/idempotency key after uncertainty. An existing active, overdue, unpaid or paused subscription must be managed through billing_portal_create, not replaced with another Paid purchase. Then read checkout status and organization credits. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.", external_exports.object({
     organization_id: identifier2,
     offer: external_exports.enum(["topup", "paid"]),
     packs: external_exports.number().int().min(1).max(100).default(1),
@@ -33815,12 +33817,12 @@ function createLocalOhmyhostMcpServer(dependencies) {
     packs: input.packs,
     idempotencyKey: input.idempotency_key
   }), mutationAnnotations());
-  registerProductTool(server, dependencies, "billing_checkout_get", "Owner-only: observe the original checkout and reconcile confirmed credits/refunds, without another purchase. payment_confirmed is historical; read organization_credits_get for spendable funds and organization_account_get's effective plan for Paid coverage; paid_until remains the paid Stripe period end during renewal grace. Follow required_action: complete_checkout means give its URL to the human; open_billing_portal means call billing_portal_create and give that fresh URL to the human to resolve payment. contact_support means contact https://ohmyho.st/contact about the original invoice; none means no human payment step now, not proof of current Paid coverage. Never start a second subscription to repair a failed renewal. Follow billing_issue when tax needs attention: use billing_portal_create for open_billing_portal, or https://ohmyho.st/contact for contact_support; retain the original invoice and never disable tax. Retry the same checkout after an outage. state=expired ends this attempt; use a new key only for an explicitly requested new purchase, never automatically after an error or timeout.", external_exports.object({ organization_id: identifier2, checkout_id: identifier2 }), (client2, input) => client2.getBillingCheckout({
+  registerProductTool(server, dependencies, "billing_checkout_get", "Owner-only: observe the original checkout and reconcile confirmed credits/refunds, without another purchase. payment_confirmed is historical; read organization_credits_get for spendable funds and organization_account_get'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. Follow required_action: complete_checkout means give its URL to the human; open_billing_portal means call billing_portal_create and give that fresh URL to the human to resolve payment. contact_support means contact https://ohmyho.st/contact about the original invoice; none means no human payment step now, not proof of current Paid coverage. Never start a second subscription to repair a failed renewal. Follow billing_issue when tax needs attention: use billing_portal_create for open_billing_portal, or https://ohmyho.st/contact for contact_support; retain the original invoice and never disable tax. Retry the same checkout after an outage. state=expired ends this attempt; use a new key only for an explicitly requested new purchase, never automatically after an error or timeout.", external_exports.object({ organization_id: identifier2, checkout_id: identifier2 }), (client2, input) => client2.getBillingCheckout({
     organizationId: input.organization_id,
     checkoutId: input.checkout_id
   }));
   registerProductTool(server, dependencies, "billing_recharge_get", "Owner-only: read auto-recharge consent, spending limit and payment handoff. Reading never initiates a charge. Return private setup_url/invoice_url only to the human; never log them. Read again after Stripe card setup or payment. billing_issue identifies the original invoice: open_billing_portal means collect corrected billing details through billing_portal_create; contact_support means use https://ohmyho.st/contact. Never disable tax, discard the invoice or start another purchase to repair it.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getBillingRecharge(input.organization_id));
-  registerProductTool(server, dependencies, "billing_recharge_configure", "Owner-only: enable or disable automatic off-session payments. Enabling requires active Paid access. NEVER enable without explicit human approval for USD 9 plus tax per 1000 top-up credits, which carry over while Paid and expire on downgrade to Free, refill below 100 credits, and the chosen gross USD monthly limit. Set consent off_session_v1 only after that approval; null when disabling. Read current revision first. Preserve the original idempotency key and payload after uncertainty. A saved Stripe card may require setup_url. Disabling prevents new payment initiation; in-progress payments may finish. This does not create a subscription or Paid access.", external_exports.object({
+  registerProductTool(server, dependencies, "billing_recharge_configure", "Owner-only: enable or disable automatic off-session payments. Enabling requires active Paid access. NEVER enable without explicit human approval for USD 9 plus tax per 1000 top-up credits, which never expire, refill below 100 credits, and the chosen gross USD monthly limit. Set consent off_session_v1 only after that approval; null when disabling. Read current revision first. Preserve the original idempotency key and payload after uncertainty. A saved Stripe card may require setup_url. Disabling prevents new payment initiation; in-progress payments may finish. This does not create a subscription or Paid access.", external_exports.object({
     organization_id: identifier2,
     enabled: external_exports.boolean(),
     monthly_limit_minor: external_exports.number().int().min(1e3).max(1e5),
@@ -33846,19 +33848,11 @@ function createLocalOhmyhostMcpServer(dependencies) {
     idempotencyKey: input.idempotency_key
   }), mutationAnnotations());
   registerProductTool(server, dependencies, "project_export_get", "Owner-only: read the original SQL ZIP export's progress/error and verified download URL. Follow next_poll_after_seconds while queued/running; never create another export to poll. The signed URL lasts 24 hours and is only issued with sufficient remaining seven-day archive retention. Keep the URL out of source, logs and persisted project notes. The password cannot be retrieved. Available at zero credits.", external_exports.object({ project_id: identifier2, export_id: identifier2 }), (client2, input) => client2.getProjectExport({ projectId: input.project_id, exportId: input.export_id }));
-  registerProductTool(server, dependencies, "organization_usage_get", "Read posted UTC-month usage by project, environment and published meter/rate. One credit is 1000000 microcredits. Includes corrections; null environment means shared project cost. Current reservations are separate. Follow next_cursor with the same month (20 projects/page). Late or unmetered usage is not zero consumption. platform_overrun_micros is platform expense, not customer debt. Owner-only; works at zero credit without new charges.", external_exports.object({
-    organization_id: identifier2,
-    month: external_exports.string().regex(/^20[0-9]{2}-(0[1-9]|1[0-2])$/u),
-    cursor: identifier2.optional()
-  }), (client2, input) => client2.getOrganizationCreditUsage({
-    organizationId: input.organization_id,
-    month: input.month,
-    ...input.cursor ? { cursor: input.cursor } : {}
-  }));
-  registerProductTool(server, dependencies, "organization_account_get", "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, available monthly credits that expire at period end and top-up credits that carry over while Paid but expire on downgrade to Free, reservations and next expiry. Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. paid_until is the paid Stripe period end or grant end; null on Free or for an unbounded grant. An unpaid renewal may retain Paid features for up to 14 days after that Stripe period end, without new monthly credits. This read grants no access or credits.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationAccount(input.organization_id));
+  registerProductTool(server, dependencies, "organization_usage_get", "Read the billed usage of the last up to 14 UTC days (today included) grouped by day, project and meter, and what each project has used so far this UTC month. One credit is 1000000 microcredits. Null environment means shared project cost. Charges can arrive late and unmetered usage is not zero consumption. Owner-only; works at zero credit without new charges.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationCreditUsage(input.organization_id));
+  registerProductTool(server, dependencies, "organization_account_get", "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, the monthly credits that expire at next_expiry, the top-up and bonus credits that never expire, the reservations that hold part of them, and available_micros (monthly plus one-time minus reservations). Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. paid_until is the end of the paid coverage, which includes the 14-day renewal grace of a Stripe subscription; null on Free. This read grants no access or credits.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationAccount(input.organization_id));
   registerProductTool(server, dependencies, "referral_link_get", "Read the workspace's referral link to share. A new user whose first workspace comes from it starts with 30 days of Paid and 1,000 credits; that workspace's first payment gives this workspace 1,000 credits, plus 30 days of Paid unless a Stripe subscription or an unbounded grant already covers it. Any member may read it.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationReferral(input.organization_id));
-  registerProductTool(server, dependencies, "organization_credits_get", "Read the owner's shared organization credit pool, seven-day grace_started_at/grace_expires_at and published rate_cards. Existing services/domains are not immediately shut down at zero credit; an explicit project stop budget is separate. One credit is 1000000 microcredits. Each rate states credit_micros for units_per_charge; publication alone does not enable billing. active_meters identifies billed sources; provider outages and platform overrun are not customer debt. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationCredits(input.organization_id));
-  registerProductTool(server, dependencies, "project_budget_get", "Read the owner's project UTC-month budget, measured usage and open reservations. A budget never allocates a second wallet.", external_exports.object({ project_id: identifier2 }), (client2, input) => client2.getProjectCreditBudget(input.project_id));
+  registerProductTool(server, dependencies, "organization_credits_get", "Read the owner's shared organization credit pool (available_micros is monthly plus one-time credit minus reservations), the seven-day grace_started_at/grace_expires_at that begins when the credit is used up, and published rate_cards. Existing services/domains are not immediately shut down at zero credit; an explicit project stop budget is separate. One credit is 1000000 microcredits. Each rate states credit_micros for units_per_charge; publication alone does not enable billing. active_meters identifies billed sources; provider outages are not customer debt. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationCredits(input.organization_id));
+  registerProductTool(server, dependencies, "project_budget_get", "Read the owner's project UTC-month budget, this month's use and open reservations. A budget never allocates a second wallet.", external_exports.object({ project_id: identifier2 }), (client2, input) => client2.getProjectCreditBudget(input.project_id));
   registerProductTool(server, dependencies, "project_budget_set", "Set an owner's optional monthly project budget in microcredits (1000000 = one credit). continue is the default and uses the org pool after the threshold; stop blocks new billable work. null clears the budget and requires continue. Changing it never resets usage or adds credits. Replay the same key after uncertainty; read the budget again for current usage.", external_exports.object({
     project_id: identifier2,
     amount_micros: external_exports.string().regex(/^(0|[1-9][0-9]{0,18})$/u).nullable(),

package/package.json

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

package/src/apps/mcp/package.json

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

package/src/apps/mcp/src/local-client.ts

@@ -536,15 +536,9 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
     assertBillingPortal(value);
     return value;
   }
-  public async getOrganizationCreditUsage(
-    input: Parameters<LocalMcpProductClient["getOrganizationCreditUsage"]>[0],
-  ) {
+  public async getOrganizationCreditUsage(organizationId: string) {
     const value = await getOrganizationCreditUsage(
-      {
-        organization_id: input.organizationId,
-        month: input.month,
-        ...(input.cursor ? { cursor: input.cursor } : {}),
-      },
+      { organization_id: organizationId },
       { client: this.#client },
     );
     assertOrganizationCreditUsage(value);

package/src/apps/mcp/src/local-server.ts

@@ -189,11 +189,9 @@ export interface LocalMcpProductClient {
     idempotencyKey: string;
   }): Promise<import("@ohmyhost/sdk-ts").BillingRecharge>;
   createBillingPortal(organizationId: string): Promise<import("@ohmyhost/sdk-ts").BillingPortal>;
-  getOrganizationCreditUsage(input: {
-    organizationId: string;
-    month: string;
-    cursor?: string;
-  }): Promise<import("@ohmyhost/sdk-ts").OrganizationCreditUsage>;
+  getOrganizationCreditUsage(
+    organizationId: string,
+  ): Promise<import("@ohmyhost/sdk-ts").OrganizationCreditUsage>;
   getOrganizationAccount(
     organizationId: string,
   ): Promise<import("@ohmyhost/sdk-ts").OrganizationAccount>;
@@ -702,7 +700,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "billing_checkout_create",
-    "Owner-only: create or resume a hosted Checkout. 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 top-up credits. Monthly Paid credits expire at billing-period end; top-ups carry over while Paid and expire on downgrade to Free. Return the URL to the human to review/pay; never auto-pay or treat browser return as confirmation. Preserve the same offer/packs/idempotency key after uncertainty. An existing active, overdue, unpaid or paused subscription must be managed through billing_portal_create, not replaced with another Paid purchase. Then read checkout status and organization credits. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.",
+    "Owner-only: create or resume a hosted Checkout. 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 top-up credits. Monthly Paid credits expire at billing-period end; top-ups never expire, also after a downgrade to Free. Return the URL to the human to review/pay; never auto-pay or treat browser return as confirmation. Preserve the same offer/packs/idempotency key after uncertainty. An existing active, overdue, unpaid or paused subscription must be managed through billing_portal_create, not replaced with another Paid purchase. Then read checkout status and organization credits. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.",
     z.object({
       organization_id: identifier,
       offer: z.enum(["topup", "paid"]),
@@ -722,7 +720,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "billing_checkout_get",
-    "Owner-only: observe the original checkout and reconcile confirmed credits/refunds, without another purchase. payment_confirmed is historical; read organization_credits_get for spendable funds and organization_account_get's effective plan for Paid coverage; paid_until remains the paid Stripe period end during renewal grace. Follow required_action: complete_checkout means give its URL to the human; open_billing_portal means call billing_portal_create and give that fresh URL to the human to resolve payment. contact_support means contact https://ohmyho.st/contact about the original invoice; none means no human payment step now, not proof of current Paid coverage. Never start a second subscription to repair a failed renewal. Follow billing_issue when tax needs attention: use billing_portal_create for open_billing_portal, or https://ohmyho.st/contact for contact_support; retain the original invoice and never disable tax. Retry the same checkout after an outage. state=expired ends this attempt; use a new key only for an explicitly requested new purchase, never automatically after an error or timeout.",
+    "Owner-only: observe the original checkout and reconcile confirmed credits/refunds, without another purchase. payment_confirmed is historical; read organization_credits_get for spendable funds and organization_account_get'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. Follow required_action: complete_checkout means give its URL to the human; open_billing_portal means call billing_portal_create and give that fresh URL to the human to resolve payment. contact_support means contact https://ohmyho.st/contact about the original invoice; none means no human payment step now, not proof of current Paid coverage. Never start a second subscription to repair a failed renewal. Follow billing_issue when tax needs attention: use billing_portal_create for open_billing_portal, or https://ohmyho.st/contact for contact_support; retain the original invoice and never disable tax. Retry the same checkout after an outage. state=expired ends this attempt; use a new key only for an explicitly requested new purchase, never automatically after an error or timeout.",
     z.object({ organization_id: identifier, checkout_id: identifier }),
     (client, input) =>
       client.getBillingCheckout({
@@ -742,7 +740,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "billing_recharge_configure",
-    "Owner-only: enable or disable automatic off-session payments. Enabling requires active Paid access. NEVER enable without explicit human approval for USD 9 plus tax per 1000 top-up credits, which carry over while Paid and expire on downgrade to Free, refill below 100 credits, and the chosen gross USD monthly limit. Set consent off_session_v1 only after that approval; null when disabling. Read current revision first. Preserve the original idempotency key and payload after uncertainty. A saved Stripe card may require setup_url. Disabling prevents new payment initiation; in-progress payments may finish. This does not create a subscription or Paid access.",
+    "Owner-only: enable or disable automatic off-session payments. Enabling requires active Paid access. NEVER enable without explicit human approval for USD 9 plus tax per 1000 top-up credits, which never expire, refill below 100 credits, and the chosen gross USD monthly limit. Set consent off_session_v1 only after that approval; null when disabling. Read current revision first. Preserve the original idempotency key and payload after uncertainty. A saved Stripe card may require setup_url. Disabling prevents new payment initiation; in-progress payments may finish. This does not create a subscription or Paid access.",
     z.object({
       organization_id: identifier,
       enabled: z.boolean(),
@@ -804,24 +802,15 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "organization_usage_get",
-    "Read posted UTC-month usage by project, environment and published meter/rate. One credit is 1000000 microcredits. Includes corrections; null environment means shared project cost. Current reservations are separate. Follow next_cursor with the same month (20 projects/page). Late or unmetered usage is not zero consumption. platform_overrun_micros is platform expense, not customer debt. Owner-only; works at zero credit without new charges.",
-    z.object({
-      organization_id: identifier,
-      month: z.string().regex(/^20[0-9]{2}-(0[1-9]|1[0-2])$/u),
-      cursor: identifier.optional(),
-    }),
-    (client, input) =>
-      client.getOrganizationCreditUsage({
-        organizationId: input.organization_id,
-        month: input.month,
-        ...(input.cursor ? { cursor: input.cursor } : {}),
-      }),
+    "Read the billed usage of the last up to 14 UTC days (today included) grouped by day, project and meter, and what each project has used so far this UTC month. One credit is 1000000 microcredits. Null environment means shared project cost. Charges can arrive late and unmetered usage is not zero consumption. Owner-only; works at zero credit without new charges.",
+    z.object({ organization_id: identifier }),
+    (client, input) => client.getOrganizationCreditUsage(input.organization_id),
   );
   registerProductTool(
     server,
     dependencies,
     "organization_account_get",
-    "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, available monthly credits that expire at period end and top-up credits that carry over while Paid but expire on downgrade to Free, reservations and next expiry. Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. paid_until is the paid Stripe period end or grant end; null on Free or for an unbounded grant. An unpaid renewal may retain Paid features for up to 14 days after that Stripe period end, without new monthly credits. This read grants no access or credits.",
+    "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, the monthly credits that expire at next_expiry, the top-up and bonus credits that never expire, the reservations that hold part of them, and available_micros (monthly plus one-time minus reservations). Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. paid_until is the end of the paid coverage, which includes the 14-day renewal grace of a Stripe subscription; null on Free. This read grants no access or credits.",
     z.object({ organization_id: identifier }),
     (client, input) => client.getOrganizationAccount(input.organization_id),
   );
@@ -837,7 +826,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "organization_credits_get",
-    "Read the owner's shared organization credit pool, seven-day grace_started_at/grace_expires_at and published rate_cards. Existing services/domains are not immediately shut down at zero credit; an explicit project stop budget is separate. One credit is 1000000 microcredits. Each rate states credit_micros for units_per_charge; publication alone does not enable billing. active_meters identifies billed sources; provider outages and platform overrun are not customer debt. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.",
+    "Read the owner's shared organization credit pool (available_micros is monthly plus one-time credit minus reservations), the seven-day grace_started_at/grace_expires_at that begins when the credit is used up, and published rate_cards. Existing services/domains are not immediately shut down at zero credit; an explicit project stop budget is separate. One credit is 1000000 microcredits. Each rate states credit_micros for units_per_charge; publication alone does not enable billing. active_meters identifies billed sources; provider outages are not customer debt. Works at zero credit. Top-ups and enabling auto-recharge require active Paid access.",
     z.object({ organization_id: identifier }),
     (client, input) => client.getOrganizationCredits(input.organization_id),
   );
@@ -845,7 +834,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "project_budget_get",
-    "Read the owner's project UTC-month budget, measured usage and open reservations. A budget never allocates a second wallet.",
+    "Read the owner's project UTC-month budget, this month's use and open reservations. A budget never allocates a second wallet.",
     z.object({ project_id: identifier }),
     (client, input) => client.getProjectCreditBudget(input.project_id),
   );

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" ||