@amerged/ohmyhost-cli 0.1.33 → 0.1.34

package/README.md

@@ -1,6 +1,6 @@
 # @amerged/ohmyhost-cli
 
-ohmyho.st cli client, version 0.1.33.
+ohmyho.st cli client, version 0.1.34.
 
 ```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-3RDHFA76.js";
+} from "./chunk-SRN6L765.js";
 import "./chunk-7D2RFLWM.js";
 
 // apps/product-cli/dist/bin.js

package/dist/{chunk-3RDHFA76.js → chunk-SRN6L765.js}

@@ -37142,14 +37142,25 @@ function parseProjectCreditBudget(value) {
   return input;
 }
 var parseCurrentIdentity = (value) => {
-  const input = exactRecord2(value, ["actor_id", "organization_ids"]);
+  const input = exactRecord2(value, ["actor_id", "email", "organization_ids", "organizations"]);
+  const email = input["email"];
   const organizationIds = input["organization_ids"];
+  const organizations = input["organizations"];
   if (typeof input["actor_id"] !== "string" || input["actor_id"].length === 0 || input["actor_id"].length > 256 || [...input["actor_id"]].some((character) => {
     const codePoint = character.codePointAt(0) ?? 0;
     return codePoint <= 31 || codePoint === 127;
-  }) || !Array.isArray(organizationIds) || organizationIds.some((organizationId) => !isUlid(organizationId)) || new Set(organizationIds).size !== organizationIds.length) {
+  }) || email !== null && (!boundedString(email, 3, 254) || !/^[^\s@]+@[^\s@.]+(?:\.[^\s@.]+)+$/u.test(email) || /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(email)) || !Array.isArray(organizationIds) || organizationIds.some((organizationId) => !isUlid(organizationId)) || new Set(organizationIds).size !== organizationIds.length || !Array.isArray(organizations) || organizations.length !== organizationIds.length) {
     throw new ResponseContractError();
   }
+  organizations.forEach((organization, index) => {
+    const entry = exactRecord2(organization, ["id", "name"]);
+    if (entry["id"] !== organizationIds[index] || !boundedString(entry["name"], 1, 128) || entry["name"].trim() !== entry["name"] || [...entry["name"]].some((character) => {
+      const codePoint = character.codePointAt(0) ?? 0;
+      return codePoint <= 31 || codePoint === 127;
+    })) {
+      throw new ResponseContractError();
+    }
+  });
   return input;
 };
 var parseAccountProfile = (value) => {
@@ -40628,7 +40639,7 @@ function exact3(v, keys) {
 // apps/product-cli/package.json
 var package_default = {
   name: "@ohmyhost/product-cli",
-  version: "0.1.33",
+  version: "0.1.34",
   private: true,
   ohmyhost: {
     deployment: "production",
@@ -40965,7 +40976,7 @@ var HELP_USAGE = Object.freeze({
   "project flag set": "ohmyhost project flag set --project ULID --enabled true|false --idempotency-key KEY --json (shows the small Powered by ohmyho.st flag on the production site; while it shows, this project's custom domain uses no domain credits and also works on Free, and each Paid period bought through Stripe adds 250 credits to the workspace, however many projects show the flag)",
   "project handle check": "ohmyhost project handle check --handle HANDLE --json (is this address free? answers with a reason and free alternatives; the address becomes HANDLE.check.omh.st)",
   "project handle set": "ohmyhost project handle set --project ULID --handle HANDLE --if-match ETAG --idempotency-key KEY --json (moves the project to a free address; the old one stops working and anyone may claim it)",
-  "database compute set": "ohmyhost database compute set --project ULID --environment dev|prod --profile standard|performance --idempotency-key KEY --yes [--wait] --json\n  standard: Free 0.25 CU/1 GB/60s idle, Paid 0.5 CU/2 GB/60s idle. performance: Paid 1 CU/4 GB/300s idle, 2.5x database compute credits per equal active minute; longer idle time also consumes credits.",
+  "database compute set": "ohmyhost database compute set --project ULID --environment dev|prod --profile standard|performance --idempotency-key KEY --yes [--wait] --json\n  standard: Free 0.25 CU/1 GB, Paid 0.5 CU/2 GB. performance: Paid 1 CU/4 GB, 2.5x database compute credits per equal active minute. All profiles use the provider-default idle suspension.",
   "database compute get": "ohmyhost database compute get --project ULID [--environment dev|prod] --json",
   "database write": "ohmyhost database write --project ULID --environment dev|prod --statement-file PATH --idempotency-key KEY [--parameters-json JSON] --yes --json",
   "database query": "ohmyhost database query --project ULID --environment dev|prod --statement SQL [--parameters-json JSON] --json",

package/dist/index.js

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

package/package.json

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

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

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

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

@@ -399,7 +399,7 @@ const HELP_USAGE = Object.freeze({
     "ohmyhost project handle set --project ULID --handle HANDLE --if-match ETAG --idempotency-key KEY --json (moves the project to a free address; the old one stops working and anyone may claim it)",
   "database compute set":
     "ohmyhost database compute set --project ULID --environment dev|prod --profile standard|performance --idempotency-key KEY --yes [--wait] --json\n" +
-    "  standard: Free 0.25 CU/1 GB/60s idle, Paid 0.5 CU/2 GB/60s idle. performance: Paid 1 CU/4 GB/300s idle, 2.5x database compute credits per equal active minute; longer idle time also consumes credits.",
+    "  standard: Free 0.25 CU/1 GB, Paid 0.5 CU/2 GB. performance: Paid 1 CU/4 GB, 2.5x database compute credits per equal active minute. All profiles use the provider-default idle suspension.",
   "database compute get":
     "ohmyhost database compute get --project ULID [--environment dev|prod] --json",
   "database write":

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

@@ -63,7 +63,9 @@ export interface SafeProblem {
 
 export interface PublicCurrentIdentity {
   readonly actor_id: string;
+  readonly email: string | null;
   readonly organization_ids: readonly string[];
+  readonly organizations: readonly { readonly id: string; readonly name: string }[];
 }
 
 /** One workspace the signed-in user belongs to, with the provider identity a selection needs. */
@@ -635,8 +637,10 @@ export function parseProjectCreditBudget(value: unknown): ProjectCreditBudget {
 }
 
 export const parseCurrentIdentity = (value: unknown): PublicCurrentIdentity => {
-  const input = exactRecord(value, ["actor_id", "organization_ids"]);
+  const input = exactRecord(value, ["actor_id", "email", "organization_ids", "organizations"]);
+  const email = input["email"];
   const organizationIds = input["organization_ids"];
+  const organizations = input["organizations"];
   if (
     typeof input["actor_id"] !== "string" ||
     input["actor_id"].length === 0 ||
@@ -645,12 +649,32 @@ export const parseCurrentIdentity = (value: unknown): PublicCurrentIdentity => {
       const codePoint = character.codePointAt(0) ?? 0;
       return codePoint <= 31 || codePoint === 127;
     }) ||
+    (email !== null &&
+      (!boundedString(email, 3, 254) ||
+        !/^[^\s@]+@[^\s@.]+(?:\.[^\s@.]+)+$/u.test(email) ||
+        /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(email))) ||
     !Array.isArray(organizationIds) ||
     organizationIds.some((organizationId) => !isUlid(organizationId)) ||
-    new Set(organizationIds).size !== organizationIds.length
+    new Set(organizationIds).size !== organizationIds.length ||
+    !Array.isArray(organizations) ||
+    organizations.length !== organizationIds.length
   ) {
     throw new ResponseContractError();
   }
+  organizations.forEach((organization: unknown, index) => {
+    const entry = exactRecord(organization, ["id", "name"]);
+    if (
+      entry["id"] !== organizationIds[index] ||
+      !boundedString(entry["name"], 1, 128) ||
+      entry["name"].trim() !== entry["name"] ||
+      [...entry["name"]].some((character) => {
+        const codePoint = character.codePointAt(0) ?? 0;
+        return codePoint <= 31 || codePoint === 127;
+      })
+    ) {
+      throw new ResponseContractError();
+    }
+  });
   return input as unknown as PublicCurrentIdentity;
 };
 

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

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

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

@@ -945,7 +945,7 @@ export const completeCloudflareDnsAuthorization = <ThrowOnError extends boolean
 /**
  * Get the current authenticated identity
  *
- * Returns the stable ohmyhost actor and internal organization identifiers derived from the bearer credential.
+ * Returns the stable ohmyhost actor, the current user's or API-key owner's email, and the credential's organization scope with current display names. Machine-to-machine credentials have a null email. Organizations match organization_ids in the same order.
  */
 export const getCurrentIdentity = <ThrowOnError extends boolean = true>(
   parameters?: {

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

@@ -1148,11 +1148,25 @@ export type OrganizationAccount = {
 };
 
 /**
- * Minimal customer-visible identity and organization scope for authenticated agent clients.
+ * Customer-visible current account and credential organization scope for authenticated agent clients.
  */
 export type CurrentIdentity = {
   actor_id: string;
+  /**
+   * Email of the current user or user API-key owner; null for machine-to-machine credentials.
+   */
+  email: string | null;
   organization_ids: Array<Ulid>;
+  /**
+   * Current names for exactly the organization_ids scope, in the same order.
+   */
+  organizations: Array<{
+    id: Ulid;
+    /**
+     * Current organization display name without surrounding whitespace or ASCII control characters.
+     */
+    name: string;
+  }>;
 };
 
 export type Project = {