@memberjunction/server 6.2.0-edge.3 → 6.2.0-edge.5

package/dist/agentSessions/BridgeHostInstance.d.ts

@@ -0,0 +1,25 @@
+import { IMetadataProvider, UserInfo } from '@memberjunction/core';
+/**
+ * Gives the realtime bridge engine (`AIBridgeEngine`) this MJAPI instance's identity, the one its agent-session rows
+ * carry: `hostname:port:pid:bootId` ({@link GetCurrentHostInstance}). The engine stamps it into the `HostInstanceID`
+ * of each `MJ: AI Agent Session Bridges` row it creates, and its orphan reconcile closes only the bridges an earlier
+ * boot of this instance left, never another MJAPI's (#5310). Without it the engine's fallback identity applies, which
+ * names this process alone, so the reconcile would never find what an earlier boot left.
+ *
+ * `Serve` calls it right after `SetHostInstancePort`, before anything can start a bridge: a server extension may start
+ * a scheduled meeting bridge before the server listens.
+ */
+export declare function BindBridgeEngineHostInstance(): void;
+/**
+ * Starts the realtime bridge engine's orphan reconcile: now, then every 10 minutes, it closes the bridges an earlier
+ * boot of this instance left `Connecting` or `Connected` (reason `Janitor`) and finalizes their co-agent runs.
+ *
+ * `Serve` calls it once the server listens on its port, where it starts the session janitor. Holding the port is what
+ * makes another boot of this instance a process that has ended; before that, an MJAPI started on a port another MJAPI
+ * still serves would take that one's live bridges for its own orphans.
+ *
+ * @param provider The server's metadata provider, for the reads and writes.
+ * @param systemUser The user the writes run as.
+ */
+export declare function StartBridgeOrphanReconciliation(provider: IMetadataProvider, systemUser: UserInfo): void;
+//# sourceMappingURL=BridgeHostInstance.d.ts.map

package/dist/agentSessions/BridgeHostInstance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BridgeHostInstance.d.ts","sourceRoot":"","sources":["../../src/agentSessions/BridgeHostInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAInE;;;;;;;;;GASG;AACH,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,QAAQ,GAAG,IAAI,CAEvG"}

package/dist/agentSessions/BridgeHostInstance.js

@@ -0,0 +1,30 @@
+import { AIBridgeEngine } from '@memberjunction/ai-bridge-server';
+import { GetCurrentHostInstance } from './HostInstance.js';
+/**
+ * Gives the realtime bridge engine (`AIBridgeEngine`) this MJAPI instance's identity, the one its agent-session rows
+ * carry: `hostname:port:pid:bootId` ({@link GetCurrentHostInstance}). The engine stamps it into the `HostInstanceID`
+ * of each `MJ: AI Agent Session Bridges` row it creates, and its orphan reconcile closes only the bridges an earlier
+ * boot of this instance left, never another MJAPI's (#5310). Without it the engine's fallback identity applies, which
+ * names this process alone, so the reconcile would never find what an earlier boot left.
+ *
+ * `Serve` calls it right after `SetHostInstancePort`, before anything can start a bridge: a server extension may start
+ * a scheduled meeting bridge before the server listens.
+ */
+export function BindBridgeEngineHostInstance() {
+    AIBridgeEngine.Instance.SetHostInstanceIdentity(GetCurrentHostInstance());
+}
+/**
+ * Starts the realtime bridge engine's orphan reconcile: now, then every 10 minutes, it closes the bridges an earlier
+ * boot of this instance left `Connecting` or `Connected` (reason `Janitor`) and finalizes their co-agent runs.
+ *
+ * `Serve` calls it once the server listens on its port, where it starts the session janitor. Holding the port is what
+ * makes another boot of this instance a process that has ended; before that, an MJAPI started on a port another MJAPI
+ * still serves would take that one's live bridges for its own orphans.
+ *
+ * @param provider The server's metadata provider, for the reads and writes.
+ * @param systemUser The user the writes run as.
+ */
+export function StartBridgeOrphanReconciliation(provider, systemUser) {
+    AIBridgeEngine.Instance.StartOrphanReconciliation(systemUser, provider);
+}
+//# sourceMappingURL=BridgeHostInstance.js.map

