@amerged/ohmyhost-cli 0.1.11 → 0.1.14

package/dist/index.js

@@ -47,7 +47,7 @@ import {
   selectWorkspace,
   selectedWorkspaceId,
   workspaceOf
-} from "./chunk-WT2RRQUB.js";
+} from "./chunk-U32PJQHH.js";
 import {
   CredentialStoreIntegrityError,
   CredentialStoreUnavailableError,

package/package.json

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

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

@@ -75,7 +75,6 @@ import {
   type PublicEnvironmentSecret,
   parseOperation,
   parseOperationEvent,
-  parseProjectMailDomain,
   parseProjectPage,
   parseProjectStatus,
   parseProjectDatabaseQuery,
@@ -254,6 +253,7 @@ interface CliErrorDocument {
     readonly suggested_action: string;
     readonly message?: string;
     readonly retry_after_seconds?: number;
+    readonly request_id?: string;
   };
 }
 
@@ -312,6 +312,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.",
@@ -367,9 +369,24 @@ const HELP_USAGE = Object.freeze({
     "printf '%s' \"$SECRET_VALUE\" | ohmyhost secret set NAME --project ULID --environment ENVIRONMENT_ULID --idempotency-key KEY --stdin [--wait] --json",
   "secret delete":
     "ohmyhost secret delete NAME --project ULID --environment ENVIRONMENT_ULID --idempotency-key KEY [--wait] --json",
+  "mail setup":
+    "ohmyhost mail setup --project ULID --environment ULID --domain DOMAIN --sending true --receiving false --idempotency-key KEY --json",
+  "mail status": "ohmyhost mail status --project ULID --environment ULID --json",
+  "mail webhook set":
+    "ohmyhost mail webhook set --project ULID --environment ULID --url HTTPS_URL --idempotency-key KEY --json",
+  "mail webhook verify":
+    "ohmyhost mail webhook verify --project ULID --environment ULID --idempotency-key KEY --json",
+  "mail webhook disable":
+    "ohmyhost mail webhook disable --project ULID --environment ULID --idempotency-key KEY --json",
+  "mail messages list":
+    "ohmyhost mail messages list --project ULID --environment ULID [--after ULID] --json",
+  "mail messages get":
+    "ohmyhost mail messages get --project ULID --environment ULID --message ULID --json",
+  "mail messages retry":
+    "ohmyhost mail messages retry --project ULID --environment ULID --message ULID --idempotency-key KEY --json",
   "mail domain set":
-    "ohmyhost mail domain set --project ULID --domain DOMAIN --idempotency-key KEY --json",
-  "mail domain status": "ohmyhost mail domain status --project ULID --json",
+    "ohmyhost mail domain set --project ULID --environment ULID --domain DOMAIN --sending true --receiving false --idempotency-key KEY --json",
+  "mail domain status": "ohmyhost mail domain status --project ULID --environment ULID --json",
 } satisfies Readonly<Record<CustomerCommandLabel, string>>);
 
 const HELP_COMMANDS = Object.freeze(
@@ -691,6 +708,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));
@@ -802,9 +821,11 @@ export class ProductCli {
       if (command.kind === "secret-list") return await this.listEnvironmentSecrets(command, signal);
       if (command.kind === "function-runs") return await this.listFunctionRuns(command, signal);
       if (command.kind === "secret-set") return await this.putEnvironmentSecret(command, signal);
-      if (command.kind === "mail-domain-set")
-        return await this.configureMailDomain(command, signal);
-      if (command.kind === "mail-domain-status") return await this.getMailDomain(command, signal);
+      if (command.kind === "managed-mail") {
+        const api = await this.authenticatedApi(command.credentialStore, signal);
+        if (!api.managedMail) throw new Error("Mail unavailable");
+        return success(command.label, { mail: await api.managedMail(command.request) });
+      }
       return await this.deleteEnvironmentSecret(command, signal);
     } catch (error) {
       if (error instanceof UserTokenFileError)
@@ -1169,6 +1190,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,
@@ -1742,30 +1779,6 @@ export class ProductCli {
     );
   }
 
