openmausbot 0.1.85 → 0.1.87

package/enterprise/README.md

@@ -5,24 +5,42 @@ folder has its own [LICENSE](./LICENSE); everything outside it is Apache 2.0.
 
 **Delete this folder and you have the open-source edition.** Core only
 reaches the layer through one hook point, `server/enterprise.ts`, which
-loads `enterprise/server/index.ts` if it exists and otherwise reports the
-open-source edition. No core file imports anything from here.
+loads `enterprise/server/index.ts` (or the bundled `index.js`) if it exists
+and otherwise reports the open-source edition. No core file imports anything
+from here.
+
+Where core looks, in order: `OMB_ENTERPRISE_DIR` when it is set (and then
+only there); otherwise beside the server root (a checkout's `enterprise/`,
+the npm package's `<package>/enterprise/`), then inside it
+(`dist-server/enterprise/`, which is all the Docker image and the packaged
+desktop carry; `scripts/bundle-server.mjs` writes the bundled layer and this
+LICENSE there).
 
 ## How a deployment turns enterprise
 
 Set `OMB_LICENSE_KEY` on the server. The key is `omb1.<claims>.<signature>`:
 the claims are visible JSON (who it is for, which entitlements, when it
 expires), signed with an Ed25519 key whose public half is baked into
-`server/license.ts`. Verification is offline, and one build serves every
-customer, because the key decides the feature set rather than the code.
+`enterprise/server/license.ts`. Verification is offline, and one build serves
+every customer, because the key decides the feature set rather than the code.
 
 `GET /api/edition` reports the outcome:
 
 ```json
-{ "edition": "enterprise", "customer": "Acme", "features": ["sso", "whitelabel"], "expiresAt": "2027-09-02" }
-{ "edition": "oss", "features": [], "notice": "OMB_LICENSE_KEY expired on 2027-09-02; renew it to keep enterprise features" }
+{ "edition": "enterprise", "customer": "Acme", "features": ["budgets", "whitelabel"], "expiresAt": "2027-09-02", "expiresInDays": 12 }
+{ "edition": "enterprise", "customer": "Acme", "features": ["budgets", "whitelabel"], "expiresAt": "2027-09-02", "expiresInDays": -2, "graceEndsAt": "2027-09-09", "notice": "OMB_LICENSE_KEY expired on 2027-09-02; enterprise features keep working until 2027-09-09 while it is renewed" }
+{ "edition": "oss", "features": [], "notice": "enterprise layer disabled: OMB_LICENSE_KEY expired on 2027-09-02; renew it to keep enterprise features" }
 ```
 
+`expiresInDays` is present whenever the key has an expiry; a non-admin
+session's `/api/edition` leaves out `expiresInDays`, `graceEndsAt` and the
+notice. From 30 days
+before it, the server logs a warning at startup and admins see a banner in
+Settings. After the expiry date the features keep working for a 7-day grace
+period, with the notice above and a banner saying until when; then they stop,
+without a restart. The key format and its signature check do not change: the
+layer simply accepts a key that expired less than the grace period ago.
+
 A missing, altered, or expired key does not stop an ordinary standalone
 server: it runs the open-source edition and the notice says what to fix.
 A workspace explicitly configured for hosted sign-in fails closed for remote
@@ -31,12 +49,15 @@ must not silently fall back to standalone email or pairing credentials.
 
 ## Entitlement ids
 
-| id | grants |
-|---|---|
-| `whitelabel` | product name, tagline, accent colour, logo, favicon and support link from `brand.json` (below) |
-| `sso` | identity-header trust behind an OIDC proxy |
-| `admin` | Settings → Workspaces and the optional hosted workspace sign-in adapter |
-| `budgets` | per-bot and per-section spend limits |
+| id | grants | status |
+|---|---|---|
+| `whitelabel` | product name, tagline, accent colour, logo, favicon and support link from `brand.json` (below) | shipped |
+| `sso` | sign-in through a company identity provider | planned: nothing checks it yet |
+| `admin` | Settings → Installations and the optional hosted workspace sign-in adapter | shipped |
+| `budgets` | one monthly spend limit for the whole workspace, refusing new turns at the cap, with a warning percentage and admin notices (not per bot or per section) | shipped |
+| `billing` | sell prices per model: a billable column in Usage → History and its CSV, and per-model prices that replace list prices in cost estimates | shipped |
+
+[FEATURES](./FEATURES) is the authoritative list.
 
 Core gates a feature with `entitled("id")` from `server/enterprise.ts`.
 Unknown ids are carried in the key but grant nothing, so keys can be issued

package/enterprise/server/index.js

@@ -14579,9 +14579,6 @@ function verifyLicenseKey(key, options = {}) {
 // enterprise/server/workspace-access.ts
 import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 
-// server/enterprise.ts
-import { join as join2 } from "node:path";
-
 // server/proxy-paths.ts
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -14615,7 +14612,7 @@ var layerSchema = external_exports.object({
   features: external_exports.array(external_exports.string().min(1)),
   expiresAt: external_exports.string().nullable()
 });
-var DEFAULT_DIR = join2(SERVER_ROOT, "..", "enterprise");
+var DAY_MS = 24 * 60 * 6e4;
 function hostedWorkspaceConfiguration(env = process.env) {
   try {
     const origin = (raw) => {
@@ -14934,9 +14931,12 @@ function createWorkspaceAccess(options) {
 }
 
 // enterprise/server/index.ts
+var MAX_GRACE_DAYS = 14;
+var DAY_MS2 = 24 * 60 * 6e4;
 function register(options) {
   if (!options.licenseKey) return null;
-  const claims = verifyLicenseKey(options.licenseKey);
+  const graceDays = Math.min(MAX_GRACE_DAYS, Math.max(0, Number.isFinite(options.graceDays) ? options.graceDays : 0));
+  const claims = verifyLicenseKey(options.licenseKey, { now: new Date((options.now ?? Date.now()) - graceDays * DAY_MS2) });
   return { customer: claims.customer, features: claims.features, expiresAt: claims.expires };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmausbot",
-  "version": "0.1.85",
+  "version": "0.1.87",
   "description": "Run the OpenMausBot server anywhere and pair your devices to it",
   "license": "Apache-2.0",
   "type": "module",