package/dist/agentSessions/BridgeHostInstance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BridgeHostInstance.js","sourceRoot":"","sources":["../../src/agentSessions/BridgeHostInstance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D;;;;;;;;;GASG;AACH,MAAM,UAAU,4BAA4B;IACxC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,CAAC,sBAAsB,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,+BAA+B,CAAC,QAA2B,EAAE,UAAoB;IAC7F,cAAc,CAAC,QAAQ,CAAC,yBAAyB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC"}

package/dist/agentSessions/HostInstance.d.ts

@@ -1,19 +1,83 @@
 /**
- * Returns this process's stable host-instance identity (`hostname:pid:bootId`).
- * Stamped into `AIAgentSession.HostInstanceID` at session create and read back by the
- * janitor for own-host orphan recovery.
+ * Identity of one MJAPI instance and of one boot of it. A boot stamps its id into the `HostInstanceID` of the
+ * `MJ: AI Agent Sessions` rows it owns, and of the `MJ: AI Agent Session Bridges` rows the realtime bridge engine
+ * creates for it (see `BindBridgeEngineHostInstance`), so that after a restart the instance can tell the rows it left
+ * behind from another server's live ones.
+ *
+ * An instance is one MJAPI on one host, named by the host and the port it serves on. Two MJAPIs running at the same
+ * time on one host can't serve on the same port, so they are two instances; an MJAPI that restarts serves on its port
+ * again, so it is the same instance. Each boot adds its process id and a UUID made at load:
+ * `hostname:port:pid:bootId`.
+ *
+ * A row stamped by another boot of this instance was left by a process that has ended, since this boot holds the
+ * port. A row of another instance (another port on this host, or another host) may belong to a server that is still
+ * running.
  */
-export declare function GetHostInstanceID(): string;
+export declare class HostInstanceIdentity {
+    /** The OS host name. */
+    readonly HostName: string;
+    /**
+     * What tells this instance apart from the other MJAPIs on the host: the port it serves on, or `pid-<pid>` for a
+     * process that has not set one (see {@link SetHostInstancePort}).
+     */
+    readonly InstanceKey: string;
+    /** The OS process id of this boot. */
+    readonly ProcessID: number;
+    /** A UUID made once per boot, so two boots never share an id, even when the OS reuses a process id. */
+    readonly BootID: string;
+    /**
+     * @param hostName The OS host name.
+     * @param instanceKey The port the instance serves on, or `pid-<pid>` for a process that serves none.
+     * @param processID The OS process id of this boot.
+     * @param bootID A UUID made once per boot.
+     */
+    constructor(hostName: string, instanceKey: string, processID: number, bootID: string);
+    /** The id this boot stamps into the rows it owns: `hostname:port:pid:bootId`. */
+    GetHostInstanceID(): string;
+    /** The prefix every boot of this instance shares and no other instance has: `hostname:port:`. */
+    GetInstancePrefix(): string;
+    /**
+     * Whether a `HostInstanceID` was stamped by another boot of this instance: this instance's prefix, then a process
+     * id and a boot id, and not this boot's own id. That boot has ended, since this one holds the instance's port.
+     *
+     * False for this boot's id, for another instance's (another port on this host, or another host), for the format
+     * used before the port was added (`hostname:pid:bootId`), and for null. The match is exact: unlike a SQL `LIKE`,
+     * a `_` in a host name matches only `_`.
+     *
+     * @param hostInstanceID A row's `HostInstanceID`.
+     */
+    IsPriorBoot(hostInstanceID: string | null | undefined): boolean;
+}
 /**
- * Returns the host-name prefix (`hostname:`) used to match *any* session previously hosted
- * by this OS host, regardless of which boot created it. The janitor uses this to find rows
- * that belong to this host but to a *different* (older) boot — i.e. crash/redeploy orphans.
+ * Names this process's MJAPI instance by the port it serves on. `Serve` calls it first, before anything stamps a row,
+ * so every `HostInstanceID` the server writes carries its port.
+ *
+ * Until it is called the instance is the process alone (`pid-<pid>`), and its startup recovery closes no other
+ * process's sessions. The identity is fixed once read: a later call with another port is logged and ignored, so the
+ * rows already stamped keep matching this process.
+ *
+ * @param port The port this MJAPI serves on (`graphqlPort`).
  */
