@amerged/ohmyhost-mcp 0.1.11 → 0.1.13

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

@@ -254,6 +254,7 @@ interface CliErrorDocument {
     readonly suggested_action: string;
     readonly message?: string;
     readonly retry_after_seconds?: number;
+    readonly request_id?: string;
   };
 }
 
@@ -312,6 +313,8 @@ const HELP_USAGE = Object.freeze({
   "project dev-access create": "ohmyhost project dev-access create --project ULID --json",
   "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.",
@@ -691,6 +694,8 @@ export class ProductCli {
       if (command.kind === "project-list") return await this.listProjects(command, signal);
       if (command.kind === "project-handle-check")
         return await this.checkProjectHandle(command, signal);
+      if (command.kind === "project-handle-set")
+        return await this.changeProjectHandle(command, signal);
       if (command.kind === "database-compute-set") {
         const api = await this.authenticatedApi(command.credentialStore, signal);
         let operation = parseOperation(await api.changeDatabaseCompute(command));
@@ -1169,6 +1174,22 @@ export class ProductCli {
     return success("project list", { status: "succeeded", projects });
   }
 
+  private async changeProjectHandle(
+    command: Extract<ProductCliCommand, { kind: "project-handle-set" }>,
+    signal: AbortSignal,
+  ): Promise<CliResult> {
+    const api = await this.authenticatedApi(command.credentialStore, signal);
+    const operation = parseOperation(
+      await api.changeProjectHandle({
+        projectId: command.projectId,
+        handle: command.handle,
+        ifMatch: command.ifMatch,
+        idempotencyKey: command.idempotencyKey,
+      }),
+    );
+    return success("project handle set", { status: "accepted", operation });
+  }
+
   private async checkProjectHandle(
     command: Extract<ProductCliCommand, { kind: "project-handle-check" }>,
     signal: AbortSignal,
@@ -2030,6 +2051,7 @@ const classifyFailure = (command: CommandLabel, error: unknown, signal: AbortSig
         problem.suggestedAction,
         undefined,
         problem.retryAfterSeconds,
+        problem.requestId,
       );
     } catch {
       return failure(
@@ -2079,6 +2101,7 @@ const failure = (
   suggestedAction: string,
   operation?: ReturnType<typeof parseOperation>,
   retryAfterSeconds?: number,
+  requestId?: string,
 ): CliResult => {
   const document: CliErrorDocument = {
     version: 1,
@@ -2090,6 +2113,7 @@ const failure = (
       retryable,
       suggested_action: suggestedAction,
       ...(retryAfterSeconds === undefined ? {} : { retry_after_seconds: retryAfterSeconds }),
+      ...(requestId === undefined ? {} : { request_id: requestId }),
       ...(operation?.error === undefined ? {} : { message: operation.error.message }),
     },
   };
@@ -2129,6 +2153,7 @@ const parsedCommandName = (command: ProductCliCommand): CommandLabel => {
   if (command.kind === "project-status") return "project status";
   if (command.kind === "project-dev-access-create") return "project dev-access create";
   if (command.kind === "project-handle-check") return "project handle check";
+  if (command.kind === "project-handle-set") return "project handle set";
   if (command.kind === "database-write") return "database write";
   if (command.kind === "database-query") return "database query";
   if (command.kind === "database-access-create") return "database access create";

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

@@ -132,6 +132,15 @@ export type ProductCliCommand =
       readonly idempotencyKey: string;
       readonly credentialStore: "native";
     }
+  | {
+      /** Moves a project to a chosen address once its gateways serve it. */
+      readonly kind: "project-handle-set";
+      readonly projectId: string;
+      readonly handle: string;
+      readonly ifMatch: string;
+      readonly idempotencyKey: string;
+      readonly credentialStore: "native";
+    }
   | {
       /** Asks whether a project address is free; the candidate is sent exactly as the agent typed it. */
       readonly kind: "project-handle-check";
@@ -494,6 +503,7 @@ export type RecognizedCommandLabel =
   | "project status"
   | "project dev-access create"
   | "project handle check"
+  | "project handle set"
   | "database write"
   | "database query"
   | "database access create"
@@ -585,6 +595,8 @@ export const recognizedCommandLabel = (argv: readonly string[]): RecognizedComma
     if (value === "project" && values[0] === "status") return "project status";
     if (value === "project" && values[0] === "handle" && values[1] === "check")
       return "project handle check";
+    if (value === "project" && values[0] === "handle" && values[1] === "set")
+      return "project handle set";
     if (value === "project" && values[0] === "dev-access" && values[1] === "create")
       return "project dev-access create";
     if (value === "database" && values[0] === "compute" && values[1] === "set")
@@ -1054,6 +1066,24 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
   }
   if (first === "project") {
     const subcommand = values.shift();
+    if (subcommand === "handle" && values[0] === "set") {
+      values.shift();
+      if (yes || wait || follow || stdin) throw new InvalidCommandError();
+      const options = parseOptions(values, [
+        "--project",
+        "--handle",
+        "--if-match",
+        "--idempotency-key",
+      ]);
+      return {
+        kind: "project-handle-set",
+        projectId: options["--project"],
+        handle: options["--handle"],
+        ifMatch: options["--if-match"],
+        idempotencyKey: options["--idempotency-key"],
+        credentialStore,
+      };
+    }
     if (subcommand === "handle" && values.shift() === "check") {
       if (yes || wait || follow || stdin) throw new InvalidCommandError();
       const options = parseOptions(values, ["--handle"]);

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

@@ -429,9 +429,11 @@ const runOfflineInit = async (
       false,
       error instanceof RepositoryInitConflictError
         ? "Keep the existing ohmyhost.yaml or remove it explicitly before retrying."
-        : 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.",
+        : 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.",
     );
     io.writeStdout(result.stdout);
     return result.exitCode;

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

@@ -83,6 +83,7 @@ import {
   listEnvironmentSecrets,
   listFunctionRuns,
   listProjects,
+  changeProjectHandle,
   getProjectHandleAvailability,
   planDeployment,
   planPaidProjectDomain,
@@ -211,6 +212,12 @@ export interface ProductApi {
   getAccountProfile(): Promise<readonly PublicWorkspace[]>;
   listProjects(input: { readonly cursor?: string; readonly limit: number }): Promise<ProjectPage>;
   checkProjectHandle(input: { readonly handle: string }): Promise<ProjectHandleAvailability>;
+  changeProjectHandle(input: {
+    readonly projectId: string;
+    readonly handle: string;
+    readonly ifMatch: string;
+    readonly idempotencyKey: string;
+  }): Promise<Operation>;
   getProjectStatus(projectId: string): Promise<ProjectStatus>;
   writeProjectDatabase(
     input: ProjectDatabaseWriteRequest & { projectId: string; idempotencyKey: string },
@@ -585,6 +592,23 @@ export class GeneratedSdkProductApi implements ProductApi {
     return listProjects(input, { client: this.#client });
   }
 
+  public async changeProjectHandle(input: {
+    readonly projectId: string;
+    readonly handle: string;
+    readonly ifMatch: string;
+    readonly idempotencyKey: string;
+  }): Promise<Operation> {
+    return changeProjectHandle(
+      {
+        project_id: input.projectId,
+        "Idempotency-Key": input.idempotencyKey,
+        "If-Match": input.ifMatch,
+        handle: input.handle,
+      },
+      { client: this.#client },
+    );
+  }
+
   public async checkProjectHandle(input: {
     readonly handle: string;
   }): Promise<ProjectHandleAvailability> {

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

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { lstat, open, readFile, readdir, stat } from "node:fs/promises";
-import { posix, resolve } from "node:path";
+import { dirname, posix, resolve } from "node:path";
 
 import {
   normalizeApplicationRoot,
@@ -876,6 +876,30 @@ async function assertRepositoryRoot(root: string): Promise<void> {
   if (!information.isDirectory()) {
     throw new RepositoryInitError("repository_not_directory", "Repository path is not a directory");
   }
+  // A Git worktree uses a .git file; never read or follow that file's target.
+  for (let ancestor = root; ; ancestor = dirname(ancestor)) {
+    let marker;
+    try {
+      marker = await lstat(resolve(ancestor, ".git"));
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        throw new RepositoryInitError(
+          "repository_unreadable",
+          "Could not determine the Git repository root",
+        );
+      }
+    }
+    if (marker !== undefined) {
+      if (ancestor !== root) {
+        throw new RepositoryInitError(
+          "repository_root_required",
+          "Run ohmyhost init from the Git repository root and select the application directory with --root; ohmyhost.yaml must be at the repository root.",
+        );
+      }
+      return;
+    }
+    if (dirname(ancestor) === ancestor) return;
+  }
 }
 
 async function collectRepositoryFiles(root: string): Promise<string[]> {

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

@@ -129,6 +129,29 @@ const PROBLEM_POLICY = {
     retryable: true,
     action: "Retry project creation with the same idempotency key.",
   },
+  project_handle_taken: {
+    status: 409,
+    retryable: false,
+    action:
+      "Run 'ohmyhost project handle check' for a free address, then rename to one of the alternatives it returns.",
+  },
+  project_handle_invalid: {
+    status: 409,
+    retryable: false,
+    action:
+      "Choose one to five lowercase words of letters and digits, three to fifty-nine characters, avoiding reserved words.",
+  },
+  project_handle_unchanged: {
+    status: 409,
+    retryable: false,
+    action: "The project already answers on this address; no rename is needed.",
+  },
+  project_rename_blocked: {
+    status: 409,
+    retryable: true,
+    action:
+      "Wait for the running operation to finish, read the project again, then rename with the new ETag.",
+  },
   project_identity_unavailable: {
     status: 503,
     retryable: true,
@@ -196,6 +219,12 @@ const PROBLEM_POLICY = {
     action:
       "Run 'ohmyhost init', apply the matching ohmyhost framework skill, then plan the new commit.",
   },
+  repository_configuration_missing: {
+    status: 409,
+    retryable: false,
+    action:
+      "Place ohmyhost.yaml at the Git repository root and set applicationRoot to the application directory (for example website). Commit and push the change, then plan the new commit.",
+  },
   migration_filename_noncanonical: {
     status: 409,
     retryable: false,
@@ -278,6 +307,7 @@ export class ResponseContractError extends Error {
 }
 
 export interface SafeProblem {
+  readonly requestId: string;
   readonly retryAfterSeconds?: number;
   readonly code: ProblemCode;
   readonly retryable: boolean;
@@ -676,9 +706,9 @@ export const parseDevAccessTicket = (value: unknown): PublicDevAccessTicket => {
     !isUlid(input["project_id"]) ||
     !isUlid(input["environment_id"]) ||
     typeof origin !== "string" ||
-    !/^https:\/\/dev-[a-z]+-[a-z]+-[a-z]+\.(?:dev\.)?check\.omh\.st$/u.test(origin) ||
+    !/^https:\/\/dev-[a-z0-9]+(?:-[a-z0-9]+){0,4}\.(?:dev\.)?check\.omh\.st$/u.test(origin) ||
     typeof redeemUrl !== "string" ||
-    !/^https:\/\/dev-[a-z]+-[a-z]+-[a-z]+\.(?:dev\.)?check\.omh\.st\/\.ohmyhost\/dev-access\/redeem\?stage=dev&ticket=[A-Za-z0-9_-]{43}$/u.test(
+    !/^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(
       redeemUrl,
     ) ||
     new URL(redeemUrl).origin !== origin ||
@@ -880,8 +910,8 @@ const parseProject = (value: unknown): PublicProject => {
     !isUlid(input["organization_id"]) ||
     !boundedString(input["name"], 1, 128) ||
     input["name"] !== input["name"].trim() ||
-    !boundedString(input["handle"], 5, 59) ||
-    !/^[a-z]+-[a-z]+-[a-z]+$/u.test(input["handle"]) ||
+    !boundedString(input["handle"], 3, 59) ||
+    !/^[a-z0-9]+(?:-[a-z0-9]+){0,4}$/u.test(input["handle"]) ||
     (input["data_mode"] !== "shared" && input["data_mode"] !== "isolated") ||
     (input["region"] !== "us" && input["region"] !== "eu") ||
     !isIsoInstant(input["created_at"])
@@ -910,6 +940,7 @@ export const parseProjectPage = (
 export const parseProjectStatus = (value: unknown): Readonly<Record<string, unknown>> => {
   const input = exactRecord(value, [
     "project_id",
+    "etag",
     "handle",
     "region",
     "lifecycle",
@@ -925,8 +956,10 @@ export const parseProjectStatus = (value: unknown): Readonly<Record<string, unkn
   const handle = input["handle"];
   if (
     !isUlid(input["project_id"]) ||
-    !boundedString(handle, 5, 59) ||
-    !/^[a-z]+-[a-z]+-[a-z]+$/u.test(handle) ||
+    typeof input["etag"] !== "string" ||
+    !/^"sha256-[a-f0-9]{64}"$/u.test(input["etag"]) ||
+    !boundedString(handle, 3, 59) ||
+    !/^[a-z0-9]+(?:-[a-z0-9]+){0,4}$/u.test(handle) ||
     (input["region"] !== "us" && input["region"] !== "eu") ||
     (input["lifecycle"] !== "active" &&
       input["lifecycle"] !== "deleting" &&
@@ -1540,6 +1573,7 @@ export const parseSafeProblem = (value: unknown): SafeProblem => {
     !isHttpsUrl(input["type"]) ||
     !boundedString(input["title"], 1, 160) ||
     !boundedString(input["request_id"], 1, 128) ||
+    /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(input["request_id"]) ||
     typeof input["retryable"] !== "boolean" ||
     !boundedString(input["suggested_action"], 1, 500) ||
     (input["detail"] !== undefined && !boundedString(input["detail"], 1, 2_000)) ||
@@ -1558,6 +1592,7 @@ export const parseSafeProblem = (value: unknown): SafeProblem => {
   )
     throw new ResponseContractError();
   return {
+    requestId: input["request_id"],
     code: code as ProblemCode,
     retryable: policy.retryable,
     suggestedAction: