@fjall/components-infrastructure 3.1.0 → 3.2.1

package/dist/lib/app.d.ts

@@ -292,6 +292,13 @@ export declare class App extends CdkApp {
      * the fleet's environment tag matches the deploying config rather than the
      * construct's `management` fallback; an explicit
      * `props.costAllocationEnvironment` still wins.
+     *
+     * Alarm actions default to the account's `SharedAlarmTopicArn` export
+     * (design § D14 — alerting ships WITH the fleet): every fjall-governed
+     * account's Account/Platform stack produces that export, so alarms page
+     * out of the box. An explicit `props.alarmSnsTopicArn` still wins.
+     * `applicationId` defaults to the app name so the alarm webhook can map
+     * pages to the application; an explicit prop still wins.
      */
     addBuildkite(props: BuildkitePropsInput): Buildkite;
     /**

package/dist/lib/app.js

@@ -16,6 +16,7 @@ import { BACKUP_TIER_TAG_KEY, BACKUP_TIER_TAG_MAP } from "./utils/backupTierMapp
 import { randomBytes } from "crypto";
 import { getConfig } from "./utils/getConfig.js";
 import { UNKNOWN_ENVIRONMENT } from "./utils/env.js";
+import { SHARED_ALARM_TOPIC_EXPORT_NAME } from "./config/aws/alarmTopic.js";
 import AuditRoleFactory from "./resources/aws/audit/auditRole.js";
 import { FJALL_AUDIT_CONFIG } from "./config/audit.js";
 import { FjallLogger } from "./utils/validationLogger.js";
@@ -496,6 +497,13 @@ export class App extends CdkApp {
      * the fleet's environment tag matches the deploying config rather than the
      * construct's `management` fallback; an explicit
      * `props.costAllocationEnvironment` still wins.
+     *
+     * Alarm actions default to the account's `SharedAlarmTopicArn` export
+     * (design § D14 — alerting ships WITH the fleet): every fjall-governed
+     * account's Account/Platform stack produces that export, so alarms page
+     * out of the box. An explicit `props.alarmSnsTopicArn` still wins.
+     * `applicationId` defaults to the app name so the alarm webhook can map
+     * pages to the application; an explicit prop still wins.
      */
     addBuildkite(props) {
         const computeStack = this.getDefaultComputeStack();
@@ -508,6 +516,12 @@ export class App extends CdkApp {
             configEnvironment !== UNKNOWN_ENVIRONMENT) {
             constructProps.costAllocationEnvironment = configEnvironment;
         }
+        if (constructProps.alarmSnsTopicArn === undefined) {
+            constructProps.alarmSnsTopicArn = `import:${SHARED_ALARM_TOPIC_EXPORT_NAME}`;
+        }
+        if (constructProps.applicationId === undefined) {
+            constructProps.applicationId = this.getName();
+        }
         const fleet = new Buildkite(computeStack.getStack(), "Buildkite", constructProps);
         computeStack.addConstruct(fleet);
         return fleet;

package/dist/lib/config/aws/alarmTopic.d.ts

@@ -1,6 +1,13 @@
 import { CfnOutput } from "aws-cdk-lib";
 import type { ITopic } from "aws-cdk-lib/aws-sns";
 import { Construct } from "constructs";
+/**
+ * The well-known cross-stack export name for the account's shared alarm
+ * topic. Consumers build `"import:" + SHARED_ALARM_TOPIC_EXPORT_NAME`
+ * strings for `resolveAlertsTopic`; the CfnOutput below is the single
+ * producer.
+ */
+export declare const SHARED_ALARM_TOPIC_EXPORT_NAME = "SharedAlarmTopicArn";
 export declare class SharedAlarmTopic extends Construct {
     readonly topic: ITopic;
     readonly topicArn: CfnOutput;

package/dist/lib/config/aws/alarmTopic.js

@@ -1,6 +1,13 @@
 import { CfnOutput } from "aws-cdk-lib";
 import { Construct } from "constructs";
 import { SNSTopic } from "../../resources/aws/messaging/sns.js";
+/**
+ * The well-known cross-stack export name for the account's shared alarm
+ * topic. Consumers build `"import:" + SHARED_ALARM_TOPIC_EXPORT_NAME`
+ * strings for `resolveAlertsTopic`; the CfnOutput below is the single
+ * producer.
+ */
+export const SHARED_ALARM_TOPIC_EXPORT_NAME = "SharedAlarmTopicArn";
 export class SharedAlarmTopic extends Construct {
     topic;
     topicArn;
@@ -15,9 +22,9 @@ export class SharedAlarmTopic extends Construct {
         // thinking it duplicates the wrapper's AlarmNotificationsTopicArn —
         // the wrapper's auto-output has no exportName and cannot be imported.
         this.topicArn = new CfnOutput(this, "SharedAlarmTopicArn", {
-            key: "SharedAlarmTopicArn",
+            key: SHARED_ALARM_TOPIC_EXPORT_NAME,
             value: wrapped.getTopicArn(),
-            exportName: "SharedAlarmTopicArn"
+            exportName: SHARED_ALARM_TOPIC_EXPORT_NAME
         });
     }
 }

package/dist/lib/patterns/aws/apexDomainPattern.d.ts

@@ -14,12 +14,12 @@ export interface ApexDomainPatternResult {
  *
  * Delegation direction (D8): child writes NS. The apex zone's contribution
  * to delegation is the org-gated `DelegationRole` the `HostedZone` wrapper
- * creates on the create path — the delegated child `Domain` assumes that
- * role by LITERAL ARN (`parentDelegationRoleArn`) and UPSERTs its own NS
- * records into this zone via `CrossAccountZoneDelegationRecord`. The old
- * parent-writes `delegations[]` path (NS records from `Fn.importValue` of
- * child nameserver exports) was removed with the H13 legacy layer: it was
- * export-locked, child-first-deploy-ordered, and removal required a parent
- * redeploy.
+ * creates for created AND adopted zones — the delegated child `Domain`
+ * assumes that role by LITERAL ARN (`parentDelegationRoleArn`) and UPSERTs
+ * its own NS records into this zone via `CrossAccountZoneDelegationRecord`.
+ * The old parent-writes `delegations[]` path (NS records from
+ * `Fn.importValue` of child nameserver exports) was removed with the H13
+ * legacy layer: it was export-locked, child-first-deploy-ordered, and
+ * removal required a parent redeploy.
  */
 export declare function composeApexDomain(scope: Construct, props: Route53ApexProps): ApexDomainPatternResult;

package/dist/lib/patterns/aws/apexDomainPattern.js

@@ -2,32 +2,28 @@ import { HostedZone } from "../../resources/aws/networking/hostedZone.js";
 import { DomainCertificate } from "../../resources/aws/networking/domainCertificate.js";
 import { composeTypedDnsRecords } from "./dnsRecordComposer.js";
 import { toPascalCase, getSafeZoneName } from "../../utils/capitaliseString.js";
-import { resolveOrgId } from "../../utils/cdkContext.js";
 /**
  * Composition for `registrar: "route53"`. Creates (or imports) the apex
  * `HostedZone` and composes all user records + certificates.
  *
  * Delegation direction (D8): child writes NS. The apex zone's contribution
  * to delegation is the org-gated `DelegationRole` the `HostedZone` wrapper
- * creates on the create path — the delegated child `Domain` assumes that
- * role by LITERAL ARN (`parentDelegationRoleArn`) and UPSERTs its own NS
- * records into this zone via `CrossAccountZoneDelegationRecord`. The old
- * parent-writes `delegations[]` path (NS records from `Fn.importValue` of
- * child nameserver exports) was removed with the H13 legacy layer: it was
- * export-locked, child-first-deploy-ordered, and removal required a parent
- * redeploy.
+ * creates for created AND adopted zones — the delegated child `Domain`
+ * assumes that role by LITERAL ARN (`parentDelegationRoleArn`) and UPSERTs
+ * its own NS records into this zone via `CrossAccountZoneDelegationRecord`.
+ * The old parent-writes `delegations[]` path (NS records from
+ * `Fn.importValue` of child nameserver exports) was removed with the H13
+ * legacy layer: it was export-locked, child-first-deploy-ordered, and
+ * removal required a parent redeploy.
  */
 export function composeApexDomain(scope, props) {
     const safeZone = toPascalCase(getSafeZoneName(props.zoneName));
-    // Gotcha: the cross-account DelegationRole imports CFN export `OrganisationId`
-    // from the org/account stack — only published when an `orgId` CDK context
-    // value is set. Single-account deploys would roll back at synth without
-    // this gate.
-    const inOrganisation = resolveOrgId(scope.node) !== undefined;
+    // Gotcha: `createDelegationRole` is deliberately omitted — the wrapper's
+    // org-gated default gives created AND adopted apex zones the DelegationRole;
+    // re-adding a create-path-only condition would strand adopted apexes (D8).
     const hostedZoneConstruct = new HostedZone(scope, `${safeZone}HostedZone`, {
         zoneName: props.zoneName,
         hostedZoneId: props.hostedZoneId,
-        createDelegationRole: props.hostedZoneId === undefined && inOrganisation,
         costAllocationEnvironment: props.costAllocationEnvironment,
         costAllocationDomain: props.zoneName
     });

package/dist/lib/patterns/aws/buildkite/alarms.d.ts

@@ -3,6 +3,11 @@ export interface BuildkiteAlarmParams {
     readonly buildkiteOrgSlug: string;
     readonly buildkiteQueue: string;
     readonly autoScalingGroupName: string;
+    /**
+     * Alarm-action destination, in either `resolveAlertsTopic` string shape:
+     * a literal `arn:...` or `"import:<ExportName>"` (e.g.
+     * `"import:SharedAlarmTopicArn"`). Omitted → alarms exist but page nobody.
+     */
     readonly alarmSnsTopicArn?: string;
 }
 /**

package/dist/lib/patterns/aws/buildkite/alarms.js

@@ -1,7 +1,7 @@
 import { Duration } from "aws-cdk-lib";
 import { Alarm, ComparisonOperator, MathExpression, Metric, TreatMissingData } from "aws-cdk-lib/aws-cloudwatch";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
-import { Topic } from "aws-cdk-lib/aws-sns";
+import { resolveAlertsTopic } from "../../../utils/resolveAlertsTopic.js";
 /**
  * Metrics namespace the buildkite-agent-scaler publishes to, dimensioned by
  * {Org, Queue} — BOTH dimensions are required; querying Queue alone reads no
@@ -70,8 +70,8 @@ export function addBuildkiteAlarms(scope, params) {
         evaluationPeriods: 3,
         treatMissingData: TreatMissingData.NOT_BREACHING
     });
-    if (params.alarmSnsTopicArn !== undefined) {
-        const topic = Topic.fromTopicArn(scope, "BuildkiteAlarmTopic", params.alarmSnsTopicArn);
+    const topic = resolveAlertsTopic(scope, "BuildkiteAlarmTopic", params.alarmSnsTopicArn);
+    if (topic !== undefined) {
         heartbeatAlarm.addAlarmAction(new SnsAction(topic));
         queuedAlarm.addAlarmAction(new SnsAction(topic));
     }

package/dist/lib/patterns/aws/buildkite/buildkite.js

@@ -1,4 +1,4 @@
-import { CfnOutput, Duration, Stack, Token } from "aws-cdk-lib";
+import { CfnOutput, Duration, RemovalPolicy, Stack, Token } from "aws-cdk-lib";
 import { InstanceArchitecture, InstanceType, MachineImage, SubnetType } from "aws-cdk-lib/aws-ec2";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Source } from "aws-cdk-lib/aws-s3-deployment";
@@ -8,8 +8,9 @@ import { Ec2Instance } from "../../../resources/aws/compute/ec2.js";
 import { SamApplication } from "../../../resources/aws/compute/samApplication.js";
 import { Policy } from "../../../resources/aws/iam/index.js";
 import { BucketDeployment, S3Bucket } from "../../../resources/aws/storage/index.js";
+import { createBuildkiteAlarms } from "../../../resources/aws/monitoring/index.js";
 import { applyCostAllocationTags } from "../../../utils/costAllocationTags.js";
-import { addBuildkiteAlarms } from "./alarms.js";
+import { resolveAlertsTopic } from "../../../utils/resolveAlertsTopic.js";
 import { buildAgentRole } from "./iam.js";
 import { BUILDKITE_STACK_PINS, resolvePinnedAmiId, resolveScalerSarApplicationArn } from "./pins.js";
 import { validateBuildkiteProps } from "./schema.js";
@@ -55,7 +56,10 @@ export class Buildkite extends Construct {
             })
         });
         const artifactBucket = new S3Bucket(this, `${id}ArtifactBucket`);
-        const managedSecretsBucket = new S3Bucket(this, `${id}ManagedSecretsBucket`);
+        // Secrets (SSH deploy keys, git credentials) must survive stack teardown
+        // and accidental overwrite; the artifact bucket is scratch output and
+        // keeps the wrapper's env-aware default (DESTROY + pre-empty off prod).
+        const managedSecretsBucket = new S3Bucket(this, `${id}ManagedSecretsBucket`, { versioned: true, removalPolicy: RemovalPolicy.RETAIN });
         if (config.fjallApiKeySsmParameterName !== undefined) {
             this.addFjallApiKeyEnvHook(id, managedSecretsBucket, config.fjallApiKeySsmParameterName, region);
         }
@@ -163,12 +167,15 @@ export class Buildkite extends Construct {
                 costAllocationEnvironment: config.costAllocationEnvironment
             })
         });
-        addBuildkiteAlarms(this, {
+        const alertsTopic = resolveAlertsTopic(this, "BuildkiteAlarmTopic", config.alarmSnsTopicArn);
+        createBuildkiteAlarms({
+            scope: this,
             buildkiteOrgSlug: config.buildkiteOrgSlug,
             buildkiteQueue: config.buildkiteQueue,
             autoScalingGroupName: autoScalingGroup.autoScalingGroupName,
-            ...(config.alarmSnsTopicArn !== undefined && {
-                alarmSnsTopicArn: config.alarmSnsTopicArn
+            ...(alertsTopic !== undefined && { alarmTopic: alertsTopic }),
+            ...(config.applicationId !== undefined && {
+                applicationId: config.applicationId
             })
         });
         this.artifactBucketName = artifactBucket.bucketName;

package/dist/lib/patterns/aws/buildkite/iam.js

@@ -58,7 +58,8 @@ export const BUILDKITE_AGENT_IAM_ACTION_ALLOWLIST = [
  */
 export function buildAgentRole(scope, id, params) {
     return new Role(scope, id, {
-        description: "Buildkite agent instance role — allowlist-only, no deploy capability",
+        // IAM descriptions only accept [\t\n\r\x20-\x7E\xA1-\xFF] — no em-dashes
+        description: "Buildkite agent instance role - allowlist-only, no deploy capability",
         inlinePolicies: buildAgentPolicyDocuments(params),
         assumedBy: new CompositePrincipal(new ServicePrincipal("autoscaling.amazonaws.com"), new ServicePrincipal("ec2.amazonaws.com"))
     });

package/dist/lib/patterns/aws/buildkite/schema.d.ts

@@ -66,6 +66,7 @@ export declare const BuildkitePropsSchema: z.ZodObject<{
     scaleOutWaitingForJobs: z.ZodDefault<z.ZodBoolean>;
     rolePermissionsBoundaryArn: z.ZodOptional<z.ZodString>;
     alarmSnsTopicArn: z.ZodOptional<z.ZodString>;
+    applicationId: z.ZodOptional<z.ZodString>;
     costAllocationEnvironment: z.ZodOptional<z.ZodString>;
     costAllocationOwner: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;

package/dist/lib/patterns/aws/buildkite/schema.js

@@ -124,6 +124,13 @@ export const BuildkitePropsSchema = z
      * actions (visible on the console, silent).
      */
     alarmSnsTopicArn: z.string().min(1).optional(),
+    /**
+     * Fjall application the fleet belongs to — appended to alarm
+     * descriptions and tagged (`fjall:applicationId`) so the alarm webhook
+     * can map pages to the application. `App.addBuildkite` injects the app
+     * name automatically; set only to override.
+     */
+    applicationId: z.string().min(1).optional(),
     costAllocationEnvironment: z.string().min(1).optional(),
     costAllocationOwner: z.string().min(1).optional()
 })

package/dist/lib/patterns/aws/buildkite.d.ts

@@ -9,4 +9,3 @@ export { BUILDKITE_AMI_OWNER_ACCOUNT_ID, BUILDKITE_CPU_ARCHITECTURES, BUILDKITE_
 export { BuildkitePropsSchema, validateBuildkiteProps, type BuildkiteProps, type BuildkitePropsInput } from "./buildkite/schema.js";
 export { BUILDKITE_AGENT_IAM_ACTION_ALLOWLIST, buildAgentRole, type BuildkiteAgentRoleParams } from "./buildkite/iam.js";
 export { BUILDKITE_DOCKER_PART_ENV_KEYS, BUILDKITE_MOUNT_PART_ENV_KEYS, BUILDKITE_USER_DATA_ENV_KEYS, buildBuildkiteDockerCommands, buildBuildkiteInstallCommands, buildBuildkiteMountCommands, buildBuildkiteUserData, type BuildkiteUserDataContext } from "./buildkite/userData.js";
-export { addBuildkiteAlarms, type BuildkiteAlarmParams } from "./buildkite/alarms.js";

package/dist/lib/patterns/aws/buildkite.js

@@ -9,4 +9,3 @@ export { BUILDKITE_AMI_OWNER_ACCOUNT_ID, BUILDKITE_CPU_ARCHITECTURES, BUILDKITE_
 export { BuildkitePropsSchema, validateBuildkiteProps } from "./buildkite/schema.js";
 export { BUILDKITE_AGENT_IAM_ACTION_ALLOWLIST, buildAgentRole } from "./buildkite/iam.js";
 export { BUILDKITE_DOCKER_PART_ENV_KEYS, BUILDKITE_MOUNT_PART_ENV_KEYS, BUILDKITE_USER_DATA_ENV_KEYS, buildBuildkiteDockerCommands, buildBuildkiteInstallCommands, buildBuildkiteMountCommands, buildBuildkiteUserData } from "./buildkite/userData.js";
-export { addBuildkiteAlarms } from "./buildkite/alarms.js";

package/dist/lib/patterns/aws/devSubstrate.d.ts

@@ -40,27 +40,38 @@ export interface IDevSubstrateProps {
     readonly adoptSlotEcr?: boolean;
     /**
      * Deploy phase for the R2 two-step cert-hang guard. `"zone"` synthesises the
-     * `dev.<appDomain>` child zone + cross-account NS delegation only; `"full"`
-     * additionally builds the wildcard cert + :443 listener (A6) — deploy that
-     * only after the delegated NS has propagated, else ACM DNS-validation hangs.
-     * Defaults to `"full"`. Inert unless `domain` is set.
+     * `devDomain` zone + cross-account NS delegation only; `"full"` additionally
+     * builds the wildcard cert + :443 listener (A6) — deploy that only after the
+     * delegated NS has propagated, else ACM DNS-validation hangs. Defaults to
+     * `"full"`. Inert unless `domain` is set.
      */
     readonly phase?: DomainDeployPhase;
     /**
-     * Public domain the substrate hangs a `dev.<appDomain>` child zone under. When
-     * omitted, the substrate stands up no zone/cert (early milestone — G2 reaches
-     * slots via `curl --resolve`).
+     * The zone slots serve under — an EXPLICIT name (`devDomain`, e.g.
+     * `development.fjall.io`), never derived by prefixing. When omitted, the
+     * substrate stands up no zone/cert (early milestone — G2 reaches slots via
+     * `curl --resolve`).
      *
-     * `parentDelegationRoleArn`, when present, wires the same-org **Case-1** in-stack
-     * NS delegation (design VD2-a): the child stack's `CrossAccountZoneDelegationRecord`
-     * assumes the parent account's `DelegationRole` by LITERAL ARN and UPSERTs the
-     * child NS into the parent zone. Omit it for a plain externally-owned parent
-     * (Case 3 — manual one-off delegation) or a connected different-org parent
-     * (Case 2 — worker UPSERT, B3b, deferred): the substrate then emits only the
-     * zone + its NS export for out-of-band delegation.
+     * Adopt mode (`hostedZoneId` present): the substrate adopts an existing zone
+     * (e.g. the account's delegated Domain) by import — no zone resource, no
+     * delegation record, no NS export. Mutually exclusive with `parentDomain` /
+     * `parentDelegationRoleArn`.
+     *
+     * Create mode (no `hostedZoneId`): the substrate creates the `devDomain`
+     * zone. `parentDelegationRoleArn`, when present, wires the same-org **Case-1**
+     * in-stack NS delegation (design VD2-a): the child stack's
+     * `CrossAccountZoneDelegationRecord` assumes the parent account's
+     * `DelegationRole` by LITERAL ARN and UPSERTs the child NS into the
+     * `parentDomain` zone — `parentDomain` (a proper DNS suffix of `devDomain`)
+     * MUST accompany it. Omit both for a plain externally-owned parent (Case 3 —
+     * manual one-off delegation) or a connected different-org parent (Case 2 —
+     * worker UPSERT, B3b, deferred): the substrate then emits only the zone + its
+     * NS export for out-of-band delegation.
      */
     readonly domain?: {
-        readonly appDomain: string;
+        readonly devDomain: string;
+        readonly hostedZoneId?: string;
+        readonly parentDomain?: string;
         readonly parentDelegationRoleArn?: string;
     };
 }

package/dist/lib/patterns/aws/devSubstrate.js

@@ -4,6 +4,7 @@ import { Cluster } from "aws-cdk-lib/aws-ecs";
 import { Repository } from "aws-cdk-lib/aws-ecr";
 import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Code, Runtime } from "aws-cdk-lib/aws-lambda";
+import { PublicHostedZone } from "aws-cdk-lib/aws-route53";
 import { SqsDestination } from "aws-cdk-lib/aws-s3-notifications";
 import { Construct } from "constructs";
 import { readFileSync } from "node:fs";
@@ -48,7 +49,7 @@ const DEV_SUBSTRATE_WAKER_ID = "DevSubstrateWaker";
 const DEV_SUBSTRATE_WAKER_TG_ID = "DevSubstrateWakerTargetGroup";
 const DEV_SUBSTRATE_WAKER_SOURCE_FILE = "devSubstrate.waker.source.cjs";
 const DEV_SUBSTRATE_WAKER_TIMEOUT_SECONDS = 30;
-/** Construct ids for the substrate's delegated `dev.<appDomain>` child zone. */
+/** Construct ids for the substrate's `devDomain` slot zone (created or adopted). */
 const DEV_SUBSTRATE_ZONE_ID = "DevSubstrateZone";
 const DEV_SUBSTRATE_DELEGATION_ID = "DevSubstrateDelegation";
 const DEV_SUBSTRATE_PARENT_ROLE_ID = "DevSubstrateParentDelegationRole";
@@ -306,32 +307,51 @@ export class DevSubstrate extends Construct {
     #createDomain(props, loadBalancer) {
         if (props.domain === undefined)
             return {};
-        const { appDomain, parentDelegationRoleArn } = props.domain;
-        const childZoneName = `dev.${appDomain}`;
-        // The delegated child zone: createDelegationRole:false because the PARENT
-        // account owns the delegation role (this is the child). The HostedZone
-        // wrapper's create path auto-emits the `<zone>-nameservers` CFN export the
-        // parent consumes to point NS records at us — no manual export needed.
-        const childZone = new HostedZone(this, DEV_SUBSTRATE_ZONE_ID, {
-            zoneName: childZoneName,
-            createDelegationRole: false
-        });
-        // Case-1 same-org delegation fires only when a parent role ARN is supplied.
-        // The in-stack custom resource assumes the parent account's DelegationRole by
-        // LITERAL ARN (Role.fromRoleArn) — NOT Fn.importValue, which resolves
-        // same-account only and is exactly why the DomainDelegation pattern cannot go
-        // cross-account (design VD2-a). The parent DelegationRole trusts the whole
-        // org (OrganizationPrincipal), so a sibling dev account can assume it. Absent
-        // ARN ⇒ Case 2 (worker UPSERT, B3b) / Case 3 (manual), handled out of band:
-        // the zone + NS export above is all the substrate emits.
-        if (parentDelegationRoleArn !== undefined) {
-            const parentRole = Role.fromRoleArn(this, DEV_SUBSTRATE_PARENT_ROLE_ID, parentDelegationRoleArn);
-            new CrossAccountDelegationRecord(this, DEV_SUBSTRATE_DELEGATION_ID, {
-                delegationRole: parentRole,
-                delegatedZone: childZone.hostedZone,
-                delegatedZoneName: childZoneName,
-                parentHostedZoneName: appDomain
+        const { devDomain, hostedZoneId, parentDomain, parentDelegationRoleArn } = props.domain;
+        const childZoneName = devDomain;
+        let childZone;
+        if (hostedZoneId !== undefined) {
+            // Adopt mode: import only — no zone resource, no delegation record, no NS
+            // export (the zone's NS was delegated when the account Domain deployed).
+            // Plain CDK import, NOT the HostedZone wrapper: its import path re-emits
+            // the global `<zone>-hosted-zone-id` export, colliding with the owning
+            // Domain stack's.
+            childZone = PublicHostedZone.fromHostedZoneAttributes(this, DEV_SUBSTRATE_ZONE_ID, { hostedZoneId, zoneName: childZoneName });
+        }
+        else {
+            // Create mode: createDelegationRole:false because the PARENT account owns
+            // the delegation role (this is the child). The HostedZone wrapper's create
+            // path auto-emits the `<zone>-nameservers` CFN export the parent consumes
+            // to point NS records at us — no manual export needed.
+            const createdZone = new HostedZone(this, DEV_SUBSTRATE_ZONE_ID, {
+                zoneName: childZoneName,
+                createDelegationRole: false
             });
+            childZone = createdZone.hostedZone;
+            // Case-1 same-org delegation fires only when a parent role ARN is supplied.
+            // The in-stack custom resource assumes the parent account's DelegationRole by
+            // LITERAL ARN (Role.fromRoleArn) — NOT Fn.importValue, which resolves
+            // same-account only and is exactly why the DomainDelegation pattern cannot go
+            // cross-account (design VD2-a). The parent DelegationRole trusts the whole
+            // org (OrganizationPrincipal), so a sibling dev account can assume it. Absent
+            // ARN ⇒ Case 2 (worker UPSERT, B3b) / Case 3 (manual), handled out of band:
+            // the zone + NS export above is all the substrate emits.
+            if (parentDelegationRoleArn !== undefined) {
+                // Re-checked here because direct construct calls bypass the Zod schema.
+                if (parentDomain === undefined) {
+                    throw new Error(`DevSubstrate domain "${devDomain}": parentDelegationRoleArn was ` +
+                        `supplied without parentDomain. Set domain.parentDomain to the ` +
+                        `parent zone the DelegationRole belongs to (a proper DNS suffix ` +
+                        `of devDomain), or omit parentDelegationRoleArn.`);
+                }
+                const parentRole = Role.fromRoleArn(this, DEV_SUBSTRATE_PARENT_ROLE_ID, parentDelegationRoleArn);
+                new CrossAccountDelegationRecord(this, DEV_SUBSTRATE_DELEGATION_ID, {
+                    delegationRole: parentRole,
+                    delegatedZone: childZone,
+                    delegatedZoneName: childZoneName,
+                    parentHostedZoneName: parentDomain
+                });
+            }
         }
         // Step 2 of the R2 two-step gate: synthesising the cert before the step-1 NS
         // has propagated hangs ACM DNS-validation for hours, so "zone" stops here.
@@ -342,7 +362,7 @@ export class DevSubstrate extends Construct {
         // would otherwise render an invalid CFN export name.
         const certificate = new DomainCertificate(this, DEV_SUBSTRATE_CERT_ID, {
             domainName: `*.${childZoneName}`,
-            hostedZone: childZone.hostedZone,
+            hostedZone: childZone,
             exportCertificateArn: false
         });
         // Unconditional 404 as on :80 (per-slot rules attach out of band, §5.4). open

package/dist/lib/resources/aws/monitoring/buildkiteAlarms.d.ts

@@ -0,0 +1,29 @@
+import { Alarm } from "aws-cdk-lib/aws-cloudwatch";
+import type { ITopic } from "aws-cdk-lib/aws-sns";
+import type { Construct } from "constructs";
+export interface BuildkiteAlarmsProps {
+    scope: Construct;
+    buildkiteOrgSlug: string;
+    buildkiteQueue: string;
+    autoScalingGroupName: string;
+    /**
+     * Omitted → the alarms exist on the console but page nobody. Unlike the
+     * sibling builders the topic is optional: `App.addBuildkite` defaults it to
+     * the shared platform topic, and a bare construct must still synth.
+     */
+    alarmTopic?: ITopic;
+    applicationId?: string;
+}
+/**
+ * The fleet's two Phase-1 alarms (design § D14) — the "~zero babysitting"
+ * posture is honest only with these:
+ *
+ * 1. Scaler heartbeat — `ScheduledJobsCount` goes MISSING for 15 minutes.
+ *    The scaler publishes every poll, so metric absence means the scaler
+ *    Lambda is dead or failing; `treatMissingData: BREACHING` is the alarm's
+ *    entire mechanism.
+ * 2. Queued with zero capacity — jobs scheduled while the ASG has no
+ *    in-service instances for 15 minutes: the fleet cannot boot (AMI gone,
+ *    quota, subnet failure) while work is waiting.
+ */
+export declare function createBuildkiteAlarms(props: BuildkiteAlarmsProps): Alarm[];

package/dist/lib/resources/aws/monitoring/buildkiteAlarms.js

@@ -0,0 +1,90 @@
+import { Duration } from "aws-cdk-lib";
+import { Alarm, ComparisonOperator, MathExpression, Metric, TreatMissingData } from "aws-cdk-lib/aws-cloudwatch";
+import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
+import { buildAlarmDescription, registerAlarm, tagAlarmsWithApplicationId } from "./alarmDefaults.js";
+/**
+ * Metrics namespace the buildkite-agent-scaler publishes to, dimensioned by
+ * {Org, Queue} — BOTH dimensions are required; querying Queue alone reads no
+ * data (CloudWatch dimension matching is exact-set), leaving the heartbeat
+ * permanently ALARM and the queued alarm permanently inert. Phase-1b rollout
+ * gate: verify both metrics carry data after the first build before trusting
+ * the alarms (design § D13/D14) — a namespace/dimension mismatch here is
+ * invisible to the synth tests.
+ */
+const SCALER_METRICS_NAMESPACE = "Buildkite";
+/**
+ * The fleet's two Phase-1 alarms (design § D14) — the "~zero babysitting"
+ * posture is honest only with these:
+ *
+ * 1. Scaler heartbeat — `ScheduledJobsCount` goes MISSING for 15 minutes.
+ *    The scaler publishes every poll, so metric absence means the scaler
+ *    Lambda is dead or failing; `treatMissingData: BREACHING` is the alarm's
+ *    entire mechanism.
+ * 2. Queued with zero capacity — jobs scheduled while the ASG has no
+ *    in-service instances for 15 minutes: the fleet cannot boot (AMI gone,
+ *    quota, subnet failure) while work is waiting.
+ */
+export function createBuildkiteAlarms(props) {
+    const { scope, buildkiteOrgSlug, buildkiteQueue, autoScalingGroupName, alarmTopic, applicationId } = props;
+    const alarms = [];
+    const snsAction = alarmTopic !== undefined ? new SnsAction(alarmTopic) : undefined;
+    const scheduledJobs = new Metric({
+        namespace: SCALER_METRICS_NAMESPACE,
+        metricName: "ScheduledJobsCount",
+        dimensionsMap: {
+            Org: buildkiteOrgSlug,
+            Queue: buildkiteQueue
+        },
+        statistic: "Maximum",
+        period: Duration.minutes(5)
+    });
+    const heartbeatAlarm = new Alarm(scope, "ScalerHeartbeatAlarm", {
+        alarmDescription: buildAlarmDescription(`Buildkite scaler for queue '${buildkiteQueue}' has stopped ` +
+            "publishing metrics — scaler Lambda dead or erroring. Jobs will " +
+            "queue with no scale-out.", applicationId),
+        metric: scheduledJobs,
+        comparisonOperator: ComparisonOperator.LESS_THAN_THRESHOLD,
+        threshold: 0,
+        evaluationPeriods: 3,
+        treatMissingData: TreatMissingData.BREACHING
+    });
+    if (snsAction !== undefined) {
+        registerAlarm(heartbeatAlarm, snsAction, alarms);
+    }
+    else {
+        alarms.push(heartbeatAlarm);
+    }
+    const inServiceInstances = new Metric({
+        namespace: "AWS/AutoScaling",
+        metricName: "GroupInServiceInstances",
+        dimensionsMap: { AutoScalingGroupName: autoScalingGroupName },
+        statistic: "Maximum",
+        period: Duration.minutes(5)
+    });
+    const queuedWithZeroCapacity = new MathExpression({
+        expression: "IF(scheduled > 0 AND inService == 0, 1, 0)",
+        usingMetrics: {
+            scheduled: scheduledJobs,
+            inService: inServiceInstances
+        },
+        period: Duration.minutes(5)
+    });
+    const queuedAlarm = new Alarm(scope, "QueuedWithZeroCapacityAlarm", {
+        alarmDescription: buildAlarmDescription(`Buildkite queue '${buildkiteQueue}' has scheduled jobs but zero ` +
+            "in-service agents for 15 minutes — the fleet cannot boot (AMI, " +
+            "quota, or subnet failure) while work waits.", applicationId),
+        metric: queuedWithZeroCapacity,
+        comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
+        threshold: 1,
+        evaluationPeriods: 3,
+        treatMissingData: TreatMissingData.NOT_BREACHING
+    });
+    if (snsAction !== undefined) {
+        registerAlarm(queuedAlarm, snsAction, alarms);
+    }
+    else {
+        alarms.push(queuedAlarm);
+    }
+    tagAlarmsWithApplicationId(alarms, applicationId);
+    return alarms;
+}

package/dist/lib/resources/aws/monitoring/index.d.ts

@@ -4,5 +4,6 @@ export { createRdsAlarms, type RdsAlarmThresholds, type RdsAlarmsProps } from ".
 export { createLambdaAlarms, type LambdaAlarmThresholds, type LambdaAlarmsProps } from "./lambdaAlarms.js";
 export { createScheduleAlarms, type ScheduleAlarmThresholds, type CreateScheduleAlarmsProps } from "./scheduleAlarms.js";
 export { createClickHouseAlarms, type ClickHouseAlarmThresholds, type ClickHouseAlarmsProps } from "./clickhouseAlarms.js";
+export { createBuildkiteAlarms, type BuildkiteAlarmsProps } from "./buildkiteAlarms.js";
 export { createLogPatternAlarms, type LogPatternAlarmSpec, type LogPatternAlarmsProps } from "./logPatternAlarms.js";
 export { METRIC_NAMESPACE, type MetricNamespace } from "./metricNamespaces.js";

package/dist/lib/resources/aws/monitoring/index.js

@@ -4,5 +4,6 @@ export { createRdsAlarms } from "./rdsAlarms.js";
 export { createLambdaAlarms } from "./lambdaAlarms.js";
 export { createScheduleAlarms } from "./scheduleAlarms.js";
 export { createClickHouseAlarms } from "./clickhouseAlarms.js";
+export { createBuildkiteAlarms } from "./buildkiteAlarms.js";
 export { createLogPatternAlarms } from "./logPatternAlarms.js";
 export { METRIC_NAMESPACE } from "./metricNamespaces.js";

package/dist/lib/resources/aws/networking/hostedZone.js

@@ -13,6 +13,9 @@ export class HostedZoneFactory {
         return new HostedZone(stack.getStack(), `${safeZone}HostedZone`, {
             hostedZoneId,
             zoneName,
+            // BYO app-stack imports never mint the role: its fixed RoleName would
+            // collide with the domain stack's own DelegationRole in the same account.
+            createDelegationRole: false,
             costAllocationEnvironment: opts?.costAllocationEnvironment,
             costAllocationDomain: opts?.costAllocationDomain,
             description: opts?.description
@@ -56,25 +59,6 @@ export class HostedZone extends Construct {
                 value: Fn.join(",", created.hostedZoneNameServers ?? []),
                 exportName: exportNames.nameservers
             });
-            // Org-gate: a single account has no OrganisationId export, so an org-trusting
-            // delegation role would leave an unresolved Fn::ImportValue and roll the stack
-            // back. Default follows org presence; explicit `true` opts in (and fails fast).
-            const inOrganisation = resolveOrgId(this.node) !== undefined;
-            if (props.createDelegationRole === true && !inOrganisation) {
-                throw new Error(`HostedZone "${props.zoneName}": createDelegationRole was requested but ` +
-                    `this account is not part of an AWS Organization (no "orgId" context). ` +
-                    `Cross-account DNS delegation requires an organisation — omit ` +
-                    `createDelegationRole for single-account setups, or connect an organisation.`);
-            }
-            if (props.createDelegationRole ?? inOrganisation) {
-                this.delegationRole = new DelegationRole(this, `${safeZone}DelegationRole`, {
-                    zoneName: props.zoneName,
-                    hostedZone: created,
-                    organisationIdExportName: props.organisationIdExportName,
-                    costAllocationEnvironment: props.costAllocationEnvironment,
-                    costAllocationDomain: props.costAllocationDomain
-                });
-            }
         }
         else {
             // Import path — `fromHostedZoneAttributes` creates a reference, not a
@@ -88,6 +72,26 @@ export class HostedZone extends Construct {
             this.isImported = true;
             Tags.of(this).add("fjall:description", this.description);
         }
+        // Org-gate: a single account has no OrganisationId export, so an org-trusting
+        // delegation role would leave an unresolved Fn::ImportValue and roll the stack
+        // back. Default follows org presence; explicit `true` opts in (and fails fast).
+        // Runs for created AND adopted zones — `grantDelegation` is on IHostedZone.
+        const inOrganisation = resolveOrgId(this.node) !== undefined;
+        if (props.createDelegationRole === true && !inOrganisation) {
+            throw new Error(`HostedZone "${props.zoneName}": createDelegationRole was requested but ` +
+                `this account is not part of an AWS Organization (no "orgId" context). ` +
+                `Cross-account DNS delegation requires an organisation — omit ` +
+                `createDelegationRole for single-account setups, or connect an organisation.`);
+        }
+        if (props.createDelegationRole ?? inOrganisation) {
+            this.delegationRole = new DelegationRole(this, `${safeZone}DelegationRole`, {
+                zoneName: props.zoneName,
+                hostedZone: this.hostedZone,
+                organisationIdExportName: props.organisationIdExportName,
+                costAllocationEnvironment: props.costAllocationEnvironment,
+                costAllocationDomain: props.costAllocationDomain
+            });
+        }
         applyCostAllocationTags(this, {
             service: "hostedZone",
             domain: props.costAllocationDomain ?? props.zoneName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
   "bin": {
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-organizations": "^3.1038.0",
-    "@fjall/generator": "^3.1.0",
-    "@fjall/util": "^3.1.0",
+    "@fjall/generator": "^3.2.1",
+    "@fjall/util": "^3.2.1",
     "constructs": "^10.6.0"
   },
   "overrides": {
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "0f27cc5e260fdf218d33de546ba8610be89e1d81"
+  "gitHead": "1a249298df7bf3104d9d49b47700234db815ebb1"
 }