@oneuptime/common 12.0.32 → 12.0.33

package/build/dist/UI/Components/SideOver/SideOver.js

@@ -1,8 +1,8 @@
 import Button, { ButtonStyleType } from "../Button/Button";
 import Icon from "../Icon/Icon";
 import IconProp from "../../../Types/Icon/IconProp";
-import { lockPageScroll, unlockPageScroll } from "../../Utils/PageScrollLock";
-import React, { useEffect, useId, useLayoutEffect, useState, } from "react";
+import { usePageScrollLock } from "../../Utils/PageScrollLock";
+import React, { useEffect, useId, useState, } from "react";
 import { createPortal } from "react-dom";
 export var SideOverSize;
 (function (SideOverSize) {
@@ -81,22 +81,7 @@ const SideOver = (props) => {
             document.removeEventListener("fullscreenchange", syncPortalTarget);
         };
     }, []);
-    /*
-     * A layout effect, not an ordinary one. Hiding the page scrollbar widens the
-     * viewport that `right: 0` resolves against, so a panel that painted before
-     * the lock landed would visibly jump sideways by the scrollbar's width on
-     * every platform that draws a classic scrollbar. Locking before paint means
-     * the panel is only ever drawn in its final position.
-     */
-    useLayoutEffect(() => {
-        if (props.disablePageScrollLock) {
-            return undefined;
-        }
-        lockPageScroll();
-        return () => {
-            unlockPageScroll();
-        };
-    }, [props.disablePageScrollLock]);
+    usePageScrollLock(!props.disablePageScrollLock);
     const sideOver = (
     /*
      * z-30 clears every tier of page chrome (sticky headers and table headers
@@ -134,10 +119,10 @@ const SideOver = (props) => {
                     React.createElement("div", { className: "flex-shrink-0 border-t border-gray-200 px-4 py-5 sm:px-6 flex justify-between", "data-testid": "side-over-footer" },
                         React.createElement("div", { className: "flex justify-start space-x-3" }, props.leftFooterElement),
                         React.createElement("div", { className: "flex justify-end space-x-3" },
-                            React.createElement(Button, { title: "Close", onClick: () => {
+                            React.createElement(Button, { title: "Close", disabled: props.closeButtonDisabled, onClick: () => {
                                     props.onClose();
                                 }, buttonStyle: ButtonStyleType.NORMAL }),
-                            props.onSubmit && (React.createElement(Button, { title: props.submitButtonText || "Save", disabled: props.submitButtonDisabled, onClick: () => {
+                            props.onSubmit && (React.createElement(Button, { title: props.submitButtonText || "Save", disabled: props.submitButtonDisabled, isLoading: props.submitButtonIsLoading, onClick: () => {
                                     props.onSubmit();
                                 }, buttonStyle: ButtonStyleType.PRIMARY })))))))));
     if (!portalTarget) {

package/build/dist/UI/Components/SideOver/SideOver.js.map

@@ -1 +1 @@
-{"version":3,"file":"SideOver.js","sourceRoot":"","sources":["../../../../../UI/Components/SideOver/SideOver.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SideOver.js","sourceRoot":"","sources":["../../../../../UI/Components/SideOver/SideOver.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Utils/PageScrollLock.js

@@ -11,6 +11,7 @@
  * snapshot the other had already overwritten, leaving the page either scrolling
  * under a dialog that is still open or locked forever with no dialog on screen.
  */
+import { useLayoutEffect } from "react";
 let openDialogCount = 0;
 let bodyOverflowBeforeLock = "";
 let bodyPaddingRightBeforeLock = "";
@@ -31,13 +32,40 @@ export const lockPageScroll = () => {
     }
     document.body.style.overflow = "hidden";
 };
