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

package/src/mcp/resources/model_resource.ts

@@ -2,7 +2,7 @@ import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    ModelNotFoundError,
    PackageNotFoundError,
@@ -23,12 +23,12 @@ import type { components } from "../../api"; // Import the components type
  */
 export function registerModelResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    mcpServer.resource(
       "model",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}",
+         "malloy://environment/{environmentName}/package/{packageName}/models/{modelPath}",
          { list: undefined }, // No list handler for individual models
       ),
       /** Handles GetResource requests for specific Malloy Models */
@@ -38,18 +38,18 @@ export function registerModelResource(
             params,
             "model",
             async ({
-               projectName,
+               environmentName,
                packageName,
                modelPath,
             }: {
-               projectName?: unknown;
+               environmentName?: unknown;
                packageName?: unknown;
                modelPath?: unknown;
             }) => {
                try {
                   // Validate all parameters
-                  if (typeof projectName !== "string") {
-                     throw new Error("Invalid project name parameter.");
+                  if (typeof environmentName !== "string") {
+                     throw new Error("Invalid environment name parameter.");
                   }
                   if (typeof packageName !== "string") {
                      throw new Error("Invalid package name parameter.");
@@ -58,14 +58,14 @@ export function registerModelResource(
                      throw new Error("Invalid model path parameter.");
                   }
 
-                  // *** UPDATED LOGIC using ProjectStore ***
-                  // getProject can throw ProjectNotFoundError (though unlikely if name is 'home')
-                  const project = await projectStore.getProject(
-                     projectName,
+                  // *** UPDATED LOGIC using EnvironmentStore ***
+                  // getEnvironment can throw EnvironmentNotFoundError (though unlikely if name is 'home')
+                  const environment = await environmentStore.getEnvironment(
+                     environmentName,
                      false,
                   );
                   // getPackage can throw PackageNotFoundError
-                  const pkg = await project.getPackage(packageName, false);
+                  const pkg = await environment.getPackage(packageName, false);
                   // getModel is SYNCHRONOUS
                   const modelInstance = pkg.getModel(modelPath);
                   // *** END UPDATED LOGIC ***
@@ -98,20 +98,22 @@ export function registerModelResource(
                   let errorDetails;
                   // Provide specific context for error messages
                   // Use validated string parameters here
-                  const safeProjectName =
-                     typeof projectName === "string" ? projectName : "unknown";
+                  const safeEnvironmentName =
+                     typeof environmentName === "string"
+                        ? environmentName
+                        : "unknown";
                   const safePackageName =
                      typeof packageName === "string" ? packageName : "unknown";
                   const safeModelPath =
                      typeof modelPath === "string" ? modelPath : "unknown";
 
-                  const notFoundContext = `Model '${safeModelPath}' in package '${safePackageName}' for project '${safeProjectName}'`;
-                  const malloyErrorContext = `${safeProjectName}/${safePackageName}/${safeModelPath}`;
+                  const notFoundContext = `Model '${safeModelPath}' in package '${safePackageName}' for environment '${safeEnvironmentName}'`;
+                  const malloyErrorContext = `${safeEnvironmentName}/${safePackageName}/${safeModelPath}`;
 
                   if (error instanceof PackageNotFoundError) {
                      // Package not found during getPackage call
                      errorDetails = getNotFoundError(
-                        `Package '${safePackageName}' in project '${safeProjectName}'`,
+                        `Package '${safePackageName}' in environment '${safeEnvironmentName}'`,
                      );
                   } else if (error instanceof ModelNotFoundError) {
                      // Model not found (either from getModel or type check)

package/src/mcp/resources/notebook_resource.ts

@@ -10,7 +10,7 @@ import {
    PackageNotFoundError,
 } from "../../errors";
 import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    getInternalError,
    getMalloyErrorDetails,
@@ -21,7 +21,7 @@ import { RESOURCE_METADATA } from "../resource_metadata";
 
 // Define the expected parameter types
 type NotebookParams = {
-   projectName?: unknown;
+   environmentName?: unknown;
    packageName?: unknown;
    notebookName?: unknown;
 };
@@ -32,12 +32,12 @@ type NotebookParams = {
  */
 export function registerNotebookResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    mcpServer.resource(
       "notebook",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/notebooks/{notebookName}",
+         "malloy://environment/{environmentName}/package/{packageName}/notebooks/{notebookName}",
          { list: undefined }, // Listing notebooks is not supported via this template
       ),
       (uri, params) =>
@@ -46,11 +46,11 @@ export function registerNotebookResource(
             params as NotebookParams,
             "notebook",
             async (
-               { projectName, packageName, notebookName }: NotebookParams,
+               { environmentName, packageName, notebookName }: NotebookParams,
                uri: URL,
             ) => {
                if (
-                  typeof projectName !== "string" ||
+                  typeof environmentName !== "string" ||
                   typeof packageName !== "string" ||
                   typeof notebookName !== "string"
                ) {
@@ -59,11 +59,11 @@ export function registerNotebookResource(
 
                let modelInstance;
                try {
-                  const project = await projectStore.getProject(
-                     projectName,
+                  const environment = await environmentStore.getEnvironment(
+                     environmentName,
                      false,
                   );
-                  const pkg = await project.getPackage(packageName, false);
+                  const pkg = await environment.getPackage(packageName, false);
                   // Get the model instance using the notebookName as the path
                   modelInstance = pkg.getModel(notebookName);
 
@@ -75,7 +75,7 @@ export function registerNotebookResource(
                      const isNotebookError =
                         modelInstance?.getModelType() !== "notebook";
                      const errorDetails = getNotFoundError(
-                        `Notebook '${notebookName}' in package '${packageName}' project '${projectName}'${
+                        `Notebook '${notebookName}' in package '${packageName}' environment '${environmentName}'${
                            isNotebookError ? " (not a .malloynb file)" : ""
                         }`,
                      );
@@ -95,13 +95,13 @@ export function registerNotebookResource(
                   if (error instanceof PackageNotFoundError) {
                      throw new McpGetResourceError(
                         getNotFoundError(
-                           `Package '${packageName}' in project '${projectName}'`,
+                           `Package '${packageName}' in environment '${environmentName}'`,
                         ),
                      );
                   }
                   // Handle ModelCompilationError from modelInstance.getModel()
                   if (error instanceof ModelCompilationError) {
-                     const malloyErrorContext = `${projectName}/${packageName}/${notebookName}`;
+                     const malloyErrorContext = `${environmentName}/${packageName}/${notebookName}`;
                      throw new McpGetResourceError(
                         getMalloyErrorDetails(
                            "GetResource (notebook compilation)",
@@ -114,7 +114,7 @@ export function registerNotebookResource(
                   if (error instanceof ModelNotFoundError) {
                      throw new McpGetResourceError(
                         getNotFoundError(
-                           `Notebook '${notebookName}' not found in package '${packageName}' project '${projectName}'`,
+                           `Notebook '${notebookName}' not found in package '${packageName}' environment '${environmentName}'`,
                         ),
                      );
                   }

package/src/mcp/resources/package_resource.ts

@@ -6,7 +6,7 @@ import { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { URL } from "url";
 import { PackageNotFoundError } from "../../errors";
 import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    getInternalError,
    getNotFoundError,
@@ -22,20 +22,23 @@ import { RESOURCE_METADATA } from "../resource_metadata";
 // *** Define handleGetPackageContents function ***
 async function handleGetPackageContents(
    uri: URL,
-   params: { projectName?: string; packageName?: string },
-   projectStore: ProjectStore,
+   params: { environmentName?: string; packageName?: string },
+   environmentStore: EnvironmentStore,
 ) {
    try {
-      const { projectName, packageName } = params;
-      if (typeof projectName !== "string" || projectName === "") {
-         throw new Error("Invalid project name parameter.");
+      const { environmentName, packageName } = params;
+      if (typeof environmentName !== "string" || environmentName === "") {
+         throw new Error("Invalid environment name parameter.");
       }
       if (typeof packageName !== "string" || packageName === "") {
          throw new Error("Invalid package name parameter.");
       }
 
-      const project = await projectStore.getProject(projectName, false);
-      const packageInstance = await project.getPackage(packageName, false);
+      const environment = await environmentStore.getEnvironment(
+         environmentName,
+         false,
+      );
+      const packageInstance = await environment.getPackage(packageName, false);
 
       // Use listModels() which returns { path: string, type: 'source' | 'notebook' }[]
       const entries = await packageInstance.listModels();
@@ -58,7 +61,7 @@ async function handleGetPackageContents(
 
          // Common components for URI building
          const baseUriComponents = {
-            project: projectName,
+            environment: environmentName,
             package: packageName,
          };
 
@@ -172,10 +175,10 @@ async function handleGetPackageContents(
       } else if (
          error instanceof Error &&
          (error.message.includes("Invalid package name") ||
-            error.message.includes("Invalid project name"))
+            error.message.includes("Invalid environment name"))
       ) {
          errorDetails = getNotFoundError(
-            `Invalid project/package identifier in URI '${uri.href}'`,
+            `Invalid environment/package identifier in URI '${uri.href}'`,
          );
       } else {
          logger.error(
@@ -197,19 +200,19 @@ async function handleGetPackageContents(
  */
 export function registerPackageResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    // Define the expected parameter type for the read callback
    type ReadPackageParams = {
       fsPath?: string; // Expect string
-      projectName?: string; // Expect string
+      environmentName?: string; // Expect string
       packageName?: string; // Expect string
    };
 
    mcpServer.resource(
       "package",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}",
+         "malloy://environment/{environmentName}/package/{packageName}",
          {
             list: undefined, // TODO: Implement and add listAllPackages here if needed
          },
@@ -221,26 +224,26 @@ export function registerPackageResource(
             params as ReadPackageParams, // Cast params to the updated type
             "package",
             async ({
-               projectName,
+               environmentName,
                packageName,
             }: {
                // Keep unknown here as it reflects the raw input possibility
                // before validation inside the async function
-               projectName?: unknown;
+               environmentName?: unknown;
                packageName?: unknown;
             }) => {
                try {
-                  if (typeof projectName !== "string") {
-                     throw new Error("Invalid project name parameter.");
+                  if (typeof environmentName !== "string") {
+                     throw new Error("Invalid environment name parameter.");
                   }
                   if (typeof packageName !== "string") {
                      throw new Error("Invalid package name parameter.");
                   }
-                  const project = await projectStore.getProject(
-                     projectName,
+                  const environment = await environmentStore.getEnvironment(
+                     environmentName,
                      false,
                   );
-                  const pkg = await project.getPackage(packageName, false);
+                  const pkg = await environment.getPackage(packageName, false);
                   return pkg.getPackageMetadata();
                } catch (error) {
                   let errorDetails;
@@ -251,10 +254,10 @@ export function registerPackageResource(
                   } else if (
                      error instanceof Error &&
                      (error.message.includes("Invalid package name") ||
-                        error.message.includes("Invalid project name"))
+                        error.message.includes("Invalid environment name"))
                   ) {
                      errorDetails = getNotFoundError(
-                        `Invalid project/package identifier in URI '${uri.href}'`,
+                        `Invalid environment/package identifier in URI '${uri.href}'`,
                      );
                   } else {
                      errorDetails = getInternalError(
@@ -273,7 +276,7 @@ export function registerPackageResource(
    mcpServer.resource(
       "package-contents",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/contents",
+         "malloy://environment/{environmentName}/package/{packageName}/contents",
          {
             // Contents are listed via GetResource on this specific URI,
             // so no general list callback needed here.
@@ -293,7 +296,7 @@ export function registerPackageResource(
             const resourceDefinitions = await handleGetPackageContents(
                uri,
                validatedParams,
-               projectStore,
+               environmentStore,
             );
 
             // Return the array directly as JSON content
@@ -332,11 +335,11 @@ export function registerPackageResource(
             } else if (
                error instanceof Error &&
                (error.message.includes("Invalid package name") ||
-                  error.message.includes("Invalid project name"))
+                  error.message.includes("Invalid environment name"))
             ) {
                // Handle invalid identifier errors specifically
                errorDetails = getNotFoundError(
-                  `Invalid project/package identifier in URI '${uri.href}'`,
+                  `Invalid environment/package identifier in URI '${uri.href}'`,
                );
             } else {
                // Handle other unexpected errors

package/src/mcp/resources/query_resource.ts

@@ -6,7 +6,7 @@ import { URL } from "url";
 import type { components } from "../../api"; // Need this for Query definition type
 import { ModelCompilationError } from "../../errors";
 import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    getInternalError,
    getMalloyErrorDetails,
@@ -21,7 +21,7 @@ import { RESOURCE_METADATA } from "../resource_metadata";
 
 // Define the expected parameter types
 type QueryParams = {
-   projectName?: unknown;
+   environmentName?: unknown;
    packageName?: unknown;
    modelPath?: unknown;
    queryName?: unknown;
@@ -32,12 +32,12 @@ type QueryParams = {
  */
 export function registerQueryResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    mcpServer.resource(
       "query",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}/queries/{queryName}",
+         "malloy://environment/{environmentName}/package/{packageName}/models/{modelPath}/queries/{queryName}",
          { list: undefined }, // Listing queries is not supported via this template
       ),
       (uri, params) =>
@@ -46,11 +46,16 @@ export function registerQueryResource(
             params as QueryParams,
             "query",
             async (
-               { projectName, packageName, modelPath, queryName }: QueryParams,
+               {
+                  environmentName,
+                  packageName,
+                  modelPath,
+                  queryName,
+               }: QueryParams,
                uri: URL,
             ) => {
                if (
-                  typeof projectName !== "string" ||
+                  typeof environmentName !== "string" ||
                   typeof packageName !== "string" ||
                   typeof modelPath !== "string" ||
                   typeof queryName !== "string"
@@ -60,8 +65,8 @@ export function registerQueryResource(
 
                try {
                   const modelResult = await getModelForQuery(
-                     projectStore,
-                     projectName,
+                     environmentStore,
+                     environmentName,
                      packageName,
                      modelPath,
                   );
@@ -83,7 +88,7 @@ export function registerQueryResource(
                   if (!query) {
                      // Specific "Query not found" error
                      const errorDetails = getNotFoundError(
-                        `Query '${queryName}' in model '${modelPath}' package '${packageName}' project '${projectName}'`,
+                        `Query '${queryName}' in model '${modelPath}' package '${packageName}' environment '${environmentName}'`,
                      );
                      throw new McpGetResourceError(errorDetails);
                   }
@@ -95,7 +100,7 @@ export function registerQueryResource(
                   if (error instanceof ModelCompilationError) {
                      const errorDetails = getMalloyErrorDetails(
                         "GetResource (query - model compilation)",
-                        `${projectName}/${packageName}/${modelPath}`,
+                        `${environmentName}/${packageName}/${modelPath}`,
                         error,
                      );
                      throw new McpGetResourceError(errorDetails);

package/src/mcp/resources/source_resource.ts

@@ -6,7 +6,7 @@ import { URL } from "url";
 import type { components } from "../../api";
 import { ModelCompilationError } from "../../errors";
 import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    getInternalError,
    getMalloyErrorDetails,
@@ -21,7 +21,7 @@ import { RESOURCE_METADATA } from "../resource_metadata";
 
 // Define the expected parameter types for this resource
 type SourceParams = {
-   projectName?: unknown;
+   environmentName?: unknown;
    packageName?: unknown;
    modelPath?: unknown;
    sourceName?: unknown;
@@ -33,12 +33,12 @@ type SourceParams = {
  */
 export function registerSourceResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    mcpServer.resource(
       "source",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}/sources/{sourceName}",
+         "malloy://environment/{environmentName}/package/{packageName}/models/{modelPath}/sources/{sourceName}",
          { list: undefined }, // Listing sources directly is not supported via this template
       ),
       /** Handles GetResource requests for specific Sources within a Model */
@@ -50,7 +50,7 @@ export function registerSourceResource(
             // Define the getData async callback
             async (
                {
-                  projectName,
+                  environmentName,
                   packageName,
                   modelPath,
                   sourceName,
@@ -60,7 +60,7 @@ export function registerSourceResource(
             ) => {
                // Input validation
                if (
-                  typeof projectName !== "string" ||
+                  typeof environmentName !== "string" ||
                   typeof packageName !== "string" ||
                   typeof modelPath !== "string" ||
                   typeof sourceName !== "string"
@@ -72,8 +72,8 @@ export function registerSourceResource(
                try {
                   // Use the imported getModelForQuery
                   const modelResult = await getModelForQuery(
-                     projectStore,
-                     projectName,
+                     environmentStore,
+                     environmentName,
                      packageName,
                      modelPath,
                   );
@@ -96,7 +96,7 @@ export function registerSourceResource(
 
                   if (!source) {
                      const errorDetails = getNotFoundError(
-                        `Source '${sourceName}' in model '${modelPath}' package '${packageName}' project '${projectName}'`,
+                        `Source '${sourceName}' in model '${modelPath}' package '${packageName}' environment '${environmentName}'`,
                      );
                      throw new McpGetResourceError(errorDetails);
                   }
@@ -116,7 +116,7 @@ export function registerSourceResource(
                   if (error instanceof ModelCompilationError) {
                      const errorDetails = getMalloyErrorDetails(
                         "GetResource (source - model compilation)",
-                        `${projectName}/${packageName}/${modelPath}`,
+                        `${environmentName}/${packageName}/${modelPath}`,
                         error,
                      );
                      throw new McpGetResourceError(errorDetails);

package/src/mcp/resources/view_resource.ts

@@ -6,7 +6,7 @@ import { URL } from "url";
 import type { components } from "../../api"; // Need this for View definition type
 import { ModelCompilationError } from "../../errors";
 import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
+import { EnvironmentStore } from "../../service/environment_store";
 import {
    getInternalError,
    getMalloyErrorDetails,
@@ -21,7 +21,7 @@ import { RESOURCE_METADATA } from "../resource_metadata";
 
 // Define the expected parameter types
 type ViewParams = {
-   projectName?: unknown;
+   environmentName?: unknown;
    packageName?: unknown;
    modelPath?: unknown;
    sourceName?: unknown;
@@ -33,12 +33,12 @@ type ViewParams = {
  */
 export function registerViewResource(
    mcpServer: McpServer,
-   projectStore: ProjectStore,
+   environmentStore: EnvironmentStore,
 ): void {
    mcpServer.resource(
       "view",
       new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}/sources/{sourceName}/views/{viewName}",
+         "malloy://environment/{environmentName}/package/{packageName}/models/{modelPath}/sources/{sourceName}/views/{viewName}",
          { list: undefined }, // Listing views is not supported via this template
       ),
       (uri, params) =>
@@ -48,7 +48,7 @@ export function registerViewResource(
             "view",
             async (
                {
-                  projectName,
+                  environmentName,
                   packageName,
                   modelPath,
                   sourceName,
@@ -57,7 +57,7 @@ export function registerViewResource(
                uri: URL,
             ) => {
                if (
-                  typeof projectName !== "string" ||
+                  typeof environmentName !== "string" ||
                   typeof packageName !== "string" ||
                   typeof modelPath !== "string" ||
                   typeof sourceName !== "string" ||
@@ -68,8 +68,8 @@ export function registerViewResource(
 
                try {
                   const modelResult = await getModelForQuery(
-                     projectStore,
-                     projectName,
+                     environmentStore,
+                     environmentName,
                      packageName,
                      modelPath,
                   );
@@ -89,7 +89,7 @@ export function registerViewResource(
                   if (!source) {
                      throw new McpGetResourceError(
                         getNotFoundError(
-                           `Source '${sourceName}' in model '${modelPath}' package '${packageName}' project '${projectName}'`,
+                           `Source '${sourceName}' in model '${modelPath}' package '${packageName}' environment '${environmentName}'`,
                         ),
                      );
                   }
@@ -102,7 +102,7 @@ export function registerViewResource(
                   if (!view) {
                      // Specific "View not found" error
                      const errorDetails = getNotFoundError(
-                        `View '${viewName}' in source '${sourceName}' model '${modelPath}' package '${packageName}' project '${projectName}'`,
+                        `View '${viewName}' in source '${sourceName}' model '${modelPath}' package '${packageName}' environment '${environmentName}'`,
                      );
                      throw new McpGetResourceError(errorDetails);
                   }
@@ -114,7 +114,7 @@ export function registerViewResource(
                   if (error instanceof ModelCompilationError) {
                      const errorDetails = getMalloyErrorDetails(
                         "GetResource (view - model compilation)",
-                        `${projectName}/${packageName}/${modelPath}`,
+                        `${environmentName}/${packageName}/${modelPath}`,
                         error,
                      );
                      throw new McpGetResourceError(errorDetails);