@malloy-publisher/server 0.0.195 → 0.0.196

package/tests/integration/mcp/mcp_resource.integration.spec.ts

@@ -20,7 +20,8 @@ interface PackageContentEntry {
 }
 
 // --- Test Suite ---
-describe("MCP Resource Handlers (E2E Integration)", () => {
+// Serial: one shared MCP client; concurrent it() blocks can interleave StreamableHTTP requests.
+describe.serial("MCP Resource Handlers (E2E Integration)", () => {
    let env: McpE2ETestEnvironment | null = null;
    let mcpClient: Client;
 
@@ -36,29 +37,29 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
    });
 
    // --- Test Constants ---
-   const homeProjectUri = "malloy://project/malloy-samples";
-   const faaPackageUri = "malloy://project/malloy-samples/package/faa";
+   const homeProjectUri = "malloy://environment/malloy-samples";
+   const faaPackageUri = "malloy://environment/malloy-samples/package/faa";
    const flightsModelUri =
-      "malloy://project/malloy-samples/package/faa/models/flights.malloy";
+      "malloy://environment/malloy-samples/package/faa/models/flights.malloy";
    const FLIGHTS_SOURCE = "flights";
    const FLIGHTS_CARRIER_QUERY = "flights_by_carrier";
    const FLIGHTS_MONTH_VIEW = "flights_by_month";
    const OVERVIEW_NOTEBOOK = "overview.malloynb";
    const nonExistentPackageUri =
-      "malloy://project/malloy-samples/package/nonexistent";
+      "malloy://environment/malloy-samples/package/nonexistent";
    const nonExistentModelUri =
-      "malloy://project/malloy-samples/package/faa/models/nonexistent.malloy";
-   const nonExistentProjectUri = "malloy://project/invalid_project";
+      "malloy://environment/malloy-samples/package/faa/models/nonexistent.malloy";
+   const nonExistentProjectUri = "malloy://environment/invalid_project";
    const invalidUri = "invalid://format";
 
-   const validSourceUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}`;
-   const validQueryUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/queries/${FLIGHTS_CARRIER_QUERY}`;
-   const validViewUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}/views/${FLIGHTS_MONTH_VIEW}`;
-   const validNotebookUri = `malloy://project/malloy-samples/package/faa/notebooks/${OVERVIEW_NOTEBOOK}`;
-   const nonExistentSourceUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/sources/non_existent_source`;
-   const nonExistentQueryUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/queries/non_existent_query`;
-   const nonExistentViewUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}/views/non_existent_view`;
-   const nonExistentNotebookUri = `malloy://project/malloy-samples/package/faa/notebooks/non_existent.malloynb`;
+   const validSourceUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}`;
+   const validQueryUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/queries/${FLIGHTS_CARRIER_QUERY}`;
+   const validViewUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}/views/${FLIGHTS_MONTH_VIEW}`;
+   const validNotebookUri = `malloy://environment/malloy-samples/package/faa/notebooks/${OVERVIEW_NOTEBOOK}`;
+   const nonExistentSourceUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/sources/non_existent_source`;
+   const nonExistentQueryUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/queries/non_existent_query`;
+   const nonExistentViewUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/sources/${FLIGHTS_SOURCE}/views/non_existent_view`;
+   const nonExistentNotebookUri = `malloy://environment/malloy-samples/package/faa/notebooks/non_existent.malloynb`;
 
    describe("client.listResources", () => {
       it(
@@ -85,17 +86,17 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
             expect(faaPackageEntry).toBeDefined();
             expect(faaPackageEntry?.name).toBe("faa");
 
-            const firstResource = result.resources[0];
-            expect(firstResource).toBeDefined();
-            expect(firstResource.uri).toBeDefined();
-            expect(typeof firstResource.uri).toBe("string");
-            expect(firstResource.uri).toMatch(/^malloy:\/\//);
-            expect(firstResource.name).toBeDefined();
-            expect(typeof firstResource.name).toBe("string");
-            expect(firstResource.description).toBeDefined();
-            expect(typeof firstResource.description).toBe("string");
-            if (firstResource.mimeType) {
-               expect(typeof firstResource.mimeType).toBe("string");
+            // Assert shape on a known row (order of listResources is not guaranteed).
+            const sample = faaPackageEntry!;
+            expect(sample.uri).toBeDefined();
+            expect(typeof sample.uri).toBe("string");
+            expect(sample.uri).toMatch(/^malloy:\/\//);
+            expect(sample.name).toBeDefined();
+            expect(typeof sample.name).toBe("string");
+            expect(sample.description).toBeDefined();
+            expect(typeof sample.description).toBe("string");
+            if (sample.mimeType) {
+               expect(typeof sample.mimeType).toBe("string");
             }
          },
          { timeout: 30000 },
@@ -216,7 +217,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
             );
             if (flightsEntry) {
                expect(flightsEntry.uri).toBe(
-                  "malloy://project/malloy-samples/package/faa/sources/flights.malloy",
+                  "malloy://environment/malloy-samples/package/faa/sources/flights.malloy",
                );
                expect(flightsEntry.metadata).toBeDefined();
                expect(flightsEntry.metadata!.description).toContain(
@@ -231,7 +232,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
             );
             if (notebookEntry) {
                expect(notebookEntry.uri).toBe(
-                  "malloy://project/malloy-samples/package/faa/notebooks/aircraft_analysis.malloynb",
+                  "malloy://environment/malloy-samples/package/faa/notebooks/aircraft_analysis.malloynb",
                );
                expect(notebookEntry.metadata).toBeDefined();
                expect(notebookEntry.metadata!.description).toContain(
@@ -504,7 +505,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          // Adjust test to expect the generic "Resource not found" error, as the specific
          // "not a notebook" detail isn't easily surfaced in the standard error format.
          expect(errorPayload.error).toMatch(/Notebook 'overview.malloynb'/);
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/); // Check project name
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
@@ -531,8 +532,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          expect(errorPayload.error).toMatch(/Resource not found/i);
          // Check for the specific source name in the message
          expect(errorPayload.error).toMatch(/Source 'non_existent_source'/);
-         // Adjust project name expectation
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/);
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
@@ -557,8 +557,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          expect(errorPayload.error).toMatch(/Resource not found/i);
          // Check for the specific query name in the message
          expect(errorPayload.error).toMatch(/Query 'non_existent_query'/);
-         // Adjust project name expectation
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/);
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
@@ -583,8 +582,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          expect(errorPayload.error).toMatch(/Resource not found/i);
          // Check for the specific view name in the message
          expect(errorPayload.error).toMatch(/View 'non_existent_view'/);
-         // Adjust project name expectation
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/);
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
@@ -610,8 +608,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          // Check for the specific notebook name and context in the message
          // Adjust test to expect the generic "Resource not found" error
          expect(errorPayload.error).toMatch(/Notebook 'non_existent.malloynb'/);
-         // Adjust project name expectation
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/);
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
          expect(errorPayload.suggestions.length).toBeGreaterThan(0);
@@ -622,7 +619,7 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
 
       it("should return structured app error when requesting view from wrong source", async () => {
          if (!env) throw new Error("Test environment not initialized");
-         const wrongSourceUri = `malloy://project/malloy-samples/package/faa/models/flights.malloy/sources/aircraft/views/${FLIGHTS_MONTH_VIEW}`;
+         const wrongSourceUri = `malloy://environment/malloy-samples/package/faa/models/flights.malloy/sources/aircraft/views/${FLIGHTS_MONTH_VIEW}`;
          const result = await mcpClient.readResource({ uri: wrongSourceUri });
          expect(result.isError).toBe(true);
          expect(result.contents).toBeDefined();
@@ -632,22 +629,17 @@ describe("MCP Resource Handlers (E2E Integration)", () => {
          // eslint-disable-next-line @typescript-eslint/no-explicit-any
          const errorPayload = JSON.parse((result.contents![0] as any).text);
          expect(errorPayload.error).toBeDefined();
-         // Adjust expectation: The primary error should be the project not found
          expect(errorPayload.error).toMatch(/Resource not found/i);
-         expect(errorPayload.error).toMatch(/project 'malloy-samples'/);
-         // Remove checks for view/source name in the error for this specific case
+         expect(errorPayload.error).toMatch(/View 'flights_by_month'/);
+         expect(errorPayload.error).toMatch(/source 'aircraft'/);
+         expect(errorPayload.error).toMatch(/environment 'malloy-samples'/);
          expect(errorPayload.suggestions).toBeDefined();
          expect(Array.isArray(errorPayload.suggestions)).toBe(true);
-         expect(errorPayload.suggestions.length).toBeGreaterThan(0);
-
-         // The suggestions come as full sentences, so we check for expected content
          expect(errorPayload.suggestions.length).toBe(3);
          expect(errorPayload.suggestions[0]).toContain(
             "Verify the identifier or URI",
          );
-         expect(errorPayload.suggestions[0]).toContain(
-            "project 'malloy-samples'",
-         );
+         expect(errorPayload.suggestions[0]).toContain("flights_by_month");
          expect(errorPayload.suggestions[0]).toContain("is spelled correctly");
          expect(errorPayload.suggestions[0]).toContain(
             "Check capitalization and path separators",

package/tests/integration/mcp/mcp_transport.integration.spec.ts

@@ -18,7 +18,7 @@ import {
 // --- Test Suite ---
 // Note: These tests assume interaction via a standard MCP client.
 // Tests for raw HTTP edge cases (non-JSON, non-RPC) are omitted based on this assumption.
-describe("MCP Transport Tests (E2E Integration)", () => {
+describe.serial("MCP Transport Tests (E2E Integration)", () => {
    let env: McpE2ETestEnvironment | null = null;
    let mcpClient: Client<Request, Notification, Result>; // Convenience variable
 

package/tests/unit/duckdb/attached_databases.test.ts

@@ -12,7 +12,7 @@ import fs from "fs/promises";
 import os from "os";
 import path from "path";
 import type { components } from "../../../src/api";
-import { createProjectConnections } from "../../../src/service/connection";
+import { createEnvironmentConnections } from "../../../src/service/connection";
 
 type ApiConnection = components["schemas"]["Connection"];
 
@@ -355,7 +355,7 @@ describe("DuckDB Attached Databases", () => {
    });
 });
 
-describe("createProjectConnections - DuckDB", () => {
+describe("createEnvironmentConnections - DuckDB", () => {
    const PROJECT_TEST_DIR = path.join(os.tmpdir(), "duckdb-project-tests");
    let createdConnections: Map<string, unknown> = new Map();
 
@@ -402,7 +402,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          const { malloyConnections, apiConnections } =
-            await createProjectConnections(connections, PROJECT_TEST_DIR);
+            await createEnvironmentConnections(connections, PROJECT_TEST_DIR);
 
          createdConnections = malloyConnections;
 
@@ -433,7 +433,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          const { malloyConnections, apiConnections } =
-            await createProjectConnections(connections, PROJECT_TEST_DIR);
+            await createEnvironmentConnections(connections, PROJECT_TEST_DIR);
 
          createdConnections = malloyConnections;
 
@@ -462,7 +462,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          const { malloyConnections, apiConnections } =
-            await createProjectConnections(connections, PROJECT_TEST_DIR);
+            await createEnvironmentConnections(connections, PROJECT_TEST_DIR);
 
          createdConnections = malloyConnections;
 
@@ -502,7 +502,7 @@ describe("createProjectConnections - DuckDB", () => {
             },
          ];
 
-         const { malloyConnections } = await createProjectConnections(
+         const { malloyConnections } = await createEnvironmentConnections(
             connections,
             PROJECT_TEST_DIR,
          );
@@ -533,7 +533,7 @@ describe("createProjectConnections - DuckDB", () => {
             },
          ];
 
-         const { malloyConnections } = await createProjectConnections(
+         const { malloyConnections } = await createEnvironmentConnections(
             connections,
             PROJECT_TEST_DIR,
          );
@@ -591,7 +591,7 @@ describe("createProjectConnections - DuckDB", () => {
             },
          ];
 
-         const { malloyConnections } = await createProjectConnections(
+         const { malloyConnections } = await createEnvironmentConnections(
             connections,
             PROJECT_TEST_DIR,
          );
@@ -624,7 +624,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow();
       });
 
@@ -637,7 +637,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("DuckDB connection configuration is missing");
       });
 
@@ -658,7 +658,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Unsupported database type");
       });
 
@@ -682,7 +682,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("service account key required");
       });
 
@@ -704,7 +704,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("keyId and secret are required");
       });
 
@@ -726,7 +726,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("accessKeyId and secretAccessKey are required");
       });
 
@@ -748,7 +748,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("PostgreSQL connection configuration is required");
       });
 
@@ -761,7 +761,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("DuckLake connection configuration is missing");
       });
 
@@ -785,7 +785,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("username is required");
       });
 
@@ -806,7 +806,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("PostgreSQL connection configuration missing");
       });
 
@@ -836,7 +836,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow(
             "DuckDB attached database names cannot conflict with connection name",
          );
@@ -854,7 +854,7 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("DuckDB connection name cannot be 'duckdb'");
       });
 
@@ -884,10 +884,28 @@ describe("createProjectConnections - DuckDB", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("DuckDB connection name cannot be 'duckdb'");
       });
 
+      it("should throw when DuckDB connection has no attached databases", async () => {
+         const connections: ApiConnection[] = [
+            {
+               name: "no_attached_db",
+               type: "duckdb",
+               duckdbConnection: {
+                  attachedDatabases: [],
+               },
+            },
+         ];
+
+         await expect(
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
+         ).rejects.toThrow(
+            "DuckDB connection must have at least one attached database",
+         );
+      });
+
       it("should throw on unsupported connection type", async () => {
          const connections = [
             {
@@ -897,7 +915,7 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Unsupported connection type");
       });
 
@@ -921,13 +939,13 @@ describe("createProjectConnections - DuckDB", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow();
       });
    });
 });
 
-describe("createProjectConnections - Other Connection Types", () => {
+describe("createEnvironmentConnections - Other Connection Types", () => {
    const PROJECT_TEST_DIR = path.join(
       os.tmpdir(),
       "connection-validation-tests",
@@ -970,7 +988,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Snowflake connection configuration is missing");
       });
 
@@ -988,7 +1006,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Snowflake account is required");
       });
 
@@ -1006,7 +1024,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Snowflake username is required");
       });
 
@@ -1024,7 +1042,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow(
             "Snowflake password or private key or private key path is required",
          );
@@ -1044,7 +1062,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Snowflake warehouse is required");
       });
    });
@@ -1059,7 +1077,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("Trino connection configuration is missing");
       });
 
@@ -1076,7 +1094,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow(
             'Invalid Trino connection: expected "http://server:port" or "https://server:port"',
          );
@@ -1093,7 +1111,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ] as ApiConnection[];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("MotherDuck connection configuration is missing");
       });
 
@@ -1107,7 +1125,7 @@ describe("createProjectConnections - Other Connection Types", () => {
          ];
 
          await expect(
-            createProjectConnections(connections, PROJECT_TEST_DIR),
+            createEnvironmentConnections(connections, PROJECT_TEST_DIR),
          ).rejects.toThrow("MotherDuck access token is required");
       });
    });