@amerged/ohmyhost-mcp 0.1.23 → 0.1.24

package/src/apps/product-cli/{command.ts → src/command.ts}

@@ -1,8 +1,30 @@
+import { isUserSecretName } from "@ohmyhost/contracts/secret-names";
+import {
+  isProjectDataChangeKind,
+  type ProjectDataChangeKind,
+} from "@ohmyhost/contracts/project-data-changes";
 import type { ManagedMailCommand } from "@ohmyhost/sdk-ts";
 import { USER_API_KEY_ID } from "@ohmyhost/contracts/user-api-keys";
 import { WORKOS_USER_API_KEY_PATTERN } from "@ohmyhost/workos-auth-contracts/user-api-keys";
 import { isProfileName, isProfileUserId } from "./profile-store.js";
 export type ProductCliCommand =
+  | {
+      readonly kind: "project-data-plan";
+      readonly projectId: string;
+      readonly change: ProjectDataChangeKind;
+      readonly credentialStore: "native";
+    }
+  | {
+      readonly kind: "project-data-change";
+      readonly projectId: string;
+      readonly change: ProjectDataChangeKind;
+      readonly ifMatch: string;
+      readonly confirmationToken: string;
+      readonly idempotencyKey: string;
+      readonly yes: true;
+      readonly wait: boolean;
+      readonly credentialStore: "native";
+    }
   | {
       readonly kind: "github-connect";
       readonly organizationId: string;
@@ -550,6 +572,8 @@ export class InvalidCommandError extends Error {
 }
 
 export type RecognizedCommandLabel =
+  | "project data plan"
+  | "project data change"
   | "database compute set"
   | "database compute get"
   | "project context"
@@ -696,6 +720,10 @@ export const recognizedCommandLabel = (argv: readonly string[]): RecognizedComma
     if (value === "feedback" && values[0] === "submit") return "feedback submit";
     if (value === "feedback" && values[0] === "status") return "feedback status";
     if (value === "project" && values[0] === "create") return "project create";
+    if (value === "project" && values[0] === "data" && values[1] === "plan")
+      return "project data plan";
+    if (value === "project" && values[0] === "data" && values[1] === "change")
+      return "project data change";
     if (value === "organization" && values[0] === "create") return "organization create";
     if (value === "organization" && values[0] === "list") return "organization list";
     if (value === "organization" && values[0] === "use") return "organization use";
@@ -1242,6 +1270,33 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
   }
   if (first === "project") {
     const subcommand = values.shift();
+    if (subcommand === "data") {
+      const action = values.shift();
+      if (follow || stdin || (action !== "plan" && action !== "change"))
+        throw new InvalidCommandError();
+      if ((action === "plan" && (yes || wait)) || (action === "change" && !yes))
+        throw new InvalidCommandError();
+      const options = parseOptions(
+        values,
+        action === "plan"
+          ? ["--project", "--change"]
+          : ["--project", "--change", "--if-match", "--confirmation-token", "--idempotency-key"],
+      );
+      const change = options["--change"];
+      if (!isProjectDataChangeKind(change)) throw new InvalidCommandError();
+      const common = { projectId: options["--project"], change, credentialStore };
+      return action === "plan"
+        ? { kind: "project-data-plan", ...common }
+        : {
+            kind: "project-data-change",
+            ...common,
+            ifMatch: options["--if-match"],
+            confirmationToken: options["--confirmation-token"],
+            idempotencyKey: options["--idempotency-key"],
+            yes: true,
+            wait,
+          };
+    }
     if (subcommand === "handle" && values[0] === "set") {
       values.shift();
       if (yes || wait || follow || stdin) throw new InvalidCommandError();
@@ -1928,7 +1983,7 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
     if (yes || follow || stdin) throw new InvalidCommandError();
     values.shift();
     const name = values.shift();
-    if (!isUserSecretName(name)) throw new InvalidCommandError();
+    if (!isUserSecretName(name, "delete")) throw new InvalidCommandError();
     const options = parseOptions(values, ["--project", "--environment", "--idempotency-key"]);
     return {
       kind: "secret-delete",
@@ -2120,6 +2175,7 @@ const parseOptions = <T extends string>(
     if (option === undefined || !allowed.includes(option as T) || !isValue(value)) {
       throw new InvalidCommandError();
     }
+    if (option === "--idempotency-key" && value.length > 128) throw new InvalidCommandError();
     if (option in result) throw new InvalidCommandError();
     result[option as T] = value;
   }
@@ -2144,6 +2200,7 @@ const parseOptionalOptions = <T extends string>(
     if (option === undefined || !allowed.includes(option as T) || !isValue(value)) {
       throw new InvalidCommandError();
     }
+    if (option === "--idempotency-key" && value.length > 128) throw new InvalidCommandError();
     if (option in result) throw new InvalidCommandError();
     result[option as T] = value;
   }
@@ -2220,13 +2277,3 @@ const validPaidHostname = (value: string): boolean =>
   !value.endsWith(".omh.st") &&
   value !== "ohmyho.st" &&
   !value.endsWith(".ohmyho.st");
-
-const isUserSecretName = (value: string | undefined): value is string =>
-  isValue(value) &&
-  /^[A-Z][A-Z0-9_]{0,127}$/u.test(value) &&
-  value !== "DATABASE_URL" &&
-  value !== "HYPERDRIVE" &&
-  value !== "BETTER_AUTH_SECRET" &&
-  value !== "BETTER_AUTH_URL" &&
-  value !== "OHMYHOST_MAIL_KEY" &&
-  value !== "OHMYHOST_MAIL_GATEWAY_URL";

package/src/apps/product-cli/{composition.ts → src/composition.ts}

@@ -21,6 +21,11 @@ import {
   ProductCli,
   classifyCliFailure,
   cliMetadataResult,
+  CREDENTIAL_STORE_UNAVAILABLE_ACTION,
+  endedLoginAction,
+  INTERNAL_ERROR_ACTION,
+  invalidCommandAction,
+  refreshFailedAction,
   NetworkTransportError,
   LifecycleTransportError,
   TokenRefreshRejectedError,
@@ -550,7 +555,7 @@ export const runProductionCli = async (
     args = extracted.argv;
     profileName = extracted.profileName;
   } catch {
-    return written(invalidCommandFailure(recognizedCommandLabel(argv)));
+    return written(invalidCommandFailure(argv, environment));
   }
   const workingDirectory = overrides.workingDirectory ?? process.cwd();
   let command: ProductCliCommand;
@@ -607,14 +612,20 @@ export const runProductionCli = async (
           recognizedCommandLabel(args),
           3,
           "credential_store_unavailable",
-          true,
-          "Unlock or repair the selected credential store and retry.",
+          false,
+          CREDENTIAL_STORE_UNAVAILABLE_ACTION,
         ),
       );
     const result =
       error instanceof InvalidCommandError
-        ? invalidCommandFailure(recognizedCommandLabel(args))
-        : errorDocument("unknown", 1, "internal_error", false, "Retry the command.");
+        ? invalidCommandFailure(args, environment)
+        : errorDocument(
+            recognizedCommandLabel(args),
+            1,
+            "internal_error",
+            false,
+            INTERNAL_ERROR_ACTION,
+          );
     if (!(error instanceof InvalidCommandError)) {
       diagnostics.record({
         correlationId: randomUUID(),
@@ -626,7 +637,16 @@ export const runProductionCli = async (
     return written(result);
   }
   if (command.kind === "init") {
-    if (profileName !== undefined) return written(invalidCommandFailure("init"));
+    if (profileName !== undefined)
+      return written(
+        errorDocument(
+          "init",
+          2,
+          "invalid_command",
+          false,
+          "ohmyhost init runs offline and uses no login: remove --profile-name and run it again.",
+        ),
+      );
     return runOfflineInit(command, io, diagnostics);
   }
   if (command.kind === "help" || command.kind === "version") {
@@ -708,6 +728,9 @@ export const runProductionCli = async (
     overrides.profiles ?? new NativeKeyringProfileRegistry(undefined, platform.credentialService);
   const linkDirectory = join(workingDirectory, platform.linkDirectory);
   const projectId = commandProjectId(command);
+  // A command that named its project read no link yet, but the link still says whose project it is.
+  if (projectId !== undefined && linked === null)
+    links = await readProjectLinks(linkDirectory, platform.apiOrigin);
   // The organization this command is about: named on the command, or recorded by this checkout's
   // link of its project. It narrows the saved logins and is checked against OHMYHOST_TOKEN.
   const organizationId =
@@ -803,9 +826,21 @@ export const runProductionCli = async (
       }
     }
   } catch (error) {
-    return written(
-      compositionFailure(recognizedCommandLabel(args), error, signal, platform.commandPrefix),
+    const result = compositionFailure(
+      recognizedCommandLabel(args),
+      error,
+      signal,
+      platform.commandPrefix,
+      profile,
     );
+    if (result.exitCode === 1)
+      diagnostics.record({
+        correlationId: randomUUID(),
+        category: "internal",
+        subsystem: "authentication",
+        errorKind: "unexpected",
+      });
+    return written(result);
   }
   const selected = profile;
   const productApiOrigin = platform.apiOrigin;
@@ -939,6 +974,7 @@ const compositionFailure = (
   error: unknown,
   signal: AbortSignal,
   commandPrefix: string,
+  profile: LocalProfile | undefined,
 ): CliResult => {
   if (error instanceof ProfileSelectionError)
     return errorDocument(command, error.exitCode, error.code, false, error.suggestedAction);
@@ -957,14 +993,14 @@ const compositionFailure = (
           5,
           "authentication_required",
           false,
-          `Run '${commandPrefix} login --json'.`,
+          endedLoginAction(commandPrefix, profile),
         )
       : errorDocument(
           command,
           5,
           "token_refresh_failed",
           true,
-          `Run '${commandPrefix} login --json' if retrying does not succeed.`,
+          refreshFailedAction(commandPrefix, profile),
         );
   return classifyCliFailure(command, error, signal);
 };
@@ -1006,6 +1042,7 @@ const runOfflineInit = async (
         // The functions runtime reports its own bindings and packages; dropping it left a
         // storage-enabled functions app with no contract to read at all.
         worker: result.worker,
+        runtime: result.runtime,
       })}\n`,
     );
     return blocked ? 9 : 0;
@@ -1031,19 +1068,42 @@ const runOfflineInit = async (
       exitCode,
       code,
       false,
-      error instanceof RepositoryInitConflictError
-        ? "Keep the existing ohmyhost.yaml or remove it explicitly before retrying."
-        : error instanceof RepositoryInitError && error.code === "repository_root_required"
-          ? "Run ohmyhost init from the Git repository root with --root set to the application directory (for example --root website); commit the root ohmyhost.yaml before planning."
-          : error instanceof RepositoryInitError && error.code === "project_name_invalid"
-            ? "Pass a lowercase deployment slug with '--project', then rerun init."
-            : "Run 'ohmyhost init --dry-run --json' and resolve every reported blocker.",
+      known ? initFailureAction(error) : INTERNAL_ERROR_ACTION,
     );
     io.writeStdout(result.stdout);
     return result.exitCode;
   }
 };
 
+/** How to fix one init failure: what went wrong, then the exact next step. */
+const initFailureAction = (error: RepositoryInitError): string => {
+  if (error instanceof RepositoryInitBlockedError)
+    return "Run 'ohmyhost init --dry-run --json' and resolve every reported blocker.";
+  if (error instanceof RepositoryInitConflictError)
+    return "ohmyhost.yaml already exists and init never overwrites it; that file stays authoritative. Run 'ohmyhost init --dry-run --json' to check it and list blockers, then edit the file by hand. Do not delete it to rerun init.";
+  const message = /[.!?]$/u.test(error.message) ? error.message : `${error.message}.`;
+  switch (error.code) {
+    case "repository_root_required":
+      return "Run ohmyhost init from the Git repository root with --root set to the application directory (for example --root website); commit the root ohmyhost.yaml before planning.";
+    case "project_name_invalid":
+      return "Pass a lowercase deployment slug with '--project', then rerun init.";
+    case "application_root_ambiguous":
+      return `${message} Run 'ohmyhost init --root DIR --dry-run --json' from the Git repository root with the directory to deploy; ask the customer if it is unclear.`;
+    case "application_root_not_found":
+    case "application_root_unsupported":
+      return `${message} init needs a package.json that depends on next (without vite or @tanstack/react-start), on vite, or on @tanstack/react-start, or a functions app with src/ohmyhost/worker.ts. Pass --root DIR with the app's directory, or fix its package.json, then run init again.`;
+    case "application_root_invalid":
+    case "application_root_missing":
+      return `${message} Pass --root as a path relative to the repository root, for example apps/web.`;
+    case "repository_configuration_invalid":
+      return `${error.message.replace(/\.$/u, "")}. Fix that, then run 'ohmyhost init --dry-run --json' again; do not delete ohmyhost.yaml.`;
+    case "repository_configuration_root_mismatch":
+      return error.message;
+    default:
+      return `${message} Fix that and run 'ohmyhost init --json' again from the Git repository root.`;
+  }
+};
+
 class FetchWorkosPublicTransport implements WorkosPublicTransport {
   public constructor(
     private readonly parentSignal: AbortSignal,
@@ -1423,8 +1483,8 @@ const runOfflineLogout = async (
       "logout",
       3,
       "credential_store_unavailable",
-      true,
-      "Unlock or repair the selected credential store and retry.",
+      false,
+      CREDENTIAL_STORE_UNAVAILABLE_ACTION,
     );
   }
   io.writeStdout(result.stdout);
@@ -1461,8 +1521,25 @@ export const readSecretValueFromStandardInput = async (
   }
 };
 
-const invalidCommandFailure = (command: OutputCommand): CliResult =>
-  errorDocument(command, 2, "invalid_command", false, "Check 'ohmyhost --help'.");
+/** The refused command's usage, with the command prefix of the selected platform environment. */
+const invalidCommandFailure = (
+  argv: readonly string[],
+  environment: ProductCliEnvironment,
+): CliResult => {
+  let commandPrefix = "ohmyhost";
+  try {
+    commandPrefix = resolveProductCliEnvironment(environment).commandPrefix;
+  } catch {
+    // An invalid OHMYHOST_ENVIRONMENT is reported once the command itself is valid.
+  }
+  return errorDocument(
+    recognizedCommandLabel(argv),
+    2,
+    "invalid_command",
+    false,
+    invalidCommandAction(argv, commandPrefix),
+  );
+};
 
 const resultDocument = (
   command: OutputCommand,

package/src/apps/product-cli/{index.ts → src/index.ts}

@@ -23,6 +23,7 @@ export {
   parseOperation,
   parseOperationEvent,
   parseSafeProblem,
+  parseProjectDataChangePlan,
 } from "./runtime-contract.js";
 
 export * from "./user-token-file.js";

package/src/apps/product-cli/{product-api.ts → src/product-api.ts}

@@ -1,4 +1,8 @@
 import { executeManagedMail, type ManagedMailCommand } from "@ohmyhost/sdk-ts";
+import type {
+  ProjectDataChangeKind,
+  ProjectDataChangePlan,
+} from "@ohmyhost/contracts/project-data-changes";
 import {
   assertProjectDatabaseAccess,
   assertProjectDatabaseAccessCredential,
@@ -66,6 +70,8 @@ import {
   setProjectPoweredByFlag,
   createDeployment,
   createProject,
+  planProjectDataChange,
+  createProjectDataChange,
   submitFeedback,
   getFeedback,
   createOrganization,
@@ -107,7 +113,6 @@ import {
   revokeProjectDatabaseAccess,
   reconcileOperation,
   streamOperationEvents,
-  streamDeploymentLogs,
   type DeploymentPlan,
   type CloudflareDnsAuthorization,
   type CloudflareDnsAuthorizationStatus,
@@ -128,12 +133,16 @@ import {
   type PaidDomain,
   type PaidDomainPlan,
   type ProjectDatabaseQueryResult,
-  type DeploymentDiagnostic,
   type DeploymentDiagnosticPage,
   type Deployment,
   type SourceAutoDeploy,
 } from "@ohmyhost/sdk-ts";
-import { parseAccountProfile, type PublicAccount } from "./runtime-contract.js";
+import {
+  parseAccountProfile,
+  parseProjectDataChangePlan,
+  parseOperation,
+  type PublicAccount,
+} from "./runtime-contract.js";
 
 export interface ProjectCreateInput {
   readonly organizationId: string;
@@ -145,6 +154,17 @@ export interface ProjectCreateInput {
 }
 
 export interface ProductApi {
+  planProjectDataChange(input: {
+    projectId: string;
+    change: ProjectDataChangeKind;
+  }): Promise<ProjectDataChangePlan>;
+  createProjectDataChange(input: {
+    projectId: string;
+    change: ProjectDataChangeKind;
+    ifMatch: string;
+    confirmationToken: string;
+    idempotencyKey: string;
+  }): Promise<Operation>;
   changeDatabaseCompute(input: {
     projectId: string;
     environment: "dev" | "prod";
@@ -345,9 +365,14 @@ export interface ProductApi {
     readonly projectId: string;
     readonly deploymentId: string;
   }): Promise<Deployment>;
+  /**
+   * One connection to the operation's events, resumed after `lastEventId` when given. It ends,
+   * without retrying, when the server closes it or refuses it; the caller decides what follows.
+   */
   streamOperationEvents(
     operationId: string,
     signal: AbortSignal,
+    lastEventId?: string,
   ): Promise<AsyncIterable<OperationEvent>>;
   getDeploymentLogs(input: {
     readonly projectId: string;
@@ -355,10 +380,6 @@ export interface ProductApi {
     readonly cursor?: string;
     readonly limit: number;
   }): Promise<DeploymentDiagnosticPage>;
-  streamDeploymentLogs(
-    input: { readonly projectId: string; readonly deploymentId: string },
-    signal: AbortSignal,
-  ): Promise<AsyncIterable<DeploymentDiagnostic>>;
   planRollback(input: {
     readonly projectId: string;
     readonly deploymentId: string;
@@ -846,6 +867,32 @@ export class GeneratedSdkProductApi implements ProductApi {
     ) as import("@ohmyhost/sdk-ts").FeedbackStatus;
   }
 
+  public async planProjectDataChange(
+    input: Parameters<ProductApi["planProjectDataChange"]>[0],
+  ): Promise<ProjectDataChangePlan> {
+    return parseProjectDataChangePlan(
+      await planProjectDataChange(
+        { project_id: input.projectId, projectDataChangeRequest: { change: input.change } },
+        { client: this.#client },
+      ),
+    );
+  }
+  public async createProjectDataChange(
+    input: Parameters<ProductApi["createProjectDataChange"]>[0],
+  ): Promise<Operation> {
+    return parseOperation(
+      await createProjectDataChange(
+        {
+          project_id: input.projectId,
+          projectDataChangeRequest: { change: input.change },
+          "If-Match": input.ifMatch,
+          "X-Confirmation-Token": input.confirmationToken,
+          "Idempotency-Key": input.idempotencyKey,
+        },
+        { client: this.#client },
+      ),
+    );
+  }
   public async createProject(input: ProjectCreateInput): Promise<Operation> {
     return createProject(
       {
@@ -1014,11 +1061,21 @@ export class GeneratedSdkProductApi implements ProductApi {
   public async streamOperationEvents(
     operationId: string,
     signal: AbortSignal,
+    lastEventId?: string,
   ): Promise<AsyncIterable<OperationEvent>> {
     return (
       await streamOperationEvents(
         { operation_id: operationId },
-        { client: this.#client, signal, headers: { Accept: "text/event-stream" } },
+        {
+          client: this.#client,
+          signal,
+          // The generated client would otherwise retry a refused stream, such as a 404, forever.
+          sseMaxRetryAttempts: 1,
+          headers: {
+            Accept: "text/event-stream",
+            ...(lastEventId === undefined ? {} : { "Last-Event-ID": lastEventId }),
+          },
+        },
       )
     ).stream;
   }
@@ -1038,17 +1095,6 @@ export class GeneratedSdkProductApi implements ProductApi {
       { client: this.#client },
     );
   }
-  public async streamDeploymentLogs(
-    input: { readonly projectId: string; readonly deploymentId: string },
-    signal: AbortSignal,
-  ): Promise<AsyncIterable<DeploymentDiagnostic>> {
-    return (
-      await streamDeploymentLogs(
-        { project_id: input.projectId, deployment_id: input.deploymentId },
-        { client: this.#client, signal, headers: { Accept: "text/event-stream" } },
-      )
-    ).stream;
-  }
 
   public async planRollback(input: {
     readonly projectId: string;