@malloy-publisher/server 0.0.196-dev → 0.0.197-dev

package/src/server.ts

@@ -36,9 +36,9 @@ import { logger, loggerMiddleware } from "./logger";
 import { ManifestController } from "./controller/manifest.controller";
 import { MaterializationController } from "./controller/materialization.controller";
 import { initializeMcpServer } from "./mcp/server";
+import { EnvironmentStore } from "./service/environment_store";
 import { ManifestService } from "./service/manifest_service";
 import { MaterializationService } from "./service/materialization_service";
-import { ProjectStore } from "./service/project_store";
 
 /** Normalize an Express query param into a string[] or undefined. */
 export function normalizeQueryArray(value: unknown): string[] | undefined {
@@ -132,24 +132,27 @@ const isDevelopment = process.env["NODE_ENV"] === "development";
 export const app = express();
 app.use(loggerMiddleware);
 app.use(httpMetricsMiddleware);
-const projectStore = new ProjectStore(SERVER_ROOT);
-const manifestService = new ManifestService(projectStore);
-const watchModeController = new WatchModeController(projectStore);
-const connectionController = new ConnectionController(projectStore);
-const modelController = new ModelController(projectStore);
-const packageController = new PackageController(projectStore, manifestService);
-const databaseController = new DatabaseController(projectStore);
-const queryController = new QueryController(projectStore);
-const compileController = new CompileController(projectStore);
+const environmentStore = new EnvironmentStore(SERVER_ROOT);
+const manifestService = new ManifestService(environmentStore);
+const watchModeController = new WatchModeController(environmentStore);
+const connectionController = new ConnectionController(environmentStore);
+const modelController = new ModelController(environmentStore);
+const packageController = new PackageController(
+   environmentStore,
+   manifestService,
+);
+const databaseController = new DatabaseController(environmentStore);
+const queryController = new QueryController(environmentStore);
+const compileController = new CompileController(environmentStore);
 const materializationService = new MaterializationService(
-   projectStore,
+   environmentStore,
    manifestService,
 );
 const materializationController = new MaterializationController(
    materializationService,
 );
 const manifestController = new ManifestController(
-   projectStore,
+   environmentStore,
    manifestService,
 );
 
@@ -181,7 +184,7 @@ mcpApp.all(MCP_ENDPOINT, async (req, res) => {
             });
          };
 
