agent-embassy 1.9.4 → 2.0.1

package/dist/src/gateway/store.js

@@ -5,7 +5,7 @@ import os from "node:os";
 import path from "node:path";
 import { BridgeError } from "../errors.js";
 import { KeyedMutex } from "../mutex.js";
-import { peerEdgeRef } from "./peer-protocol.js";
+import { peerEdgeRef, peerRouteRef } from "./peer-protocol.js";
 import { deliveryStates, directionId, gatewayActivityActions, gatewayActivityKinds, gatewayProviders, gatewayPublicSnapshotLimits, gatewayRegistrationIngressPrefixes, parseDirection, projectGatewayPublicSnapshot, routeRegistrationModes } from "./types.js";
 const STATE_MARKER = ".agent-embassy-state";
 const STATE_MARKER_CONTENT = "agent-embassy-state-v1\n";
@@ -18,15 +18,14 @@ const DEFAULT_RETAINED_BODY_BYTES = 1 * 1024 * 1024;
 const ALIAS_PATTERN = /^[a-z][a-z0-9_-]{0,31}@[a-z0-9](?:[a-z0-9.-]{0,61}[a-z0-9])?$/;
 const HOST_PATTERN = /^[a-z0-9](?:[a-z0-9.-]{0,61}[a-z0-9])?$/;
 const PRIVATE_TOKEN_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,255}$/;
+const REGISTRATION_ID_PATTERN = /^reg_[A-Za-z0-9_-]{1,252}$/;
 const PEER_ROUTE_HANDLE_PATTERN = /^peer:[0-9a-f]{64}$/;
 const SAFE_CODE_PATTERN = /^[A-Z][A-Z0-9_]{0,63}$/;
 const MESSAGE_ID_PATTERN = /^msg_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const MESSAGE_SUFFIX_PATTERN = /^[0-9a-f]{8}$/;
 const CONVERSATION_SUFFIX_PATTERN = /^[A-Za-z0-9_-]{8}$/;
 const FINGERPRINT_PATTERN = /^[A-Za-z0-9_-]{43}$/;
-// New/public tokens are exact 24-character handles. The wider private read
-// bound keeps pre-release v3 artifacts written before that correction bootable.
-const DELIVERY_TOKEN_PATTERN = /^dlv_[A-Za-z0-9_-]{24,128}$/;
+const DELIVERY_TOKEN_PATTERN = /^dlv_[A-Za-z0-9_-]{24}$/;
 const SHA256_PATTERN = /^[0-9a-f]{64}$/;
 const PROVIDERS = new Set(gatewayProviders);
 const REGISTRATION_MODES = new Set(routeRegistrationModes);
@@ -103,12 +102,13 @@ function isRoute(value) {
         typeof value.alias === "string" &&
         ALIAS_PATTERN.test(value.alias) &&
         isLogicalBinding(value.binding) &&
+        REGISTRATION_ID_PATTERN.test(value.binding.registrationId) &&
         typeof value.registrationMode === "string" &&
         REGISTRATION_MODES.has(value.registrationMode) &&
         (value.binding.provider !== "peer" || value.registrationMode === "federated_peer" ||
             PEER_ROUTE_HANDLE_PATTERN.test(value.binding.routeHandle)) &&
         typeof value.enabled === "boolean" &&
-        (value.busyPolicy === "queue" || value.busyPolicy === "refuse") &&
+        value.busyPolicy === "queue" &&
         isIsoTimestamp(value.registeredAt) &&
         isIsoTimestamp(value.updatedAt) &&
         isCounters(value.counters));
@@ -396,17 +396,17 @@ function isRuntimeActivity(value) {
         typeof event.operatorAction === "boolean" &&
         (event.safeErrorCode === undefined || isSafeCode(event.safeErrorCode)));
 }
