@forgezero/agent 0.1.23 → 0.1.24

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;

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,7 @@ async function enrolGuestIdentity(options) {
     token,
     label: options.label,
     gitDeployPublicKey: options.gitDeployPublicKey,
+    privateNetworkAttachment: options.privateNetworkAttachment,
     publicKeys: {
       ed25519: options.keys.ed25519.publicKey,
       mlDsa: options.keys.mlDsa.publicKey
@@ -2919,7 +2940,7 @@ function materializeWarpMdm(options) {
 }
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.24";
 
 // src/index.ts
 function loadOrCreateSeed(path) {
@@ -3062,7 +3083,8 @@ 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
+      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 +3302,8 @@ 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
+      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

@@ -259,6 +259,16 @@ function agentEnrolmentUnit(options) {
 ` : "";
   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 +287,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}${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}
@@ -355,6 +365,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 ?? {};
@@ -941,7 +966,7 @@ async function resolveIdentity(selector, socketPath) {
 }
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.24";
 
 // src/cli/index.ts
 var DEFAULT_MODE = THRESHOLD_MODES[0].id;
@@ -1170,6 +1195,10 @@ 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,

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,7 @@ export interface GuestEnrolmentOptions {
     keys: NodeKeyPair;
     label?: string;
     gitDeployPublicKey?: string;
+    privateNetworkAttachment?: GuestPrivateNetworkAttachment;
     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,7 @@ async function enrolGuestIdentity(options) {
     token,
     label: options.label,
     gitDeployPublicKey: options.gitDeployPublicKey,
+    privateNetworkAttachment: options.privateNetworkAttachment,
     publicKeys: {
       ed25519: options.keys.ed25519.publicKey,
       mlDsa: options.keys.mlDsa.publicKey
@@ -138,6 +159,7 @@ async function enrolGuestIdentity(options) {
   return binding;
 }
 export {
+  privateNetworkAttachmentFromEnvironment,
   loadGuestBinding,
   enrolGuestIdentity
 };

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. */

package/dist/provision.js

@@ -151,6 +151,16 @@ function agentEnrolmentUnit(options) {
 ` : "";
   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 +179,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}${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}
@@ -247,6 +257,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 ?? {};

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.24";

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.24",
 	"type": "module",
 	"scripts": {
 		"check": "tsc --noEmit",