-         const requestMcpServer = initializeMcpServer(projectStore);
+         const requestMcpServer = initializeMcpServer(environmentStore);
          await requestMcpServer.connect(transport);
 
          res.on("close", () => {
@@ -300,7 +303,7 @@ app.use(drainingGuard);
 
 app.get(`${API_PREFIX}/status`, async (_req, res) => {
    try {
-      const status = await projectStore.getStatus();
+      const status = await environmentStore.getStatus();
       res.status(200).json(status);
    } catch (error) {
       logger.error("Error getting status", { error });
@@ -313,9 +316,9 @@ app.get(`${API_PREFIX}/watch-mode/status`, watchModeController.getWatchStatus);
 app.post(`${API_PREFIX}/watch-mode/start`, watchModeController.startWatching);
 app.post(`${API_PREFIX}/watch-mode/stop`, watchModeController.stopWatchMode);
 
-app.get(`${API_PREFIX}/projects`, async (_req, res) => {
+app.get(`${API_PREFIX}/environments`, async (_req, res) => {
    try {
-      res.status(200).json(await projectStore.listProjects());
+      res.status(200).json(await environmentStore.listEnvironments());
    } catch (error) {
       logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
@@ -323,11 +326,11 @@ app.get(`${API_PREFIX}/projects`, async (_req, res) => {
    }
 });
 
-app.post(`${API_PREFIX}/projects`, async (req, res) => {
+app.post(`${API_PREFIX}/environments`, async (req, res) => {
    try {
-      logger.info("Adding project", { body: req.body });
-      const project = await projectStore.addProject(req.body);
-      res.status(200).json(await project.serialize());
+      logger.info("Adding environment", { body: req.body });
+      const environment = await environmentStore.addEnvironment(req.body);
+      res.status(200).json(await environment.serialize());
    } catch (error) {
       logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
@@ -335,24 +338,13 @@ app.post(`${API_PREFIX}/projects`, async (req, res) => {
    }
 });
 
-app.get(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
+app.get(`${API_PREFIX}/environments/:environmentName`, async (req, res) => {
    try {
-      const project = await projectStore.getProject(
-         req.params.projectName,
+      const environment = await environmentStore.getEnvironment(
+         req.params.environmentName,
          req.query.reload === "true",
       );
-      res.status(200).json(await project.serialize());
-   } catch (error) {
-      logger.error(error);
-      const { json, status } = internalErrorToHttpError(error as Error);
-      res.status(status).json(json);
-   }
-});
-
-app.patch(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
-   try {
-      const project = await projectStore.updateProject(req.body);
-      res.status(200).json(await project.serialize());
+      res.status(200).json(await environment.serialize());
    } catch (error) {
       logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
@@ -360,10 +352,10 @@ app.patch(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
    }
 });
 
-app.delete(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
+app.patch(`${API_PREFIX}/environments/:environmentName`, async (req, res) => {
    try {
-      const project = await projectStore.deleteProject(req.params.projectName);
-      res.status(200).json(await project?.serialize());
+      const environment = await environmentStore.updateEnvironment(req.body);
+      res.status(200).json(await environment.serialize());
    } catch (error) {
       logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
@@ -371,11 +363,12 @@ app.delete(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
    }
 });
 
-app.get(`${API_PREFIX}/projects/:projectName/connections`, async (req, res) => {
+app.delete(`${API_PREFIX}/environments/:environmentName`, async (req, res) => {
    try {
-      res.status(200).json(
-         await connectionController.listConnections(req.params.projectName),
+      const environment = await environmentStore.deleteEnvironment(
+         req.params.environmentName,
       );
+      res.status(200).json(await environment?.serialize());
    } catch (error) {
       logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
@@ -384,12 +377,29 @@ app.get(`${API_PREFIX}/projects/:projectName/connections`, async (req, res) => {
 });
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName`,
+   `${API_PREFIX}/environments/:environmentName/connections`,
+   async (req, res) => {
+      try {
+         res.status(200).json(
+            await connectionController.listConnections(
+               req.params.environmentName,
+            ),
+         );
+      } catch (error) {
+         logger.error(error);
+         const { json, status } = internalErrorToHttpError(error as Error);
+         res.status(status).json(json);
+      }
+   },
+);
+
+app.get(
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnection(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
             ),
          );
@@ -402,11 +412,11 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName`,
    async (req, res) => {
       try {
          const result = await connectionController.addConnection(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.connectionName,
             req.body,
          );
@@ -420,11 +430,11 @@ app.post(
 );
 
 app.patch(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName`,
    async (req, res) => {
       try {
          const result = await connectionController.updateConnection(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.connectionName,
             req.body,
          );
@@ -438,11 +448,11 @@ app.patch(
 );
 
 app.delete(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName`,
    async (req, res) => {
       try {
          const result = await connectionController.deleteConnection(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.connectionName,
          );
          res.status(200).json(result);
@@ -467,12 +477,12 @@ app.post(`${API_PREFIX}/connections/test`, async (req, res) => {
 });
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/schemas`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/schemas`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.listSchemas(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
             ),
          );
@@ -485,12 +495,12 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/schemas/:schemaName/tables`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/schemas/:schemaName/tables`,
    async (req, res) => {
       logger.info("req.params", { params: req.params });
       try {
          const results = await connectionController.listTables(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.connectionName,
             req.params.schemaName,
             normalizeQueryArray(req.query.tableNames),
@@ -505,12 +515,12 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/schemas/:schemaName/tables/:tablePath`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/schemas/:schemaName/tables/:tablePath`,
    async (req, res) => {
       logger.info("req.params", { params: req.params });
       try {
          const results = await connectionController.getTable(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.connectionName,
             req.params.schemaName,
             req.params.tablePath,
@@ -528,12 +538,12 @@ app.get(
 // `duckdb` is per-package; non-`duckdb` names fall through to the
 // project's connection registry via the package's MalloyConfig wrapper.
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/schemas`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.listSchemas(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.params.packageName,
             ),
@@ -547,12 +557,12 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.listTables(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.params.schemaName,
                normalizeQueryArray(req.query.tableNames),
@@ -568,12 +578,12 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables/:tablePath`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables/:tablePath`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getTable(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.params.schemaName,
                req.params.tablePath,
@@ -589,15 +599,15 @@ app.get(
 );
 
 /**
- * @deprecated Use /projects/:projectName/connections/:connectionName/sqlSource POST method instead
+ * @deprecated Use /environments/:environmentName/connections/:connectionName/sqlSource POST method instead
  */
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/sqlSource`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/sqlSource`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionSqlSource(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
             ),
@@ -611,12 +621,12 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/sqlSource`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/sqlSource`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionSqlSource(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
             ),
@@ -631,12 +641,12 @@ app.post(
 
 // Per-package versions
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlSource`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/sqlSource`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionSqlSource(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
                req.params.packageName,
@@ -651,12 +661,12 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlSource`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/sqlSource`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionSqlSource(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
                req.params.packageName,
@@ -671,15 +681,15 @@ app.post(
 );
 
 /**
- * @deprecated Use /projects/:projectName/connections/:connectionName/sqlQuery POST method instead
+ * @deprecated Use /environments/:environmentName/connections/:connectionName/sqlQuery POST method instead
  */
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/queryData`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/queryData`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionQueryData(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
                req.query.options as string,
@@ -694,15 +704,15 @@ app.get(
 );
 
 /**
- * @deprecated Use /projects/:projectName/packages/:packageName/connections/:connectionName/sqlQuery
+ * @deprecated Use /environments/:environmentName/packages/:packageName/connections/:connectionName/sqlQuery
  */
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/queryData`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/queryData`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionQueryData(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
                req.query.options as string,
@@ -718,7 +728,7 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/sqlQuery`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/sqlQuery`,
    async (req, res) => {
       try {
          let options: string | ParsedQs | (string | ParsedQs)[] | undefined;
@@ -732,7 +742,7 @@ app.post(
          }
          res.status(200).json(
             await connectionController.getConnectionQueryData(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
                options as string,
@@ -747,7 +757,7 @@ app.post(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlQuery`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/sqlQuery`,
    async (req, res) => {
       try {
          let options: string | ParsedQs | (string | ParsedQs)[] | undefined;
@@ -758,7 +768,7 @@ app.post(
          }
          res.status(200).json(
             await connectionController.getConnectionQueryData(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
                options as string,
@@ -774,15 +784,15 @@ app.post(
 );
 
 /**
- * @deprecated Use /projects/:projectName/connections/:connectionName/sqlTemporaryTable POST method instead
+ * @deprecated Use environments/:environmentName/connections/:connectionName/sqlTemporaryTable POST method instead
  */
 app.get(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/temporaryTable`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/temporaryTable`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionTemporaryTable(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
             ),
@@ -796,15 +806,15 @@ app.get(
 );
 
 /**
- * @deprecated Use /projects/:projectName/packages/:packageName/connections/:connectionName/sqlTemporaryTable
+ * @deprecated Use /environments/:environmentName/packages/:packageName/connections/:connectionName/sqlTemporaryTable
  */
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/temporaryTable`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/temporaryTable`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionTemporaryTable(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.query.sqlStatement as string,
                req.params.packageName,
@@ -819,12 +829,12 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/connections/:connectionName/sqlTemporaryTable`,
+   `${API_PREFIX}/environments/:environmentName/connections/:connectionName/sqlTemporaryTable`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionTemporaryTable(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
             ),
@@ -838,12 +848,12 @@ app.post(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlTemporaryTable`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/connections/:connectionName/sqlTemporaryTable`,
    async (req, res) => {
       try {
          res.status(200).json(
             await connectionController.getConnectionTemporaryTable(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.connectionName,
                req.body.sqlStatement as string,
                req.params.packageName,
@@ -857,41 +867,47 @@ app.post(
    },
 );
 
-app.get(`${API_PREFIX}/projects/:projectName/packages`, async (req, res) => {
-   if (req.query.versionId) {
-      setVersionIdError(res);
-      return;
-   }
+app.get(
+   `${API_PREFIX}/environments/:environmentName/packages`,
+   async (req, res) => {
+      if (req.query.versionId) {
+         setVersionIdError(res);
+         return;
+      }
 
-   try {
-      res.status(200).json(
-         await packageController.listPackages(req.params.projectName),
-      );
-   } catch (error) {
-      logger.error(error);
-      const { json, status } = internalErrorToHttpError(error as Error);
-      res.status(status).json(json);
-   }
-});
+      try {
+         res.status(200).json(
+            await packageController.listPackages(req.params.environmentName),
+         );
+      } catch (error) {
+         logger.error(error);
+         const { json, status } = internalErrorToHttpError(error as Error);
+         res.status(status).json(json);
+      }
+   },
+);
 
-app.post(`${API_PREFIX}/projects/:projectName/packages`, async (req, res) => {
-   try {
-      const autoLoadManifest = req.query.autoLoadManifest === "true";
-      const _package = await packageController.addPackage(
-         req.params.projectName,
-         req.body,
-         { autoLoadManifest },
-      );
-      res.status(200).json(_package?.getPackageMetadata());
-   } catch (error) {
-      logger.error(error);
-      const { json, status } = internalErrorToHttpError(error as Error);
-      res.status(status).json(json);
-   }
-});
+app.post(
+   `${API_PREFIX}/environments/:environmentName/packages`,
+   async (req, res) => {
+      try {
+         const autoLoadManifest = req.query.autoLoadManifest === "true";
+         const _package = await packageController.addPackage(
+            req.params.environmentName,
+            req.body,
+            { autoLoadManifest },
+         );
+         res.status(200).json(_package?.getPackageMetadata());
+      } catch (error) {
+         logger.error(error);
+         const { json, status } = internalErrorToHttpError(error as Error);
+         res.status(status).json(json);
+      }
+   },
+);
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -901,7 +917,7 @@ app.get(
       try {
          res.status(200).json(
             await packageController.getPackage(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                req.query.reload === "true",
             ),
@@ -915,12 +931,12 @@ app.get(
 );
 
 app.patch(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName`,
    async (req, res) => {
       try {
          res.status(200).json(
             await packageController.updatePackage(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                req.body,
             ),
@@ -934,12 +950,12 @@ app.patch(
 );
 
 app.delete(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName`,
    async (req, res) => {
       try {
          res.status(200).json(
             await packageController.deletePackage(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
             ),
          );
@@ -952,7 +968,7 @@ app.delete(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/models`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/models`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -962,7 +978,7 @@ app.get(
       try {
          res.status(200).json(
             await modelController.listModels(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
             ),
          );
@@ -975,7 +991,7 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/models/*?`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/models/*?`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -987,7 +1003,7 @@ app.get(
          const modelPath = (req.params as Record<string, string>)["0"];
          res.status(200).json(
             await modelController.getModel(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                modelPath,
             ),
@@ -1001,7 +1017,7 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/notebooks`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/notebooks`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -1011,7 +1027,7 @@ app.get(
       try {
          res.status(200).json(
             await modelController.listNotebooks(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
             ),
          );
@@ -1026,7 +1042,7 @@ app.get(
 // Execute notebook cell route must come BEFORE the general get notebook route
 // to avoid the wildcard matching incorrectly
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/notebooks/*/cells/:cellIndex`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/notebooks/*/cells/:cellIndex`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -1062,7 +1078,7 @@ app.get(
 
          res.status(200).json(
             await modelController.executeNotebookCell(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                notebookPath,
                cellIndex,
@@ -1079,7 +1095,7 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/notebooks/*?`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/notebooks/*?`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -1091,7 +1107,7 @@ app.get(
          const notebookPath = (req.params as Record<string, string>)["0"];
          res.status(200).json(
             await modelController.getNotebook(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                notebookPath,
             ),
@@ -1105,7 +1121,7 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/models/*?/query`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/models/*?/query`,
    async (req, res) => {
       if (req.body.versionId) {
          setVersionIdError(res);
@@ -1117,7 +1133,7 @@ app.post(
          const modelPath = (req.params as Record<string, string>)["0"];
          res.status(200).json(
             await queryController.getQuery(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                modelPath,
                req.body.sourceName as string,
@@ -1139,7 +1155,7 @@ app.post(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/databases`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/databases`,
    async (req, res) => {
       if (req.query.versionId) {
          setVersionIdError(res);
@@ -1149,7 +1165,7 @@ app.get(
       try {
          res.status(200).json(
             await databaseController.listDatabases(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
             ),
          );
@@ -1162,11 +1178,11 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/models/:modelName/compile`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/models/:modelName/compile`,
    async (req, res) => {
       try {
          const result = await compileController.compile(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             req.params.modelName,
             req.body.source,
@@ -1184,11 +1200,11 @@ app.post(
 // ==================== MATERIALIZATION ROUTES ====================
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations`,
    async (req, res) => {
       try {
          const build = await materializationController.createMaterialization(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             req.body || {},
          );
@@ -1201,7 +1217,7 @@ app.post(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations`,
    async (req, res) => {
       try {
          const limit = req.query.limit
@@ -1211,7 +1227,7 @@ app.get(
             ? parseInt(req.query.offset as string, 10)
             : undefined;
          const builds = await materializationController.listMaterializations(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             { limit, offset },
          );
@@ -1224,11 +1240,11 @@ app.get(
 );
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations/:materializationId`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations/:materializationId`,
    async (req, res) => {
       try {
          const build = await materializationController.getMaterialization(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             req.params.materializationId,
          );
@@ -1241,11 +1257,11 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations/teardown`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations/teardown`,
    async (req, res) => {
       try {
          const result = await materializationController.teardownPackage(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             req.body || {},
          );
@@ -1258,20 +1274,20 @@ app.post(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations/:materializationId`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations/:materializationId`,
    async (req, res) => {
       try {
          const action = req.query.action;
          if (action === "start") {
             const build = await materializationController.startMaterialization(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                req.params.materializationId,
             );
             res.status(202).json(build);
          } else if (action === "stop") {
             const build = await materializationController.stopMaterialization(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
                req.params.materializationId,
             );
@@ -1289,11 +1305,11 @@ app.post(
 );
 
 app.delete(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/materializations/:materializationId`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/materializations/:materializationId`,
    async (req, res) => {
       try {
          await materializationController.deleteMaterialization(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
             req.params.materializationId,
          );
@@ -1308,11 +1324,11 @@ app.delete(
 // ==================== MANIFEST ROUTES ====================
 
 app.get(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/manifest`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/manifest`,
    async (req, res) => {
       try {
          const manifest = await manifestController.getManifest(
-            req.params.projectName,
+            req.params.environmentName,
             req.params.packageName,
          );
          res.status(200).json(manifest);
@@ -1325,13 +1341,13 @@ app.get(
 );
 
 app.post(
-   `${API_PREFIX}/projects/:projectName/packages/:packageName/manifest`,
+   `${API_PREFIX}/environments/:environmentName/packages/:packageName/manifest`,
    async (req, res) => {
       try {
          const action = req.query.action;
          if (action === "reload") {
             const manifest = await manifestController.reloadManifest(
-               req.params.projectName,
+               req.params.environmentName,
                req.params.packageName,
             );
             res.status(200).json(manifest);