-function isLegacyActivity(value) {
+function isMessageActivity(value) {
     return (isObject(value) &&
         hasOnlyKeys(value, ["type", "event"]) &&
-        value.type === "legacy_message" &&
+        value.type === "message_activity" &&
         isNormalizedEvent(value.event));
 }
-export function isGatewayPersistedStateV3(value) {
+export function isGatewayPersistedStateV4(value) {
     if (!isObject(value) ||
         !hasOnlyKeys(value, ["schemaVersion", "commit", "createdAt", "updatedAt", "eventSequence",
             "routes", "consentEdges", "messages", "dedupe", "rateBuckets", "activity", "accounting"]) ||
-        value.schemaVersion !== 3 ||
+        value.schemaVersion !== 4 ||
         !isObject(value.commit) ||
         !hasOnlyKeys(value.commit, ["sequence", "id"]) ||
         !isNonNegativeInteger(value.commit.sequence) ||
@@ -428,7 +428,7 @@ export function isGatewayPersistedStateV3(value) {
             typeof bucket.sourceAlias === "string" && ALIAS_PATTERN.test(bucket.sourceAlias) &&
             isIsoTimestamp(bucket.windowStartedAt) && isNonNegativeInteger(bucket.count)) ||
         !Array.isArray(value.activity) ||
-        !value.activity.every((entry) => isLegacyActivity(entry) || isRuntimeActivity(entry)) ||
+        !value.activity.every((entry) => isMessageActivity(entry) || isRuntimeActivity(entry)) ||
         !isAccounting(value.accounting)) {
         return false;
     }
@@ -690,7 +690,7 @@ export class GatewayStore {
                 const now = this.now();
                 const loaded = await this.loadStateFile();
                 this.state = loaded ?? {
-                    schemaVersion: 3,
+                    schemaVersion: 4,
                     commit: { sequence: 0, id: this.randomId() },
                     createdAt: now.toISOString(), updatedAt: now.toISOString(),
                     eventSequence: 0, routes: [],
@@ -760,7 +760,7 @@ export class GatewayStore {
     }
     async reconcilePeerCatalog(peerHost, catalog) {
         return this.mutate((state, now) => {
-            const localHost = this.config.hostId ?? this.config.allowedHosts[0];
+            const localHost = this.config.hostId;
             if (!this.config.allowedHosts.includes(peerHost) || peerHost === localHost ||
                 !catalog.complete || catalog.truncated || catalog.routes.some((route) => route.host !== peerHost) ||
                 catalog.consentEdges.some((edge) => edge.ownerHost !== peerHost)) {
@@ -807,7 +807,7 @@ export class GatewayStore {
                     (endpoint.host === peerHost ? route.registrationMode === "federated_peer" && route.binding.hostId === peerHost &&
                         route.binding.routeHandle === endpoint.routeRef : endpoint.host === localHost &&
                         route.registrationMode !== "federated_peer" && route.binding.hostId === localHost &&
-                        route.binding.registrationId === endpoint.routeRef)));
+                        peerRouteRef(localHost, route.binding.registrationId) === endpoint.routeRef)));
                 if (resolved[0] === undefined || resolved[1] === undefined || edge.ref !== peerEdgeRef(edge.endpoints))
                     throw new BridgeError("INVALID_PEER_CATALOG", "A peer consent edge does not match current endpoint authority.");
                 desiredEdges.push(canonicalConsentEndpoints(resolved[0], resolved[1]));
@@ -831,7 +831,7 @@ export class GatewayStore {
     }
     async enqueuePeerHandoff(peerHost, handoff) {
         return this.mutate((state, now) => {
-            const localHost = this.config.hostId ?? this.config.allowedHosts[0];
+            const localHost = this.config.hostId;
             if (!this.config.allowedHosts.includes(peerHost) || peerHost === localHost || handoff.source.host !== peerHost ||
                 handoff.target.host !== localHost || handoff.edgeOwnerHost !== [peerHost, localHost].sort()[0] ||
                 handoff.edgeRef !== peerEdgeRef([handoff.source, handoff.target]))
@@ -840,7 +840,7 @@ export class GatewayStore {
                 route.alias === handoff.source.alias && route.binding.provider === handoff.source.provider && route.binding.routeHandle === handoff.source.routeRef);
             const target = state.routes.find((route) => route.registrationMode !== "federated_peer" && route.binding.hostId === localHost &&
                 route.alias === handoff.target.alias && route.binding.provider === handoff.target.provider &&
-                route.binding.registrationId === handoff.target.routeRef && route.enabled);
+                peerRouteRef(localHost, route.binding.registrationId) === handoff.target.routeRef && route.enabled);
             if (source === undefined || target === undefined)
                 throw new BridgeError("ROUTE_UNREGISTERED", "The peer handoff endpoint is no longer current.");
             const endpoints = canonicalConsentEndpoints(source, target);
@@ -1093,7 +1093,7 @@ export class GatewayStore {
                 throw new BridgeError("ROUTE_UNREGISTERED", "The native ingress target registration is no longer current.");
             }
             const nativeSourceHost = target.registrationMode === "federated_peer"
-                ? (this.config.hostId ?? this.config.allowedHosts[0]) : target.binding.hostId;
+                ? this.config.hostId : target.binding.hostId;
             if (input.source.binding.provider !== "claude" ||
                 input.source.binding.hostId !== nativeSourceHost ||
                 input.source.alias.endsWith(`@${nativeSourceHost}`) === false) {
@@ -1448,16 +1448,16 @@ export class GatewayStore {
                     },
                 ],
                 host: edgeOwnerHost(edge.endpoints), counters: { ...edge.counters },
-                mutable: edgeOwnerHost(edge.endpoints) === (this.config.hostId ?? this.config.allowedHosts[0]),
+                mutable: edgeOwnerHost(edge.endpoints) === this.config.hostId,
             }));
             const currentEvents = state.messages.map((message) => this.projectMessageEvent(message));
-            const legacyEvents = state.activity
-                .filter((entry) => entry.type === "legacy_message")
+            const messageEvents = state.activity
+                .filter((entry) => entry.type === "message_activity")
                 .map((entry) => structuredClone(entry.event));
             const activityEvents = state.activity
                 .filter((entry) => entry.type === "activity")
                 .map((entry) => structuredClone(entry.event));
-            const messages = [...legacyEvents, ...currentEvents]
+            const messages = [...messageEvents, ...currentEvents]
                 .sort((left, right) => left.sequence - right.sequence)
                 .slice(-gatewayPublicSnapshotLimits.messages);
             const pressureBuckets = [
@@ -1499,7 +1499,7 @@ export class GatewayStore {
                     connectors: 0, availablePeers: 0,
                     routes: 0, consentEdges: 0,
                     activityEvents: 0,
-                    messages: Math.max(0, legacyEvents.length + currentEvents.length - messages.length),
+                    messages: Math.max(0, messageEvents.length + currentEvents.length - messages.length),
                     alerts: 0,
                 },
             });
@@ -1545,10 +1545,11 @@ export class GatewayStore {
         };
     }
     validateRouteInput(input) {
-        const localHost = this.config.hostId ?? this.config.allowedHosts[0];
+        const localHost = this.config.hostId;
         if (!isObject(input) ||
             !ALIAS_PATTERN.test(input.alias) ||
             !isLogicalBinding(input.binding) ||
+            !REGISTRATION_ID_PATTERN.test(input.binding.registrationId) ||
             !REGISTRATION_MODES.has(input.registrationMode) ||
             (input.binding.provider === "peer" && input.registrationMode !== "federated_peer" &&
                 !PEER_ROUTE_HANDLE_PATTERN.test(input.binding.routeHandle)) ||
@@ -1816,7 +1817,7 @@ export class GatewayStore {
             return;
         state.eventSequence += 1;
         state.activity.push({
-            type: "legacy_message",
+            type: "message_activity",
             event: {
                 sequence: state.eventSequence, timestamp: now.toISOString(),
                 messageIdSuffix: suffix,
@@ -2051,7 +2052,7 @@ export class GatewayStore {
     assertConfiguredBounds(state) {
         const active = state.messages.filter((message) => message.state.phase !== "terminal");
         if (state.routes.some((route) => !this.config.allowedHosts.includes(route.binding.hostId) ||
-            !routeModeMatchesHost(route, this.config.hostId ?? this.config.allowedHosts[0])) ||
+            !routeModeMatchesHost(route, this.config.hostId)) ||
             state.routes.length > this.config.limits.maxRoutes ||
             state.consentEdges.length > this.config.limits.maxConsentEdges ||
             active.length > this.config.limits.maxQueueMessages ||
@@ -2171,7 +2172,7 @@ export class GatewayStore {
         }
         if (!markerExists) {
             const entries = await readdir(root);
-            if (existed && entries.length > 0) {
+            if (existed && entries.some((entry) => entry !== "nodes.json")) {
                 throw new BridgeError("GATEWAY_STATE_DIRECTORY_NOT_OWNED", "The existing state directory is non-empty and lacks the ownership marker.");
             }
             const marker = await open(markerPath, constants.O_CREAT |
@@ -2338,11 +2339,11 @@ export class GatewayStore {
         catch {
             throw new BridgeError("CORRUPT_GATEWAY_STATE", "The gateway controller state is not valid JSON.");
         }
-        if (isObject(parsed) && parsed.schemaVersion === 2) {
-            throw new BridgeError("GATEWAY_STATE_CONVERSION_REQUIRED", "The gateway state must be converted offline before this release can start.");
+        if (isObject(parsed) && Object.hasOwn(parsed, "schemaVersion") && parsed.schemaVersion !== 4) {
+            throw new BridgeError("GATEWAY_STATE_SCHEMA_UNSUPPORTED", "The gateway state schema is unsupported. Stop Embassy, move gateway-state.json aside, keep nodes.json, then restart and re-register, select, and pair routes.");
         }
-        if (!isGatewayPersistedStateV3(parsed)) {
-            throw new BridgeError("CORRUPT_GATEWAY_STATE", "The gateway controller state failed strict v3 schema validation.");
+        if (!isGatewayPersistedStateV4(parsed)) {
+            throw new BridgeError("CORRUPT_GATEWAY_STATE", "The gateway controller state failed strict v4 schema validation.");
         }
         this.assertConfiguredBounds(parsed);
         return parsed;