+const restoreBodyStyle = (property, value) => {
+    if (value === "") {
+        document.body.style.removeProperty(property);
+        return;
+    }
+    document.body.style.setProperty(property, value);
+};
 export const unlockPageScroll = () => {
-    openDialogCount = Math.max(0, openDialogCount - 1);
+    /*
+     * Nothing is open, so there is nothing of ours on the page to put back. A
+     * stray unlock — one surface releasing twice, a cleanup that outlives the
+     * lock it was paired with — has to be inert rather than paint a snapshot
+     * taken for some earlier dialog over whatever the page is wearing now.
+     */
+    if (openDialogCount === 0) {
+        return;
+    }
+    openDialogCount--;
     if (openDialogCount > 0 || typeof document === "undefined") {
         return;
     }
-    document.body.style.overflow = bodyOverflowBeforeLock;
-    document.body.style.paddingRight = bodyPaddingRightBeforeLock;
+    restoreBodyStyle("overflow", bodyOverflowBeforeLock);
+    restoreBodyStyle("padding-right", bodyPaddingRightBeforeLock);
+};
+export const usePageScrollLock = (isLocked) => {
+    useLayoutEffect(() => {
+        if (!isLocked) {
+            return undefined;
+        }
+        lockPageScroll();
+        return () => {
+            unlockPageScroll();
+        };
+    }, [isLocked]);
 };
 /*
  * Test-only escape hatch. The counter is module state that survives between

package/build/dist/UI/Utils/PageScrollLock.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageScrollLock.js","sourceRoot":"","sources":["../../../../UI/Utils/PageScrollLock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,IAAI,eAAe,GAAW,CAAC,CAAC;AAChC,IAAI,sBAAsB,GAAW,EAAE,CAAC;AACxC,IAAI,0BAA0B,GAAW,EAAE,CAAC;AAI5C,MAAM,CAAC,MAAM,cAAc,GAA2B,GAAS,EAAE;IAC/D,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IACtD,0BAA0B,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IAE9D;;;OAGG;IACH,MAAM,cAAc,GAClB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;IAE3D,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,cAAc,IAAI,CAAC;IAC3D,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAA2B,GAAS,EAAE;IACjE,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,CAAC;IAEnD,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,sBAAsB,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,0BAA0B,CAAC;AAChE,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,GAAS,EAAE;IACT,eAAe,GAAG,CAAC,CAAC;IACpB,sBAAsB,GAAG,EAAE,CAAC;IAC5B,0BAA0B,GAAG,EAAE,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"PageScrollLock.js","sourceRoot":"","sources":["../../../../UI/Utils/PageScrollLock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,IAAI,eAAe,GAAW,CAAC,CAAC;AAChC,IAAI,sBAAsB,GAAW,EAAE,CAAC;AACxC,IAAI,0BAA0B,GAAW,EAAE,CAAC;AAI5C,MAAM,CAAC,MAAM,cAAc,GAA2B,GAAS,EAAE;IAC/D,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IACtD,0BAA0B,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IAE9D;;;OAGG;IACH,MAAM,cAAc,GAClB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;IAE3D,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,cAAc,IAAI,CAAC;IAC3D,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAC1C,CAAC,CAAC;AAWF,MAAM,gBAAgB,GAA6B,CACjD,QAAgB,EAChB,KAAa,EACP,EAAE;IACR,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE7C,OAAO;IACT,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAA2B,GAAS,EAAE;IACjE;;;;;OAKG;IACH,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,gBAAgB,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;IACrD,gBAAgB,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;AAChE,CAAC,CAAC;AA4BF,MAAM,CAAC,MAAM,iBAAiB,GAA8B,CAC1D,QAAiB,EACX,EAAE;IACR,eAAe,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,cAAc,EAAE,CAAC;QAEjB,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,GAAS,EAAE;IACT,eAAe,GAAG,CAAC,CAAC;IACpB,sBAAsB,GAAG,EAAE,CAAC;IAC5B,0BAA0B,GAAG,EAAE,CAAC;AAClC,CAAC,CAAC"}

package/build/dist/UI/Utils/PermissionGate.js

@@ -1,4 +1,4 @@
-import { PermissionHelper, } from "../../Types/Permission";
+import Permission, { PermissionHelper, } from "../../Types/Permission";
 import PermissionUtil from "./Permission";
 import User from "./User";
 /*
@@ -120,6 +120,23 @@ export default class PermissionGate {
         return titles;
     }
     static hasPermission(model, action, userPermissions) {
+        if (this.hasDeclaredPermission(model, action, userPermissions)) {
+            return true;
+        }
+        /*
+         * The server widens a model's declared permissions with the matching
+         * *AllOperationalResources wildcard for anything marked
+         * @OperationalResource (TablePermission.getEffectiveModelPermissions, and
+         * its analytics twin). Without the same step here, somebody granted
+         * "Edit All Operational Resources" - and nothing else - was told by every
+         * gate in the UI that they could not edit a monitor, an incident or a
+         * dashboard, while the API happily accepted the write. The gate must not
+         * be stricter than the endpoint it is standing in front of.
+         */
+        const wildcard = this.getOperationalWildcard(model, action);
+        return Boolean(wildcard && userPermissions.includes(wildcard));
+    }
+    static hasDeclaredPermission(model, action, userPermissions) {
         switch (action) {
             case ModelAction.Create:
                 return model.hasCreatePermissions(userPermissions);
@@ -133,6 +150,30 @@ export default class PermissionGate {
                 return false;
         }
     }
+    /*
+     * The wildcard that covers this operation on this model, or null when the
+     * model is not an operational resource. Kept out of getModelPermissions on
+     * purpose: that list is what the "you need one of these permissions"
+     * sentence is built from, and the server names only the model's own
+     * permissions there too.
+     */
+    static getOperationalWildcard(model, action) {
+        if (!model.isOperationalResource) {
+            return null;
+        }
+        switch (action) {
+            case ModelAction.Create:
+                return Permission.CreateAllOperationalResources;
+            case ModelAction.Read:
+                return Permission.ReadAllOperationalResources;
+            case ModelAction.Update:
+                return Permission.EditAllOperationalResources;
+            case ModelAction.Delete:
+                return Permission.DeleteAllOperationalResources;
+            default:
+                return null;
+        }
+    }
     /*
      * Applies a gate to a card button in one line. Several tables replace the
      * built in create modal with a button that routes to a dedicated create

package/build/dist/UI/Utils/PermissionGate.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionGate.js","sourceRoot":"","sources":["../../../../UI/Utils/PermissionGate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PermissionGate.js","sourceRoot":"","sources":["../../../../UI/Utils/PermissionGate.ts"],"names":[],"mappings":"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"}

package/build/dist/UI/Utils/SensitiveUrlToken.js

@@ -0,0 +1,97 @@
+/*
+ * Client half of the sensitive-URL-token handoff.
+ *
+ * Common/Server/Views/Partials/SensitiveUrlToken.ejs runs in <head>, moves the
+ * bearer token out of the path into sessionStorage and rewrites the address bar
+ * to the token-free route. By the time React mounts, the token is no longer a
+ * route parameter, so pages read it from here instead of from the router.
+ *
+ * Deliberately not routed through Common/UI/Utils/Navigation: this is read
+ * during the reset and verification flows, where the value has to be available
+ * whether or not the bootstrap managed to clean the URL, and Navigation only
+ * ever sees whatever the router was given.
+ *
+ * TOKEN_ROUTES is duplicated in the partial. The two lists have to agree about
+ * which routes carry a token; Common/Tests/App/SensitiveUrlTokenBootstrap.test.ts
+ * asserts that they do.
+ */
+const STORAGE_KEY = "oneuptime-sensitive-url-token";
+/*
+ * Route segments whose NEXT path segment is a single-use bearer token. Matched
+ * against the second-to-last segment, so this covers
+ * /accounts/reset-password/<token>, /reset-password/<token> and
+ * /status-page/<id>/reset-password/<token> alike.
+ */
+const TOKEN_ROUTES = ["reset-password", "verify-email"];
+export default class SensitiveUrlToken {
+    /*
+     * The token for the current page, or "" when there is none.
+     *
+     * Order matters. sessionStorage is where the bootstrap normally puts it and
+     * is the only source that survives a reload of the cleaned URL. The in-memory
+     * handoff covers blocked storage. The path is the last resort: it only holds
+     * a token when the bootstrap could not run, and reading it keeps the flow
+     * working on the browsers where that happens.
+     */
+    static read() {
+        try {
+            const stored = window.sessionStorage.getItem(STORAGE_KEY);
+            if (stored) {
+                return stored;
+            }
+        }
+        catch (_a) {
+            /* Private mode or storage disabled; fall through. */
+        }
+        const handedOff = window
+            .__ONEUPTIME_SENSITIVE_URL_TOKEN__;
+        if (handedOff) {
+            return handedOff;
+        }
+        return SensitiveUrlToken.readFromPath(window.location.pathname);
+    }
+    /*
+     * Pull the token out of a path, if that path is a token-bearing route.
+     * Returns "" for the cleaned form of the same route, which is what the
+     * address bar holds once the bootstrap has run.
+     */
+    static readFromPath(pathname) {
+        const segments = SensitiveUrlToken.segmentsOf(pathname);
+        if (segments.length < 2) {
+            return "";
+        }
+        if (!TOKEN_ROUTES.includes(segments[segments.length - 2])) {
+            return "";
+        }
+        const token = segments[segments.length - 1];
+        try {
+            return decodeURIComponent(token);
+        }
+        catch (_a) {
+            // A malformed escape sequence is handed on verbatim.
+            return token;
+        }
+    }
+    /*
+     * Drop the stashed token once the flow that needed it has completed.
+     *
+     * Only call this on success. A failed reset (an expired token, a password the
+     * server rejected) has to leave the stash intact, or the retry — and any
+     * reload of the now token-free URL — has nothing to submit.
+     */
+    static clear() {
+        try {
+            window.sessionStorage.removeItem(STORAGE_KEY);
+        }
+        catch (_a) {
+            /* Nothing was stored, so nothing to remove. */
+        }
+        delete window.__ONEUPTIME_SENSITIVE_URL_TOKEN__;
+    }
+    static segmentsOf(pathname) {
+        return (pathname || "").split("/").filter((segment) => {
+            return segment !== "";
+        });
+    }
+}
+//# sourceMappingURL=SensitiveUrlToken.js.map

package/build/dist/UI/Utils/SensitiveUrlToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SensitiveUrlToken.js","sourceRoot":"","sources":["../../../../UI/Utils/SensitiveUrlToken.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,GAAW,+BAA+B,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,YAAY,GAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;AAMvE,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;;;;;OAQG;IACI,MAAM,CAAC,IAAI;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAkB,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAEzE,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAAC,WAAM,CAAC;YACP,qDAAqD;QACvD,CAAC;QAED,MAAM,SAAS,GAAwB,MAAwB;aAC5D,iCAAiC,CAAC;QAErC,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,YAAY,CAAC,QAAgB;QACzC,MAAM,QAAQ,GAAkB,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEvE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC;YAC3D,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,KAAK,GAAW,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;QAErD,IAAI,CAAC;YACH,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAAC,WAAM,CAAC;YACP,qDAAqD;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK;QACjB,IAAI,CAAC;YACH,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;QAAC,WAAM,CAAC;YACP,+CAA+C;QACjD,CAAC;QAED,OAAQ,MAAwB,CAAC,iCAAiC,CAAC;IACrE,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAgB;QACxC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAe,EAAW,EAAE;YACrE,OAAO,OAAO,KAAK,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/build/dist/UI/Utils/TestLLMProvider.js

@@ -20,11 +20,10 @@ export default class TestLLMProvider {
                 };
             }
             const responseData = response.data;