-export declare function GetHostNamePrefix(): string;
+export declare function SetHostInstancePort(port: number): void;
+/**
+ * This process's identity: the one place MJServer reads it, to stamp the rows it owns and to recover them after a
+ * restart. Made on first call from the host name, the port {@link SetHostInstancePort} set (or `pid-<pid>`), the
+ * process id and this boot's id.
+ */
+export declare function GetCurrentHostInstance(): HostInstanceIdentity;
 /**
- * Returns the UUID generated once at process start. Exposed primarily for diagnostics and
- * tests; the janitor compares against the full {@link GetHostInstanceID} rather than this
- * value directly.
+ * Returns this boot's id (`hostname:port:pid:bootId`), stamped into `AIAgentSession.HostInstanceID` at session
+ * create. Same as `GetCurrentHostInstance().GetHostInstanceID()`.
  */
+export declare function GetHostInstanceID(): string;
+/**
+ * Returns `hostname:`, the prefix of every `HostInstanceID` stamped on this host by any MJAPI.
+ *
+ * @deprecated Not an ownership test: several MJAPIs can run on one host. Match this instance's rows with
+ * {@link HostInstanceIdentity.GetInstancePrefix} and {@link HostInstanceIdentity.IsPriorBoot} on
+ * {@link GetCurrentHostInstance}.
+ */
+export declare function GetHostNamePrefix(): string;
+/** Returns the UUID made once at process start. For diagnostics and tests. */
 export declare function GetBootID(): string;
 //# sourceMappingURL=HostInstance.d.ts.map