-  private async configureMailDomain(
-    command: Extract<ProductCliCommand, { kind: "mail-domain-set" }>,
-    signal: AbortSignal,
-  ): Promise<CliResult> {
-    const api = await this.authenticatedApi(command.credentialStore, signal);
-    const mailDomain = parseProjectMailDomain(
-      await api.configureMailDomain({
-        projectId: command.projectId,
-        domain: command.domain,
-        idempotencyKey: command.idempotencyKey,
-      }),
-    );
-    return success("mail domain set", { status: mailDomain.status, mail_domain: mailDomain });
-  }
-
-  private async getMailDomain(
-    command: Extract<ProductCliCommand, { kind: "mail-domain-status" }>,
-    signal: AbortSignal,
-  ): Promise<CliResult> {
-    const api = await this.authenticatedApi(command.credentialStore, signal);
-    const mailDomain = parseProjectMailDomain(await api.getMailDomain(command.projectId));
-    return success("mail domain status", { status: mailDomain.status, mail_domain: mailDomain });
-  }
-
   private async waitForOperation(
     api: ProductApi,
     initial: ReturnType<typeof parseOperation>,
@@ -2030,6 +2043,7 @@ const classifyFailure = (command: CommandLabel, error: unknown, signal: AbortSig
         problem.suggestedAction,
         undefined,
         problem.retryAfterSeconds,
+        problem.requestId,
       );
     } catch {
       return failure(
@@ -2079,6 +2093,7 @@ const failure = (
   suggestedAction: string,
   operation?: ReturnType<typeof parseOperation>,
   retryAfterSeconds?: number,
+  requestId?: string,
 ): CliResult => {
   const document: CliErrorDocument = {
     version: 1,
@@ -2090,6 +2105,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 +2145,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";
@@ -2153,8 +2170,7 @@ const parsedCommandName = (command: ProductCliCommand): CommandLabel => {
   if (command.kind === "function-runs") return "function runs";
   if (command.kind === "secret-set") return "secret set";
   if (command.kind === "secret-delete") return "secret delete";
-  if (command.kind === "mail-domain-set") return "mail domain set";
-  if (command.kind === "mail-domain-status") return "mail domain status";
+  if (command.kind === "managed-mail") return command.label;
   return command.kind;
 };
 

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

@@ -1,3 +1,4 @@
+import type { ManagedMailCommand } from "@ohmyhost/sdk-ts";
 import { USER_API_KEY_ID } from "@ohmyhost/contracts/user-api-keys";
 export type ProductCliCommand =
   | {
@@ -132,6 +133,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";
@@ -388,15 +398,19 @@ export type ProductCliCommand =
       readonly credentialStore: "native";
     }
   | {
-      readonly kind: "mail-domain-set";
-      readonly projectId: string;
-      readonly domain: string;
-      readonly idempotencyKey: string;
-      readonly credentialStore: "native";
-    }
-  | {
-      readonly kind: "mail-domain-status";
-      readonly projectId: string;
+      readonly kind: "managed-mail";
+      readonly request: ManagedMailCommand;
+      readonly label:
+        | "mail domain set"
+        | "mail domain status"
+        | "mail setup"
+        | "mail status"
+        | "mail webhook set"
+        | "mail webhook verify"
+        | "mail webhook disable"
+        | "mail messages list"
+        | "mail messages get"
+        | "mail messages retry";
       readonly credentialStore: "native";
     }
   | {
@@ -494,6 +508,7 @@ export type RecognizedCommandLabel =
   | "project status"
   | "project dev-access create"
   | "project handle check"
+  | "project handle set"
   | "database write"
   | "database query"
   | "database access create"
@@ -524,6 +539,14 @@ export type RecognizedCommandLabel =
   | "function runs"
   | "secret set"
   | "secret delete"
+  | "mail setup"
+  | "mail status"
+  | "mail webhook set"
+  | "mail webhook verify"
+  | "mail webhook disable"
+  | "mail messages list"
+  | "mail messages get"
+  | "mail messages retry"
   | "mail domain set"
   | "mail domain status";
 
@@ -585,6 +608,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")
@@ -627,6 +652,20 @@ export const recognizedCommandLabel = (argv: readonly string[]): RecognizedComma
       if (values[0] === "delete") return "secret delete";
     }
     if (value === "function" && values[0] === "runs") return "function runs";
+    if (value === "mail") {
+      if (values[0] === "setup") return "mail setup";
+      if (values[0] === "status") return "mail status";
+      if (values[0] === "webhook") {
+        if (values[1] === "set") return "mail webhook set";
+        if (values[1] === "verify") return "mail webhook verify";
+        if (values[1] === "disable") return "mail webhook disable";
+      }
+      if (values[0] === "messages") {
+        if (values[1] === "list") return "mail messages list";
+        if (values[1] === "get") return "mail messages get";
+        if (values[1] === "retry") return "mail messages retry";
+      }
+    }
     if (value === "mail" && values[0] === "domain") {
       if (values[1] === "set") return "mail domain set";
       if (values[1] === "status") return "mail domain status";
@@ -1054,6 +1093,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"]);
@@ -1694,34 +1751,82 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
     }
     throw new InvalidCommandError();
   }
-  if (first === "mail" && values[0] === "domain" && values[1] === "set") {
+  if (first === "mail") {
     if (yes || wait || follow || stdin) throw new InvalidCommandError();
-    values.splice(0, 2);
-    const options = parseOptions(values, ["--project", "--domain", "--idempotency-key"]);
-    if (
-      !/^(?=.{1,253}$)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}$/u.test(
-        options["--domain"],
-      )
-    ) {
-      throw new InvalidCommandError();
-    }
-    return {
-      kind: "mail-domain-set",
-      projectId: options["--project"],
-      domain: options["--domain"],
-      idempotencyKey: options["--idempotency-key"],
-      credentialStore,
-    };
-  }
-  if (first === "mail" && values[0] === "domain" && values[1] === "status") {
-    if (yes || wait || follow || stdin) throw new InvalidCommandError();
-    values.splice(0, 2);
-    const options = parseOptions(values, ["--project"]);
-    return {
-      kind: "mail-domain-status",
-      projectId: options["--project"],
-      credentialStore,
+    const area = values.shift();
+    const sub =
+      area === "webhook" || area === "messages" || area === "domain" ? values.shift() : undefined;
+    const options = parseOptionalOptions(values, [
+      "--project",
+      "--environment",
+      "--domain",
+      "--sending",
+      "--receiving",
+      "--url",
+      "--idempotency-key",
+      "--message",
+      "--after",
+    ]);
+    const required = (key: keyof typeof options) => {
+      const value = options[key];
+      if (!value) throw new InvalidCommandError();
+      return value;
     };
+    const scope = { projectId: required("--project"), environmentId: required("--environment") };
+    let request: ManagedMailCommand,
+      label: Extract<ProductCliCommand, { kind: "managed-mail" }>["label"];
+    if (area === "setup" || (area === "domain" && sub === "set")) {
+      const sending = required("--sending"),
+        receiving = required("--receiving");
+      if (!["true", "false"].includes(sending) || !["true", "false"].includes(receiving))
+        throw new InvalidCommandError();
+      request = {
+        ...scope,
+        action: "configure",
+        domain: required("--domain"),
+        sending: sending === "true",
+        receiving: receiving === "true",
+        idempotencyKey: required("--idempotency-key"),
+      };
+      label = area === "domain" ? "mail domain set" : "mail setup";
+    } else if (area === "status" || (area === "domain" && sub === "status")) {
+      request = { ...scope, action: "status" };
+      label = area === "domain" ? "mail domain status" : "mail status";
+    } else if (area === "webhook" && sub === "set") {
+      request = {
+        ...scope,
+        action: "webhook_set",
+        url: required("--url"),
+        idempotencyKey: required("--idempotency-key"),
+      };
+      label = "mail webhook set";
+    } else if (area === "webhook" && (sub === "verify" || sub === "disable")) {
+      request = {
+        ...scope,
+        action: sub === "verify" ? "webhook_verify" : "webhook_disable",
+        idempotencyKey: required("--idempotency-key"),
+      };
+      label = sub === "verify" ? "mail webhook verify" : "mail webhook disable";
+    } else if (area === "messages" && sub === "list") {
+      request = {
+        ...scope,
+        action: "messages_list",
+        ...(options["--after"] ? { after: options["--after"] } : {}),
+      };
+      label = "mail messages list";
+    } else if (area === "messages" && sub === "get") {
+      request = { ...scope, action: "message_get", messageId: required("--message") };
+      label = "mail messages get";
+    } else if (area === "messages" && sub === "retry") {
+      request = {
+        ...scope,
+        action: "message_retry",
+        messageId: required("--message"),
+        idempotencyKey: required("--idempotency-key"),
+      };
+      label = "mail messages retry";
+    } else throw new InvalidCommandError();
+    return { kind: "managed-mail", request, label, credentialStore };
   }
   throw new InvalidCommandError();
 };

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

@@ -1,3 +1,4 @@
+import { executeManagedMail, type ManagedMailCommand } from "@ohmyhost/sdk-ts";
 import {
   assertProjectDatabaseAccess,
   assertProjectDatabaseAccessCredential,
@@ -53,7 +54,6 @@ import {
   type ProjectCreditBudget,
   applyPaidProjectDomain,
   configureProjectDomains,
-  configureProjectMailDomain,
   configureProjectSourceAutoDeploy,
   createCloudflareDnsAuthorization,
   createProjectDevAccessTicket,
@@ -74,7 +74,6 @@ import {
   getAccountProfile,
   getCurrentIdentity,
   getDeployment,
-  getProjectMailDomain,
   getProjectSourceAutoDeploy,
   getProjectStatus,
   getPaidProjectDomain,
@@ -83,6 +82,7 @@ import {
   listEnvironmentSecrets,
   listFunctionRuns,
   listProjects,
+  changeProjectHandle,
   getProjectHandleAvailability,
   planDeployment,
   planPaidProjectDomain,
@@ -112,7 +112,6 @@ import {
   type DeleteEnvironmentSecretResult,
   type OhMyHostClient,
   type ProviderReconciliationAttempt,
-  type ProjectMailDomain,
   type CurrentIdentity,
   type DevAccessTicket,
   type ProjectPage,
@@ -211,6 +210,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 },
@@ -368,12 +373,7 @@ export interface ProductApi {
     readonly name: string;
     readonly idempotencyKey: string;
   }): Promise<DeleteEnvironmentSecretResult>;
-  configureMailDomain(input: {
-    readonly projectId: string;
-    readonly domain: string;
-    readonly idempotencyKey: string;
-  }): Promise<ProjectMailDomain>;
-  getMailDomain(projectId: string): Promise<ProjectMailDomain>;
+  managedMail?(input: ManagedMailCommand): Promise<unknown>;
 }
 
 export class GeneratedSdkProductApi implements ProductApi {
@@ -585,6 +585,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> {
@@ -1070,22 +1087,7 @@ export class GeneratedSdkProductApi implements ProductApi {
     );
   }
 
-  public async configureMailDomain(input: {
-    readonly projectId: string;
-    readonly domain: string;
-    readonly idempotencyKey: string;
-  }): Promise<ProjectMailDomain> {
-    return configureProjectMailDomain(
-      {
-        "Idempotency-Key": input.idempotencyKey,
-        project_id: input.projectId,
-        configureProjectMailDomainRequest: { domain: input.domain },
-      },
-      { client: this.#client },
-    );
-  }
-
-  public async getMailDomain(projectId: string): Promise<ProjectMailDomain> {
-    return getProjectMailDomain({ project_id: projectId }, { client: this.#client });
+  public managedMail(input: ManagedMailCommand) {
+    return executeManagedMail(this.#client, input);
   }
 }

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,
@@ -50,7 +50,7 @@ const MAXIMUM_SOURCE_BYTES = 2 * 1024 * 1024;
 const SOURCE_MODULE_PATTERN = /\.(?:[cm]?[jt]s|[jt]sx)$/u;
 const STORAGE_CLIENT_CALL_PATTERN = /\bcreatePrivateStorageClient\s*\(/u;
 // Both database mistakes of 2026-09-18 are visible in the source before anything is built: one read
-// a Hyperdrive connection string, the other opened a socket driver. Neither can work in a Worker, so
+// a retired database binding, the other opened a socket driver. Neither can work in a customer Worker, so
 // naming them here costs a customer minutes instead of a deployment that fails its health check.
 const DATABASE_PRIVATE_BINDING_PATTERN =
   /\bHYPERDRIVE\b|\bconnectionString\b|\bDATABASE_URL\b|postgres(?:ql)?:\/\//u;
@@ -549,7 +549,7 @@ async function databaseContractBlockers(
     if (DATABASE_PRIVATE_BINDING_PATTERN.test(source)) {
       blockers.push({
         code: "database_binding_private",
-        message: `${path} reaches for a managed database connection string. Hyperdrive, DATABASE_URL and postgres:// URLs are platform-private and never reach a customer Worker. Call the database with createPrivateDatabaseClient from "@ohmyhost/customer-runtime/database".`,
+        message: `${path} reaches for a managed database connection string. HYPERDRIVE is retired; DATABASE_URL and postgres:// URLs never reach a customer Worker. Call the database with createPrivateDatabaseClient from "@ohmyhost/customer-runtime/database".`,
       });
     }
     if (DATABASE_SOCKET_DRIVER_PATTERN.test(source)) {
@@ -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[]> {