-            return {
-                success: true,
-                message: responseData["message"] ||
-                    "Connection successful. The LLM provider responded to a test prompt.",
-            };
+            return Object.assign({ success: true, message: responseData["message"] ||
+                    "Connection successful. The LLM provider responded to a test prompt." }, (typeof responseData["supportsToolCalling"] === "boolean"
+                ? { supportsToolCalling: responseData["supportsToolCalling"] }
+                : {}));
         }
         catch (err) {
             return {

package/build/dist/UI/Utils/TestLLMProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestLLMProvider.js","sourceRoot":"","sources":["../../../../UI/Utils/TestLLMProvider.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAKtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,GAAG,MAAM,WAAW,CAAC;AAO5B,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAGxB;QACC,IAAI,CAAC;YACH,MAAM,QAAQ,GACZ,MAAM,GAAG,CAAC,IAAI,iBACZ,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAClD,oBAAoB,CACrB,EACD,IAAI,EAAE;oBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC,IACE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,CAAC;YAEL,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;gBACzB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBAC1C,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAe,QAAQ,CAAC,IAAkB,CAAC;YAE7D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EACJ,YAAY,CAAC,SAAS,CAAY;oBACnC,qEAAqE;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC;aACrC,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"TestLLMProvider.js","sourceRoot":"","sources":["../../../../UI/Utils/TestLLMProvider.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAKtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,GAAG,MAAM,WAAW,CAAC;AAe5B,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAGxB;QACC,IAAI,CAAC;YACH,MAAM,QAAQ,GACZ,MAAM,GAAG,CAAC,IAAI,iBACZ,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAClD,oBAAoB,CACrB,EACD,IAAI,EAAE;oBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC,IACE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,CAAC;YAEL,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;gBACzB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBAC1C,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAe,QAAQ,CAAC,IAAkB,CAAC;YAE7D,uBACE,OAAO,EAAE,IAAI,EACb,OAAO,EACJ,YAAY,CAAC,SAAS,CAAY;oBACnC,qEAAqE,IACpE,CAAC,OAAO,YAAY,CAAC,qBAAqB,CAAC,KAAK,SAAS;gBAC1D,CAAC,CAAC,EAAE,mBAAmB,EAAE,YAAY,CAAC,qBAAqB,CAAC,EAAE;gBAC9D,CAAC,CAAC,EAAE,CAAC,EACP;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC;aACrC,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSeats.js

@@ -115,6 +115,21 @@ export default class EnterpriseLicenseSeatsUtil {
         if (!thisInstance) {
             return null;
         }
+        /*
+         * The active-only aggregate contains none of this installation's stale
+         * reported users. Subtracting that old count would remove users belonging
+         * to active instances and under-enforce the license. Treat the complete
+         * aggregate as other-instance usage. We also cannot add the two counts:
+         * the same users may exist on both this installation and active ones.
+         * Return null to use the existing uncertainty fallback, which takes the
+         * larger complete-or-live total without subtracting or double-counting.
+         *
+         * Undefined retains the legacy behavior for responses from older license
+         * servers that did not send activity provenance.
+         */
+        if (thisInstance.isCountedTowardsUsage === false) {
+            return null;
+        }
         const ownReportedCount = this.parseCount(thisInstance.userCount);
         if (ownReportedCount === null) {
             return null;

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseSeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseLicenseSeats.js","sourceRoot":"","sources":["../../../../Utils/EnterpriseLicense/EnterpriseLicenseSeats.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EnterpriseLicenseSeats.js","sourceRoot":"","sources":["../../../../Utils/EnterpriseLicense/EnterpriseLicenseSeats.ts"],"names":[],"mappings":"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"}

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseUsage.js

@@ -1,4 +1,4 @@
-import OneUptimeDate from "../../Types/Date";
+import EnterpriseLicenseUserCountSource from "../../Types/EnterpriseLicense/EnterpriseLicenseUserCountSource";
 class EnterpriseLicenseUsageUtil {
     /*
      * License keys are shown/emailed masked — enough to identify the key
@@ -63,12 +63,114 @@ class EnterpriseLicenseUsageUtil {
         return Array.from(hashes);
     }
     static isInstanceCountedTowardsUsage(instance, now) {
-        if (!instance.lastReportedAt) {
-            // Registered (license key validated) but never reported usage yet.
+        const lastCommunicatedAt = this.getInstanceLastCommunicatedAt(instance);
+        if (!lastCommunicatedAt) {
             return false;
         }
-        const staleBefore = OneUptimeDate.addRemoveDays(now, -this.InstanceUsageFreshnessInDays);
-        return instance.lastReportedAt.getTime() >= staleBefore.getTime();
+        const inactiveAfterInMilliseconds = this.InstanceUsageFreshnessInDays * 24 * 60 * 60 * 1000;
+        const staleBefore = now.getTime() - inactiveAfterInMilliseconds;
+        /*
+         * Strictly greater than: at the exact seven-day boundary the instance has
+         * gone a full week without communicating and must already be inactive.
+         * Elapsed milliseconds are intentional; a daylight-saving transition
+         * must not shorten or extend the week.
+         */
+        return lastCommunicatedAt.getTime() > staleBefore;
+    }
+    static getInstanceLastCommunicatedAt(instance) {
+        return instance.lastReportedAt || instance.createdAt;
+    }
+    /* A registration is active, but only a real report is modern seat data. */
+    static hasActiveReportedInstanceUsage(instances, now) {
+        return instances.some((instance) => {
+            return (Boolean(instance.lastReportedAt) &&
+                this.isInstanceCountedTowardsUsage(instance, now));
+        });
+    }
+    static isTimestampWithinUsageWindow(timestamp, now) {
+        return timestamp
+            ? this.isInstanceCountedTowardsUsage({ lastReportedAt: timestamp }, now)
+            : false;
+    }
+    static hasReportedInstanceUsage(instances) {
+        return instances.some((instance) => {
+            return Boolean(instance.lastReportedAt);
+        });
+    }
+    /*
+     * Choose between modern per-instance reports and a separately persisted
+     * legacy license-wide heartbeat. The stored count fallback exists only for
+     * records written before those dedicated legacy columns were introduced;
+     * seeing any historical modern report proves that aggregate is not legacy.
+     * Once every authoritative communication timestamp is a week old, usage is
+     * zero.
+     */
+    static getEffectiveUserCount(options) {
+        return this.getEffectiveUserCountAndSource(options).userCount;
+    }
+    static getEffectiveUserCountAndSource(options) {
+        var _a, _b;
+        if (this.hasActiveReportedInstanceUsage(options.instances, options.now)) {
+            return {
+                userCount: this.getUniqueUserCount(options.instances, options.now),
+                source: EnterpriseLicenseUserCountSource.Instance,
+            };
+        }
+        if (this.isTimestampWithinUsageWindow(options.legacyUserCountUpdatedAt, options.now)) {
+            return {
+                userCount: (_a = options.legacyUserCount) !== null && _a !== void 0 ? _a : null,
+                source: EnterpriseLicenseUserCountSource.Legacy,
+            };
+        }
+        const hasRecentRegistration = options.instances.some((instance) => {
+            return (!instance.lastReportedAt &&
+                this.isInstanceCountedTowardsUsage(instance, options.now));
+        });
+        const hasRecentLegacyReport = options.storedUserCountUpdatedAt
+            ? this.isTimestampWithinUsageWindow(options.storedUserCountUpdatedAt, options.now)
+            : false;
+        const isExplicitLegacyFallback = options.storedUserCountSource ===
+            EnterpriseLicenseUserCountSource.Legacy &&
+            !options.legacyUserCountUpdatedAt &&
+            hasRecentLegacyReport;
+        const canUseCompatibilityFallback = options.allowStoredUserCountAsLegacyFallback !== false &&
+            options.storedUserCountSource !==
+                EnterpriseLicenseUserCountSource.Instance &&
+            !options.legacyUserCountUpdatedAt &&
+            !this.hasReportedInstanceUsage(options.instances);
+        if (isExplicitLegacyFallback ||
+            (canUseCompatibilityFallback &&
+                (hasRecentRegistration || hasRecentLegacyReport))) {
+            return {
+                userCount: (_b = options.storedUserCount) !== null && _b !== void 0 ? _b : null,
+                source: EnterpriseLicenseUserCountSource.Legacy,
+            };
+        }
+        if (options.instances.length === 0 &&
+            (options.storedUserCount === undefined ||
+                options.storedUserCount === null) &&
+            !options.storedUserCountUpdatedAt &&
+            (options.legacyUserCount === undefined ||
+                options.legacyUserCount === null) &&
+            !options.legacyUserCountUpdatedAt &&
+            !options.storedUserCountSource) {
+            return {
+                userCount: null,
+                source: null,
+            };
+        }
+        let inactiveUsageSource = options.storedUserCountSource || null;
+        if (!inactiveUsageSource &&
+            this.hasReportedInstanceUsage(options.instances)) {
+            inactiveUsageSource = EnterpriseLicenseUserCountSource.Instance;
+        }
+        else if (!inactiveUsageSource && options.legacyUserCountUpdatedAt) {
+            inactiveUsageSource = EnterpriseLicenseUserCountSource.Legacy;
+        }
+        return {
+            userCount: 0,
+            source: inactiveUsageSource,
+        };
     }
     /*
      * Unique users across all instances of a license: the union of email
@@ -120,11 +222,11 @@ EnterpriseLicenseUsageUtil.defaultExpiryReminderDays = 45;
  */
 EnterpriseLicenseUsageUtil.expiredNotificationCutoffDays = 30;
 /*
- * Instances that stopped reporting (for example a decommissioned staging
- * environment) stop counting towards the seat total after this many days,
- * but are still listed so the customer can see them.
+ * An instance is inactive once it has gone this many complete days without
+ * communicating with oneuptime.com. Inactive instances stay visible, but
+ * their users no longer consume seats.
  */
-EnterpriseLicenseUsageUtil.InstanceUsageFreshnessInDays = 30;
+EnterpriseLicenseUsageUtil.InstanceUsageFreshnessInDays = 7;
 // SHA-256 hex digest.
 EnterpriseLicenseUsageUtil.emailHashRegex = /^[a-f0-9]{64}$/;
 EnterpriseLicenseUsageUtil.maxEmailHashesPerInstance = 200000;

package/build/dist/Utils/EnterpriseLicense/EnterpriseLicenseUsage.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnterpriseLicenseUsage.js","sourceRoot":"","sources":["../../../../Utils/EnterpriseLicense/EnterpriseLicenseUsage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EnterpriseLicenseUsage.js","sourceRoot":"","sources":["../../../../Utils/EnterpriseLicense/EnterpriseLicenseUsage.ts"],"names":[],"mappings":"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"}