@amerged/ohmyhost-mcp 0.1.38 → 0.1.40

package/src/packages/contracts/package.json

@@ -5,6 +5,11 @@
   "type": "module",
   "sideEffects": false,
   "exports": {
+    "./database-sizes": {
+      "source": "./src/database-sizes.ts",
+      "types": "./dist/database-sizes.d.ts",
+      "import": "./dist/database-sizes.js"
+    },
     "./shared-mail": {
       "source": "./src/shared-mail.ts",
       "types": "./dist/shared-mail.d.ts",

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

@@ -96,7 +96,7 @@ export interface PublishedCreditRateCard {
     readonly meter: string;
     readonly unit: string;
     readonly units_per_charge: string;
-    readonly provider_cost_micros: string;
+    readonly provider_cost_micros: string | null;
     readonly credit_micros: string;
   }[];
 }
@@ -159,6 +159,12 @@ export function assertPublishedCreditRateCards(
       meters.add(identity);
       for (const key of ["units_per_charge", "provider_cost_micros", "credit_micros"]) {
         const amount = rate[key];
+        if (
+          key === "provider_cost_micros" &&
+          amount === null &&
+          rate["meter"] === "pgcf.memory.active"
+        )
+          continue;
         if (
           typeof amount !== "string" ||
           !/^(0|[1-9][0-9]{0,18})$/u.test(amount) ||

package/src/packages/contracts/src/database-access.ts

@@ -93,13 +93,12 @@ export interface ProjectDatabaseAccessRequest {
   readonly ttl_seconds: number;
   readonly label: string | null;
 }
-export interface ProjectDatabaseAccess {
+export interface ProjectDatabaseAccessFields {
   readonly access_id: string;
   readonly environment: DatabaseEnvironment;
   readonly mode: DatabaseAccessMode;
   readonly role_name: string;
   readonly host: string;
-  readonly database: "neondb";
   readonly label: string | null;
   readonly state: "active" | "expired" | "revoked";
   readonly issued_at: string;
@@ -113,10 +112,25 @@ export interface ProjectDatabaseAccess {
     | "data_change"
     | null;
 }
-export interface ProjectDatabaseAccessCredential extends ProjectDatabaseAccess {
+export type ProjectDatabaseAccess = ProjectDatabaseAccessFields &
+  (
+    | {
+        readonly database: "neondb";
+        readonly provider?: never;
+        readonly transport?: never;
+        readonly websocket_url?: never;
+      }
+    | {
+        readonly provider: "pgcf";
+        readonly transport: "wss";
+        readonly websocket_url: string;
+        readonly database: string;
+      }
+  );
+export type ProjectDatabaseAccessCredential = ProjectDatabaseAccess & {
   readonly connection_uri: string;
   readonly psql_command: string;
-}
+};
 export interface ProjectDatabaseAccessPage {
   readonly items: readonly ProjectDatabaseAccess[];
 }
@@ -163,17 +177,27 @@ export function parseProjectDatabaseAccessRequest(value: unknown): ProjectDataba
 export function assertProjectDatabaseAccess(
   value: unknown,
 ): asserts value is ProjectDatabaseAccess {
-  if (!record(value) || !exact(value, ACCESS_KEYS)) throw new TypeError("Invalid database access");
+  if (!record(value) || !exact(value, accessKeys(value)))
+    throw new TypeError("Invalid database access");
   assertAccessFields(value);
 }
 export function assertProjectDatabaseAccessCredential(
   value: unknown,
 ): asserts value is ProjectDatabaseAccessCredential {
-  if (!record(value) || !exact(value, [...ACCESS_KEYS, "connection_uri", "psql_command"]))
+  if (!record(value) || !exact(value, [...accessKeys(value), "connection_uri", "psql_command"]))
     throw new TypeError("Invalid database access credential");
   assertAccessFields(value);
   const uri = value["connection_uri"];
-  if (typeof uri !== "string" || value["psql_command"] !== `psql '${uri}'`)
+  if (
+    typeof uri !== "string" ||
+    (value["provider"] === "pgcf"
+      ? typeof value["psql_command"] !== "string" ||
+        !new RegExp(
+          `^ohmyhost database psql --project [0-7][0-9A-HJKMNP-TV-Z]{25} --environment ${value["environment"]} --mode ${value["mode"]}$`,
+          "u",
+        ).test(value["psql_command"])
+      : value["psql_command"] !== `psql '${uri}'`)
+  )
     throw new TypeError("Invalid database access credential");
   let parsed: URL;
   try {
@@ -182,13 +206,20 @@ export function assertProjectDatabaseAccessCredential(
     throw new TypeError("Invalid database access credential");
   }
   if (
-    parsed.protocol !== "postgresql:" ||
+    (value["provider"] === "pgcf"
+      ? !["postgres:", "postgresql:"].includes(parsed.protocol)
+      : parsed.protocol !== "postgresql:") ||
     decodeURIComponent(parsed.username) !== value["role_name"] ||
     parsed.password === "" ||
     parsed.hostname !== value["host"] ||
-    parsed.host !== value["host"] ||
-    decodeURIComponent(parsed.pathname.slice(1)) !== "neondb" ||
-    parsed.search !== "?sslmode=require"
+    (value["provider"] === "pgcf"
+      ? parsed.port !== "" && parsed.port !== "5432"
+      : parsed.host !== value["host"]) ||
+    decodeURIComponent(parsed.pathname.slice(1)) !== value["database"] ||
+    parsed.hash !== "" ||
+    (value["provider"] === "pgcf"
+      ? !["", "?sslmode=require", "?sslmode=verify-full"].includes(parsed.search)
+      : parsed.search !== "?sslmode=require")
   )
     throw new TypeError("Invalid database access credential");
 }
@@ -204,6 +235,11 @@ export function assertProjectDatabaseAccessPage(
     throw new TypeError("Invalid database access page");
   for (const item of value["items"]) assertProjectDatabaseAccess(item);
 }
+function accessKeys(value: Record<string, unknown>): readonly string[] {
+  return value["provider"] === "pgcf"
+    ? [...ACCESS_KEYS, "provider", "transport", "websocket_url"]
+    : ACCESS_KEYS;
+}
 function assertAccessFields(value: Record<string, unknown>): void {
   const revoked = value["revoked_at"],
     reason = value["revocation_reason"];
@@ -216,7 +252,12 @@ function assertAccessFields(value: Record<string, unknown>): void {
     !ACCESS_ROLE_PATTERN.test(value["role_name"]) ||
     typeof value["host"] !== "string" ||
     !/^[a-z0-9]([a-z0-9.-]{0,251}[a-z0-9])?$/u.test(value["host"]) ||
-    value["database"] !== "neondb" ||
+    (value["provider"] === "pgcf"
+      ? typeof value["database"] !== "string" ||
+        !/^[a-z][a-z0-9]{19}$/u.test(value["database"]) ||
+        value["transport"] !== "wss" ||
+        value["websocket_url"] !== `wss://${value["host"]}/`
+      : value["database"] !== "neondb") ||
     (value["label"] !== null && accessLabel(value["label"]) !== value["label"]) ||
     !["active", "expired", "revoked"].includes(String(value["state"])) ||
     !timestamp(value["issued_at"]) ||

package/src/packages/contracts/src/database-compute.ts

@@ -1,19 +1,39 @@
+import { databaseSizeForClass } from "./database-sizes.js";
+
+export type PgcfComputeState = "provisioning" | "cold" | "warm" | "suspended" | "error";
+export interface PgcfDatabaseCompute {
+  readonly provider: "pgcf";
+  readonly size_class_id: string;
+  readonly memory_mib: number;
+  readonly cpu_millicores: number;
+  readonly storage_mib: number;
+  readonly max_connections: number;
+  readonly suspend_timeout_seconds: number;
+  readonly state: PgcfComputeState;
+  readonly pending_state: PgcfComputeState | null;
+  readonly disabled: boolean;
+  readonly region: "us" | "eu";
+}
+
 export interface DatabaseCompute {
   readonly project_id: string;
   readonly environment: "dev" | "prod";
   readonly data_mode: "shared" | "isolated";
   readonly observed_at: string;
-  readonly database: null | {
-    readonly min_cu: number;
-    readonly max_cu: number;
-    readonly min_memory_gb: number;
-    readonly max_memory_gb: number;
-    readonly suspend_timeout_seconds: number;
-    readonly state: "init" | "active" | "idle";
-    readonly pending_state: "init" | "active" | "idle" | null;
-    readonly disabled: boolean;
-    readonly region: string;
-  };
+  readonly database:
+    | null
+    | PgcfDatabaseCompute
+    | {
+        readonly min_cu: number;
+        readonly max_cu: number;
+        readonly min_memory_gb: number;
+        readonly max_memory_gb: number;
+        readonly suspend_timeout_seconds: number;
+        readonly state: "init" | "active" | "idle";
+        readonly pending_state: "init" | "active" | "idle" | null;
+        readonly disabled: boolean;
+        readonly region: string;
+      };
 }
 export function assertDatabaseCompute(value: unknown): asserts value is DatabaseCompute {
   if (
@@ -30,6 +50,10 @@ export function assertDatabaseCompute(value: unknown): asserts value is Database
     throw new TypeError("Invalid database compute report");
   const db = value["database"];
   if (db === null) return;
+  if (record(db) && db["provider"] === "pgcf") {
+    assertPgcfCompute(db);
+    return;
+  }
   if (
     !record(db) ||
     !exact(db, [
@@ -64,6 +88,37 @@ export function assertDatabaseCompute(value: unknown): asserts value is Database
   )
     throw new TypeError("Invalid database compute configuration");
 }
+function assertPgcfCompute(db: Record<string, unknown>): void {
+  const size = databaseSizeForClass(db["size_class_id"]);
+  const states = ["provisioning", "cold", "warm", "suspended", "error"];
+  if (
+    !exact(db, [
+      "cpu_millicores",
+      "disabled",
+      "max_connections",
+      "memory_mib",
+      "pending_state",
+      "provider",
+      "region",
+      "size_class_id",
+      "state",
+      "storage_mib",
+      "suspend_timeout_seconds",
+    ]) ||
+    db["memory_mib"] !== size.memoryMiB ||
+    db["cpu_millicores"] !== size.cpuMillicores ||
+    db["storage_mib"] !== size.storageMiB ||
+    db["max_connections"] !== size.maxConnections ||
+    !Number.isSafeInteger(db["suspend_timeout_seconds"]) ||
+    Number(db["suspend_timeout_seconds"]) < 60 ||
+    Number(db["suspend_timeout_seconds"]) > 900 ||
+    !states.includes(String(db["state"])) ||
+    (db["pending_state"] !== null && !states.includes(String(db["pending_state"]))) ||
+    typeof db["disabled"] !== "boolean" ||
+    !["us", "eu"].includes(String(db["region"]))
+  )
+    throw new TypeError("Invalid fixed database compute configuration");
+}
 function record(v: unknown): v is Record<string, unknown> {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }

package/src/packages/contracts/src/database-sizes.ts

@@ -0,0 +1,114 @@
+export type DatabaseMemoryMiB = 256 | 512 | 1024 | 2048 | 4096;
+export type DatabaseComputeSelection =
+  | { readonly memoryMiB: DatabaseMemoryMiB; readonly profile?: never }
+  | { readonly profile: "standard" | "performance"; readonly memoryMiB?: never };
+
+export function parseDatabaseComputeChangeRequest(value: unknown): {
+  readonly environment: "dev" | "prod";
+  readonly selection: DatabaseComputeSelection;
+} {
+  if (value === null || typeof value !== "object" || Array.isArray(value))
+    throw new TypeError("Invalid database compute change");
+  const input = value as Record<string, unknown>;
+  const keys = Object.keys(input).sort().join(",");
+  if (
+    (keys !== "confirm,environment,memory_mib" && keys !== "confirm,environment,profile") ||
+    input["confirm"] !== true ||
+    (input["environment"] !== "dev" && input["environment"] !== "prod")
+  )
+    throw new TypeError("Invalid database compute change");
+  if (keys === "confirm,environment,memory_mib")
+    return {
+      environment: input["environment"],
+      selection: { memoryMiB: databaseSizeForMemory(input["memory_mib"]).memoryMiB },
+    };
+  if (input["profile"] !== "standard" && input["profile"] !== "performance")
+    throw new TypeError("Invalid transitional database profile");
+  return { environment: input["environment"], selection: { profile: input["profile"] } };
+}
+
+export interface DatabaseSize {
+  readonly memoryMiB: DatabaseMemoryMiB;
+  readonly storageMiB: number;
+  readonly cpuMillicores: number;
+  readonly maxConnections: number;
+  readonly sizeClassId: string;
+  readonly creditsPerAwakeHour: number;
+  readonly paidRequired: boolean;
+}
+
+/** Operator-approved product sizes; storage is total nominal volume, including WAL. */
+export const DATABASE_SIZES: readonly DatabaseSize[] = Object.freeze([
+  Object.freeze({
+    memoryMiB: 256,
+    storageMiB: 500,
+    cpuMillicores: 250,
+    maxConnections: 20,
+    sizeClassId: "r256-s500m",
+    creditsPerAwakeHour: 10,
+    paidRequired: false,
+  } as const),
+  Object.freeze({
+    memoryMiB: 512,
+    storageMiB: 1024,
+    cpuMillicores: 250,
+    maxConnections: 40,
+    sizeClassId: "r512-s1g",
+    creditsPerAwakeHour: 20,
+    paidRequired: true,
+  } as const),
+  Object.freeze({
+    memoryMiB: 1024,
+    storageMiB: 2048,
+    cpuMillicores: 500,
+    maxConnections: 80,
+    sizeClassId: "r1024-s2g",
+    creditsPerAwakeHour: 40,
+    paidRequired: true,
+  } as const),
+  Object.freeze({
+    memoryMiB: 2048,
+    storageMiB: 4096,
+    cpuMillicores: 1000,
+    maxConnections: 160,
+    sizeClassId: "r2048-s4g",
+    creditsPerAwakeHour: 80,
+    paidRequired: true,
+  } as const),
+  Object.freeze({
+    memoryMiB: 4096,
+    storageMiB: 8192,
+    cpuMillicores: 2000,
+    maxConnections: 200,
+    sizeClassId: "r4096-s8g",
+    creditsPerAwakeHour: 160,
+    paidRequired: true,
+  } as const),
+]);
+
+export function databaseSizeForMemory(value: unknown): DatabaseSize {
+  const size = DATABASE_SIZES.find((candidate) => candidate.memoryMiB === value);
+  if (size === undefined) throw new TypeError("Unsupported database memory size");
+  return size;
+}
+
+export function databaseSizeForClass(value: unknown): DatabaseSize {
+  const size = DATABASE_SIZES.find((candidate) => candidate.sizeClassId === value);
+  if (size === undefined) throw new TypeError("Unsupported database size class");
+  return size;
+}
+
+/** A downgrade never silently reduces a database's physical allocation. */
+export function assertDatabaseSizeChange(input: {
+  readonly memoryMiB: unknown;
+  readonly paid: boolean;
+  readonly currentStorageMiB: number;
+}): DatabaseSize {
+  const size = databaseSizeForMemory(input.memoryMiB);
+  if (size.paidRequired && !input.paid) throw new TypeError("Database size requires Paid");
+  if (!Number.isSafeInteger(input.currentStorageMiB) || input.currentStorageMiB < 0)
+    throw new TypeError("Invalid current database allocation");
+  if (size.storageMiB < input.currentStorageMiB)
+    throw new TypeError("A smaller database volume requires a separate data migration");
+  return size;
+}

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/contracts/src/index.ts

@@ -209,7 +209,7 @@ function normalizeEgressOrigins(value: readonly string[] | undefined): readonly
 function forbiddenEgressHostname(hostname: string): boolean {
   const normalized = hostname.toLowerCase();
   return (
-    /^ohmyho-(?:mail|storage)-gateway-[a-z0-9][a-z0-9-]*\.[a-z0-9][a-z0-9-]*\.workers\.dev\.?$/u.test(
+    /(?:^|\.)ohmyho-(?:mail|storage)-gateway-[a-z0-9][a-z0-9-]*\.[a-z0-9][a-z0-9-]*\.workers\.dev\.?$/u.test(
       normalized,
     ) ||
     normalized === "localhost" ||

package/src/packages/contracts/src/operation-failure.ts

@@ -111,8 +111,8 @@ const failures = {
     "The built Worker could not be loaded: top-level code throws or calls fetch, timers or random values outside a handler, an import cannot be resolved, a Worker module such as src/ohmyhost/companion.ts has no default export, or the bundle is too large. Fix that, save or push the corrected version and plan its commit; replaying this operation cannot pass. If none of this applies, report the operation ID through feedback.",
   ],
   storage_jurisdiction_conflict: [
-    "storage.jurisdiction must equal the project's hosting region.",
-    "Set storage.jurisdiction in ohmyhost.yaml to the project's region (us or eu) shown by 'ohmyhost project status', save or push the corrected version, then plan its commit (for a promotion, deploy it to Dev and promote again); the unchanged commit fails again. A project cannot move its files between regions; do not delete or recreate the project to change it.",
+    "storage.jurisdiction must match the project's recorded storage jurisdiction.",
+    "Read 'Storage jurisdiction' in 'ohmyhost project context --project ULID --json' and set storage.jurisdiction in ohmyhost.yaml to that recorded value (us or eu). Existing R2 buckets and reservations keep their jurisdiction after a project-region migration; only new storage without a recorded bucket uses the project region. If context reports unavailable, report the request ID through feedback rather than guessing. Save or push the corrected version and plan its commit; for promotion, deploy it to Dev and promote again. Do not delete or recreate the project to move files.",
   ],
   provider_state_absent: [
     "Reconciliation confirmed that the required deployment resources are absent.",

package/src/packages/contracts/src/platform-origins.ts

@@ -3,3 +3,11 @@ export type SaasCnameTarget = "customers.omh.st" | "customers.ohmyho.st";
 export function isSaasCnameTarget(value: unknown): value is SaasCnameTarget {
   return value === "customers.omh.st" || value === "customers.ohmyho.st";
 }
+
+export {
+  classifyPlatformGatewayHostname,
+  createPinnedStorageGatewayOrigin,
+  parsePinnedStorageGatewayOrigin,
+  type PinnedStorageGatewayOrigin,
+  type StorageGatewayOriginScope,
+} from "./storage-gateway-origin.js";

package/src/packages/contracts/src/problem-policy.ts

@@ -120,6 +120,20 @@ export const PROBLEM_POLICY = {
     restAction:
       "Performance compute needs active Paid and usable credits or grace; repeating unchanged does not help. Read 'ohmyhost credits account --organization ULID --json'. On Free, the Owner may start Paid with 'ohmyhost billing checkout --offer paid'; without usable credits, they may add credits. Until then, keep standard compute.",
   },
+  compute_paid_required: {
+    status: 403,
+    retryable: false,
+    action:
+      "Database sizes above 256 MiB require active Paid access. Read the account status; keep the existing database until the owner chooses an eligible size or Paid access.",
+    title: "Database size requires Paid access",
+  },
+  compute_storage_shrink_requires_migration: {
+    status: 409,
+    retryable: false,
+    action:
+      "This size includes less storage than the current volume. Keep the current database and plan an explicit data migration to a fresh smaller volume; do not retry the resize or delete data automatically.",
+    title: "Smaller storage requires a data migration",
+  },
   compute_performance_unavailable: {
     status: 503,
     retryable: false,
@@ -327,10 +341,10 @@ export const PROBLEM_POLICY = {
     status: 409,
     retryable: false,
     action:
-      "Set storage.jurisdiction in ohmyhost.yaml to the project's region (us or eu) shown by 'ohmyhost project status', save or push the corrected version, then plan its commit (for a promotion, deploy it to Dev and promote again); the unchanged commit fails again. A project cannot move its files between regions; do not delete or recreate the project to change it.",
+      "Read 'Storage jurisdiction' in 'ohmyhost project context --project ULID --json' and set storage.jurisdiction in ohmyhost.yaml to that recorded value (us or eu). Existing R2 buckets and reservations keep their jurisdiction after a project-region migration; only new storage without a recorded bucket uses the project region. If context reports unavailable, report the request ID through feedback rather than guessing. Save or push the corrected version and plan its commit; for promotion, deploy it to Dev and promote again. Do not delete or recreate the project to move files.",
     title: "Storage jurisdiction conflict",
     restAction:
-      "Set storage.jurisdiction in ohmyhost.yaml to the project's region (us or eu) shown by 'ohmyhost project status', save or push the corrected version, then plan its commit (for a promotion, deploy it to Dev and promote again); the unchanged commit fails again. A project cannot move its files between regions; do not delete or recreate the project to change it.",
+      "Read 'Storage jurisdiction' in 'ohmyhost project context --project ULID --json' and set storage.jurisdiction in ohmyhost.yaml to that recorded value (us or eu). Existing R2 buckets and reservations keep their jurisdiction after a project-region migration; only new storage without a recorded bucket uses the project region. If context reports unavailable, report the request ID through feedback rather than guessing. Save or push the corrected version and plan its commit; for promotion, deploy it to Dev and promote again. Do not delete or recreate the project to move files.",
   },
   shared_data_requires_promotion: {
     status: 409,

package/src/packages/contracts/src/storage-gateway-origin.ts

@@ -0,0 +1,93 @@
+/** The platform supplies the project separately through its trusted dispatch context. */
+export interface StorageGatewayOriginScope {
+  readonly organizationId: string;
+  readonly environmentId: string;
+  readonly dataEnvironmentId: string;
+}
+export interface PinnedStorageGatewayOrigin extends StorageGatewayOriginScope {
+  readonly baseOrigin: string;
+}
+
+const GATEWAY_FAMILY =
+  /(?:^|\.)ohmyho-(mail|storage)-gateway-[a-z0-9][a-z0-9-]*\.[a-z0-9][a-z0-9-]*\.workers\.dev\.?$/u;
+const ULID = /^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u;
+const PIN_ORGANIZATION = /^s1-([0-7][0-9a-hjkmnp-tv-z]{25})$/u;
+const PIN_ENVIRONMENTS = /^([0-7][0-9a-hjkmnp-tv-z]{25})-([0-7][0-9a-hjkmnp-tv-z]{25})$/u;
+
+/** A malformed prefixed pin is still a platform gateway and must never reach public fetch. */
+export function classifyPlatformGatewayHostname(hostname: unknown): "mail" | "storage" | null {
+  if (typeof hostname !== "string") return null;
+  const family = GATEWAY_FAMILY.exec(hostname)?.[1];
+  return family === "mail" || family === "storage" ? family : null;
+}
+
+/** Encodes all three immutable data identities using two canonical, bounded DNS labels. */
+export function createPinnedStorageGatewayOrigin(baseOrigin: string, scope: unknown): string {
+  const base = canonicalOrigin(baseOrigin);
+  if (
+    base === null ||
+    base.hostname.split(".").length !== 4 ||
+    classifyPlatformGatewayHostname(base.hostname) !== "storage" ||
+    typeof scope !== "object" ||
+    scope === null ||
+    Array.isArray(scope)
+  )
+    throw new TypeError("Storage gateway origin scope is invalid");
+  const record = scope as Record<string, unknown>;
+  const values = [record["organizationId"], record["environmentId"], record["dataEnvironmentId"]];
+  if (values.some((value) => typeof value !== "string" || value.length !== 26 || !ULID.test(value)))
+    throw new TypeError("Storage gateway origin scope is invalid");
+  const [organization, environment, data] = values.map((value) => String(value).toLowerCase());
+  const origin = `https://s1-${organization}.${environment}-${data}.${base.hostname}`;
+  if (canonicalOrigin(origin) === null) throw new TypeError("Storage gateway origin is too long");
+  return origin;
+}
+
+/** Decodes only the versioned canonical pin; the trusted caller must bind its base and project. */
+export function parsePinnedStorageGatewayOrigin(value: unknown): PinnedStorageGatewayOrigin | null {
+  const origin = canonicalOrigin(value);
+  if (origin === null) return null;
+  const labels = origin.hostname.split(".");
+  if (labels.length !== 6) return null;
+  const organization = PIN_ORGANIZATION.exec(labels[0] ?? "")?.[1];
+  const environments = PIN_ENVIRONMENTS.exec(labels[1] ?? "");
+  const environment = environments?.[1];
+  const data = environments?.[2];
+  const baseHostname = labels.slice(2).join(".");
+  if (
+    organization === undefined ||
+    environment === undefined ||
+    data === undefined ||
+    classifyPlatformGatewayHostname(baseHostname) !== "storage"
+  )
+    return null;
+  return Object.freeze({
+    baseOrigin: `https://${baseHostname}`,
+    organizationId: organization.toUpperCase(),
+    environmentId: environment.toUpperCase(),
+    dataEnvironmentId: data.toUpperCase(),
+  });
+}
+
+function canonicalOrigin(value: unknown): URL | null {
+  if (typeof value !== "string") return null;
+  try {
+    const url = new URL(value);
+    return url.protocol === "https:" &&
+      url.origin === value &&
+      url.port === "" &&
+      url.username === "" &&
+      url.password === "" &&
+      url.pathname === "/" &&
+      url.search === "" &&
+      url.hash === "" &&
+      url.hostname.length <= 253 &&
+      url.hostname
+        .split(".")
+        .every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/u.test(label))
+      ? url
+      : null;
+  } catch {
+    return null;
+  }
+}