package/dist/agentSessions/HostInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HostInstance.d.ts","sourceRoot":"","sources":["../../src/agentSessions/HostInstance.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC"}
+{"version":3,"file":"HostInstance.d.ts","sourceRoot":"","sources":["../../src/agentSessions/HostInstance.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;GAcG;AACH,qBAAa,oBAAoB;IAC7B,wBAAwB;IACxB,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC;;;OAGG;IACH,SAAgB,WAAW,EAAE,MAAM,CAAC;IAEpC,sCAAsC;IACtC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,uGAAuG;IACvG,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpF,iFAAiF;IAC1E,iBAAiB,IAAI,MAAM;IAIlC,iGAAiG;IAC1F,iBAAiB,IAAI,MAAM;IAIlC;;;;;;;;;OASG;IACI,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO;CAOzE;AAcD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAUtD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,oBAAoB,CAK7D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,8EAA8E;AAC9E,wBAAgB,SAAS,IAAI,MAAM,CAElC"}

package/dist/agentSessions/HostInstance.js

@@ -1,47 +1,118 @@
 import { hostname } from 'os';
 import { randomUUID } from 'crypto';
+import { LogError } from '@memberjunction/core';
+/** What follows an instance's prefix in a `HostInstanceID`: a process id, then a boot id. */
+const PID_AND_BOOT_ID = /^\d+:[^:]+$/;
 /**
- * Stable, per-process identity for this server node, used to anchor
- * {@link import('@memberjunction/core-entities').MJAIAgentSessionEntity} rows to the
- * instance that currently owns their in-memory sockets.
+ * Identity of one MJAPI instance and of one boot of it. A boot stamps its id into the `HostInstanceID` of the
+ * `MJ: AI Agent Sessions` rows it owns, and of the `MJ: AI Agent Session Bridges` rows the realtime bridge engine
+ * creates for it (see `BindBridgeEngineHostInstance`), so that after a restart the instance can tell the rows it left
+ * behind from another server's live ones.
  *
- * The shape is `${hostname}:${pid}:${bootId}` where:
- * - `hostname` and `pid` locate the OS process,
- * - `bootId` is a UUID generated **once** at module load, so two different boots of the
- *   *same* host (a crash/redeploy that reuses pid, or a long-lived host that restarts the
- *   process) produce **distinct** identities.
+ * An instance is one MJAPI on one host, named by the host and the port it serves on. Two MJAPIs running at the same
+ * time on one host can't serve on the same port, so they are two instances; an MJAPI that restarts serves on its port
+ * again, so it is the same instance. Each boot adds its process id and a UUID made at load:
+ * `hostname:port:pid:bootId`.
  *
- * This last property is what lets {@link import('./SessionJanitor.js').SessionJanitor} tell a
- * live session owned by *this* boot apart from an orphan left by a *previous* boot of the
- * same host: only the latter has a `HostInstanceID` that starts with `${hostname}:` but
- * carries a different `bootId`.
+ * A row stamped by another boot of this instance was left by a process that has ended, since this boot holds the
+ * port. A row of another instance (another port on this host, or another host) may belong to a server that is still
+ * running.
  */
-const BOOT_ID = randomUUID();
-/** Resolved host name captured once at load (cheap; avoids repeated syscalls). */
+export class HostInstanceIdentity {
+    /**
+     * @param hostName The OS host name.
+     * @param instanceKey The port the instance serves on, or `pid-<pid>` for a process that serves none.
+     * @param processID The OS process id of this boot.
+     * @param bootID A UUID made once per boot.
+     */
+    constructor(hostName, instanceKey, processID, bootID) {
+        this.HostName = hostName;
+        this.InstanceKey = instanceKey;
+        this.ProcessID = processID;
+        this.BootID = bootID;
+    }
+    /** The id this boot stamps into the rows it owns: `hostname:port:pid:bootId`. */
+    GetHostInstanceID() {
+        return `${this.GetInstancePrefix()}${this.ProcessID}:${this.BootID}`;
+    }
+    /** The prefix every boot of this instance shares and no other instance has: `hostname:port:`. */
+    GetInstancePrefix() {
+        return `${this.HostName}:${this.InstanceKey}:`;
+    }
+    /**
+     * Whether a `HostInstanceID` was stamped by another boot of this instance: this instance's prefix, then a process
+     * id and a boot id, and not this boot's own id. That boot has ended, since this one holds the instance's port.
+     *
+     * False for this boot's id, for another instance's (another port on this host, or another host), for the format
+     * used before the port was added (`hostname:pid:bootId`), and for null. The match is exact: unlike a SQL `LIKE`,
+     * a `_` in a host name matches only `_`.
+     *
+     * @param hostInstanceID A row's `HostInstanceID`.
+     */
+    IsPriorBoot(hostInstanceID) {
+        if (!hostInstanceID || hostInstanceID === this.GetHostInstanceID()) {
+            return false;
+        }
+        const prefix = this.GetInstancePrefix();
+        return hostInstanceID.startsWith(prefix) && PID_AND_BOOT_ID.test(hostInstanceID.slice(prefix.length));
+    }
+}
+/** The OS host name, read once at load. */
 const HOST_NAME = hostname();
-/** The full, immutable host-instance identity string for this process. */
-const HOST_INSTANCE_ID = `${HOST_NAME}:${process.pid}:${BOOT_ID}`;
+/** This boot's id, made once at load. */
+const BOOT_ID = randomUUID();
+/** The instance key until {@link SetHostInstancePort} sets the port: this process alone. */
+let instanceKey = `pid-${process.pid}`;
+/** This process's identity, made on first use and fixed from then on. */
+let currentInstance = null;
+/**
+ * Names this process's MJAPI instance by the port it serves on. `Serve` calls it first, before anything stamps a row,
+ * so every `HostInstanceID` the server writes carries its port.
+ *
+ * Until it is called the instance is the process alone (`pid-<pid>`), and its startup recovery closes no other
+ * process's sessions. The identity is fixed once read: a later call with another port is logged and ignored, so the
+ * rows already stamped keep matching this process.
+ *
+ * @param port The port this MJAPI serves on (`graphqlPort`).
+ */
+export function SetHostInstancePort(port) {
+    const key = String(port);
+    if (currentInstance && currentInstance.InstanceKey !== key) {
+        LogError(`[HostInstance] Port ${key} was set after this process's identity (${currentInstance.GetHostInstanceID()}) ` +
+            `was in use; keeping that identity so the rows it stamped still match this process`);
+        return;
+    }
+    instanceKey = key;
+}
+/**
+ * This process's identity: the one place MJServer reads it, to stamp the rows it owns and to recover them after a
+ * restart. Made on first call from the host name, the port {@link SetHostInstancePort} set (or `pid-<pid>`), the
+ * process id and this boot's id.
+ */
+export function GetCurrentHostInstance() {
+    if (!currentInstance) {
+        currentInstance = new HostInstanceIdentity(HOST_NAME, instanceKey, process.pid, BOOT_ID);
+    }
+    return currentInstance;
+}
 /**
- * Returns this process's stable host-instance identity (`hostname:pid:bootId`).
- * Stamped into `AIAgentSession.HostInstanceID` at session create and read back by the
- * janitor for own-host orphan recovery.
+ * Returns this boot's id (`hostname:port:pid:bootId`), stamped into `AIAgentSession.HostInstanceID` at session
+ * create. Same as `GetCurrentHostInstance().GetHostInstanceID()`.
  */
 export function GetHostInstanceID() {
-    return HOST_INSTANCE_ID;
+    return GetCurrentHostInstance().GetHostInstanceID();
 }
 /**
- * Returns the host-name prefix (`hostname:`) used to match *any* session previously hosted
- * by this OS host, regardless of which boot created it. The janitor uses this to find rows
- * that belong to this host but to a *different* (older) boot — i.e. crash/redeploy orphans.
+ * Returns `hostname:`, the prefix of every `HostInstanceID` stamped on this host by any MJAPI.
+ *
+ * @deprecated Not an ownership test: several MJAPIs can run on one host. Match this instance's rows with
+ * {@link HostInstanceIdentity.GetInstancePrefix} and {@link HostInstanceIdentity.IsPriorBoot} on
+ * {@link GetCurrentHostInstance}.
  */
 export function GetHostNamePrefix() {
     return `${HOST_NAME}:`;
 }
-/**
- * Returns the UUID generated once at process start. Exposed primarily for diagnostics and
- * tests; the janitor compares against the full {@link GetHostInstanceID} rather than this
- * value directly.
- */
+/** Returns the UUID made once at process start. For diagnostics and tests. */
 export function GetBootID() {
     return BOOT_ID;
 }

package/dist/agentSessions/HostInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"HostInstance.js","sourceRoot":"","sources":["../../src/agentSessions/HostInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC;;;;;;;;;;;;;;;GAeG;AACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAE7B,kFAAkF;AAClF,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;AAE7B,0EAA0E;AAC1E,MAAM,gBAAgB,GAAG,GAAG,SAAS,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,EAAE,CAAC;AAElE;;;;GAIG;AACH,MAAM,UAAU,iBAAiB;IAC7B,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB;IAC7B,OAAO,GAAG,SAAS,GAAG,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS;IACrB,OAAO,OAAO,CAAC;AACnB,CAAC"}
+{"version":3,"file":"HostInstance.js","sourceRoot":"","sources":["../../src/agentSessions/HostInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,6FAA6F;AAC7F,MAAM,eAAe,GAAG,aAAa,CAAC;AAEtC;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,oBAAoB;IAgB7B;;;;;OAKG;IACH,YAAY,QAAgB,EAAE,WAAmB,EAAE,SAAiB,EAAE,MAAc;QAChF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,iFAAiF;IAC1E,iBAAiB;QACpB,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IACzE,CAAC;IAED,iGAAiG;IAC1F,iBAAiB;QACpB,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC;IACnD,CAAC;IAED;;;;;;;;;OASG;IACI,WAAW,CAAC,cAAyC;QACxD,IAAI,CAAC,cAAc,IAAI,cAAc,KAAK,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACxC,OAAO,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1G,CAAC;CACJ;AAED,2CAA2C;AAC3C,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;AAE7B,yCAAyC;AACzC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAE7B,4FAA4F;AAC5F,IAAI,WAAW,GAAG,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;AAEvC,yEAAyE;AACzE,IAAI,eAAe,GAAgC,IAAI,CAAC;AAExD;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,IAAI,eAAe,IAAI,eAAe,CAAC,WAAW,KAAK,GAAG,EAAE,CAAC;QACzD,QAAQ,CACJ,uBAAuB,GAAG,2CAA2C,eAAe,CAAC,iBAAiB,EAAE,IAAI;YACxG,mFAAmF,CAC1F,CAAC;QACF,OAAO;IACX,CAAC;IACD,WAAW,GAAG,GAAG,CAAC;AACtB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB;IAClC,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,eAAe,GAAG,IAAI,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB;IAC7B,OAAO,sBAAsB,EAAE,CAAC,iBAAiB,EAAE,CAAC;AACxD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB;IAC7B,OAAO,GAAG,SAAS,GAAG,CAAC;AAC3B,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,SAAS;IACrB,OAAO,OAAO,CAAC;AACnB,CAAC"}

package/dist/agentSessions/ReturningVisitorRecap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReturningVisitorRecap.d.ts","sourceRoot":"","sources":["../../src/agentSessions/ReturningVisitorRecap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAW,QAAQ,EAAuB,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAiBtG;;;;;;;;;;;;GAYG;AACH,wBAAsB,0BAA0B,CAC9C,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAClC,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,0DAA0D;AAC1D,wBAAsB,0BAA0B,CAC9C,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAClC,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC,CAEf"}
+{"version":3,"file":"ReturningVisitorRecap.d.ts","sourceRoot":"","sources":["../../src/agentSessions/ReturningVisitorRecap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAW,QAAQ,EAAuB,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAkBtG;;;;;;;;;;;;GAYG;AACH,wBAAsB,0BAA0B,CAC9C,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAClC,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,0DAA0D;AAC1D,wBAAsB,0BAA0B,CAC9C,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAClC,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC,CAEf"}

package/dist/agentSessions/ReturningVisitorRecap.js

@@ -22,6 +22,7 @@
  * @module @memberjunction/server/agentSessions
  */
 import { RunView, LogError, LogStatus } from '@memberjunction/core';
+import { ConversationEngine } from '@memberjunction/core-entities';
 import { AIEngine } from '@memberjunction/aiengine';
 import { AIPromptParams } from '@memberjunction/ai-core-plus';
 import { AIPromptRunner } from '@memberjunction/ai-prompts';
@@ -117,13 +118,16 @@ async function recapAlreadyExists(conversationId, contextUser) {
     }, contextUser);
     return result.Success && (result.Results?.length ?? 0) > 0;
 }
-/** Builds a compact transcript string from the conversation's most-recent detail turns. */
+/**
+ * Builds a compact transcript string from the most recent detail turns in Main that no rerun replaced
+ * (a returning visitor's widget conversation has no forks). Returns undefined when there are none.
+ */
 async function loadTranscript(conversationId, contextUser) {
     const rv = new RunView();
     const result = await rv.RunView({
         EntityName: CONVERSATION_DETAILS_ENTITY,
-        ExtraFilter: `ConversationID = '${conversationId}'`,
-        OrderBy: '__mj_CreatedAt DESC',
+        ExtraFilter: ConversationEngine.LiveRowsFilter(ConversationEngine.ScopeFilter(ConversationEngine.TrunkScope(conversationId))),
+        OrderBy: 'Sequence DESC',
         MaxRows: MAX_TRANSCRIPT_TURNS,
         ResultType: 'entity_object',
     }, contextUser);

package/dist/agentSessions/ReturningVisitorRecap.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReturningVisitorRecap.js","sourceRoot":"","sources":["../../src/agentSessions/ReturningVisitorRecap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,OAAO,EAAY,QAAQ,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AAEtG,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AACjD,MAAM,2BAA2B,GAAG,0BAA0B,CAAC;AAC/D,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAChD,MAAM,iBAAiB,GAAG,yBAAyB,CAAC;AAEpD,gGAAgG;AAChG,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAErC,uFAAuF;AACvF,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,cAAyC,EACzC,OAAkC,EAClC,WAAqB,EACrB,QAA2B,EAC3B,aAA6B;IAE7B,IAAI,CAAC;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,wDAAwD,cAAc,EAAE,CAAC,CAAC;QACpF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAuB,QAAQ,EAAE,oBAAoB,EAAE,WAAW,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAChE,QAAQ,CAAC,uDAAuD,cAAc,YAAY,CAAC,CAAC;YAC5F,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,oGAAoG;YACpG,SAAS,CAAC,0EAA0E,cAAc,YAAY,CAAC,CAAC;YAChH,OAAO;QACT,CAAC;QAED,IAAI,MAAM,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;YAC1D,SAAS,CAAC,oDAAoD,cAAc,aAAa,CAAC,CAAC;YAC3F,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,SAAS,CAAC,gDAAgD,cAAc,YAAY,CAAC,CAAC;YACtF,OAAO;QACT,CAAC;QACD,SAAS,CAAC,8CAA8C,UAAU,CAAC,MAAM,eAAe,cAAc,wBAAwB,CAAC,CAAC;QAEhI,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACvE,SAAS,CAAC,2CAA2C,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,QAAQ,cAAc,oBAAoB,CAAC,CAAC;YACvI,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;IAC1G,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,qEAAqE,cAAc,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjJ,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,cAAyC,EACzC,OAAkC,EAClC,WAAqB,EACrB,QAA2B,EAC3B,aAA6B;IAE7B,OAAO,0BAA0B,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;AACnG,CAAC;AAQD;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,YAAkC,EAAE,QAA2B;IACxF,IAAI,YAAY,CAAC,cAAc,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;QAC/D,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,CAAC;IAC1F,CAAC;IACD,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,qBAAqB,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAoB,CAAC,EAAE,EAAE,CAAC;QACjG,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC;QACxE,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iGAAiG;AACjG,KAAK,UAAU,kBAAkB,CAAC,cAAsB,EAAE,WAAqB;IAC7E,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAC7B;QACE,UAAU,EAAE,kBAAkB;QAC9B,WAAW,EAAE,2BAA2B,cAAc,gDAAgD;QACtG,MAAM,EAAE,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,CAAC;QACV,UAAU,EAAE,QAAQ;KACrB,EACD,WAAW,CACZ,CAAC;IACF,OAAO,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7D,CAAC;AAED,2FAA2F;AAC3F,KAAK,UAAU,cAAc,CAAC,cAAsB,EAAE,WAAqB;IACzE,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAC7B;QACE,UAAU,EAAE,2BAA2B;QACvC,WAAW,EAAE,qBAAqB,cAAc,GAAG;QACnD,OAAO,EAAE,qBAAqB;QAC9B,OAAO,EAAE,oBAAoB;QAC7B,UAAU,EAAE,eAAe;KAC5B,EACD,WAAW,CACZ,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,qFAAqF;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE;SACjC,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;SAC9D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAED,mGAAmG;AACnG,KAAK,UAAU,mBAAmB,CAAC,UAAkB,EAAE,WAAqB;IAC1E,MAAM,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7H,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,QAAQ,CAAC,yCAAyC,iBAAiB,sDAAsD,CAAC,CAAC;QAC3H,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,SAAS,CAAC,yCAAyC,YAAY,CAAC,IAAI,eAAe,YAAY,CAAC,iBAAiB,YAAY,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACrJ,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;IAC7B,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,IAAI,GAAG,EAAE,UAAU,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,QAAQ,CAAC,gDAAgD,MAAM,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC;QAC7F,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACtG,SAAS,CAAC,6DAA6D,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACrG,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;AAClC,CAAC;AAED,0GAA0G;AAC1G,KAAK,UAAU,gBAAgB,CAAC,IAQ/B;IACC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAsB,IAAI,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvG,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;IACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IACtB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACvB,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC;IAClC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAChD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAChD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC;IAChD,iGAAiG;IACjG,8DAA8D;IAC9D,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,QAAQ,CAAC,sDAAsD,IAAI,CAAC,YAAY,EAAE,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;QACxH,OAAO;IACT,CAAC;IACD,SAAS,CAAC,4CAA4C,IAAI,CAAC,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,qBAAqB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;AACnK,CAAC;AAED,0GAA0G;AAC1G,KAAK,UAAU,SAAS,CACtB,QAA2B,EAC3B,UAAkB,EAClB,WAAqB;IAErB,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,eAAe,CAAI,UAAU,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,4CAA4C,UAAU,cAAc,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3H,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"ReturningVisitorRecap.js","sourceRoot":"","sources":["../../src/agentSessions/ReturningVisitorRecap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,OAAO,EAAY,QAAQ,EAAE,SAAS,EAA0B,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AACjD,MAAM,2BAA2B,GAAG,0BAA0B,CAAC;AAC/D,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAChD,MAAM,iBAAiB,GAAG,yBAAyB,CAAC;AAEpD,gGAAgG;AAChG,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAErC,uFAAuF;AACvF,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,cAAyC,EACzC,OAAkC,EAClC,WAAqB,EACrB,QAA2B,EAC3B,aAA6B;IAE7B,IAAI,CAAC;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,wDAAwD,cAAc,EAAE,CAAC,CAAC;QACpF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAuB,QAAQ,EAAE,oBAAoB,EAAE,WAAW,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAChE,QAAQ,CAAC,uDAAuD,cAAc,YAAY,CAAC,CAAC;YAC5F,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,oGAAoG;YACpG,SAAS,CAAC,0EAA0E,cAAc,YAAY,CAAC,CAAC;YAChH,OAAO;QACT,CAAC;QAED,IAAI,MAAM,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC;YAC1D,SAAS,CAAC,oDAAoD,cAAc,aAAa,CAAC,CAAC;YAC3F,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,SAAS,CAAC,gDAAgD,cAAc,YAAY,CAAC,CAAC;YACtF,OAAO;QACT,CAAC;QACD,SAAS,CAAC,8CAA8C,UAAU,CAAC,MAAM,eAAe,cAAc,wBAAwB,CAAC,CAAC;QAEhI,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACvE,SAAS,CAAC,2CAA2C,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,QAAQ,cAAc,oBAAoB,CAAC,CAAC;YACvI,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;IAC1G,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,qEAAqE,cAAc,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjJ,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,cAAyC,EACzC,OAAkC,EAClC,WAAqB,EACrB,QAA2B,EAC3B,aAA6B;IAE7B,OAAO,0BAA0B,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;AACnG,CAAC;AAQD;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,YAAkC,EAAE,QAA2B;IACxF,IAAI,YAAY,CAAC,cAAc,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;QAC/D,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,CAAC;IAC1F,CAAC;IACD,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,qBAAqB,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAoB,CAAC,EAAE,EAAE,CAAC;QACjG,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC;QACxE,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iGAAiG;AACjG,KAAK,UAAU,kBAAkB,CAAC,cAAsB,EAAE,WAAqB;IAC7E,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAC7B;QACE,UAAU,EAAE,kBAAkB;QAC9B,WAAW,EAAE,2BAA2B,cAAc,gDAAgD;QACtG,MAAM,EAAE,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,CAAC;QACV,UAAU,EAAE,QAAQ;KACrB,EACD,WAAW,CACZ,CAAC;IACF,OAAO,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,cAAc,CAAC,cAAsB,EAAE,WAAqB;IACzE,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAC7B;QACE,UAAU,EAAE,2BAA2B;QACvC,WAAW,EAAE,kBAAkB,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,kBAAkB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;QAC7H,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,oBAAoB;QAC7B,UAAU,EAAE,eAAe;KAC5B,EACD,WAAW,CACZ,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,qFAAqF;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE;SACjC,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;SAC9D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAED,mGAAmG;AACnG,KAAK,UAAU,mBAAmB,CAAC,UAAkB,EAAE,WAAqB;IAC1E,MAAM,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7H,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,QAAQ,CAAC,yCAAyC,iBAAiB,sDAAsD,CAAC,CAAC;QAC3H,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,SAAS,CAAC,yCAAyC,YAAY,CAAC,IAAI,eAAe,YAAY,CAAC,iBAAiB,YAAY,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACrJ,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;IAC7B,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,IAAI,GAAG,EAAE,UAAU,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,cAAc,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,QAAQ,CAAC,gDAAgD,MAAM,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC;QAC7F,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACtG,SAAS,CAAC,6DAA6D,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACrG,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;AAClC,CAAC;AAED,0GAA0G;AAC1G,KAAK,UAAU,gBAAgB,CAAC,IAQ/B;IACC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAsB,IAAI,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvG,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;IACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IACtB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACvB,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC;IAClC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAChD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAChD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC;IAChD,iGAAiG;IACjG,8DAA8D;IAC9D,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,QAAQ,CAAC,sDAAsD,IAAI,CAAC,YAAY,EAAE,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;QACxH,OAAO;IACT,CAAC;IACD,SAAS,CAAC,4CAA4C,IAAI,CAAC,EAAE,cAAc,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,qBAAqB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;AACnK,CAAC;AAED,0GAA0G;AAC1G,KAAK,UAAU,SAAS,CACtB,QAA2B,EAC3B,UAAkB,EAClB,WAAqB;IAErB,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,eAAe,CAAI,UAAU,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,4CAA4C,UAAU,cAAc,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3H,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}