@cadenza.io/service 2.17.7 → 2.17.9

package/dist/index.mjs

@@ -382,16 +382,16 @@ function normalizeServiceTransportConfig(value) {
 }
 function normalizeServiceTransportDescriptor(value) {
   const raw = value ?? {};
-  const uuid5 = normalizeString(raw.uuid);
+  const uuid6 = normalizeString(raw.uuid);
   const serviceInstanceId = normalizeString(
     raw.serviceInstanceId ?? raw.service_instance_id
   );
   const config = normalizeServiceTransportConfig(raw);
-  if (!uuid5 || !serviceInstanceId || !config) {
+  if (!uuid6 || !serviceInstanceId || !config) {
     return null;
   }
   return {
-    uuid: uuid5,
+    uuid: uuid6,
     serviceInstanceId,
     role: config.role,
     origin: config.origin,
@@ -453,14 +453,14 @@ function normalizeTransportArray(value, serviceInstanceId) {
 }
 function normalizeServiceInstanceDescriptor(value) {
   const raw = value ?? {};
-  const uuid5 = normalizeString2(raw.uuid);
+  const uuid6 = normalizeString2(raw.uuid);
   const serviceName = normalizeString2(raw.serviceName ?? raw.service_name);
-  if (!uuid5 || !serviceName) {
+  if (!uuid6 || !serviceName) {
     return null;
   }
-  const transports = normalizeTransportArray(raw.transports, uuid5);
+  const transports = normalizeTransportArray(raw.transports, uuid6);
   return {
-    uuid: uuid5,
+    uuid: uuid6,
     serviceName,
     numberOfRunningGraphs: Math.max(
       0,
@@ -903,15 +903,15 @@ var ServiceRegistry = class _ServiceRegistry {
         if (!serviceInstance) {
           return false;
         }
-        const uuid5 = serviceInstance.uuid;
+        const uuid6 = serviceInstance.uuid;
         const serviceName = serviceInstance.serviceName;
         const deleted = Boolean(
           ctx.deleted ?? ctx.serviceInstance?.deleted ?? ctx.data?.deleted
         );
-        if (uuid5 === this.serviceInstanceId) return;
+        if (uuid6 === this.serviceInstanceId) return;
         if (deleted) {
-          const existingInstance = this.instances.get(serviceName)?.find((instance) => instance.uuid === uuid5);
-          const indexToDelete = this.instances.get(serviceName)?.findIndex((i) => i.uuid === uuid5) ?? -1;
+          const existingInstance = this.instances.get(serviceName)?.find((instance) => instance.uuid === uuid6);
+          const indexToDelete = this.instances.get(serviceName)?.findIndex((i) => i.uuid === uuid6) ?? -1;
           if (indexToDelete >= 0 && existingInstance) {
             this.instances.get(serviceName)?.splice(indexToDelete, 1);
             for (const transport of existingInstance.transports) {
@@ -923,13 +923,13 @@ var ServiceRegistry = class _ServiceRegistry {
           if (this.instances.get(serviceName)?.length === 0) {
             this.instances.delete(serviceName);
           }
-          this.unregisterDependee(uuid5, serviceName);
+          this.unregisterDependee(uuid6, serviceName);
           return;
         }
         if (!this.instances.has(serviceName))
           this.instances.set(serviceName, []);
         const instances = this.instances.get(serviceName);
-        const existing = instances.find((i) => i.uuid === uuid5);
+        const existing = instances.find((i) => i.uuid === uuid6);
         if (existing) {
           Object.assign(existing, {
             ...serviceInstance,
@@ -939,7 +939,7 @@ var ServiceRegistry = class _ServiceRegistry {
         } else {
           instances.push(serviceInstance);
         }
-        const trackedInstance = existing ?? instances.find((instance) => instance.uuid === uuid5);
+        const trackedInstance = existing ?? instances.find((instance) => instance.uuid === uuid6);
         if (trackedInstance) {
           const snapshot = this.resolveRuntimeStatusSnapshot(
             trackedInstance.numberOfRunningGraphs ?? 0,
@@ -952,7 +952,7 @@ var ServiceRegistry = class _ServiceRegistry {
           trackedInstance.reportedAt = trackedInstance.reportedAt ?? (/* @__PURE__ */ new Date()).toISOString();
         }
         if (!serviceInstance.isBootstrapPlaceholder) {
-          this.reconcileBootstrapPlaceholderInstance(serviceName, uuid5, emit);
+          this.reconcileBootstrapPlaceholderInstance(serviceName, uuid6, emit);
         }
         if (this.serviceName === serviceName) {
           return false;
@@ -978,7 +978,7 @@ var ServiceRegistry = class _ServiceRegistry {
             if (!clientCreated) {
               emit("meta.service_registry.dependee_registered", {
                 serviceName,
-                serviceInstanceId: uuid5,
+                serviceInstanceId: uuid6,
                 serviceTransportId: trackedTransport.uuid,
                 serviceOrigin: trackedTransport.origin,
                 transportProtocols: trackedTransport.protocols,
@@ -992,7 +992,7 @@ var ServiceRegistry = class _ServiceRegistry {
           } else {
             emit("meta.service_registry.routeable_transport_missing", {
               serviceName,
-              serviceInstanceId: uuid5,
+              serviceInstanceId: uuid6,
               requiredRole: this.getRoutingTransportRole(),
               isFrontend: this.isFrontend
             });
@@ -3233,6 +3233,7 @@ import http from "http";
 import fs from "fs";
 import https from "https";
 import fetch from "node-fetch";
+import { v4 as uuid3 } from "uuid";
 var RestController = class _RestController {
   /**
    * Constructor for initializing the REST server and related configurations.
@@ -3594,7 +3595,7 @@ var RestController = class _RestController {
                   const internalOrigin = httpOrigin ?? httpsOrigin;
                   if (internalOrigin) {
                     transportData.unshift({
-                      uuid: `${ctx.__serviceInstanceId}-internal-auto`,
+                      uuid: uuid3(),
                       service_instance_id: ctx.__serviceInstanceId,
                       role: "internal",
                       origin: internalOrigin,
@@ -7955,7 +7956,7 @@ function tableFieldTypeToSchemaType(type) {
 }
 
 // src/Cadenza.ts
-import { v4 as uuid3 } from "uuid";
+import { v4 as uuid4 } from "uuid";
 
 // src/graph/controllers/GraphSyncController.ts
 var ACTOR_TASK_METADATA = /* @__PURE__ */ Symbol.for("@cadenza.io/core/actor-task-meta");
@@ -8017,10 +8018,29 @@ function buildActorRegistrationData(actor) {
     version: 1
   };
 }
+function resolveSyncServiceName(task) {
+  const taskServiceName = typeof task?.serviceName === "string" ? task.serviceName.trim() : "";
+  const registryServiceName = typeof CadenzaService.serviceRegistry.serviceName === "string" ? CadenzaService.serviceRegistry.serviceName.trim() : "";
+  return taskServiceName || registryServiceName || void 0;
+}
+function buildIntentRegistryData(intent) {
+  const name = String(intent?.name ?? "").trim();
+  if (!name) {
+    return null;
+  }
+  return {
+    name,
+    description: typeof intent?.description === "string" ? intent.description : "",
+    input: intent?.input && typeof intent.input === "object" ? intent.input : { type: "object" },
+    output: intent?.output && typeof intent.output === "object" ? intent.output : { type: "object" },
+    isMeta: isMetaIntentName(name)
+  };
+}
 var GraphSyncController = class _GraphSyncController {
   constructor() {
     this.registeredActors = /* @__PURE__ */ new Set();
     this.registeredActorTaskMaps = /* @__PURE__ */ new Set();
+    this.registeredIntentDefinitions = /* @__PURE__ */ new Set();
     this.isCadenzaDBReady = false;
   }
   static get instance() {
@@ -8028,11 +8048,27 @@ var GraphSyncController = class _GraphSyncController {
     return this._instance;
   }
   init() {
+    const insertIntentRegistryTask = this.isCadenzaDBReady ? CadenzaService.createCadenzaDBInsertTask(
+      "intent_registry",
+      {
+        onConflict: {
+          target: ["name"],
+          action: {
+            do: "nothing"
+          }
+        }
+      },
+      { concurrency: 30 }
+    ) : CadenzaService.get("dbInsertIntentRegistry");
     this.splitRoutinesTask = CadenzaService.createMetaTask(
       "Split routines for registration",
       async function* (ctx, emit) {
         const { routines } = ctx;
         if (!routines) return;
+        const serviceName = resolveSyncServiceName();
+        if (!serviceName) {
+          return;
+        }
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
           delayMs: 2e3
         });
@@ -8043,7 +8079,7 @@ var GraphSyncController = class _GraphSyncController {
               name: routine.name,
               version: routine.version,
               description: routine.description,
-              serviceName: CadenzaService.serviceRegistry.serviceName,
+              serviceName,
               isMeta: routine.isMeta
             },
             __routineName: routine.name
@@ -8085,6 +8121,10 @@ var GraphSyncController = class _GraphSyncController {
       function* (ctx) {
         const { routines } = ctx;
         if (!routines) return;
+        const serviceName = resolveSyncServiceName();
+        if (!serviceName) {
+          return;
+        }
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
           delayMs: 3e3
         });
@@ -8104,7 +8144,7 @@ var GraphSyncController = class _GraphSyncController {
                   taskVersion: nextTask.version,
                   routineName: routine.name,
                   routineVersion: routine.version,
-                  serviceName: CadenzaService.serviceRegistry.serviceName
+                  serviceName
                 },
                 __routineName: routine.name,
                 __taskName: nextTask.name
@@ -8207,6 +8247,10 @@ var GraphSyncController = class _GraphSyncController {
           delayMs: 3e3
         });
         const tasks = ctx.tasks;
+        const serviceName = resolveSyncServiceName();
+        if (!serviceName) {
+          return;
+        }
         for (const task of tasks) {
           if (task.registered) continue;
           const { __functionString, __getTagCallback } = task.export();
@@ -8236,7 +8280,7 @@ var GraphSyncController = class _GraphSyncController {
               retryDelay: task.retryDelay,
               retryDelayMax: task.retryDelayMax,
               retryDelayFactor: task.retryDelayFactor,
-              service_name: CadenzaService.serviceRegistry.serviceName,
+              service_name: serviceName,
               signals: {
                 emits: Array.from(task.emitsSignals),
                 signalsToEmitAfter: Array.from(task.signalsToEmitAfter),
@@ -8284,11 +8328,15 @@ var GraphSyncController = class _GraphSyncController {
         CadenzaService.debounce("meta.sync_controller.synced_resource", {
           delayMs: 3e3
         });
+        const serviceName = resolveSyncServiceName();
+        if (!serviceName) {
+          return;
+        }
         const actors = ctx.actors ?? [];
         for (const actor of actors) {
           const data = {
             ...buildActorRegistrationData(actor),
-            service_name: CadenzaService.serviceRegistry.serviceName
+            service_name: serviceName
           };
           if (!data.name) {
             continue;
@@ -8344,7 +8392,11 @@ var GraphSyncController = class _GraphSyncController {
         if (!metadata?.actorName) {
           return;
         }
-        const registrationKey = `${metadata.actorName}|${task.name}|${task.version}|${CadenzaService.serviceRegistry.serviceName}`;
+        const serviceName = resolveSyncServiceName(task);
+        if (!serviceName) {
+          return;
+        }
+        const registrationKey = `${metadata.actorName}|${task.name}|${task.version}|${serviceName}`;
         if (this.registeredActorTaskMaps.has(registrationKey)) {
           return;
         }
@@ -8354,7 +8406,7 @@ var GraphSyncController = class _GraphSyncController {
             actor_version: 1,
             task_name: task.name,
             task_version: task.version,
-            service_name: CadenzaService.serviceRegistry.serviceName,
+            service_name: serviceName,
             mode: metadata.mode,
             description: task.description ?? metadata.actorDescription ?? "",
             is_meta: metadata.actorKind === "meta" || task.isMeta === true
@@ -8409,6 +8461,10 @@ var GraphSyncController = class _GraphSyncController {
       function* (ctx) {
         const task = ctx.task;
         if (task.hidden || !task.register) return;
+        const serviceName = resolveSyncServiceName(task);
+        if (!serviceName) {
+          return;
+        }
         for (const signal of task.observedSignals) {
           const _signal = signal.split(":")[0];
           if (task.registeredSignals.has(signal)) continue;
@@ -8419,7 +8475,7 @@ var GraphSyncController = class _GraphSyncController {
               isGlobal,
               taskName: task.name,
               taskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName
+              serviceName
             },
             __taskName: task.name,
             __signal: signal
@@ -8445,6 +8501,46 @@ var GraphSyncController = class _GraphSyncController {
         { concurrency: 30 }
       ) : CadenzaService.get("dbInsertSignalToTaskMap"))?.then(registerSignalTask)
     );
+    this.splitIntentsTask = CadenzaService.createMetaTask(
+      "Split intents for registration",
+      function* (ctx) {
+        CadenzaService.debounce("meta.sync_controller.synced_resource", {
+          delayMs: 3e3
+        });
+        const intents = Array.isArray(ctx.intents) ? ctx.intents : Array.from(CadenzaService.inquiryBroker.intents.values());
+        for (const intent of intents) {
+          const intentData = buildIntentRegistryData(intent);
+          if (!intentData) {
+            continue;
+          }
+          if (this.registeredIntentDefinitions.has(intentData.name)) {
+            continue;
+          }
+          yield {
+            data: intentData,
+            __intentName: intentData.name
+          };
+        }
+      }.bind(this)
+    ).then(
+      insertIntentRegistryTask?.then(
+        CadenzaService.createMetaTask("Record intent definition registration", (ctx) => {
+          if (!ctx.__syncing) {
+            return;
+          }
+          CadenzaService.debounce("meta.sync_controller.synced_resource", {
+            delayMs: 3e3
+          });
+          this.registeredIntentDefinitions.add(ctx.__intentName);
+          return true;
+        }).then(
+          CadenzaService.createUniqueMetaTask(
+            "Gather intent registration",
+            () => true
+          ).emits("meta.sync_controller.synced_intents")
+        )
+      )
+    );
     const registerIntentTask = CadenzaService.createMetaTask(
       "Record intent registration",
       (ctx) => {
@@ -8464,6 +8560,10 @@ var GraphSyncController = class _GraphSyncController {
       function* (ctx) {
         const task = ctx.task;
         if (task.hidden || !task.register) return;
+        const serviceName = resolveSyncServiceName(task);
+        if (!serviceName) {
+          return;
+        }
         task.__registeredIntents = task.__registeredIntents ?? /* @__PURE__ */ new Set();
         task.__invalidMetaIntentWarnings = task.__invalidMetaIntentWarnings ?? /* @__PURE__ */ new Set();
         for (const intent of task.handlesIntents) {
@@ -8483,36 +8583,75 @@ var GraphSyncController = class _GraphSyncController {
             }
             continue;
           }
+          const intentDefinition = buildIntentRegistryData(CadenzaService.inquiryBroker.intents.get(intent)) ?? buildIntentRegistryData({ name: intent });
+          if (!intentDefinition) {
+            continue;
+          }
           yield {
             data: {
               intentName: intent,
               taskName: task.name,
               taskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName
+              serviceName
             },
             __taskName: task.name,
-            __intent: intent
+            __intent: intent,
+            __intentDefinition: intentDefinition,
+            __intentMapData: {
+              intentName: intent,
+              taskName: task.name,
+              taskVersion: task.version,
+              serviceName
+            }
           };
         }
       }
     ).then(
-      (this.isCadenzaDBReady ? CadenzaService.createCadenzaDBInsertTask(
-        "intent_to_task_map",
-        {
-          onConflict: {
-            target: [
-              "intent_name",
-              "task_name",
-              "task_version",
-              "service_name"
-            ],
-            action: {
-              do: "nothing"
-            }
+      CadenzaService.createMetaTask(
+        "Prepare intent definition for intent-to-task map",
+        (ctx) => {
+          if (!ctx.__intentDefinition || !ctx.__intentMapData) {
+            return false;
           }
-        },
-        { concurrency: 30 }
-      ) : CadenzaService.get("dbInsertIntentToTaskMap"))?.then(registerIntentTask)
+          return {
+            ...ctx,
+            data: ctx.__intentDefinition
+          };
+        }
+      ).then(
+        insertIntentRegistryTask?.then(
+          CadenzaService.createMetaTask(
+            "Restore intent-to-task map payload",
+            (ctx) => {
+              if (!ctx.__intentMapData) {
+                return false;
+              }
+              return {
+                ...ctx,
+                data: ctx.__intentMapData
+              };
+            }
+          ).then(
+            (this.isCadenzaDBReady ? CadenzaService.createCadenzaDBInsertTask(
+              "intent_to_task_map",
+              {
+                onConflict: {
+                  target: [
+                    "intent_name",
+                    "task_name",
+                    "task_version",
+                    "service_name"
+                  ],
+                  action: {
+                    do: "nothing"
+                  }
+                }
+              },
+              { concurrency: 30 }
+            ) : CadenzaService.get("dbInsertIntentToTaskMap"))?.then(registerIntentTask)
+          )
+        )
+      )
     );
     this.registerTaskMapTask = CadenzaService.createMetaTask(
       "Register task map to DB",
@@ -8522,18 +8661,26 @@ var GraphSyncController = class _GraphSyncController {
           delayMs: 3e3
         });
         if (task.hidden || !task.register) return;
+        const predecessorServiceName = resolveSyncServiceName(task);
+        if (!predecessorServiceName) {
+          return;
+        }
         for (const t of task.nextTasks) {
           if (task.taskMapRegistration.has(t.name) || t.hidden || !t.register) {
             continue;
           }
+          const serviceName = resolveSyncServiceName(t);
+          if (!serviceName) {
+            continue;
+          }
           yield {
             data: {
               taskName: t.name,
               taskVersion: t.version,
               predecessorTaskName: task.name,
               predecessorTaskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName,
-              predecessorServiceName: CadenzaService.serviceRegistry.serviceName
+              serviceName,
+              predecessorServiceName
             },
             __taskName: task.name,
             __nextTaskName: t.name
@@ -8580,14 +8727,19 @@ var GraphSyncController = class _GraphSyncController {
         if (task.hidden || !task.register) return;
         if (task.isDeputy && !task.signalName) {
           if (task.registeredDeputyMap) return;
+          const serviceName = resolveSyncServiceName(task);
+          const predecessorServiceName = resolveSyncServiceName();
+          if (!serviceName || !predecessorServiceName) {
+            return;
+          }
           return {
             data: {
               task_name: task.remoteRoutineName,
               task_version: 1,
-              service_name: task.serviceName,
+              service_name: serviceName,
               predecessor_task_name: task.name,
               predecessor_task_version: task.version,
-              predecessor_service_name: CadenzaService.serviceRegistry.serviceName
+              predecessor_service_name: predecessorServiceName
             },
             __taskName: task.name
           };
@@ -8632,6 +8784,12 @@ var GraphSyncController = class _GraphSyncController {
       "meta.service_registry.initial_sync_complete"
     ).then(this.splitSignalsTask);
     CadenzaService.registry.getAllTasks.clone().doOn("meta.sync_controller.synced_signals").then(this.splitTasksForRegistration);
+    CadenzaService.createMetaTask("Get all intents", (ctx) => {
+      return {
+        ...ctx,
+        intents: Array.from(CadenzaService.inquiryBroker.intents.values())
+      };
+    }).doOn("meta.sync_controller.synced_tasks").then(this.splitIntentsTask);
     CadenzaService.registry.getAllRoutines.clone().doOn("meta.sync_controller.synced_tasks").then(this.splitRoutinesTask);
     CadenzaService.createMetaTask("Get all actors", (ctx) => {
       return {
@@ -8642,9 +8800,9 @@ var GraphSyncController = class _GraphSyncController {
     CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks").then(
       this.registerTaskMapTask,
       this.registerSignalToTaskMapTask,
-      this.registerIntentToTaskMapTask,
       this.registerDeputyRelationshipTask
     );
+    CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks", "meta.sync_controller.synced_intents").then(this.registerIntentToTaskMapTask);
     CadenzaService.registry.doForEachTask.clone().doOn("meta.sync_controller.synced_tasks", "meta.sync_controller.synced_actors").then(this.registerActorTaskMapTask);
     CadenzaService.registry.getAllRoutines.clone().doOn("meta.sync_controller.synced_routines").then(this.splitTasksInRoutines);
     CadenzaService.createMetaTask("Finish sync", (ctx, emit) => {
@@ -8711,6 +8869,15 @@ function readConfiguredPort(value) {
 function buildBootstrapUrl(protocol, address, port) {
   return `${protocol}://${address}:${port}`;
 }
+function readExplicitPortFromOrigin(raw) {
+  const match = raw.match(
+    /^[a-z]+:\/\/(?:\[[^\]]+\]|[^\/?#:]+):(\d+)(?:\/)?$/i
+  );
+  if (!match?.[1]) {
+    return void 0;
+  }
+  return readConfiguredPort(match[1]);
+}
 function resolveInjectedBootstrapUrl(injectedGlobalKey) {
   if (typeof globalThis === "undefined") {
     return void 0;
@@ -8800,7 +8967,8 @@ function resolveBootstrapEndpoint(options) {
         "Bootstrap URL must be an origin without a path component."
       );
     }
-    const port2 = parsed2.port ? readConfiguredPort(parsed2.port) : fallbackPort;
+    const explicitPort = readExplicitPortFromOrigin(raw);
+    const port2 = explicitPort ?? (parsed2.port ? readConfiguredPort(parsed2.port) : fallbackPort);
     if (!port2) {
       throw new Error(
         "Bootstrap URL must include a port or CADENZA_DB_PORT must be provided."
@@ -8894,9 +9062,9 @@ var CadenzaService = class {
   static normalizeDeclaredTransports(transports, serviceId) {
     return (transports ?? []).map((transport) => normalizeServiceTransportConfig(transport)).filter(
       (transport) => !!transport
-    ).map((transport, index) => ({
+    ).map((transport) => ({
       ...transport,
-      uuid: `${serviceId}-transport-${index + 1}`
+      uuid: uuid4()
     }));
   }
   static createBootstrapTransport(serviceInstanceId, role, endpoint) {
@@ -9140,7 +9308,7 @@ var CadenzaService = class {
       }
       for (const responder of responders) {
         const { task, descriptor } = responder;
-        const inquiryId = uuid3();
+        const inquiryId = uuid4();
         startTimeByTask.set(task, Date.now());
         const resolverTask = this.createEphemeralMetaTask(
           `Resolve inquiry ${inquiry} for ${descriptor.localTaskName}`,
@@ -9629,7 +9797,7 @@ var CadenzaService = class {
     this.bootstrap();
     this.validateName(serviceName);
     this.validateServiceName(serviceName);
-    const serviceId = options.customServiceId ?? uuid3();
+    const serviceId = options.customServiceId ?? uuid4();
     this.serviceRegistry.serviceName = serviceName;
     this.serviceRegistry.serviceInstanceId = serviceId;
     this.setHydrationResults(options.hydration);
@@ -10460,7 +10628,7 @@ import {
 } from "@cadenza.io/core";
 
 // src/ssr/createSSRInquiryBridge.ts
-import { v4 as uuid4 } from "uuid";
+import { v4 as uuid5 } from "uuid";
 function ensureFetch() {
   if (typeof globalThis.fetch !== "function") {
     throw new Error("SSR inquiry bridge requires global fetch support.");
@@ -10536,7 +10704,7 @@ function createSSRInquiryBridge(options = {}) {
         __remoteRoutineName: remoteRoutineName,
         __metadata: {
           ...context.__metadata ?? {},
-          __deputyExecId: uuid4()
+          __deputyExecId: uuid5()
         }
       }),
       signal