@amerged/ohmyhost-cli 0.1.15 → 0.1.18

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

@@ -44,7 +44,7 @@ import {
 } from "./credential-store.js";
 import { GeneratedSdkProductApi, type ProductApi } from "./product-api.js";
 import { workspaceOf, type WorkspaceSession } from "./workspace.js";
-import { OwnerOnlyProjectLinkStore } from "./project-link-store.js";
+import { OwnerOnlyProjectLinkStore, readLinkedProjectId } from "./project-link-store.js";
 import {
   initializeRepository,
   RepositoryInitBlockedError,
@@ -67,6 +67,8 @@ export interface ProductCliIo {
 
 export interface ProductCliCompositionOverrides {
   readonly credentialStore?: CredentialStore;
+  /** Directory whose project link supplies a missing --project; defaults to the process directory. */
+  readonly workingDirectory?: string;
   readonly readSecretValue?: (signal: AbortSignal) => Promise<string>;
 }
 
@@ -221,7 +223,16 @@ export const runProductionCli = async (
   const diagnostics = new StderrDiagnosticSink(io);
   let command: ProductCliCommand;
   try {
-    command = parseProductCliCommand(argv);
+    const parsed = await parseWithLinkedProject(argv, async () => {
+      const profile = resolveProductCliEnvironment(environment);
+      return readLinkedProjectId(
+        join(overrides.workingDirectory ?? process.cwd(), profile.linkDirectory),
+        profile.apiOrigin,
+      );
+    });
+    command = parsed.command;
+    if (parsed.linkedProjectId !== null)
+      io.writeStderr(`ohmyhost: using linked project ${parsed.linkedProjectId}\n`);
   } catch (error) {
     const result =
       error instanceof InvalidCommandError
@@ -344,7 +355,10 @@ export const runProductionCli = async (
           signal,
         },
       ),
-    projectLinkStore: new OwnerOnlyProjectLinkStore(join(process.cwd(), profile.linkDirectory)),
+    projectLinkStore: new OwnerOnlyProjectLinkStore(
+      join(process.cwd(), profile.linkDirectory),
+      process.cwd(),
+    ),
     productApiOrigin: profile.apiOrigin,
     tokenRefresher: new PublicWorkosTokenRefresher(environment),
     tokenRevoker: lifecycle,
@@ -588,6 +602,36 @@ export class GeneratedSdkSessionRevoker implements TokenRevoker {
   }
 }
 
+/**
+ * A command run inside a linked directory may omit --project; the link supplies it. The
+ * link is read only when the command needs a project it did not name.
+ */
+export async function parseWithLinkedProject(
+  argv: readonly string[],
+  linkedProjectId: () => Promise<string | null>,
+): Promise<{ readonly command: ProductCliCommand; readonly linkedProjectId: string | null }> {
+  try {
+    return { command: parseProductCliCommand(argv), linkedProjectId: null };
+  } catch (error) {
+    if (!(error instanceof InvalidCommandError) || argv.includes("--project")) throw error;
+    let projectId: string | null;
+    try {
+      projectId = await linkedProjectId();
+    } catch {
+      projectId = null;
+    }
+    if (projectId === null) throw error;
+    try {
+      return {
+        command: parseProductCliCommand([...argv, "--project", projectId]),
+        linkedProjectId: projectId,
+      };
+    } catch {
+      throw error;
+    }
+  }
+}
+
 class StderrDiagnosticSink implements DiagnosticSink {
   public constructor(private readonly io: ProductCliIo) {}
 

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

@@ -11,6 +11,7 @@ export {
   parseAccountProfile,
   parseCurrentIdentity,
   parseDevAccessTicket,
+  parseDevAccessState,
   parseCloudflareDnsAuthorization,
   parseCloudflareDnsAuthorizationStatus,
   parsePaidDomain,

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

@@ -24,7 +24,7 @@ import {
   type UserApiKeyCreation,
   type UserApiKeyPage,
 } from "@ohmyhost/contracts/user-api-keys";
-import { parseFeedbackReceipt } from "@ohmyhost/contracts/feedback";
+import { parseFeedbackReceipt, parseFeedbackStatus } from "@ohmyhost/contracts/feedback";
 import {
   getProjectContext,
   setProjectNotes,
@@ -57,9 +57,14 @@ import {
   configureProjectSourceAutoDeploy,
   createCloudflareDnsAuthorization,
   createProjectDevAccessTicket,
+  ensureProjectDevShareLink,
+  rotateProjectDevShareLink,
+  revokeProjectDevShareLink,
+  setProjectDevAccessMode,
   createDeployment,
   createProject,
   submitFeedback,
+  getFeedback,
   createOrganization,
   type Organization,
   type GithubConnectionAuthorization,
@@ -131,6 +136,7 @@ export interface ProjectCreateInput {
   readonly organizationId: string;
   readonly name: string;
   readonly dataMode?: "shared" | "isolated";
+  readonly devAccessMode?: "protected" | "public";
   readonly region?: "us" | "eu";
   readonly idempotencyKey: string;
 }
@@ -257,10 +263,28 @@ export interface ProductApi {
     readonly idempotencyKey: string;
   }): Promise<PaidDomain>;
   createDevAccessTicket(projectId: string): Promise<DevAccessTicket>;
+  ensureDevShareLink(projectId: string): Promise<import("@ohmyhost/sdk-ts").DevAccessState>;
+  rotateDevShareLink(
+    projectId: string,
+    idempotencyKey: string,
+  ): Promise<import("@ohmyhost/sdk-ts").DevAccessState>;
+  revokeDevShareLink(
+    projectId: string,
+    idempotencyKey: string,
+  ): Promise<import("@ohmyhost/sdk-ts").DevAccessState>;
+  setDevAccessMode(
+    projectId: string,
+    mode: "protected" | "public",
+    idempotencyKey: string,
+  ): Promise<import("@ohmyhost/sdk-ts").DevAccessState>;
   submitFeedback(input: {
     report: import("@ohmyhost/sdk-ts").FeedbackSubmission;
     idempotencyKey: string;
   }): Promise<import("@ohmyhost/sdk-ts").FeedbackReceipt>;
+  getFeedback(
+    feedbackId: string,
+    cursor?: string,
+  ): Promise<import("@ohmyhost/sdk-ts").FeedbackStatus>;
   createProject(input: ProjectCreateInput): Promise<Operation>;
   getOperation(operationId: string): Promise<Operation>;
   reconcileOperation(input: {
@@ -298,6 +322,7 @@ export interface ProductApi {
   planDeployment(input: {
     readonly projectId: string;
     readonly commitSha: string;
+    readonly environment: "dev" | "prod";
   }): Promise<DeploymentPlan>;
   createDeployment(input: {
     readonly projectId: string;
@@ -736,6 +761,35 @@ export class GeneratedSdkProductApi implements ProductApi {
     );
   }
 
+  public async ensureDevShareLink(projectId: string) {
+    return ensureProjectDevShareLink({ project_id: projectId }, { client: this.#client });
+  }
+  public async rotateDevShareLink(projectId: string, idempotencyKey: string) {
+    return rotateProjectDevShareLink(
+      { project_id: projectId, "Idempotency-Key": idempotencyKey },
+      { client: this.#client },
+    );
+  }
+  public async revokeDevShareLink(projectId: string, idempotencyKey: string) {
+    return revokeProjectDevShareLink(
+      { project_id: projectId, "Idempotency-Key": idempotencyKey },
+      { client: this.#client },
+    );
+  }
+  public async setDevAccessMode(
+    projectId: string,
+    mode: "protected" | "public",
+    idempotencyKey: string,
+  ) {
+    return setProjectDevAccessMode(
+      {
+        project_id: projectId,
+        "Idempotency-Key": idempotencyKey,
+        setDevAccessModeRequest: { mode },
+      },
+      { client: this.#client },
+    );
+  }
   public async createDevAccessTicket(projectId: string): Promise<DevAccessTicket> {
     return createProjectDevAccessTicket({ project_id: projectId }, { client: this.#client });
   }
@@ -752,6 +806,18 @@ export class GeneratedSdkProductApi implements ProductApi {
     );
   }
 
+  public async getFeedback(
+    feedbackId: string,
+    cursor?: string,
+  ): Promise<import("@ohmyhost/sdk-ts").FeedbackStatus> {
+    return parseFeedbackStatus(
+      await getFeedback(
+        { feedback_id: feedbackId, ...(cursor === undefined ? {} : { cursor }) },
+        { client: this.#client },
+      ),
+    ) as import("@ohmyhost/sdk-ts").FeedbackStatus;
+  }
+
   public async createProject(input: ProjectCreateInput): Promise<Operation> {
     return createProject(
       {
@@ -760,6 +826,7 @@ export class GeneratedSdkProductApi implements ProductApi {
           organization_id: input.organizationId,
           name: input.name,
           ...(input.dataMode === undefined ? {} : { data_mode: input.dataMode }),
+          ...(input.devAccessMode === undefined ? {} : { dev_access_mode: input.devAccessMode }),
           ...(input.region === undefined ? {} : { region: input.region }),
         },
       },
@@ -880,9 +947,13 @@ export class GeneratedSdkProductApi implements ProductApi {
   public async planDeployment(input: {
     readonly projectId: string;
     readonly commitSha: string;
+    readonly environment: "dev" | "prod";
   }): Promise<DeploymentPlan> {
     return planDeployment(
-      { project_id: input.projectId, planDeploymentRequest: { commit_sha: input.commitSha } },
+      {
+        project_id: input.projectId,
+        planDeploymentRequest: { commit_sha: input.commitSha, environment: input.environment },
+      },
       { client: this.#client },
     );
   }

package/src/apps/product-cli/project-link-store.ts

@@ -1,4 +1,4 @@
-import { chmod, mkdir, rename, writeFile } from "node:fs/promises";
+import { appendFile, chmod, mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
 export interface ProjectLinkMetadata {
@@ -14,8 +14,32 @@ export interface ProjectLinkStore {
   save(metadata: ProjectLinkMetadata): Promise<void>;
 }
 
+/** The project this directory was linked to for this API, or null when there is no usable link. */
+export async function readLinkedProjectId(
+  directory: string,
+  apiOrigin: string,
+): Promise<string | null> {
+  try {
+    const link = JSON.parse(await readFile(join(directory, "link.json"), "utf8")) as unknown;
+    if (typeof link !== "object" || link === null) return null;
+    const { version, api_origin, project_id } = link as Record<string, unknown>;
+    return version === 1 &&
+      api_origin === apiOrigin &&
+      typeof project_id === "string" &&
+      /^[0-9A-HJKMNP-TV-Z]{26}$/u.test(project_id)
+      ? project_id
+      : null;
+  } catch {
+    return null;
+  }
+}
+
 export class OwnerOnlyProjectLinkStore implements ProjectLinkStore {
-  public constructor(private readonly directory: string) {}
+  /** repositoryRoot: when it is a Git working tree, the link directory is kept out of Git. */
+  public constructor(
+    private readonly directory: string,
+    private readonly repositoryRoot?: string,
+  ) {}
 
   public async save(metadata: ProjectLinkMetadata): Promise<void> {
     await mkdir(this.directory, { mode: 0o700, recursive: true });
@@ -26,5 +50,24 @@ export class OwnerOnlyProjectLinkStore implements ProjectLinkStore {
     await chmod(temporary, 0o600);
     await rename(temporary, target);
     await chmod(target, 0o600);
+    if (this.repositoryRoot !== undefined) await ignoreLinkDirectory(this.repositoryRoot);
+  }
+}
+
+async function ignoreLinkDirectory(root: string): Promise<void> {
+  try {
+    await stat(join(root, ".git"));
+  } catch {
+    return;
+  }
+  const file = join(root, ".gitignore");
+  let current = "";
+  try {
+    current = await readFile(file, "utf8");
+  } catch {
+    current = "";
   }
+  const lines = current.split(/\r?\n/u).map((line) => line.trim());
+  if (lines.some((line) => /^\/?\.ohmyhost\/?$/u.test(line))) return;
+  await appendFile(file, `${current === "" || current.endsWith("\n") ? "" : "\n"}/.ohmyhost/\n`);
 }

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

@@ -73,9 +73,9 @@ const STORAGE_RUNTIME_BINDINGS = Object.freeze([
   "OHMYHOST_STORAGE_GATEWAY_URL",
   "OHMYHOST_STORAGE_KEY",
 ]);
-// `@ohmyhost/customer-runtime` is private and resolves from no registry; report the release tarball
-// of this client so a bare package name never reaches a customer.
-const CUSTOMER_RUNTIME_SOURCE = `https://ohmyho.st/releases/${cliPackage.version}/ohmyhost-customer-runtime-${cliPackage.version}.tgz`;
+// The runtime release is published unchanged as `@amerged/ohmyhost-runtime`; this pinned alias keeps
+// its import name and, unlike the website archive each release removes, stays installable.
+const CUSTOMER_RUNTIME_SOURCE = `npm:@amerged/ohmyhost-runtime@${cliPackage.version}`;
 const SCHEDULED_HANDLER_PATTERN = /\bscheduled\s*(?:\(|:|,|\})/u;
 // The platform imports the module's default export; handlers that are only named exports are
 // never invoked, so init blocks them before a build or a runtime rejection would.
@@ -139,7 +139,7 @@ export interface RepositoryInitInventory {
 
 export interface RepositoryInitRuntimePackages {
   readonly betterAuth?: "1.7.1";
-  /** Exact install source: the package is private and cannot be resolved from a registry. */
+  /** Exact install source: an npm alias pinned to the published runtime of this client version. */
   readonly customerRuntime?: string;
 }
 
@@ -339,7 +339,8 @@ export async function initializeRepository(
     }),
   });
   const targetBetterAuth = existingConfiguration?.auth?.provider === "better-auth";
-  const targetMail = targetBetterAuth || existingConfiguration?.mail?.enabled === true;
+  // Mail stays an explicit choice: Better Auth or a detected mail package never enables it.
+  const targetMail = existingConfiguration?.mail?.enabled === true;
   const targetStorage = r2 || supabaseStorage;
   const configuredCompanionRequired =
     existingConfiguration !== null &&

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

@@ -1,3 +1,4 @@
+import { parseFeedbackSubmissionDetail } from "@ohmyhost/contracts/feedback";
 import { parseFrameworkConversionDetail } from "@ohmyhost/contracts/framework-admission";
 import {
   parseOperationDeploymentProgress,
@@ -21,12 +22,13 @@ import {
 } from "@ohmyhost/contracts/operation-failure";
 export type { PublicOperationFailure } from "@ohmyhost/contracts/operation-failure";
 
-const PROBLEM_POLICY = {
+/** Exported for the documentation build, which publishes one page per code. */
+export const PROBLEM_POLICY = {
   cloudflare_zone_not_bound: {
     status: 409,
     retryable: false,
     action:
-      "Configure the project domain first with 'ohmyhost domain paid plan' then 'ohmyhost domain paid apply', or configure its sender domain with 'ohmyhost mail domain set'. Then request Cloudflare authorization for that domain's zone.",
+      "Configure the project domain first with 'ohmyhost domain paid plan' then 'ohmyhost domain paid apply', or configure its sender domain with 'ohmyhost mail setup'. Then request Cloudflare authorization for that domain's zone.",
   },
   github_connection_required: {
     status: 409,
@@ -197,6 +199,12 @@ const PROBLEM_POLICY = {
     retryable: false,
     action: "Select the current succeeded dev deployment and target prod.",
   },
+  mail_capacity_unavailable: {
+    status: 503,
+    retryable: true,
+    action:
+      "Report this request ID through feedback. The stored mail setup continues automatically once ohmyho.st has capacity; follow mail status and keep the original idempotency key.",
+  },
   mail_domain_conflict: {
     status: 409,
     retryable: false,
@@ -205,7 +213,8 @@ const PROBLEM_POLICY = {
   mail_domain_required: {
     status: 409,
     retryable: false,
-    action: "Run 'ohmyhost mail domain set' for this project, then plan again.",
+    action:
+      "This app declares mail.enabled. Configure the project's own sender domain with 'ohmyhost mail setup' using its Prod environment ID, or set mail.enabled to false if the app sends no mail, then plan again.",
   },
   storage_jurisdiction_conflict: {
     status: 409,
@@ -213,6 +222,18 @@ const PROBLEM_POLICY = {
     action:
       "Set storage.jurisdiction in ohmyhost.yaml to the project's hosting region shown by project status, then plan again.",
   },
+  shared_data_requires_promotion: {
+    status: 409,
+    retryable: false,
+    action:
+      "Plan and deploy this commit to Dev, then run 'ohmyhost deployment promote plan' to reach Prod.",
+  },
+  production_deployment_required: {
+    status: 409,
+    retryable: false,
+    action:
+      "Deploy to Prod first: run 'ohmyhost plan --environment prod' and deploy that plan, or promote the current Dev deployment with 'ohmyhost deployment promote plan'. Then plan the domain again.",
+  },
   framework_conversion_required: {
     status: 409,
     retryable: false,
@@ -308,6 +329,8 @@ export class ResponseContractError extends Error {
 
 export interface SafeProblem {
   readonly requestId: string;
+  /** The error's documentation page, when the server names one on docs.ohmyho.st. */
+  readonly docsUrl?: string;
   readonly retryAfterSeconds?: number;
   readonly code: ProblemCode;
   readonly retryable: boolean;
@@ -690,6 +713,28 @@ export const parseCloudflareDnsAuthorizationStatus = (
   return input as unknown as PublicCloudflareDnsAuthorizationStatus;
 };
 
+export interface PublicDevAccessState {
+  readonly project_id: string;
+  readonly mode: "protected" | "public";
+  readonly share_url: string | null;
+}
+
+export const parseDevAccessState = (value: unknown): PublicDevAccessState => {
+  const input = exactRecord(value, ["project_id", "mode", "share_url"]);
+  if (
+    !isUlid(input["project_id"]) ||
+    (input["mode"] !== "protected" && input["mode"] !== "public") ||
+    (input["mode"] === "public" && input["share_url"] !== null) ||
+    (input["share_url"] !== null &&
+      (typeof input["share_url"] !== "string" ||
+        !/^https:\/\/dev-[a-z0-9]+(?:-[a-z0-9]+){0,4}\.(?:dev\.)?check\.omh\.st\/\.ohmyhost\/dev-access\/redeem\?stage=dev&ticket=[A-Za-z0-9_-]{43}$/u.test(
+          input["share_url"],
+        )))
+  )
+    throw new ResponseContractError();
+  return input as unknown as PublicDevAccessState;
+};
+
 export const parseDevAccessTicket = (value: unknown): PublicDevAccessTicket => {
   const input = exactRecord(value, [
     "ticket_id",
@@ -943,6 +988,7 @@ export const parseProjectStatus = (value: unknown): Readonly<Record<string, unkn
     "etag",
     "handle",
     "region",
+    "dev_access_mode",
     "lifecycle",
     "source",
     "default_environment",
@@ -961,6 +1007,7 @@ export const parseProjectStatus = (value: unknown): Readonly<Record<string, unkn
     !boundedString(handle, 3, 59) ||
     !/^[a-z0-9]+(?:-[a-z0-9]+){0,4}$/u.test(handle) ||
     (input["region"] !== "us" && input["region"] !== "eu") ||
+    (input["dev_access_mode"] !== "protected" && input["dev_access_mode"] !== "public") ||
     (input["lifecycle"] !== "active" &&
       input["lifecycle"] !== "deleting" &&
       input["lifecycle"] !== "deleted") ||
@@ -1308,6 +1355,7 @@ export const parseDeploymentPlan = (value: unknown): Readonly<Record<string, unk
   const input = exactRecord(value, [
     "id",
     "project_id",
+    "environment",
     "commit_sha",
     "source_digest",
     "build_plan_digest",
@@ -1329,6 +1377,7 @@ export const parseDeploymentPlan = (value: unknown): Readonly<Record<string, unk
     "currency",
     "rate_card_version",
     "credit_micros",
+    "credits",
     "provider_cost_micros",
     "scope",
     "reserved_seconds",
@@ -1336,6 +1385,7 @@ export const parseDeploymentPlan = (value: unknown): Readonly<Record<string, unk
   if (
     !isUlid(input["id"]) ||
     !isUlid(input["project_id"]) ||
+    (input["environment"] !== "dev" && input["environment"] !== "prod") ||
     !isCommitSha(input["commit_sha"]) ||
     !isDigest(input["source_digest"]) ||
     !isDigest(input["build_plan_digest"]) ||
@@ -1355,6 +1405,8 @@ export const parseDeploymentPlan = (value: unknown): Readonly<Record<string, unk
     !boundedString(cost["currency"], 1, 16) ||
     !boundedString(cost["rate_card_version"], 1, 128) ||
     !decimal(cost["credit_micros"]) ||
+    typeof cost["credits"] !== "string" ||
+    !/^[0-9]+(?:\.[0-9]{1,6})?$/u.test(cost["credits"]) ||
     !decimal(cost["provider_cost_micros"]) ||
     cost["scope"] !== "build_compute" ||
     !decimal(cost["reserved_seconds"]) ||
@@ -1497,14 +1549,18 @@ export const parseSafeProblem = (value: unknown): SafeProblem => {
       retryAfter > 86400)
   )
     throw new ResponseContractError();
+  const docsUrl = String(input["type"]);
   return {
     requestId: input["request_id"],
+    ...(docsUrl.startsWith("https://docs.ohmyho.st/errors/") ? { docsUrl } : {}),
     code: code as ProblemCode,
     retryable: policy.retryable,
     suggestedAction:
       (code === "framework_conversion_required"
         ? (parseFrameworkConversionDetail(input["detail"]) ?? policy.action)
-        : policy.action) +
+        : code === "invalid_request"
+          ? (parseFeedbackSubmissionDetail(input["detail"]) ?? policy.action)
+          : policy.action) +
       (retryAfter === undefined ? "" : ` Retry after ${String(retryAfter)} seconds.`),
     ...(retryAfter === undefined ? {} : { retryAfterSeconds: retryAfter as number }),
   };