@objectstack/rest 5.1.0 → 6.0.0

package/dist/index.cjs

@@ -248,6 +248,7 @@ var RouteGroupBuilder = class {
 };
 
 // src/rest-server.ts
+var import_meta = {};
 var logError = (...args) => globalThis.console?.error(...args);
 function mapDataError(error, object) {
   if (error?.code === "CONCURRENT_UPDATE" || error?.name === "ConcurrentUpdateError") {
@@ -285,7 +286,7 @@ function mapDataError(error, object) {
   }
   const raw = String(error?.message ?? error ?? "");
   const lower = raw.toLowerCase();
-  if (raw.includes("[ProjectKernelFactory]") && (lower.includes("missing database_url") || lower.includes("not found"))) {
+  if (raw.includes("[EnvironmentKernelFactory]") && (lower.includes("missing database_url") || lower.includes("not found"))) {
     const isProvisioning = lower.includes("status='provisioning'") || lower.includes("status='pending'");
     const isFailed = lower.includes("status='failed'");
     return {
@@ -442,13 +443,19 @@ function rowsToCsv(fields, rows, includeHeader) {
   return lines.join("\r\n") + (lines.length > 0 ? "\r\n" : "");
 }
 var RestServer = class {
-  constructor(server, protocol, config = {}, kernelManager, envRegistry, defaultProjectIdProvider, authServiceProvider, objectQLProvider, emailServiceProvider, sharingServiceProvider, reportsServiceProvider, approvalsServiceProvider, sharingRulesServiceProvider, i18nServiceProvider) {
+  constructor(server, protocol, config = {}, kernelManager, envRegistry, defaultEnvironmentIdProvider, authServiceProvider, objectQLProvider, emailServiceProvider, sharingServiceProvider, reportsServiceProvider, approvalsServiceProvider, sharingRulesServiceProvider, i18nServiceProvider) {
+    /**
+     * Lazily load the OpenAPI spec JSON shipped by @objectstack/spec.
+     * Cached after first read. Resilient to missing files / parse errors
+     * so a degraded environment still boots.
+     */
+    this._openApiSpecCache = void 0;
     this.protocol = protocol;
     this.config = this.normalizeConfig(config);
     this.routeManager = new RouteManager(server);
     this.kernelManager = kernelManager;
     this.envRegistry = envRegistry;
-    this.defaultProjectIdProvider = defaultProjectIdProvider;
+    this.defaultEnvironmentIdProvider = defaultEnvironmentIdProvider;
     this.authServiceProvider = authServiceProvider;
     this.objectQLProvider = objectQLProvider;
     this.emailServiceProvider = emailServiceProvider;
@@ -459,20 +466,20 @@ var RestServer = class {
     this.i18nServiceProvider = i18nServiceProvider;
   }
   /**
-   * Resolve the protocol for a given request. When `projectId` is present
+   * Resolve the protocol for a given request. When `environmentId` is present
    * and a KernelManager is wired, fetch the per-project kernel's
    * `protocol` service so metadata / data / UI reads hit the project's
    * own registry and datastore.
    *
-   * When `projectId` is absent on an unscoped route and an `envRegistry`
+   * When `environmentId` is absent on an unscoped route and an `envRegistry`
    * is wired (runtime mode), the resolution chain is:
-   *   1. Hostname → projectId (`envRegistry.resolveByHostname`)
-   *   2. `X-Project-Id` header → projectId (`envRegistry.resolveById`)
-   *   3. Default-project fallback (`defaultProjectIdProvider`, set by
-   *      `createSingleProjectPlugin`)
+   *   1. Hostname → environmentId (`envRegistry.resolveByHostname`)
+   *   2. `X-Environment-Id` header → environmentId (`envRegistry.resolveById`)
+   *   3. Default-project fallback (`defaultEnvironmentIdProvider`, set by
+   *      `createSingleEnvironmentPlugin`)
    *   4. Control-plane protocol captured at boot.
    *
-   * Special case: `projectId === 'platform'` is a reserved virtual id used
+   * Special case: `environmentId === 'platform'` is a reserved virtual id used
    * by Studio to address the control plane through the regular project
    * URL shape (`/projects/platform/...`). It is NOT a row in the projects
    * table, so we must never call `KernelManager.getOrCreate('platform')`.
@@ -480,37 +487,37 @@ var RestServer = class {
    * (and any other client) speak a single, uniform URL family without
    * duplicating route logic for the platform surface.
    */
-  async resolveProtocol(projectId, req) {
-    if (projectId === "platform") return this.protocol;
-    if (!projectId && req && this.envRegistry && this.kernelManager) {
+  async resolveProtocol(environmentId, req) {
+    if (environmentId === "platform") return this.protocol;
+    if (!environmentId && req && this.envRegistry && this.kernelManager) {
       const host = this.extractHostname(req);
       if (host) {
         try {
           const result = await this.envRegistry.resolveByHostname(host);
-          if (result?.projectId) projectId = result.projectId;
+          if (result?.environmentId) environmentId = result.environmentId;
         } catch {
         }
       }
-      if (!projectId && typeof this.envRegistry.resolveById === "function") {
+      if (!environmentId && typeof this.envRegistry.resolveById === "function") {
         const headerVal = this.extractProjectIdHeader(req);
         if (headerVal) {
           try {
             const driver = await this.envRegistry.resolveById(headerVal);
-            if (driver) projectId = headerVal;
+            if (driver) environmentId = headerVal;
           } catch {
           }
         }
       }
     }
-    if (!projectId && this.defaultProjectIdProvider) {
+    if (!environmentId && this.defaultEnvironmentIdProvider) {
       try {
-        const def = this.defaultProjectIdProvider();
-        if (def) projectId = def;
+        const def = this.defaultEnvironmentIdProvider();
+        if (def) environmentId = def;
       } catch {
       }
     }
-    if (!projectId || !this.kernelManager) return this.protocol;
-    const kernel = await this.kernelManager.getOrCreate(projectId);
+    if (!environmentId || !this.kernelManager) return this.protocol;
+    const kernel = await this.kernelManager.getOrCreate(environmentId);
     return kernel.getServiceAsync("protocol");
   }
   /**
@@ -519,43 +526,43 @@ var RestServer = class {
    * registered, so callers can short-circuit and skip translation rather
    * than failing.
    *
-   * Mirrors `resolveProtocol`'s lookup chain: explicit `projectId` from the
+   * Mirrors `resolveProtocol`'s lookup chain: explicit `environmentId` from the
    * route → kernel-managed `i18n` service. Control-plane / unscoped
    * requests intentionally return `undefined` because the platform kernel
    * does not own per-app translation bundles.
    */
-  async resolveI18nService(projectId, req) {
-    if (projectId === "platform") return void 0;
-    if (!projectId && req && this.envRegistry && this.kernelManager) {
+  async resolveI18nService(environmentId, req) {
+    if (environmentId === "platform") return void 0;
+    if (!environmentId && req && this.envRegistry && this.kernelManager) {
       const host = this.extractHostname(req);
       if (host) {
         try {
           const result = await this.envRegistry.resolveByHostname(host);
-          if (result?.projectId) projectId = result.projectId;
+          if (result?.environmentId) environmentId = result.environmentId;
         } catch {
         }
       }
-      if (!projectId && typeof this.envRegistry.resolveById === "function") {
+      if (!environmentId && typeof this.envRegistry.resolveById === "function") {
         const headerVal = this.extractProjectIdHeader(req);
         if (headerVal) {
           try {
             const driver = await this.envRegistry.resolveById(headerVal);
-            if (driver) projectId = headerVal;
+            if (driver) environmentId = headerVal;
           } catch {
           }
         }
       }
     }
-    if (!projectId && this.defaultProjectIdProvider) {
+    if (!environmentId && this.defaultEnvironmentIdProvider) {
       try {
-        const def = this.defaultProjectIdProvider();
-        if (def) projectId = def;
+        const def = this.defaultEnvironmentIdProvider();
+        if (def) environmentId = def;
       } catch {
       }
     }
-    if (projectId && this.kernelManager) {
+    if (environmentId && this.kernelManager) {
       try {
-        const kernel = await this.kernelManager.getOrCreate(projectId);
+        const kernel = await this.kernelManager.getOrCreate(environmentId);
         const svc = await kernel.getServiceAsync("i18n");
         if (svc) return svc;
       } catch {
@@ -563,7 +570,7 @@ var RestServer = class {
     }
     if (this.i18nServiceProvider) {
       try {
-        return await this.i18nServiceProvider(projectId);
+        return await this.i18nServiceProvider(environmentId);
       } catch {
         return void 0;
       }
@@ -595,23 +602,23 @@ var RestServer = class {
    * `undefined` for anonymous requests so callers can pass `context` as-is
    * to the protocol layer (the SecurityPlugin treats undefined as anon).
    */
-  async resolveExecCtx(projectId, req) {
+  async resolveExecCtx(environmentId, req) {
     try {
-      if (!projectId && req && this.envRegistry && this.kernelManager) {
+      if (!environmentId && req && this.envRegistry && this.kernelManager) {
         const host = this.extractHostname(req);
         if (host) {
           try {
             const result = await this.envRegistry.resolveByHostname(host);
-            if (result?.projectId) projectId = result.projectId;
+            if (result?.environmentId) environmentId = result.environmentId;
           } catch {
           }
         }
-        if (!projectId && typeof this.envRegistry.resolveById === "function") {
+        if (!environmentId && typeof this.envRegistry.resolveById === "function") {
           const headerVal = this.extractProjectIdHeader(req);
           if (headerVal) {
             try {
               const driver = await this.envRegistry.resolveById(headerVal);
-              if (driver) projectId = headerVal;
+              if (driver) environmentId = headerVal;
             } catch {
             }
           }
@@ -619,13 +626,13 @@ var RestServer = class {
       }
       let authService;
       let kernel;
-      if (projectId && projectId !== "platform" && this.kernelManager) {
-        kernel = await this.kernelManager.getOrCreate(projectId);
+      if (environmentId && environmentId !== "platform" && this.kernelManager) {
+        kernel = await this.kernelManager.getOrCreate(environmentId);
         authService = await kernel.getServiceAsync("auth").catch(() => void 0);
       }
-      if (!authService && this.defaultProjectIdProvider && this.kernelManager) {
+      if (!authService && this.defaultEnvironmentIdProvider && this.kernelManager) {
         try {
-          const def = this.defaultProjectIdProvider();
+          const def = this.defaultEnvironmentIdProvider();
           if (def) {
             kernel = await this.kernelManager.getOrCreate(def);
             authService = await kernel.getServiceAsync("auth").catch(() => void 0);
@@ -634,7 +641,7 @@ var RestServer = class {
         }
       }
       if (!authService && this.authServiceProvider) {
-        authService = await this.authServiceProvider(projectId).catch(() => void 0);
+        authService = await this.authServiceProvider(environmentId).catch(() => void 0);
       }
       if (!authService) return void 0;
       let api = authService.api;
@@ -667,7 +674,7 @@ var RestServer = class {
           ql = await kernel.getServiceAsync("objectql").catch(() => void 0);
         }
         if (!ql && this.objectQLProvider) {
-          ql = await this.objectQLProvider(projectId).catch(() => void 0);
+          ql = await this.objectQLProvider(environmentId).catch(() => void 0);
         }
         if (ql && typeof ql.find === "function") {
           const sysOpts = { context: { isSystem: true } };
@@ -709,12 +716,40 @@ var RestServer = class {
         }
       } catch {
       }
+      let org_user_ids = [userId];
+      if (tenantId) {
+        try {
+          let ql;
+          if (kernel) {
+            ql = await kernel.getServiceAsync("objectql").catch(() => void 0);
+          }
+          if (!ql && this.objectQLProvider) {
+            ql = await this.objectQLProvider(environmentId).catch(() => void 0);
+          }
+          if (ql && typeof ql.find === "function") {
+            const sysOpts = { context: { isSystem: true } };
+            const memberRows = await ql.find("sys_member", {
+              where: { organization_id: tenantId },
+              limit: 1e3,
+              ...sysOpts
+            }).catch(() => []);
+            const ids = /* @__PURE__ */ new Set([userId]);
+            for (const m of memberRows ?? []) {
+              const uid = m.user_id ?? m.userId;
+              if (typeof uid === "string" && uid.length > 0) ids.add(uid);
+            }
+            org_user_ids = Array.from(ids);
+          }
+        } catch {
+        }
+      }
       return {
         userId,
         tenantId,
         roles,
         permissions,
-        isSystem: false
+        isSystem: false,
+        org_user_ids
       };
     } catch {
       return void 0;
@@ -768,10 +803,10 @@ var RestServer = class {
    * locale yields a match. Falls through unchanged for unsupported types
    * or missing translations.
    */
-  async translateMetaItem(req, type, projectId, item) {
+  async translateMetaItem(req, type, environmentId, item) {
     if (!item || typeof item !== "object") return item;
     if (type !== "view" && type !== "action" && type !== "object") return item;
-    const i18n = await this.resolveI18nService(projectId, req);
+    const i18n = await this.resolveI18nService(environmentId, req);
     const bundle = this.buildTranslationBundle(i18n);
     if (!bundle) return item;
     const locale = this.extractLocale(req, i18n);
@@ -782,10 +817,10 @@ var RestServer = class {
   /**
    * Translate a list of metadata documents using `translateMetaItem`.
    */
-  async translateMetaItems(req, type, projectId, items) {
+  async translateMetaItems(req, type, environmentId, items) {
     if (!Array.isArray(items)) return items;
     if (type !== "view" && type !== "action" && type !== "object") return items;
-    const i18n = await this.resolveI18nService(projectId, req);
+    const i18n = await this.resolveI18nService(environmentId, req);
     const bundle = this.buildTranslationBundle(i18n);
     if (!bundle) return items;
     const locale = this.extractLocale(req, i18n);
@@ -819,7 +854,7 @@ var RestServer = class {
     return String(host).split(":")[0].toLowerCase();
   }
   /**
-   * Pull the `X-Project-Id` header from a Node- or Fetch-style request.
+   * Pull the `X-Environment-Id` header from a Node- or Fetch-style request.
    * Header names are case-insensitive; we probe both casings to cover
    * adapters that don't normalize headers (e.g. raw Node http).
    */
@@ -828,9 +863,9 @@ var RestServer = class {
     if (!headers) return void 0;
     let val;
     if (typeof headers.get === "function") {
-      val = headers.get("x-project-id") ?? headers.get("X-Project-Id");
+      val = headers.get("x-environment-id") ?? headers.get("X-Environment-Id");
     } else {
-      val = headers["x-project-id"] ?? headers["X-Project-Id"];
+      val = headers["x-environment-id"] ?? headers["X-Environment-Id"];
     }
     if (Array.isArray(val)) val = val[0];
     if (typeof val !== "string") return void 0;
@@ -856,6 +891,7 @@ var RestServer = class {
         enableUi: api.enableUi ?? true,
         enableBatch: api.enableBatch ?? true,
         enableDiscovery: api.enableDiscovery ?? true,
+        enableOpenApi: api.enableOpenApi ?? true,
         enableSearch: api.enableSearch ?? true,
         enableProjectScoping: api.enableProjectScoping ?? false,
         projectResolution: api.projectResolution ?? "auto",
@@ -914,16 +950,16 @@ var RestServer = class {
   }
   /**
    * Get the project-scoped base path for a given unscoped base.
-   * Example: `/api/v1` → `/api/v1/projects/:projectId`.
+   * Example: `/api/v1` → `/api/v1/environments/:environmentId`.
    */
   getScopedBasePath(basePath) {
-    return `${basePath}/projects/:projectId`;
+    return `${basePath}/environments/:environmentId`;
   }
   /**
    * Register all REST API routes
    *
    * When `enableProjectScoping` is true, routes are registered under
-   * `/api/v1/projects/:projectId/...`. The `projectResolution` strategy
+   * `/api/v1/environments/:environmentId/...`. The `projectResolution` strategy
    * controls whether unscoped legacy routes remain available:
    *   - `required` → only scoped routes registered.
    *   - `optional` / `auto` → both scoped and unscoped routes registered.
@@ -935,6 +971,9 @@ var RestServer = class {
       if (this.config.api.enableDiscovery) {
         this.registerDiscoveryEndpoints(bp);
       }
+      if (this.config.api.enableOpenApi ?? true) {
+        this.registerOpenApiEndpoints(bp);
+      }
       if (this.config.api.enableMetadata) {
         this.registerMetadataEndpoints(bp);
       }
@@ -974,12 +1013,12 @@ var RestServer = class {
    * Register discovery endpoints
    */
   registerDiscoveryEndpoints(basePath) {
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     const discoveryHandler = async (req, res) => {
       try {
         const discovery = await this.protocol.getDiscovery();
         discovery.version = this.config.api.version;
-        const realBase = isScoped ? basePath.replace(":projectId", req.params?.projectId ?? ":projectId") : basePath;
+        const realBase = isScoped ? basePath.replace(":environmentId", req.params?.environmentId ?? ":environmentId") : basePath;
         if (discovery.routes) {
           if (this.config.api.enableCrud) {
             discovery.routes.data = `${realBase}${this.config.crud.dataPrefix}`;
@@ -991,7 +1030,7 @@ var RestServer = class {
             discovery.routes.ui = `${realBase}/ui`;
           }
           if (discovery.routes.auth) {
-            const unscopedBase = isScoped ? basePath.replace(/\/projects\/:projectId$/, "") : basePath;
+            const unscopedBase = isScoped ? basePath.replace(/\/projects\/:environmentId$/, "") : basePath;
             discovery.routes.auth = `${unscopedBase}/auth`;
           }
         }
@@ -999,7 +1038,7 @@ var RestServer = class {
           enabled: this.config.api.enableProjectScoping,
           resolution: this.config.api.projectResolution,
           scoped: isScoped,
-          projectId: isScoped ? req.params?.projectId : void 0
+          environmentId: isScoped ? req.params?.environmentId : void 0
         };
         res.json(discovery);
       } catch (error) {
@@ -1026,21 +1065,150 @@ var RestServer = class {
       }
     });
   }
+  /**
+   * Register OpenAPI 3.1 spec + interactive docs viewer.
+   *
+   *   GET <basePath>/openapi.json   → enriched OpenAPI document
+   *   GET <basePath>/docs           → Scalar-rendered HTML (CDN, no dep)
+   *
+   * Enrichment at request time:
+   *   - servers[0].url           — derived from the request's Host header
+   *   - paths                    — `{object}` placeholders expanded into
+   *                                one concrete path per registered object
+   *                                from the protocol's discovery metadata
+   *
+   * The base spec is loaded lazily from @objectstack/spec/openapi.json
+   * (shipped pre-generated by spec's build pipeline) so we don't pay
+   * the cost of regenerating on every request, and a missing or
+   * malformed file degrades to a stub instead of crashing.
+   */
+  registerOpenApiEndpoints(basePath) {
+    const isScoped = basePath.includes("/environments/:environmentId");
+    const openApiHandler = async (req, res) => {
+      try {
+        const spec = await this.loadOpenApiSpec();
+        if (!spec) {
+          res.status?.(503);
+          res.json({
+            error: "openapi_unavailable",
+            message: "OpenAPI spec is not bundled with this runtime."
+          });
+          return;
+        }
+        const enriched = { ...spec, servers: [...spec.servers ?? []] };
+        const host = req.headers?.host ?? req.headers?.["host"];
+        const proto = req.headers?.["x-forwarded-proto"] || req.protocol || "http";
+        if (host) {
+          enriched.servers = [
+            { url: `${proto}://${host}`, description: "Current server" },
+            ...spec.servers ?? []
+          ];
+        }
+        try {
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const protocol = await this.resolveProtocol(environmentId, req);
+          const items = await protocol?.getMetaItems?.({ type: "object" }).catch(() => null);
+          const objects = Array.isArray(items?.items) ? items.items.map((i) => i?.name).filter(Boolean) : Array.isArray(items) ? items.map((i) => i?.name).filter(Boolean) : [];
+          if (objects.length > 0 && enriched.paths) {
+            const expanded = {};
+            for (const [p, def] of Object.entries(enriched.paths)) {
+              if (p.includes("{object}")) {
+                expanded[p] = { ...def, "x-template": true };
+                for (const obj of objects) {
+                  expanded[p.replace("{object}", obj)] = def;
+                }
+              } else {
+                expanded[p] = def;
+              }
+            }
+            enriched.paths = expanded;
+          }
+        } catch {
+        }
+        if (enriched.info) {
+          enriched.info = {
+            ...enriched.info,
+            version: this.config.api.version || enriched.info.version
+          };
+        }
+        res.json(enriched);
+      } catch (error) {
+        logError("[REST] openapi.json error:", error);
+        sendError(res, error);
+      }
+    };
+    this.routeManager.register({
+      method: "GET",
+      path: `${basePath}/openapi.json`,
+      handler: openApiHandler,
+      metadata: {
+        summary: "OpenAPI 3.1 specification (machine-readable)",
+        tags: ["openapi"]
+      }
+    });
+    this.routeManager.register({
+      method: "GET",
+      path: `${basePath}/docs`,
+      handler: async (req, res) => {
+        const reqPath = req.path || req.url || `${basePath}/docs`;
+        const apiBase = reqPath.replace(/\/docs\/?$/, "");
+        const specUrl = `${apiBase}/openapi.json`;
+        const html = `<!doctype html>
+<html>
+<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>ObjectStack API Docs</title>
+</head>
+<body>
+<script id="api-reference" data-url="${specUrl}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>
+</body>
+</html>`;
+        if (res.setHeader) res.setHeader("content-type", "text/html; charset=utf-8");
+        if (res.send) res.send(html);
+        else if (res.body) res.body = html;
+        else res.json?.(html);
+      },
+      metadata: {
+        summary: "Interactive API docs (Scalar viewer)",
+        tags: ["openapi"]
+      }
+    });
+  }
+  async loadOpenApiSpec() {
+    if (this._openApiSpecCache !== void 0) return this._openApiSpecCache;
+    try {
+      const mod = await import("module");
+      const requireFn = mod.createRequire(import_meta.url);
+      const pkgJsonPath = requireFn.resolve("@objectstack/spec/package.json");
+      const pathMod = await import("path");
+      const fsMod = await import("fs");
+      const specPath = pathMod.join(pathMod.dirname(pkgJsonPath), "json-schema", "openapi.json");
+      const raw = await fsMod.promises.readFile(specPath, "utf-8");
+      this._openApiSpecCache = JSON.parse(raw);
+      return this._openApiSpecCache;
+    } catch (err) {
+      logError("[REST] Failed to load OpenAPI spec:", err?.message ?? err);
+      this._openApiSpecCache = null;
+      return null;
+    }
+  }
   /**
    * Register metadata endpoints
    */
   registerMetadataEndpoints(basePath) {
     const { metadata } = this.config;
     const metaPath = `${basePath}${metadata.prefix}`;
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     if (metadata.endpoints.types !== false) {
       this.routeManager.register({
         method: "GET",
         path: metaPath,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
             const types = await p.getMetaTypes();
             res.json(types);
           } catch (error) {
@@ -1061,14 +1229,14 @@ var RestServer = class {
         handler: async (req, res) => {
           try {
             const packageId = req.query?.package || void 0;
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
             const items = await p.getMetaItems({
               type: req.params.type,
               packageId,
-              ...projectId ? { projectId } : {}
+              ...environmentId ? { environmentId } : {}
             });
-            const translated = await this.translateMetaItems(req, req.params.type, projectId, items);
+            const translated = await this.translateMetaItems(req, req.params.type, environmentId, items);
             res.header("Vary", "Accept-Language");
             res.json(translated);
           } catch (error) {
@@ -1088,8 +1256,8 @@ var RestServer = class {
         path: `${metaPath}/:type/:name`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
             if (metadata.enableCache && p.getMetaItemCached) {
               const cacheRequest = {
                 ifNoneMatch: req.headers["if-none-match"],
@@ -1099,7 +1267,7 @@ var RestServer = class {
                 type: req.params.type,
                 name: req.params.name,
                 cacheRequest,
-                ...projectId ? { projectId } : {}
+                ...environmentId ? { environmentId } : {}
               });
               if (result.notModified) {
                 res.status(304).send();
@@ -1118,7 +1286,7 @@ var RestServer = class {
                 res.header("Cache-Control", directives + maxAge);
               }
               res.header("Vary", "Accept-Language");
-              res.json(await this.translateMetaItem(req, req.params.type, projectId, result.data));
+              res.json(await this.translateMetaItem(req, req.params.type, environmentId, result.data));
             } else {
               const packageId = req.query?.package || void 0;
               const item = await p.getMetaItem({
@@ -1127,7 +1295,7 @@ var RestServer = class {
                 packageId
               });
               res.header("Vary", "Accept-Language");
-              res.json(await this.translateMetaItem(req, req.params.type, projectId, item));
+              res.json(await this.translateMetaItem(req, req.params.type, environmentId, item));
             }
           } catch (error) {
             logError("[REST] Unhandled error:", error);
@@ -1145,8 +1313,8 @@ var RestServer = class {
       path: `${metaPath}/:type/:name`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
           if (!p.saveMetaItem) {
             res.status(501).json({ error: "Save operation not supported by protocol implementation" });
             return;
@@ -1161,7 +1329,7 @@ var RestServer = class {
             type: req.params.type,
             name: req.params.name,
             item,
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             ...parentVersion !== void 0 ? { parentVersion } : {},
             ...actor ? { actor } : {}
           });
@@ -1181,8 +1349,8 @@ var RestServer = class {
       path: `${metaPath}/:type/:name`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
           if (!p.deleteMetaItem) {
             res.status(501).json({
               error: "Reset operation not supported by protocol implementation"
@@ -1196,7 +1364,7 @@ var RestServer = class {
           const result = await p.deleteMetaItem({
             type: req.params.type,
             name: req.params.name,
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             ...parentVersion !== void 0 ? { parentVersion } : {},
             ...actor ? { actor } : {}
           });
@@ -1216,8 +1384,8 @@ var RestServer = class {
       path: `${metaPath}/:type/:name/history`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
           if (!p.historyMetaItem) {
             res.status(501).json({
               error: "History query not supported by protocol implementation"
@@ -1229,7 +1397,7 @@ var RestServer = class {
           const result = await p.historyMetaItem({
             type: req.params.type,
             name: req.params.name,
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             ...sinceSeq !== void 0 && Number.isFinite(sinceSeq) ? { sinceSeq } : {},
             ...limit !== void 0 && Number.isFinite(limit) ? { limit } : {}
           });
@@ -1250,8 +1418,8 @@ var RestServer = class {
         path: `${metaPath}/:type/:section/:name`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
             const compoundName = `${req.params.section}/${req.params.name}`;
             const packageId = req.query?.package || void 0;
             const item = await p.getMetaItem({
@@ -1260,7 +1428,7 @@ var RestServer = class {
               packageId
             });
             res.header("Vary", "Accept-Language");
-            res.json(await this.translateMetaItem(req, req.params.type, projectId, item));
+            res.json(await this.translateMetaItem(req, req.params.type, environmentId, item));
           } catch (error) {
             logError("[REST] Unhandled error:", error);
             sendError(res, error);
@@ -1277,8 +1445,8 @@ var RestServer = class {
       path: `${metaPath}/:type/:section/:name`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
           if (!p.saveMetaItem) {
             res.status(501).json({ error: "Save operation not supported by protocol implementation" });
             return;
@@ -1292,7 +1460,7 @@ var RestServer = class {
             type: req.params.type,
             name: compoundName,
             item: req.body,
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             ...parentVersion !== void 0 ? { parentVersion } : {},
             ...actor ? { actor } : {}
           });
@@ -1313,19 +1481,19 @@ var RestServer = class {
    */
   registerUiEndpoints(basePath) {
     const uiPath = `${basePath}/ui`;
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     this.routeManager.register({
       method: "GET",
       path: `${uiPath}/view/:object/:type`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
           if (p.getUiView) {
             const view = await p.getUiView({
               object: req.params.object,
               type: req.params.type,
-              ...projectId ? { projectId } : {}
+              ...environmentId ? { environmentId } : {}
             });
             res.json(view);
           } else {
@@ -1348,7 +1516,7 @@ var RestServer = class {
   registerCrudEndpoints(basePath) {
     const { crud } = this.config;
     const dataPath = `${basePath}${crud.dataPrefix}`;
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     const operations = crud.operations;
     if (operations.list) {
       this.routeManager.register({
@@ -1356,14 +1524,14 @@ var RestServer = class {
         path: `${dataPath}/:object`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.findData({
               object: req.params.object,
               query: req.query,
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -1389,17 +1557,17 @@ var RestServer = class {
         path: `${dataPath}/:object/:id`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
             const { select, expand } = req.query || {};
-            const context = await this.resolveExecCtx(projectId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.getData({
               object: req.params.object,
               id: req.params.id,
               ...select != null ? { select } : {},
               ...expand != null ? { expand } : {},
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -1421,14 +1589,14 @@ var RestServer = class {
         path: `${dataPath}/:object`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.createData({
               object: req.params.object,
               data: req.body,
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.status(201).json(result);
@@ -1450,14 +1618,14 @@ var RestServer = class {
         path: `${dataPath}/:object/query`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.findData({
               object: req.params.object,
               query: req.body || {},
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -1479,9 +1647,9 @@ var RestServer = class {
         path: `${dataPath}/:object/:id`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const ifMatchHeader = req.headers?.["if-match"] ?? req.headers?.["If-Match"];
             const bodyVersion = req.body && typeof req.body === "object" ? req.body.expectedVersion : void 0;
@@ -1496,7 +1664,7 @@ var RestServer = class {
               id: req.params.id,
               data,
               ...expectedVersion ? { expectedVersion: String(expectedVersion) } : {},
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -1518,9 +1686,9 @@ var RestServer = class {
         path: `${dataPath}/:object/:id`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const ifMatchHeader = req.headers?.["if-match"] ?? req.headers?.["If-Match"];
             const queryVersion = req.query && typeof req.query === "object" ? req.query.expectedVersion : void 0;
@@ -1529,7 +1697,7 @@ var RestServer = class {
               object: req.params.object,
               id: req.params.id,
               ...expectedVersion ? { expectedVersion: String(expectedVersion) } : {},
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -1555,7 +1723,7 @@ var RestServer = class {
    * POST {basePath}/data/lead/:id/convert — M10.6 lead conversion.
    */
   registerDataActionEndpoints(basePath) {
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     const { crud } = this.config;
     const dataPath = `${basePath}${crud.dataPrefix}`;
     this.routeManager.register({
@@ -1563,9 +1731,9 @@ var RestServer = class {
       path: `${dataPath}/lead/:id/convert`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
           const convertLead = p.convertLead;
           if (typeof convertLead !== "function") {
@@ -1598,9 +1766,9 @@ var RestServer = class {
       path: `${dataPath}/:object/import`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
           const objectName = String(req.params.object || "");
           if (!objectName) {
@@ -1681,9 +1849,9 @@ var RestServer = class {
       path: `${dataPath}/:object/export`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
           const objectName = String(req.params.object || "");
           if (!objectName) {
@@ -1732,7 +1900,7 @@ var RestServer = class {
           }
           if (!fields || fields.length === 0) {
             try {
-              const schema = await p.getObjectSchema?.(objectName, projectId);
+              const schema = await p.getObjectSchema?.(objectName, environmentId);
               const schemaFields = schema?.fields;
               if (Array.isArray(schemaFields)) {
                 fields = schemaFields.map((f) => f.name).filter((n) => typeof n === "string");
@@ -1766,7 +1934,7 @@ var RestServer = class {
                 $top: take,
                 $skip: skip
               },
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             };
             const result = await p.findData(findArgs);
@@ -1814,15 +1982,15 @@ var RestServer = class {
    * GET {basePath}/search?q=acme&objects=lead,account&limit=20&perObject=5
    */
   registerSearchEndpoints(basePath) {
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     this.routeManager.register({
       method: "GET",
       path: `${basePath}/search`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const p = await this.resolveProtocol(projectId, req);
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const p = await this.resolveProtocol(environmentId, req);
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
           const searchAll = p.searchAll;
           if (typeof searchAll !== "function") {
@@ -1874,14 +2042,14 @@ var RestServer = class {
    *   }
    */
   registerEmailEndpoints(basePath) {
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     this.routeManager.register({
       method: "POST",
       path: `${basePath}/email/send`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
           if (!this.emailServiceProvider) {
             res.status(501).json({
@@ -1890,7 +2058,7 @@ var RestServer = class {
             });
             return;
           }
-          const emailService = await this.emailServiceProvider(projectId).catch(() => void 0);
+          const emailService = await this.emailServiceProvider(environmentId).catch(() => void 0);
           if (!emailService || typeof emailService.send !== "function") {
             res.status(501).json({
               code: "NOT_IMPLEMENTED",
@@ -1969,7 +2137,7 @@ var RestServer = class {
    * `mapViewSpecToEmbeddableConfig` expects.
    */
   registerFormEndpoints(basePath) {
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     const slugMatchesPublicLink = (publicLink, slug) => {
       if (!publicLink || typeof publicLink !== "string") return false;
       const normalized = publicLink.replace(/^\/+/, "").replace(/^forms\//, "");
@@ -1999,12 +2167,12 @@ var RestServer = class {
       }
       return null;
     };
-    const resolveFormBySlug = async (projectId, req, slug) => {
-      const p = await this.resolveProtocol(projectId, req);
+    const resolveFormBySlug = async (environmentId, req, slug) => {
+      const p = await this.resolveProtocol(environmentId, req);
       if (typeof p.getMetaItems !== "function") return null;
       const result = await p.getMetaItems({
         type: "view",
-        ...projectId ? { projectId } : {}
+        ...environmentId ? { environmentId } : {}
       });
       const items = Array.isArray(result?.items) ? result.items : Array.isArray(result) ? result : [];
       return findPublicFormView(items, slug);
@@ -2014,13 +2182,13 @@ var RestServer = class {
       path: `${basePath}/forms/:slug`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
           const slug = String(req.params?.slug ?? "").trim();
           if (!slug) {
             res.status(400).json({ code: "INVALID_REQUEST", error: "slug is required" });
             return;
           }
-          const match = await resolveFormBySlug(projectId, req, slug);
+          const match = await resolveFormBySlug(environmentId, req, slug);
           if (!match) {
             res.status(404).json({
               code: "FORM_NOT_FOUND",
@@ -2030,11 +2198,11 @@ var RestServer = class {
           }
           let objectSchema = null;
           try {
-            const p = await this.resolveProtocol(projectId, req);
+            const p = await this.resolveProtocol(environmentId, req);
             if (typeof p.getMetaItems === "function") {
               const r = await p.getMetaItems({
                 type: "object",
-                ...projectId ? { projectId } : {}
+                ...environmentId ? { environmentId } : {}
               });
               const items = Array.isArray(r?.items) ? r.items : Array.isArray(r) ? r : [];
               const obj = items.find((o) => o?.name === match.object);
@@ -2054,7 +2222,7 @@ var RestServer = class {
                 }
                 objectSchema = { name: obj.name, label: obj.label, fields };
                 try {
-                  const i18n = await this.resolveI18nService(projectId, req);
+                  const i18n = await this.resolveI18nService(environmentId, req);
                   const bundle = this.buildTranslationBundle(i18n);
                   const locale = this.extractLocale(req, i18n);
                   if (bundle && locale) {
@@ -2114,13 +2282,13 @@ var RestServer = class {
       path: `${basePath}/forms/:slug/submit`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
           const slug = String(req.params?.slug ?? "").trim();
           if (!slug) {
             res.status(400).json({ code: "INVALID_REQUEST", error: "slug is required" });
             return;
           }
-          const match = await resolveFormBySlug(projectId, req, slug);
+          const match = await resolveFormBySlug(environmentId, req, slug);
           if (!match) {
             res.status(404).json({
               code: "FORM_NOT_FOUND",
@@ -2148,11 +2316,11 @@ var RestServer = class {
             permissions: ["guest_portal"],
             anonymous: true
           };
-          const p = await this.resolveProtocol(projectId, req);
+          const p = await this.resolveProtocol(environmentId, req);
           const result = await p.createData({
             object: match.object,
             data: filteredData,
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             context
           });
           res.status(201).json(result);
@@ -2174,14 +2342,14 @@ var RestServer = class {
       path: `${basePath}/forms/:slug/lookup/:field`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
           const slug = String(req.params?.slug ?? "").trim();
           const fieldName = String(req.params?.field ?? "").trim();
           if (!slug || !fieldName) {
             res.status(400).json({ code: "INVALID_REQUEST", error: "slug and field are required" });
             return;
           }
-          const match = await resolveFormBySlug(projectId, req, slug);
+          const match = await resolveFormBySlug(environmentId, req, slug);
           if (!match) {
             res.status(404).json({
               code: "FORM_NOT_FOUND",
@@ -2208,13 +2376,13 @@ var RestServer = class {
             });
             return;
           }
-          const p = await this.resolveProtocol(projectId, req);
+          const p = await this.resolveProtocol(environmentId, req);
           let referenceTo = picker.object;
           if (!referenceTo && typeof p.getMetaItems === "function") {
             try {
               const r = await p.getMetaItems({
                 type: "object",
-                ...projectId ? { projectId } : {}
+                ...environmentId ? { environmentId } : {}
               });
               const items = Array.isArray(r?.items) ? r.items : Array.isArray(r) ? r : [];
               const obj = items.find((o) => o?.name === match.object);
@@ -2250,7 +2418,7 @@ var RestServer = class {
               select: ["id", ...displayFields],
               sort: picker.sort ?? [{ field: displayFields[0], order: "asc" }]
             },
-            ...projectId ? { projectId } : {},
+            ...environmentId ? { environmentId } : {},
             context
           });
           const rows = Array.isArray(result?.data) ? result.data : Array.isArray(result?.items) ? result.items : [];
@@ -2300,11 +2468,11 @@ var RestServer = class {
   registerSharingEndpoints(basePath) {
     const { crud } = this.config;
     const dataPath = `${basePath}${crud.dataPrefix}`;
-    const isScoped = basePath.includes("/projects/:projectId");
-    const resolveService = async (projectId) => {
+    const isScoped = basePath.includes("/environments/:environmentId");
+    const resolveService = async (environmentId) => {
       if (!this.sharingServiceProvider) return void 0;
       try {
-        return await this.sharingServiceProvider(projectId);
+        return await this.sharingServiceProvider(environmentId);
       } catch {
         return void 0;
       }
@@ -2318,10 +2486,10 @@ var RestServer = class {
       path: `${dataPath}/:object/:id/shares`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const rows = await svc.listShares(req.params.object, req.params.id, context ?? {});
           res.json({ data: rows });
@@ -2337,10 +2505,10 @@ var RestServer = class {
       path: `${dataPath}/:object/:id/shares`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const body = req.body ?? {};
           const input = {
@@ -2379,10 +2547,10 @@ var RestServer = class {
       path: `${dataPath}/:object/:id/shares/:shareId`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           await svc.revoke(req.params.shareId, context ?? {});
           res.status(204).end();
@@ -2408,11 +2576,11 @@ var RestServer = class {
    */
   registerSharingRuleEndpoints(basePath) {
     const dataPath = basePath;
-    const isScoped = basePath.includes("/projects/:projectId");
-    const resolveService = async (projectId) => {
+    const isScoped = basePath.includes("/environments/:environmentId");
+    const resolveService = async (environmentId) => {
       if (!this.sharingRulesServiceProvider) return void 0;
       try {
-        return await this.sharingRulesServiceProvider(projectId);
+        return await this.sharingRulesServiceProvider(environmentId);
       } catch {
         return void 0;
       }
@@ -2437,10 +2605,10 @@ var RestServer = class {
       path: `${dataPath}/sharing/rules`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const rows = await svc.listRules({
             object: req.query?.object,
@@ -2458,10 +2626,10 @@ var RestServer = class {
       path: `${dataPath}/sharing/rules`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const body = req.body ?? {};
           const input = {
@@ -2488,10 +2656,10 @@ var RestServer = class {
       path: `${dataPath}/sharing/rules/:idOrName`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const row = await svc.getRule(req.params.idOrName, context ?? {});
           if (!row) return res.status(404).json({ code: "RULE_NOT_FOUND" });
@@ -2507,10 +2675,10 @@ var RestServer = class {
       path: `${dataPath}/sharing/rules/:idOrName`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           await svc.deleteRule(req.params.idOrName, context ?? {});
           res.status(204).end();
@@ -2525,10 +2693,10 @@ var RestServer = class {
       path: `${dataPath}/sharing/rules/:idOrName/evaluate`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const result = await svc.evaluateRule(req.params.idOrName, context ?? {});
           res.json(result);
@@ -2562,11 +2730,11 @@ var RestServer = class {
    */
   registerReportsEndpoints(basePath) {
     const dataPath = basePath;
-    const isScoped = basePath.includes("/projects/:projectId");
-    const resolveService = async (projectId) => {
+    const isScoped = basePath.includes("/environments/:environmentId");
+    const resolveService = async (environmentId) => {
       if (!this.reportsServiceProvider) return void 0;
       try {
-        return await this.reportsServiceProvider(projectId);
+        return await this.reportsServiceProvider(environmentId);
       } catch {
         return void 0;
       }
@@ -2595,10 +2763,10 @@ var RestServer = class {
       path: `${dataPath}/reports`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const q = req.query ?? {};
           const rows = await svc.listReports({ object: q.object, ownerId: q.ownerId }, context ?? {});
@@ -2615,10 +2783,10 @@ var RestServer = class {
       path: `${dataPath}/reports`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           try {
             const row = await svc.saveReport(req.body ?? {}, context ?? {});
@@ -2639,10 +2807,10 @@ var RestServer = class {
       path: `${dataPath}/reports/:id`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const row = await svc.getReport(req.params.id, context ?? {});
           if (!row) {
@@ -2662,10 +2830,10 @@ var RestServer = class {
       path: `${dataPath}/reports/:id`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           await svc.deleteReport(req.params.id, context ?? {});
           res.status(204).end();
@@ -2681,10 +2849,10 @@ var RestServer = class {
       path: `${dataPath}/reports/:id/run`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           try {
             const result = await svc.run(req.params.id, context ?? {});
@@ -2705,10 +2873,10 @@ var RestServer = class {
       path: `${dataPath}/reports/:id/schedule`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const body = req.body ?? {};
           try {
@@ -2741,10 +2909,10 @@ var RestServer = class {
       path: `${dataPath}/reports/:id/schedules`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const rows = await svc.listSchedules({ reportId: req.params.id }, context ?? {});
           res.json({ data: rows });
@@ -2760,10 +2928,10 @@ var RestServer = class {
       path: `${dataPath}/reports/schedules/:scheduleId`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           await svc.unscheduleReport(req.params.scheduleId, context ?? {});
           res.status(204).end();
@@ -2796,11 +2964,11 @@ var RestServer = class {
    */
   registerApprovalsEndpoints(basePath) {
     const dataPath = basePath;
-    const isScoped = basePath.includes("/projects/:projectId");
-    const resolveService = async (projectId) => {
+    const isScoped = basePath.includes("/environments/:environmentId");
+    const resolveService = async (environmentId) => {
       if (!this.approvalsServiceProvider) return void 0;
       try {
-        return await this.approvalsServiceProvider(projectId);
+        return await this.approvalsServiceProvider(environmentId);
       } catch {
         return void 0;
       }
@@ -2833,10 +3001,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/processes`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const q = req.query ?? {};
           const rows = await svc.listProcesses({
@@ -2856,10 +3024,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/processes`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           try {
             const row = await svc.defineProcess(req.body ?? {}, context ?? {});
@@ -2880,10 +3048,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/processes/:id`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const row = await svc.getProcess(req.params.id, context ?? {});
           if (!row) {
@@ -2903,10 +3071,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/processes/:id`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           await svc.deleteProcess(req.params.id, context ?? {});
           res.status(204).end();
@@ -2922,10 +3090,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/requests`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const body = req.body ?? {};
           try {
@@ -2954,10 +3122,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/requests`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) {
             res.json({ data: [] });
             return;
@@ -2983,10 +3151,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/requests/:id`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const row = await svc.getRequest(req.params.id, context ?? {});
           if (!row) {
@@ -3007,10 +3175,10 @@ var RestServer = class {
         path: `${dataPath}/approvals/requests/:id/${suffix}`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
-            const svc = await resolveService(projectId);
+            const svc = await resolveService(environmentId);
             if (!svc) return respond501(res);
             const body = req.body ?? {};
             try {
@@ -3039,10 +3207,10 @@ var RestServer = class {
       path: `${dataPath}/approvals/requests/:id/actions`,
       handler: async (req, res) => {
         try {
-          const projectId = isScoped ? req.params?.projectId : void 0;
-          const context = await this.resolveExecCtx(projectId, req);
+          const environmentId = isScoped ? req.params?.environmentId : void 0;
+          const context = await this.resolveExecCtx(environmentId, req);
           if (this.enforceAuth(req, res, context)) return;
-          const svc = await resolveService(projectId);
+          const svc = await resolveService(environmentId);
           if (!svc) return respond501(res);
           const rows = await svc.listActions(req.params.id, context ?? {});
           res.json({ data: rows });
@@ -3060,7 +3228,7 @@ var RestServer = class {
   registerBatchEndpoints(basePath) {
     const { crud, batch } = this.config;
     const dataPath = `${basePath}${crud.dataPrefix}`;
-    const isScoped = basePath.includes("/projects/:projectId");
+    const isScoped = basePath.includes("/environments/:environmentId");
     const operations = batch.operations;
     if (batch.enableBatchEndpoint && this.protocol.batchData) {
       this.routeManager.register({
@@ -3068,14 +3236,14 @@ var RestServer = class {
         path: `${dataPath}/:object/batch`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.batchData({
               object: req.params.object,
               request: req.body,
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -3096,14 +3264,14 @@ var RestServer = class {
         path: `${dataPath}/:object/createMany`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.createManyData({
               object: req.params.object,
               records: req.body || [],
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.status(201).json(result);
@@ -3124,14 +3292,14 @@ var RestServer = class {
         path: `${dataPath}/:object/updateMany`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.updateManyData({
               object: req.params.object,
               ...req.body,
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -3152,14 +3320,14 @@ var RestServer = class {
         path: `${dataPath}/:object/deleteMany`,
         handler: async (req, res) => {
           try {
-            const projectId = isScoped ? req.params?.projectId : void 0;
-            const p = await this.resolveProtocol(projectId, req);
-            const context = await this.resolveExecCtx(projectId, req);
+            const environmentId = isScoped ? req.params?.environmentId : void 0;
+            const p = await this.resolveProtocol(environmentId, req);
+            const context = await this.resolveExecCtx(environmentId, req);
             if (this.enforceAuth(req, res, context)) return;
             const result = await p.deleteManyData({
               object: req.params.object,
               ...req.body,
-              ...projectId ? { projectId } : {},
+              ...environmentId ? { environmentId } : {},
               ...context ? { context } : {}
             });
             res.json(result);
@@ -3337,64 +3505,64 @@ function createRestApiPlugin(config = {}) {
         envRegistry = ctx.getService("env-registry");
       } catch (e) {
       }
-      const defaultProjectIdProvider = () => {
+      const defaultEnvironmentIdProvider = () => {
         try {
           const dp = ctx.getService("default-project");
-          return dp?.projectId;
+          return dp?.environmentId;
         } catch {
           return void 0;
         }
       };
-      const authServiceProvider = async (_projectId) => {
+      const authServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("auth");
         } catch {
           return void 0;
         }
       };
-      const objectQLProvider = async (_projectId) => {
+      const objectQLProvider = async (_environmentId) => {
         try {
           return ctx.getService("objectql");
         } catch {
           return void 0;
         }
       };
-      const emailServiceProvider = async (_projectId) => {
+      const emailServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("email");
         } catch {
           return void 0;
         }
       };
-      const sharingServiceProvider = async (_projectId) => {
+      const sharingServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("sharing");
         } catch {
           return void 0;
         }
       };
-      const reportsServiceProvider = async (_projectId) => {
+      const reportsServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("reports");
         } catch {
           return void 0;
         }
       };
-      const approvalsServiceProvider = async (_projectId) => {
+      const approvalsServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("approvals");
         } catch {
           return void 0;
         }
       };
-      const sharingRulesServiceProvider = async (_projectId) => {
+      const sharingRulesServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("sharingRules");
         } catch {
           return void 0;
         }
       };
-      const i18nServiceProvider = async (_projectId) => {
+      const i18nServiceProvider = async (_environmentId) => {
         try {
           return ctx.getService("i18n");
         } catch {
@@ -3411,7 +3579,7 @@ function createRestApiPlugin(config = {}) {
       }
       ctx.logger.info("Hydrating REST API from Protocol...");
       try {
-        const restServer = new RestServer(server, protocol, config.api, kernelManager, envRegistry, defaultProjectIdProvider, authServiceProvider, objectQLProvider, emailServiceProvider, sharingServiceProvider, reportsServiceProvider, approvalsServiceProvider, sharingRulesServiceProvider, i18nServiceProvider);
+        const restServer = new RestServer(server, protocol, config.api, kernelManager, envRegistry, defaultEnvironmentIdProvider, authServiceProvider, objectQLProvider, emailServiceProvider, sharingServiceProvider, reportsServiceProvider, approvalsServiceProvider, sharingRulesServiceProvider, i18nServiceProvider);
         restServer.registerRoutes();
         ctx.logger.info("REST API successfully registered");
       } catch (err) {
@@ -3427,13 +3595,13 @@ function createRestApiPlugin(config = {}) {
           const enableProjectScoping = config.api?.api?.enableProjectScoping ?? false;
           const projectResolution = config.api?.api?.projectResolution ?? "auto";
           if (enableProjectScoping && projectResolution === "required") {
-            registerPackageRoutes(server, packageService, `${versionedBase}/projects/:projectId`, {
+            registerPackageRoutes(server, packageService, `${versionedBase}/environments/:environmentId`, {
               protocol
             });
           } else {
             registerPackageRoutes(server, packageService, versionedBase, { protocol });
             if (enableProjectScoping) {
-              registerPackageRoutes(server, packageService, `${versionedBase}/projects/:projectId`, {
+              registerPackageRoutes(server, packageService, `${versionedBase}/environments/:environmentId`, {
                 protocol
               });
             }