@amerged/ohmyhost-mcp 0.1.10 → 0.1.13

package/dist/stdio-main.js

@@ -26,7 +26,7 @@ import {
   serverIdentityOf,
   setNegotiatedProtocolVersion,
   validateEnvelopeMeta
-} from "./chunk-7MV2EVXV.js";
+} from "./chunk-475EJ7IK.js";
 
 // node_modules/.pnpm/@modelcontextprotocol+server@2.0.0/node_modules/@modelcontextprotocol/server/dist/stdio.mjs
 var StdioServerTransport = class {
@@ -754,7 +754,7 @@ function assertOrganizationAccount(value) {
   if (!value || typeof value !== "object" || Array.isArray(value) || Object.keys(value).sort().join(",") !== "as_of,available_micros,monthly_micros,name,next_expiry,one_time_micros,organization_id,paid_until,plan,plan_source,reserved_micros,workos_organization_id")
     throw new TypeError("Invalid account fields");
   const v = value;
-  if (typeof v["organization_id"] !== "string" || !/^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u.test(v["organization_id"]) || typeof v["name"] !== "string" || v["name"].length > 128 || typeof v["workos_organization_id"] !== "string" || !/^org_[A-Za-z0-9_]+$/u.test(v["workos_organization_id"]) || v["plan"] !== "paid" && v["plan"] !== "free" || !["free", "stripe", "beta", "manual"].includes(String(v["plan_source"])) || v["plan"] === "free" !== (v["plan_source"] === "free"))
+  if (typeof v["organization_id"] !== "string" || !/^[0-7][0-9A-HJKMNP-TV-Z]{25}$/u.test(v["organization_id"]) || typeof v["name"] !== "string" || v["name"].length > 128 || typeof v["workos_organization_id"] !== "string" || !/^org_[A-Za-z0-9_]+$/u.test(v["workos_organization_id"]) || v["plan"] !== "paid" && v["plan"] !== "free" || !["free", "stripe", "granted", "manual"].includes(String(v["plan_source"])) || v["plan"] === "free" !== (v["plan_source"] === "free"))
     throw new TypeError("Invalid account scope");
   for (const field of ["available_micros", "monthly_micros", "one_time_micros", "reserved_micros"])
     if (typeof v[field] !== "string" || !/^(0|[1-9][0-9]{0,18})$/u.test(v[field]))
@@ -799,7 +799,7 @@ function exact2(v, keys) {
 // apps/product-cli/package.json
 var package_default = {
   name: "@ohmyhost/product-cli",
-  version: "0.1.10",
+  version: "0.1.13",
   private: true,
   ohmyhost: {
     deployment: "production",
@@ -1661,6 +1661,26 @@ var 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,
@@ -1726,6 +1746,11 @@ var PROBLEM_POLICY = {
     retryable: false,
     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,
@@ -1874,7 +1899,7 @@ var parseDevAccessTicket = (value) => {
   ]);
   const origin = input["origin"];
   const redeemUrl = input["redeem_url"];
-  if (!isUlid(input["ticket_id"]) || !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) || 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(redeemUrl) || new URL(redeemUrl).origin !== origin || !isIsoInstant(input["expires_at"])) {
+  if (!isUlid(input["ticket_id"]) || !isUlid(input["project_id"]) || !isUlid(input["environment_id"]) || typeof origin !== "string" || !/^https:\/\/dev-[a-z0-9]+(?:-[a-z0-9]+){0,4}\.(?:dev\.)?check\.omh\.st$/u.test(origin) || typeof redeemUrl !== "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(redeemUrl) || new URL(redeemUrl).origin !== origin || !isIsoInstant(input["expires_at"])) {
     throw new ResponseContractError();
   }
   return input;
@@ -1935,13 +1960,14 @@ var parseSafeProblem = (value) => {
   if (typeof code !== "string" || !(code in PROBLEM_POLICY))
     throw new ResponseContractError();
   const policy = PROBLEM_POLICY[code];
-  if (input["status"] !== policy.status || !boundedString(input["type"], 1, 512) || !isHttpsUrl(input["type"]) || !boundedString(input["title"], 1, 160) || !boundedString(input["request_id"], 1, 128) || typeof input["retryable"] !== "boolean" || !boundedString(input["suggested_action"], 1, 500) || input["detail"] !== void 0 && !boundedString(input["detail"], 1, 2e3) || input["instance"] !== void 0 && !boundedString(input["instance"], 1, 512)) {
+  if (input["status"] !== policy.status || !boundedString(input["type"], 1, 512) || !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"] !== void 0 && !boundedString(input["detail"], 1, 2e3) || input["instance"] !== void 0 && !boundedString(input["instance"], 1, 512)) {
     throw new ResponseContractError();
   }
   const retryAfter = input["retry_after_seconds"];
   if (retryAfter !== void 0 && (code !== "rate_limited" || typeof retryAfter !== "number" || !Number.isSafeInteger(retryAfter) || retryAfter < 1 || retryAfter > 86400))
     throw new ResponseContractError();
   return {
+    requestId: input["request_id"],
     code,
     retryable: policy.retryable,
     suggestedAction: (code === "framework_conversion_required" ? parseFrameworkConversionDetail(input["detail"]) ?? policy.action : policy.action) + (retryAfter === void 0 ? "" : ` Retry after ${String(retryAfter)} seconds.`),
@@ -2117,6 +2143,8 @@ var HELP_USAGE = Object.freeze({
   "project notes set": "ohmyhost project notes set --project ULID --version NUMBER --markdown TEXT --idempotency-key KEY --json (no credentials or signed URLs)",
   "project status": "ohmyhost project status --project ULID --json",
   "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.",
   "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",
@@ -3531,6 +3559,23 @@ var getProjectStatus = (parameters, options) => {
     ...params
   });
 };
+var getProjectHandleAvailability = (parameters, options) => {
+  const params = buildClientParams([parameters], [
+    {
+      args: [
+        { in: "headers", key: "X-Request-Id" },
+        { in: "path", key: "handle" }
+      ]
+    }
+  ]);
+  return (options?.client ?? client).get({
+    responseStyle: "data",
+    security: [{ scheme: "bearer", type: "http" }],
+    url: "/v1/project-handles/{handle}",
+    ...options,
+    ...params
+  });
+};
 var createProjectDevAccessTicket = (parameters, options) => {
   const params = buildClientParams([parameters], [
     {
@@ -3647,6 +3692,31 @@ var getCloudflareDnsAuthorizationStatus = (parameters, options) => {
     ...params
   });
 };
+var changeProjectHandle = (parameters, options) => {
+  const params = buildClientParams([parameters], [
+    {
+      args: [
+        { in: "headers", key: "X-Request-Id" },
+        { in: "headers", key: "Idempotency-Key" },
+        { in: "headers", key: "If-Match" },
+        { in: "path", key: "project_id" },
+        { in: "body", key: "handle" }
+      ]
+    }
+  ]);
+  return (options?.client ?? client).put({
+    responseStyle: "data",
+    security: [{ scheme: "bearer", type: "http" }],
+    url: "/v1/projects/{project_id}/handle",
+    ...options,
+    ...params,
+    headers: {
+      "Content-Type": "application/json",
+      ...options?.headers,
+      ...params.headers
+    }
+  });
+};
 var planPaidProjectDomain = (parameters, options) => {
   const params = buildClientParams([parameters], [
     {
@@ -4651,6 +4721,17 @@ var GeneratedSdkLocalMcpClient = class {
     const scoped = (await this.#workspace.store.read())?.accessToken;
     return scoped === void 0 ? identity : getCurrentIdentity({}, { client: this.#rescope(scoped) });
   }
+  async changeProjectHandle(input) {
+    return changeProjectHandle({
+      project_id: input.projectId,
+      "Idempotency-Key": input.idempotencyKey,
+      "If-Match": input.ifMatch,
+      handle: input.handle
+    }, { client: this.#client });
+  }
+  async checkProjectHandle(input) {
+    return getProjectHandleAvailability({ handle: input.handle }, { client: this.#client });
+  }
   async planPaidDomain(input) {
     const value = await planPaidProjectDomain({ project_id: input.projectId, paidDomainRequest: { hostname: input.hostname } }, { client: this.#client });
     parsePaidDomainPlan(value);
@@ -5186,7 +5267,7 @@ function createLocalOhmyhostMcpServer(dependencies) {
     month: input.month,
     ...input.cursor ? { cursor: input.cursor } : {}
   }));
-  registerProductTool(server, dependencies, "organization_account_get", "Owner-only: read the effective Free/Paid plan, its Stripe/Beta/manual source, available monthly and non-expiring one-time credits, reservations and next expiry. Beta/manual Paid features do not imply a Stripe subscription or extra monthly Paid allowance. This read grants no access or credits.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationAccount(input.organization_id));
+  registerProductTool(server, dependencies, "organization_account_get", "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, available monthly and non-expiring one-time credits, reservations and next expiry. Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. This read grants no access or credits.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationAccount(input.organization_id));
   registerProductTool(server, dependencies, "organization_credits_get", "Read the owner's shared organization credit pool, seven-day grace_started_at/grace_expires_at and published rate_cards. Existing services/domains are not immediately shut down at zero credit; an explicit project stop budget is separate. One credit is 1000000 microcredits. Each rate states credit_micros for units_per_charge; publication alone does not enable billing. active_meters identifies billed sources; provider outages and platform overrun are not customer debt. Works at zero credit.", external_exports.object({ organization_id: identifier2 }), (client2, input) => client2.getOrganizationCredits(input.organization_id));
   registerProductTool(server, dependencies, "project_budget_get", "Read the owner's project UTC-month budget, measured usage and open reservations. A budget never allocates a second wallet.", external_exports.object({ project_id: identifier2 }), (client2, input) => client2.getProjectCreditBudget(input.project_id));
   registerProductTool(server, dependencies, "project_budget_set", "Set an owner's optional monthly project budget in microcredits (1000000 = one credit). continue is the default and uses the org pool after the threshold; stop blocks new billable work. null clears the budget and requires continue. Changing it never resets usage or adds credits. Replay the same key after uncertainty; read the budget again for current usage.", external_exports.object({
@@ -5309,6 +5390,18 @@ function createLocalOhmyhostMcpServer(dependencies) {
     return { revoked: true, key_id: input.key_id };
   }, destructiveAnnotations());
   registerProductTool(server, dependencies, "identity_get", "Get the current ohmyho.st customer/agent identity. This does not authenticate the hosted application's end users or provision a customer AuthKit tenant; application authentication is the customer's chosen integration.", external_exports.object({}), (client2, _input, signal) => client2.getCurrentIdentity(signal));
+  registerProductTool(server, dependencies, "project_handle_check", "Check whether a project address is free before offering it to the customer. A handle is one to five lowercase words of letters and digits joined by single hyphens, three to fifty-nine characters, and never a reserved word such as admin, api, dev or www; it becomes <handle>.check.omh.st for Prod and dev-<handle>.check.omh.st for Dev. The answer names why a handle cannot be used and returns free alternatives, so offer one of those instead of guessing again. Check the name here first, then move an existing project onto it with project_handle_set.", external_exports.object({ handle: external_exports.string().min(1).max(120) }), (client2, input) => client2.checkProjectHandle({ handle: input.handle }));
+  registerProductTool(server, dependencies, "project_handle_set", "Move a project to an address the customer chose, after project_handle_check said it is free. The Dev and Prod gateways are re-published at the new address and it is stored only once both serve it; the previous address stops answering and anyone may claim it, so a link already shared stops working. Needs the project's current ETag from project_status and one idempotency key; reuse the same key after an uncertain answer. Refused while another operation is running for the project, and refused for an address that is taken, unusable, or the one the project already has. Returns an operation to follow with operation_get.", external_exports.object({
+    project_id: identifier2,
+    handle: external_exports.string().min(3).max(59),
+    if_match: external_exports.string().min(3).max(128),
+    idempotency_key: idempotencyKey
+  }), (client2, input) => client2.changeProjectHandle({
+    projectId: input.project_id,
+    handle: input.handle,
+    ifMatch: input.if_match,
+    idempotencyKey: input.idempotency_key
+  }));
   registerProductTool(server, dependencies, "projects_list", "List projects visible to the current identity", external_exports.object({
     cursor: identifier2.optional(),
     limit: external_exports.number().int().min(1).max(100).optional()
@@ -5411,7 +5504,7 @@ function createLocalOhmyhostMcpServer(dependencies) {
     operationId: input.operation_id,
     idempotencyKey: input.idempotency_key
   })), mutationAnnotations());
-  registerProductTool(server, dependencies, "mail_domain_set", "Configure the canonical transactional-mail sender domain. Requires effective Paid access. Read organization_account_get first: Stripe, Beta and manual grants all qualify; credit balance alone is not feature access. Only suggest a Paid Checkout when the account is Free and the owner wants to purchase. Reading existing configuration remains available.", external_exports.object({
+  registerProductTool(server, dependencies, "mail_domain_set", "Configure the canonical transactional-mail sender domain. Requires effective Paid access. Read organization_account_get first: a Stripe subscription and a granted entitlement both qualify; credit balance alone is not feature access. Only suggest a Paid Checkout when the account is Free and the owner wants to purchase. Reading existing configuration remains available.", external_exports.object({
     project_id: identifier2,
     domain: domainName,
     idempotency_key: idempotencyKey
@@ -5537,6 +5630,7 @@ function registerProductTool(server, dependencies, name, description, inputSchem
             code: safe.code,
             retryable: safe.retryable,
             suggested_action: safe.suggestedAction,
+            ...safe.requestId === void 0 ? {} : { request_id: safe.requestId },
             ...safe.retryAfterSeconds === void 0 ? {} : { retry_after_seconds: safe.retryAfterSeconds }
           }
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amerged/ohmyhost-mcp",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "type": "module",
   "engines": {
     "node": ">=22"

package/src/apps/mcp/local-client.ts

@@ -59,6 +59,8 @@ import {
   deleteProject,
   getCurrentIdentity,
   getDeployment,
+  changeProjectHandle,
+  getProjectHandleAvailability,
   getOperation,
   getProjectMailDomain,
   getProject,
@@ -282,6 +284,25 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
       ? identity
       : getCurrentIdentity({}, { client: this.#rescope(scoped) });
   }
+  public async changeProjectHandle(input: {
+    projectId: string;
+    handle: string;
+    ifMatch: string;
+    idempotencyKey: string;
+  }) {
+    return changeProjectHandle(
+      {
+        project_id: input.projectId,
+        "Idempotency-Key": input.idempotencyKey,
+        "If-Match": input.ifMatch,
+        handle: input.handle,
+      },
+      { client: this.#client },
+    );
+  }
+  public async checkProjectHandle(input: { handle: string }) {
+    return getProjectHandleAvailability({ handle: input.handle }, { client: this.#client });
+  }
   public async planPaidDomain(input: { projectId: string; hostname: string }) {
     const value = await planPaidProjectDomain(
       { project_id: input.projectId, paidDomainRequest: { hostname: input.hostname } },

package/src/apps/mcp/local-server.ts

@@ -39,6 +39,13 @@ import type {
 } from "@ohmyhost/sdk-ts";
 
 export interface LocalMcpProductClient {
+  checkProjectHandle(input: { handle: string }): Promise<unknown>;
+  changeProjectHandle(input: {
+    projectId: string;
+    handle: string;
+    ifMatch: string;
+    idempotencyKey: string;
+  }): Promise<unknown>;
   authorizeCloudflareDns(input: {
     projectId: string;
     zone: string;
@@ -633,7 +640,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "organization_account_get",
-    "Owner-only: read the effective Free/Paid plan, its Stripe/Beta/manual source, available monthly and non-expiring one-time credits, reservations and next expiry. Beta/manual Paid features do not imply a Stripe subscription or extra monthly Paid allowance. This read grants no access or credits.",
+    "Owner-only: read the effective Free/Paid plan, its Stripe or granted source, available monthly and non-expiring one-time credits, reservations and next expiry. Granted Paid features do not imply a Stripe subscription or extra monthly Paid allowance. This read grants no access or credits.",
     z.object({ organization_id: identifier }),
     (client, input) => client.getOrganizationAccount(input.organization_id),
   );
@@ -924,6 +931,33 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     z.object({}),
     (client, _input, signal) => client.getCurrentIdentity(signal),
   );
+  registerProductTool(
+    server,
+    dependencies,
+    "project_handle_check",
+    "Check whether a project address is free before offering it to the customer. A handle is one to five lowercase words of letters and digits joined by single hyphens, three to fifty-nine characters, and never a reserved word such as admin, api, dev or www; it becomes <handle>.check.omh.st for Prod and dev-<handle>.check.omh.st for Dev. The answer names why a handle cannot be used and returns free alternatives, so offer one of those instead of guessing again. Check the name here first, then move an existing project onto it with project_handle_set.",
+    z.object({ handle: z.string().min(1).max(120) }),
+    (client, input) => client.checkProjectHandle({ handle: input.handle }),
+  );
+  registerProductTool(
+    server,
+    dependencies,
+    "project_handle_set",
+    "Move a project to an address the customer chose, after project_handle_check said it is free. The Dev and Prod gateways are re-published at the new address and it is stored only once both serve it; the previous address stops answering and anyone may claim it, so a link already shared stops working. Needs the project's current ETag from project_status and one idempotency key; reuse the same key after an uncertain answer. Refused while another operation is running for the project, and refused for an address that is taken, unusable, or the one the project already has. Returns an operation to follow with operation_get.",
+    z.object({
+      project_id: identifier,
+      handle: z.string().min(3).max(59),
+      if_match: z.string().min(3).max(128),
+      idempotency_key: idempotencyKey,
+    }),
+    (client, input) =>
+      client.changeProjectHandle({
+        projectId: input.project_id,
+        handle: input.handle,
+        ifMatch: input.if_match,
+        idempotencyKey: input.idempotency_key,
+      }),
+  );
   registerProductTool(
     server,
     dependencies,
@@ -1192,7 +1226,7 @@ export function createLocalOhmyhostMcpServer(dependencies: LocalOhmyhostMcpDepen
     server,
     dependencies,
     "mail_domain_set",
-    "Configure the canonical transactional-mail sender domain. Requires effective Paid access. Read organization_account_get first: Stripe, Beta and manual grants all qualify; credit balance alone is not feature access. Only suggest a Paid Checkout when the account is Free and the owner wants to purchase. Reading existing configuration remains available.",
+    "Configure the canonical transactional-mail sender domain. Requires effective Paid access. Read organization_account_get first: a Stripe subscription and a granted entitlement both qualify; credit balance alone is not feature access. Only suggest a Paid Checkout when the account is Free and the owner wants to purchase. Reading existing configuration remains available.",
     z.object({
       project_id: identifier,
       domain: domainName,
@@ -1391,6 +1425,7 @@ function registerProductTool<Schema extends z.ZodObject<z.ZodRawShape>, Result>(
         retryable: boolean;
         suggestedAction: string;
         retryAfterSeconds?: number;
+        requestId?: string;
       };
       try {
         safe =
@@ -1437,6 +1472,7 @@ function registerProductTool<Schema extends z.ZodObject<z.ZodRawShape>, Result>(
             code: safe.code,
             retryable: safe.retryable,
             suggested_action: safe.suggestedAction,
+            ...(safe.requestId === undefined ? {} : { request_id: safe.requestId }),
             ...(safe.retryAfterSeconds === undefined
               ? {}
               : { retry_after_seconds: safe.retryAfterSeconds }),

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;
   };
 }
 
@@ -310,6 +311,10 @@ const HELP_USAGE = Object.freeze({
     "ohmyhost project notes set --project ULID --version NUMBER --markdown TEXT --idempotency-key KEY --json (no credentials or signed URLs)",
   "project status": "ohmyhost project status --project ULID --json",
   "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.",
@@ -687,6 +692,10 @@ export class ProductCli {
       }
       if (command.kind === "project-create") return await this.createProject(command, signal);
       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));
@@ -1165,6 +1174,31 @@ 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,
+  ): Promise<CliResult> {
+    const api = await this.authenticatedApi(command.credentialStore, signal);
+    const handle = await api.checkProjectHandle({ handle: command.handle });
+    return success("project handle check", { status: "succeeded", handle });
+  }
+
   private async getProjectStatus(
     command: Extract<ProductCliCommand, { kind: "project-status" }>,
     signal: AbortSignal,
@@ -2017,6 +2051,7 @@ const classifyFailure = (command: CommandLabel, error: unknown, signal: AbortSig
         problem.suggestedAction,
         undefined,
         problem.retryAfterSeconds,
+        problem.requestId,
       );
     } catch {
       return failure(
@@ -2066,6 +2101,7 @@ const failure = (
   suggestedAction: string,
   operation?: ReturnType<typeof parseOperation>,
   retryAfterSeconds?: number,
+  requestId?: string,
 ): CliResult => {
   const document: CliErrorDocument = {
     version: 1,
@@ -2077,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 }),
     },
   };
@@ -2115,6 +2152,8 @@ const parsedCommandName = (command: ProductCliCommand): CommandLabel => {
   if (command.kind === "project-notes-set") return "project notes set";
   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,21 @@ 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";
+      readonly handle: string;
+      readonly credentialStore: "native";
+    }
   | { readonly kind: "help"; readonly topic?: string }
   | { readonly kind: "version" }
   | { readonly kind: "whoami"; readonly credentialStore: "native" }
@@ -487,6 +502,8 @@ export type RecognizedCommandLabel =
   | "project list"
   | "project status"
   | "project dev-access create"
+  | "project handle check"
+  | "project handle set"
   | "database write"
   | "database query"
   | "database access create"
@@ -576,6 +593,10 @@ export const recognizedCommandLabel = (argv: readonly string[]): RecognizedComma
     if (value === "project" && values[0] === "notes" && values[1] === "set")
       return "project notes set";
     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")
@@ -1045,6 +1066,29 @@ 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"]);
+      return { kind: "project-handle-check", handle: options["--handle"], credentialStore };
+    }
     if (subcommand === "dev-access" && values.shift() === "create") {
       if (yes || wait || follow || stdin) throw new InvalidCommandError();
       const options = parseOptions(values, ["--project"]);

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,8 @@ import {
   listEnvironmentSecrets,
   listFunctionRuns,
   listProjects,
+  changeProjectHandle,
+  getProjectHandleAvailability,
   planDeployment,
   planPaidProjectDomain,
   planDeploymentRollback,
@@ -115,6 +117,7 @@ import {
   type CurrentIdentity,
   type DevAccessTicket,
   type ProjectPage,
+  type ProjectHandleAvailability,
   type ProjectStatus,
   type PaidDomain,
   type PaidDomainPlan,
@@ -208,6 +211,13 @@ export interface ProductApi {
   /** The signed-in user's workspaces; an interactive session is required for this route. */
   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 },
@@ -582,6 +592,29 @@ 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> {
+    return getProjectHandleAvailability({ handle: input.handle }, { client: this.#client });
+  }
+
   public async getProjectStatus(projectId: string): Promise<ProjectStatus> {
     return getProjectStatus({ project_id: projectId }, { client: this.#client });
   }

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[]> {