@forgezero/agent 0.1.23 → 0.1.25

package/dist/cli/agent-install.d.ts

@@ -56,6 +56,10 @@ export interface InstallOptions {
     warpOrganization?: string;
     warpClientIdCredentialPath?: string;
     warpClientSecretCredentialPath?: string;
+    cloudflareAccountId?: string;
+    cloudflareTunnelId?: string;
+    cloudflareVirtualNetworkId?: string;
+    cloudflareWarpPolicyId?: string;
     binPath?: string;
     sourceBinPath?: string;
     user?: string;
@@ -66,6 +70,7 @@ export interface InstallOptions {
     enrolTokenCredentialPath?: string;
     enrolStatePath?: string;
     nodeLabel?: string;
+    nodeHostname?: string;
 }
 export declare function planInstall(options: InstallOptions): ProvisionPlan;
 /** Execute the same ordered plan the control plane executes over SSH. */

package/dist/fz-agent.js

@@ -1158,6 +1158,26 @@ import {
   writeFileSync as writeFileSync2
 } from "fs";
 import { dirname as dirname2 } from "path";
+function privateNetworkAttachmentFromEnvironment(env = process.env) {
+  const values = {
+    accountId: env.FZ_CF_ACCOUNT_ID?.trim() ?? "",
+    tunnelId: env.FZ_CF_TUNNEL_ID?.trim() ?? "",
+    virtualNetworkId: env.FZ_CF_VIRTUAL_NETWORK_ID?.trim() ?? "",
+    warpPolicyId: env.FZ_CF_WARP_POLICY_ID?.trim() ?? ""
+  };
+  const supplied = [values.accountId, values.tunnelId, values.virtualNetworkId, values.warpPolicyId].some(Boolean);
+  if (!supplied)
+    return;
+  if (!values.accountId || !values.tunnelId || !values.warpPolicyId) {
+    throw new Error("private-network attachment requires account, Tunnel and WARP policy ids");
+  }
+  return {
+    accountId: values.accountId,
+    tunnelId: values.tunnelId,
+    ...values.virtualNetworkId ? { virtualNetworkId: values.virtualNetworkId } : {},
+    warpPolicyId: values.warpPolicyId
+  };
+}
 var validBinding = (value, expectedNodeKey) => {
   if (!value || typeof value !== "object")
     return false;
@@ -1204,6 +1224,8 @@ async function enrolGuestIdentity(options) {
     token,
     label: options.label,
     gitDeployPublicKey: options.gitDeployPublicKey,
+    privateNetworkAttachment: options.privateNetworkAttachment,
+    edgeHostname: options.edgeHostname?.trim() || undefined,
     publicKeys: {
       ed25519: options.keys.ed25519.publicKey,
       mlDsa: options.keys.mlDsa.publicKey
@@ -2696,17 +2718,23 @@ function validateLifecycleProfile(profile) {
   if (!Array.isArray(profile.apiUnits) || profile.apiUnits.length < 1 || profile.apiUnits.some((unit) => !unitPattern.test(unit))) {
     throw new Error("lifecycle profile needs one or more valid API service units");
   }
-  if (!unitPattern.test(profile.databaseUnit))
+  const databaseValues = [profile.databaseUnit, profile.databaseHealthUrl, profile.databasePorts];
+  if (databaseValues.some((value) => value !== undefined) && databaseValues.some((value) => value === undefined)) {
+    throw new Error("database lifecycle settings must be supplied together");
+  }
+  if (profile.databaseUnit && !unitPattern.test(profile.databaseUnit))
     throw new Error("lifecycle profile database unit is invalid");
   const apiUrl = new URL(profile.apiHealthUrl);
   if (apiUrl.protocol !== "http:" || !["127.0.0.1", "[::1]", "::1", "localhost"].includes(apiUrl.hostname)) {
     throw new Error("API health URL must be loopback HTTP");
   }
-  const databaseUrl = new URL(profile.databaseHealthUrl);
-  if (databaseUrl.protocol !== "http:" || !(["127.0.0.1", "[::1]", "::1", "localhost"].includes(databaseUrl.hostname) || privateIp(databaseUrl.hostname))) {
-    throw new Error("database health URL must be loopback or private HTTP");
+  if (profile.databaseHealthUrl) {
+    const databaseUrl = new URL(profile.databaseHealthUrl);
+    if (databaseUrl.protocol !== "http:" || !(["127.0.0.1", "[::1]", "::1", "localhost"].includes(databaseUrl.hostname) || privateIp(databaseUrl.hostname))) {
+      throw new Error("database health URL must be loopback or private HTTP");
+    }
   }
-  if (!Array.isArray(profile.databasePorts) || profile.databasePorts.length < 1 || profile.databasePorts.some((port) => !Number.isInteger(port) || port < 1 || port > 65535)) {
+  if (profile.databasePorts && (!Array.isArray(profile.databasePorts) || profile.databasePorts.length < 1 || profile.databasePorts.some((port) => !Number.isInteger(port) || port < 1 || port > 65535))) {
     throw new Error("lifecycle profile database ports are invalid");
   }
 }
@@ -2765,7 +2793,7 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
           throw new Error("WARP is not connected");
       }
       for (const address of claim.peerPrivateAddresses) {
-        for (const port of profile.databasePorts)
+        for (const port of profile.databasePorts ?? [])
           await tcpProbe(address, port);
       }
       return {
@@ -2775,6 +2803,9 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
       };
     }
     case "database-member-ready": {
+      if (!profile.databaseUnit || !profile.databaseHealthUrl) {
+        throw new Error("this workload has no controller-managed database lifecycle");
+      }
       await requireSuccess(exec, ["/usr/bin/systemctl", "is-active", profile.databaseUnit], "database service check");
       const response = await fetcher(profile.databaseHealthUrl, { signal: AbortSignal.timeout(5000) });
       if (!response.ok && response.status !== 401)
@@ -2791,7 +2822,12 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
       await requireSuccess(exec, ["/usr/bin/systemctl", "stop", ...profile.apiUnits], "API drain");
       return { sourceDrained: true };
     case "source-stopped":
-      await requireSuccess(exec, ["/usr/bin/systemctl", "stop", ...profile.apiUnits, profile.databaseUnit], "source retirement");
+      await requireSuccess(exec, [
+        "/usr/bin/systemctl",
+        "stop",
+        ...profile.apiUnits,
+        ...profile.databaseUnit ? [profile.databaseUnit] : []
+      ], "source retirement");
       return { sourceStopped: true };
     default:
       throw new Error("unknown lifecycle action");
@@ -2919,7 +2955,7 @@ function materializeWarpMdm(options) {
 }
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 
 // src/index.ts
 function loadOrCreateSeed(path) {
@@ -3062,7 +3098,9 @@ if (import.meta.main) {
       nodeKey: nodeKey2,
       keys: keys2,
       label: process.env.FZ_NODE_LABEL,
-      gitDeployPublicKey: process.env.FZ_GIT_PUBLIC_KEY_FILE ? readFileSync5(process.env.FZ_GIT_PUBLIC_KEY_FILE, "utf8").trim() : undefined
+      edgeHostname: process.env.FZ_NODE_HOSTNAME,
+      gitDeployPublicKey: process.env.FZ_GIT_PUBLIC_KEY_FILE ? readFileSync5(process.env.FZ_GIT_PUBLIC_KEY_FILE, "utf8").trim() : undefined,
+      privateNetworkAttachment: privateNetworkAttachmentFromEnvironment()
     });
     console.log(`[agent] enrolled ${binding2.computeReference} in project ${binding2.projectKey}/${binding2.environmentKey}`);
     process.exit(0);
@@ -3280,7 +3318,9 @@ if (import.meta.main) {
       nodeKey,
       keys,
       label: process.env.FZ_NODE_LABEL,
-      gitDeployPublicKey: process.env.FZ_GIT_PUBLIC_KEY_FILE ? readFileSync5(process.env.FZ_GIT_PUBLIC_KEY_FILE, "utf8").trim() : undefined
+      edgeHostname: process.env.FZ_NODE_HOSTNAME,
+      gitDeployPublicKey: process.env.FZ_GIT_PUBLIC_KEY_FILE ? readFileSync5(process.env.FZ_GIT_PUBLIC_KEY_FILE, "utf8").trim() : undefined,
+      privateNetworkAttachment: privateNetworkAttachmentFromEnvironment()
     });
     console.log(`[agent] enrolled ${binding.computeReference} in project ${binding.projectKey}/${binding.environmentKey}`);
   }

package/dist/fz.js

@@ -163,6 +163,7 @@ var systemdPath = (value, label) => {
     throw new Error(`invalid ${label} path`);
   return value;
 };
+var validNodeHostname = (value) => !value || value.length <= 253 && value === value.toLowerCase() && value.split(".").length >= 3 && value.split(".").every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label));
 function warpConfigUnit(options) {
   if (!options.warpOrganization || !/^[a-z0-9][a-z0-9-]{0,62}$/i.test(options.warpOrganization)) {
     throw new Error("WARP organization is invalid");
@@ -252,13 +253,27 @@ function agentEnrolmentUnit(options) {
   if (!options.apiUrl || !options.enrolTokenCredentialPath || !options.enrolStatePath) {
     throw new Error("direct enrolment needs API, credential and state paths");
   }
+  if (!validNodeHostname(options.nodeHostname))
+    throw new Error("node hostname is invalid");
   const bin = options.binPath ?? "fz-agent";
   const user = options.user ?? "forgezero";
   const seedCredentialPath = options.seedCredentialPath ?? "/etc/forgezero/creds/agent-seed.cred";
   const label = options.nodeLabel ? `Environment=FZ_NODE_LABEL=${options.nodeLabel}
+` : "";
+  const hostname = options.nodeHostname ? `Environment=FZ_NODE_HOSTNAME=${options.nodeHostname}
 ` : "";
   const gitPublicKey = options.gitPublicKeyPath ? `Environment=FZ_GIT_PUBLIC_KEY_FILE=${options.gitPublicKeyPath}
 ` : "";
+  const networkAttachment = [
+    options.cloudflareAccountId ? `Environment=FZ_CF_ACCOUNT_ID=${options.cloudflareAccountId}
+` : "",
+    options.cloudflareTunnelId ? `Environment=FZ_CF_TUNNEL_ID=${options.cloudflareTunnelId}
+` : "",
+    options.cloudflareVirtualNetworkId ? `Environment=FZ_CF_VIRTUAL_NETWORK_ID=${options.cloudflareVirtualNetworkId}
+` : "",
+    options.cloudflareWarpPolicyId ? `Environment=FZ_CF_WARP_POLICY_ID=${options.cloudflareWarpPolicyId}
+` : ""
+  ].join("");
   const stateDir = options.enrolStatePath.replace(/\/[^/]+$/, "");
   return `[Unit]
 Description=Bind this machine to its ForgeZero compute
@@ -277,7 +292,7 @@ Environment=FZ_SEED_CREDENTIAL=agent-seed
 Environment=FZ_ENROL_TOKEN_CREDENTIAL=enrol-token
 Environment=FZ_ENROL_STATE_FILE=${options.enrolStatePath}
 Environment=FZ_API=${options.apiUrl}
-${label}${gitPublicKey}ExecStart=${bin} enrol
+${label}${hostname}${gitPublicKey}${networkAttachment}ExecStart=${bin} enrol
 # A '+' fixed command runs as root solely to remove the host-bound one-time
 # ciphertext. Tenant code and the agent never receive a privilege boundary.
 ExecStartPost=+/usr/bin/rm -f ${options.enrolTokenCredentialPath}
@@ -336,6 +351,8 @@ WantedBy=multi-user.target
 `;
 }
 function agentUnit(options) {
+  if (!validNodeHostname(options.nodeHostname))
+    throw new Error("node hostname is invalid");
   const bin = options.binPath ?? "fz-agent";
   const user = options.user ?? "forgezero";
   const seedCredentialPath = options.seedCredentialPath ?? "/etc/forgezero/creds/agent-seed.cred";
@@ -355,6 +372,21 @@ function agentUnit(options) {
   const warpEnabled = warpValues.every(Boolean);
   if (warpValues.some(Boolean) && !warpEnabled)
     throw new Error("WARP configuration must be supplied together");
+  const networkAttachmentValues = [
+    options.cloudflareAccountId,
+    options.cloudflareTunnelId,
+    options.cloudflareVirtualNetworkId,
+    options.cloudflareWarpPolicyId
+  ];
+  if (networkAttachmentValues.some(Boolean)) {
+    if (!options.cloudflareAccountId || !options.cloudflareTunnelId || !options.cloudflareWarpPolicyId) {
+      throw new Error("private-network attachment requires account, Tunnel and WARP policy ids");
+    }
+    const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+    if (!/^[a-f0-9]{32}$/i.test(options.cloudflareAccountId) || !uuid.test(options.cloudflareTunnelId) || options.cloudflareVirtualNetworkId && !uuid.test(options.cloudflareVirtualNetworkId) || !/^[A-Za-z0-9-]{1,64}$/.test(options.cloudflareWarpPolicyId)) {
+      throw new Error("private-network attachment coordinates are invalid");
+    }
+  }
   const enrolmentEnabled = Boolean(options.enrolTokenCredentialPath && options.enrolStatePath);
   const deploymentEnvironment = options.deploymentEnvironment ?? {};
   const deploymentCredentials = options.deploymentCredentials ?? {};
@@ -378,6 +410,7 @@ function agentUnit(options) {
     options.environment ? `FZ_ENVIRONMENT=${options.environment}` : null,
     options.enrolStatePath ? `FZ_ENROL_STATE_FILE=${options.enrolStatePath}` : null,
     options.nodeLabel ? `FZ_NODE_LABEL=${options.nodeLabel}` : null,
+    options.nodeHostname ? `FZ_NODE_HOSTNAME=${options.nodeHostname}` : null,
     options.gitPublicKeyPath ? `FZ_GIT_PUBLIC_KEY_FILE=${options.gitPublicKeyPath}` : null,
     options.repository ? `FZ_DEPLOY_REPO=${options.repository}` : null,
     options.branch ? `FZ_DEPLOY_BRANCH=${options.branch}` : null,
@@ -941,7 +974,7 @@ async function resolveIdentity(selector, socketPath) {
 }
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 
 // src/cli/index.ts
 var DEFAULT_MODE = THRESHOLD_MODES[0].id;
@@ -1170,12 +1203,17 @@ async function cmdAgent(options, args) {
     warpOrganization: process.env.FZ_WARP_ORGANIZATION,
     warpClientIdCredentialPath: process.env.FZ_WARP_CLIENT_ID_CREDENTIAL_PATH,
     warpClientSecretCredentialPath: process.env.FZ_WARP_CLIENT_SECRET_CREDENTIAL_PATH,
+    cloudflareAccountId: process.env.FZ_CF_ACCOUNT_ID,
+    cloudflareTunnelId: process.env.FZ_CF_TUNNEL_ID,
+    cloudflareVirtualNetworkId: process.env.FZ_CF_VIRTUAL_NETWORK_ID,
+    cloudflareWarpPolicyId: process.env.FZ_CF_WARP_POLICY_ID,
     ...options.enrol ? {
       pullDeployments: true,
       enrolTokenSourcePath,
       enrolTokenCredentialPath,
       enrolStatePath,
       nodeLabel: process.env.FZ_NODE_LABEL,
+      nodeHostname: process.env.FZ_NODE_HOSTNAME,
       deployRoot: process.env.FZ_DEPLOY_ROOT ?? "/opt/forgezero"
     } : {},
     binPath: process.env.FZ_AGENT_BIN ?? "/usr/local/lib/forgezero/agent/fz-agent",

package/dist/guest-enrolment.d.ts

@@ -7,6 +7,14 @@ export interface GuestBinding {
     realm: 'platform' | 'tenant';
     tenantSlug?: string;
 }
+export interface GuestPrivateNetworkAttachment {
+    accountId: string;
+    tunnelId: string;
+    virtualNetworkId?: string;
+    warpPolicyId: string;
+}
+/** Fail closed when setup supplied only part of a cross-network attachment. */
+export declare function privateNetworkAttachmentFromEnvironment(env?: Record<string, string | undefined>): GuestPrivateNetworkAttachment | undefined;
 export interface GuestEnrolmentOptions {
     apiUrl: string;
     /** Already-unsealed systemd credential. Production uses this path. */
@@ -21,6 +29,9 @@ export interface GuestEnrolmentOptions {
     keys: NodeKeyPair;
     label?: string;
     gitDeployPublicKey?: string;
+    privateNetworkAttachment?: GuestPrivateNetworkAttachment;
+    /** Stable API ingress identity; signed with the rest of the enrolment body. */
+    edgeHostname?: string;
     fetch?: (input: URL, init: RequestInit) => Promise<Response>;
     requestTimeoutMs?: number;
 }

package/dist/guest-enrolment.js

@@ -68,6 +68,26 @@ async function postSignedNode(options, path, body) {
 }
 
 // src/guest-enrolment.ts
+function privateNetworkAttachmentFromEnvironment(env = process.env) {
+  const values = {
+    accountId: env.FZ_CF_ACCOUNT_ID?.trim() ?? "",
+    tunnelId: env.FZ_CF_TUNNEL_ID?.trim() ?? "",
+    virtualNetworkId: env.FZ_CF_VIRTUAL_NETWORK_ID?.trim() ?? "",
+    warpPolicyId: env.FZ_CF_WARP_POLICY_ID?.trim() ?? ""
+  };
+  const supplied = [values.accountId, values.tunnelId, values.virtualNetworkId, values.warpPolicyId].some(Boolean);
+  if (!supplied)
+    return;
+  if (!values.accountId || !values.tunnelId || !values.warpPolicyId) {
+    throw new Error("private-network attachment requires account, Tunnel and WARP policy ids");
+  }
+  return {
+    accountId: values.accountId,
+    tunnelId: values.tunnelId,
+    ...values.virtualNetworkId ? { virtualNetworkId: values.virtualNetworkId } : {},
+    warpPolicyId: values.warpPolicyId
+  };
+}
 var validBinding = (value, expectedNodeKey) => {
   if (!value || typeof value !== "object")
     return false;
@@ -114,6 +134,8 @@ async function enrolGuestIdentity(options) {
     token,
     label: options.label,
     gitDeployPublicKey: options.gitDeployPublicKey,
+    privateNetworkAttachment: options.privateNetworkAttachment,
+    edgeHostname: options.edgeHostname?.trim() || undefined,
     publicKeys: {
       ed25519: options.keys.ed25519.publicKey,
       mlDsa: options.keys.mlDsa.publicKey
@@ -138,6 +160,7 @@ async function enrolGuestIdentity(options) {
   return binding;
 }
 export {
+  privateNetworkAttachmentFromEnvironment,
   loadGuestBinding,
   enrolGuestIdentity
 };

package/dist/lifecycle-helper.d.ts

@@ -5,13 +5,13 @@ export interface LifecycleProfile {
     /** Root-owned systemd units whose normal stop path performs application drain. */
     apiUnits: readonly string[];
     /** Root-owned database service stopped only at the final retirement stage. */
-    databaseUnit: string;
+    databaseUnit?: string;
     /** Loopback health endpoint for the API on this compute. */
     apiHealthUrl: string;
     /** Loopback health endpoint for the database member on this compute. */
-    databaseHealthUrl: string;
+    databaseHealthUrl?: string;
     /** Ports that must be reachable on every signed controller-provided private peer. */
-    databasePorts: readonly number[];
+    databasePorts?: readonly number[];
 }
 export interface LifecycleCommandResult {
     exitCode: number;

package/dist/lifecycle-helper.js

@@ -22,17 +22,23 @@ function validateLifecycleProfile(profile) {
   if (!Array.isArray(profile.apiUnits) || profile.apiUnits.length < 1 || profile.apiUnits.some((unit) => !unitPattern.test(unit))) {
     throw new Error("lifecycle profile needs one or more valid API service units");
   }
-  if (!unitPattern.test(profile.databaseUnit))
+  const databaseValues = [profile.databaseUnit, profile.databaseHealthUrl, profile.databasePorts];
+  if (databaseValues.some((value) => value !== undefined) && databaseValues.some((value) => value === undefined)) {
+    throw new Error("database lifecycle settings must be supplied together");
+  }
+  if (profile.databaseUnit && !unitPattern.test(profile.databaseUnit))
     throw new Error("lifecycle profile database unit is invalid");
   const apiUrl = new URL(profile.apiHealthUrl);
   if (apiUrl.protocol !== "http:" || !["127.0.0.1", "[::1]", "::1", "localhost"].includes(apiUrl.hostname)) {
     throw new Error("API health URL must be loopback HTTP");
   }
-  const databaseUrl = new URL(profile.databaseHealthUrl);
-  if (databaseUrl.protocol !== "http:" || !(["127.0.0.1", "[::1]", "::1", "localhost"].includes(databaseUrl.hostname) || privateIp(databaseUrl.hostname))) {
-    throw new Error("database health URL must be loopback or private HTTP");
+  if (profile.databaseHealthUrl) {
+    const databaseUrl = new URL(profile.databaseHealthUrl);
+    if (databaseUrl.protocol !== "http:" || !(["127.0.0.1", "[::1]", "::1", "localhost"].includes(databaseUrl.hostname) || privateIp(databaseUrl.hostname))) {
+      throw new Error("database health URL must be loopback or private HTTP");
+    }
   }
-  if (!Array.isArray(profile.databasePorts) || profile.databasePorts.length < 1 || profile.databasePorts.some((port) => !Number.isInteger(port) || port < 1 || port > 65535)) {
+  if (profile.databasePorts && (!Array.isArray(profile.databasePorts) || profile.databasePorts.length < 1 || profile.databasePorts.some((port) => !Number.isInteger(port) || port < 1 || port > 65535))) {
     throw new Error("lifecycle profile database ports are invalid");
   }
 }
@@ -91,7 +97,7 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
           throw new Error("WARP is not connected");
       }
       for (const address of claim.peerPrivateAddresses) {
-        for (const port of profile.databasePorts)
+        for (const port of profile.databasePorts ?? [])
           await tcpProbe(address, port);
       }
       return {
@@ -101,6 +107,9 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
       };
     }
     case "database-member-ready": {
+      if (!profile.databaseUnit || !profile.databaseHealthUrl) {
+        throw new Error("this workload has no controller-managed database lifecycle");
+      }
       await requireSuccess(exec, ["/usr/bin/systemctl", "is-active", profile.databaseUnit], "database service check");
       const response = await fetcher(profile.databaseHealthUrl, { signal: AbortSignal.timeout(5000) });
       if (!response.ok && response.status !== 401)
@@ -117,7 +126,12 @@ async function executeLifecycleAction(profile, claim, exec = spawnLifecycleComma
       await requireSuccess(exec, ["/usr/bin/systemctl", "stop", ...profile.apiUnits], "API drain");
       return { sourceDrained: true };
     case "source-stopped":
-      await requireSuccess(exec, ["/usr/bin/systemctl", "stop", ...profile.apiUnits, profile.databaseUnit], "source retirement");
+      await requireSuccess(exec, [
+        "/usr/bin/systemctl",
+        "stop",
+        ...profile.apiUnits,
+        ...profile.databaseUnit ? [profile.databaseUnit] : []
+      ], "source retirement");
       return { sourceStopped: true };
     default:
       throw new Error("unknown lifecycle action");

package/dist/migration-pull.d.ts

@@ -1,5 +1,6 @@
 import type { NodeKeyPair } from '@forgezero/runtime/identity';
 export type MigrationNetwork = 'private-lan' | 'cloudflare-warp';
+export type MigrationEvidenceProfile = 'forgezero-platform' | 'tenant-managed';
 export type MigrationAction = 'network-ready' | 'database-member-ready' | 'api-ready' | 'source-drained' | 'source-stopped';
 export interface MigrationEvidence {
     targetAgentReady?: boolean;
@@ -14,6 +15,7 @@ export interface RemoteMigrationClaim {
     migrationKey: string;
     action: MigrationAction;
     network: MigrationNetwork;
+    evidenceProfile?: MigrationEvidenceProfile;
     claimToken: string;
     claimExpiresAtTs: number;
     attempt: number;

package/dist/provision.d.ts

@@ -101,6 +101,11 @@ export interface UnitOptions {
     warpOrganization?: string;
     warpClientIdCredentialPath?: string;
     warpClientSecretCredentialPath?: string;
+    /** Non-secret coordinates bound through the PQ-signed enrolment request. */
+    cloudflareAccountId?: string;
+    cloudflareTunnelId?: string;
+    cloudflareVirtualNetworkId?: string;
+    cloudflareWarpPolicyId?: string;
     /** Where `fz-agent` ended up. `bun add -g` puts it on PATH. */
     binPath?: string;
     /** Package-owned binary copied to binPath before hardened units start. */
@@ -114,6 +119,8 @@ export interface UnitOptions {
     enrolTokenCredentialPath?: string;
     enrolStatePath?: string;
     nodeLabel?: string;
+    /** Stable API ingress identity bound by the signed one-time enrolment. */
+    nodeHostname?: string;
 }
 export declare const DEPLOYMENT_RUNNER_USER = "forgezero-runner";
 export declare const DEPLOYMENT_GROUP = "forgezero-deploy";

package/dist/provision.js

@@ -55,6 +55,7 @@ var systemdPath = (value, label) => {
     throw new Error(`invalid ${label} path`);
   return value;
 };
+var validNodeHostname = (value) => !value || value.length <= 253 && value === value.toLowerCase() && value.split(".").length >= 3 && value.split(".").every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label));
 function warpConfigUnit(options) {
   if (!options.warpOrganization || !/^[a-z0-9][a-z0-9-]{0,62}$/i.test(options.warpOrganization)) {
     throw new Error("WARP organization is invalid");
@@ -144,13 +145,27 @@ function agentEnrolmentUnit(options) {
   if (!options.apiUrl || !options.enrolTokenCredentialPath || !options.enrolStatePath) {
     throw new Error("direct enrolment needs API, credential and state paths");
   }
+  if (!validNodeHostname(options.nodeHostname))
+    throw new Error("node hostname is invalid");
   const bin = options.binPath ?? "fz-agent";
   const user = options.user ?? "forgezero";
   const seedCredentialPath = options.seedCredentialPath ?? "/etc/forgezero/creds/agent-seed.cred";
   const label = options.nodeLabel ? `Environment=FZ_NODE_LABEL=${options.nodeLabel}
+` : "";
+  const hostname = options.nodeHostname ? `Environment=FZ_NODE_HOSTNAME=${options.nodeHostname}
 ` : "";
   const gitPublicKey = options.gitPublicKeyPath ? `Environment=FZ_GIT_PUBLIC_KEY_FILE=${options.gitPublicKeyPath}
 ` : "";
+  const networkAttachment = [
+    options.cloudflareAccountId ? `Environment=FZ_CF_ACCOUNT_ID=${options.cloudflareAccountId}
+` : "",
+    options.cloudflareTunnelId ? `Environment=FZ_CF_TUNNEL_ID=${options.cloudflareTunnelId}
+` : "",
+    options.cloudflareVirtualNetworkId ? `Environment=FZ_CF_VIRTUAL_NETWORK_ID=${options.cloudflareVirtualNetworkId}
+` : "",
+    options.cloudflareWarpPolicyId ? `Environment=FZ_CF_WARP_POLICY_ID=${options.cloudflareWarpPolicyId}
+` : ""
+  ].join("");
   const stateDir = options.enrolStatePath.replace(/\/[^/]+$/, "");
   return `[Unit]
 Description=Bind this machine to its ForgeZero compute
@@ -169,7 +184,7 @@ Environment=FZ_SEED_CREDENTIAL=agent-seed
 Environment=FZ_ENROL_TOKEN_CREDENTIAL=enrol-token
 Environment=FZ_ENROL_STATE_FILE=${options.enrolStatePath}
 Environment=FZ_API=${options.apiUrl}
-${label}${gitPublicKey}ExecStart=${bin} enrol
+${label}${hostname}${gitPublicKey}${networkAttachment}ExecStart=${bin} enrol
 # A '+' fixed command runs as root solely to remove the host-bound one-time
 # ciphertext. Tenant code and the agent never receive a privilege boundary.
 ExecStartPost=+/usr/bin/rm -f ${options.enrolTokenCredentialPath}
@@ -228,6 +243,8 @@ WantedBy=multi-user.target
 `;
 }
 function agentUnit(options) {
+  if (!validNodeHostname(options.nodeHostname))
+    throw new Error("node hostname is invalid");
   const bin = options.binPath ?? "fz-agent";
   const user = options.user ?? "forgezero";
   const seedCredentialPath = options.seedCredentialPath ?? "/etc/forgezero/creds/agent-seed.cred";
@@ -247,6 +264,21 @@ function agentUnit(options) {
   const warpEnabled = warpValues.every(Boolean);
   if (warpValues.some(Boolean) && !warpEnabled)
     throw new Error("WARP configuration must be supplied together");
+  const networkAttachmentValues = [
+    options.cloudflareAccountId,
+    options.cloudflareTunnelId,
+    options.cloudflareVirtualNetworkId,
+    options.cloudflareWarpPolicyId
+  ];
+  if (networkAttachmentValues.some(Boolean)) {
+    if (!options.cloudflareAccountId || !options.cloudflareTunnelId || !options.cloudflareWarpPolicyId) {
+      throw new Error("private-network attachment requires account, Tunnel and WARP policy ids");
+    }
+    const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+    if (!/^[a-f0-9]{32}$/i.test(options.cloudflareAccountId) || !uuid.test(options.cloudflareTunnelId) || options.cloudflareVirtualNetworkId && !uuid.test(options.cloudflareVirtualNetworkId) || !/^[A-Za-z0-9-]{1,64}$/.test(options.cloudflareWarpPolicyId)) {
+      throw new Error("private-network attachment coordinates are invalid");
+    }
+  }
   const enrolmentEnabled = Boolean(options.enrolTokenCredentialPath && options.enrolStatePath);
   const deploymentEnvironment = options.deploymentEnvironment ?? {};
   const deploymentCredentials = options.deploymentCredentials ?? {};
@@ -270,6 +302,7 @@ function agentUnit(options) {
     options.environment ? `FZ_ENVIRONMENT=${options.environment}` : null,
     options.enrolStatePath ? `FZ_ENROL_STATE_FILE=${options.enrolStatePath}` : null,
     options.nodeLabel ? `FZ_NODE_LABEL=${options.nodeLabel}` : null,
+    options.nodeHostname ? `FZ_NODE_HOSTNAME=${options.nodeHostname}` : null,
     options.gitPublicKeyPath ? `FZ_GIT_PUBLIC_KEY_FILE=${options.gitPublicKeyPath}` : null,
     options.repository ? `FZ_DEPLOY_REPO=${options.repository}` : null,
     options.branch ? `FZ_DEPLOY_BRANCH=${options.branch}` : null,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** One package version shared by both public binaries. Pinned to package.json by tests. */
-export declare const VERSION = "0.1.23";
+export declare const VERSION = "0.1.25";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"//": "Publishing happens from an operator's machine, not CI \u2014 CLAUDE.md records that the absence of CI is deliberate. npm's `provenance` attests a tarball was built by a recognised CI provider from a named commit, so it cannot be produced here: it was set, and the first publish failed with `Automatic provenance generation not supported for provider: null`. A setting that can never be satisfied is worse than none, because it reads as a guarantee nobody is getting. Restore it the day this publishes from CI, and not before.",
 	"name": "@forgezero/agent",
-	"version": "0.1.23",
+	"version": "0.1.25",
 	"type": "module",
 	"scripts": {
 		"check": "tsc --noEmit",