@malloy-publisher/server 0.0.226 → 0.0.228

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.226",
+   "version": "0.0.228",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"
@@ -58,8 +58,6 @@
       "aws-sdk": "^2.1692.0",
       "body-parser": "^1.20.2",
       "chokidar": "^4.0.3",
-      "class-transformer": "^0.5.1",
-      "class-validator": "^0.14.1",
       "cors": "^2.8.5",
       "express": "^4.21.0",
       "extract-zip": "^2.0.1",
@@ -74,7 +72,6 @@
       "uuid": "^11.0.3"
    },
    "devDependencies": {
-      "@anthropic-ai/dxt": "^0.1.0",
       "@eslint/compat": "^1.2.7",
       "@eslint/eslintrc": "^3.3.1",
       "@eslint/js": "^9.23.0",

package/publisher.config.example.bigquery.json

@@ -2,19 +2,19 @@
   "frozenConfig": false,
   "environments": [
     {
-      "name": "malloy-samples",
+      "name": "examples",
       "packages": [
         {
-          "name": "ecommerce",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/ecommerce"
+          "name": "storefront",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/storefront"
         },
         {
-          "name": "imdb",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/imdb"
+          "name": "governed-analytics",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/governed-analytics"
         },
         {
-          "name": "faa",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa"
+          "name": "html-data-app",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/html-data-app"
         },
         {
           "name": "bigquery-hackernews",

package/publisher.config.example.duckdb.json

@@ -2,19 +2,19 @@
   "frozenConfig": false,
   "environments": [
     {
-      "name": "malloy-samples",
+      "name": "examples",
       "packages": [
         {
-          "name": "ecommerce",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/ecommerce"
+          "name": "storefront",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/storefront"
         },
         {
-          "name": "imdb",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/imdb"
+          "name": "governed-analytics",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/governed-analytics"
         },
         {
-          "name": "faa",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa"
+          "name": "html-data-app",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/html-data-app"
         }
       ],
       "connections": []

package/publisher.config.json

@@ -2,23 +2,19 @@
   "frozenConfig": false,
   "environments": [
     {
-      "name": "malloy-samples",
+      "name": "examples",
       "packages": [
         {
-          "name": "ecommerce",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/ecommerce"
+          "name": "storefront",
+          "location": "../../examples/storefront"
         },
         {
-          "name": "imdb",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/imdb"
+          "name": "governed-analytics",
+          "location": "../../examples/governed-analytics"
         },
         {
-          "name": "faa",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa"
-        },
-        {
-          "name": "faa-givens-demo",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa-givens-demo"
+          "name": "html-data-app",
+          "location": "../../examples/html-data-app"
         }
       ],
       "connections": []

package/src/config.spec.ts

@@ -1040,8 +1040,8 @@ describe("Config path resolution (--config and bundled default)", () => {
 
       expect(result.environments.length).toBeGreaterThan(0);
       const env = result.environments[0];
-      expect(env.name).toBe("malloy-samples");
-      expect(env.packages.some((p) => p.name === "ecommerce")).toBe(true);
+      expect(env.name).toBe("examples");
+      expect(env.packages.some((p) => p.name === "storefront")).toBe(true);
       expect(env.packages.some((p) => p.name === "bigquery-hackernews")).toBe(
          false,
       );

package/src/controller/package.controller.ts

@@ -5,6 +5,13 @@ import { EnvironmentStore } from "../service/environment_store";
 
 type ApiPackage = components["schemas"]["Package"];
 
+/**
+ * Which path a reload took. `in-place` recompiles the tree already on disk and
+ * leaves it alone; `reinstalled` re-fetches from the package's install location,
+ * which overwrites on-disk edits.
+ */
+export type PackageReloadMode = "in-place" | "reinstalled";
+
 /**
  * Everything that is strict-at-publish, joined into one 400 message (or
  * undefined when the package is publishable): invalid explores entries plus
@@ -50,45 +57,69 @@ export class PackageController {
       packageName: string,
       reload: boolean,
    ): Promise<ApiPackage> {
+      if (reload) {
+         return (await this.reloadPackage(environmentName, packageName))
+            .metadata;
+      }
+
       const environment = await this.environmentStore.getEnvironment(
          environmentName,
          false,
       );
-
-      if (reload) {
-         // Resolve the package's source location from the currently-cached
-         // metadata WITHOUT triggering a stale-state reload. If a `location`
-         // is set, route the reload through `installPackage` so that
-         // download-then-load happens atomically; otherwise fall back to an
-         // in-place reload of the existing on-disk content.
-         let location: string | undefined;
-         try {
-            const cached = await environment.getPackage(packageName, false);
-            location = cached.getPackageMetadata().location;
-         } catch {
-            // Not previously loaded — nothing to reinstall from.
-         }
-         if (location) {
-            const reinstalled = await environment.installPackage(
-               packageName,
-               (stagingPath) =>
-                  this.downloadInto(
-                     environmentName,
-                     packageName,
-                     location,
-                     stagingPath,
-                  ),
-            );
-            return reinstalled.getPackageMetadata();
-         }
-         const _package = await environment.getPackage(packageName, true);
-         return _package.getPackageMetadata();
-      }
-
       const _package = await environment.getPackage(packageName, false);
       return _package.getPackageMetadata();
    }
 
+   /**
+    * Reload a package and report WHICH path ran. The two are not equivalent to
+    * anyone holding on-disk edits: an in-place reload recompiles the tree that
+    * is already there, while a reinstall re-fetches from the package's install
+    * location and overwrites it. A caller that surfaces the reload to a user
+    * needs to be able to say which happened, so it is returned rather than
+    * inferred. `getPackage` keeps returning bare metadata, so the REST contract
+    * is unchanged.
+    */
+   public async reloadPackage(
+      environmentName: string,
+      packageName: string,
+   ): Promise<{ metadata: ApiPackage; mode: PackageReloadMode }> {
+      const environment = await this.environmentStore.getEnvironment(
+         environmentName,
+         false,
+      );
+
+      // Resolve the package's source location from the currently-cached
+      // metadata WITHOUT triggering a stale-state reload. If a `location`
+      // is set, route the reload through `installPackage` so that
+      // download-then-load happens atomically; otherwise fall back to an
+      // in-place reload of the existing on-disk content.
+      let location: string | undefined;
+      try {
+         const cached = await environment.getPackage(packageName, false);
+         location = cached.getPackageMetadata().location;
+      } catch {
+         // Not previously loaded, so there is nothing to reinstall from.
+      }
+      if (location) {
+         const reinstalled = await environment.installPackage(
+            packageName,
+            (stagingPath) =>
+               this.downloadInto(
+                  environmentName,
+                  packageName,
+                  location,
+                  stagingPath,
+               ),
+         );
+         return {
+            metadata: reinstalled.getPackageMetadata(),
+            mode: "reinstalled",
+         };
+      }
+      const _package = await environment.getPackage(packageName, true);
+      return { metadata: _package.getPackageMetadata(), mode: "in-place" };
+   }
+
    async addPackage(environmentName: string, body: ApiPackage) {
       if (this.environmentStore.publisherConfigIsFrozen) {
          throw new FrozenConfigError();

package/src/default-publisher.config.json

@@ -2,19 +2,19 @@
   "frozenConfig": false,
   "environments": [
     {
-      "name": "malloy-samples",
+      "name": "examples",
       "packages": [
         {
-          "name": "ecommerce",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/ecommerce"
+          "name": "storefront",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/storefront"
         },
         {
-          "name": "imdb",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/imdb"
+          "name": "governed-analytics",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/governed-analytics"
         },
         {
-          "name": "faa",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa"
+          "name": "html-data-app",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/html-data-app"
         }
       ],
       "connections": []

package/src/health.ts

@@ -74,10 +74,10 @@ export function registerSignalHandlers(
    mcpServer: Server,
    shutdownDrainDurationSeconds: number = 0,
    shutdownGracefulCloseTimeoutSeconds: number = 0,
-   agentMcpServer?: Server,
 ): void {
-   // Keep the process alive on SIGTERM — do not close the server.
-   // K8s will SIGKILL after terminationGracePeriodSeconds (which cannot be caught).
+   // On SIGTERM, drain in-flight requests before closing the servers (see the
+   // shutdown sequence above). K8s will SIGKILL after terminationGracePeriodSeconds
+   // if this handler does not exit first.
    process.once("SIGTERM", async () => {
       logger.info("========== SIGTERM RECEIVED ==========");
       markNotReady();
@@ -97,7 +97,6 @@ export function registerSignalHandlers(
          server,
          mcpServer,
          shutdownGracefulCloseTimeoutSeconds,
-         agentMcpServer,
       );
    });
 }
@@ -116,7 +115,6 @@ export async function performGracefulShutdownAfterDrain(
    server: Server,
    mcpServer: Server,
    shutdownGracefulCloseTimeoutSeconds: number,
-   agentMcpServer?: Server,
 ): Promise<void> {
    const closeServer = (server: Server, name: string) =>
       new Promise<void>((resolve) => {
@@ -137,9 +135,6 @@ export async function performGracefulShutdownAfterDrain(
    await Promise.all([
       closeServer(server, "Main server"),
       closeServer(mcpServer, "MCP server"),
-      ...(agentMcpServer
-         ? [closeServer(agentMcpServer, "Agent MCP server")]
-         : []),
    ]);
 
    try {

package/src/mcp/error_messages.ts

@@ -3,31 +3,6 @@ export interface ErrorDetails {
    suggestions: string[];
 }
 
-export interface InvalidParamDetail {
-   name: string;
-   reason: string;
-   value?: unknown;
-}
-
-export function getInvalidParamsError(
-   params: InvalidParamDetail[],
-): ErrorDetails {
-   const reasons = params
-      .map(
-         (p) =>
-            `${p.name}: ${p.reason}${p.value !== undefined ? ` (value: ${JSON.stringify(p.value)})` : ""}`,
-      )
-      .join("; ");
-   return {
-      message: `Invalid parameter(s) provided. ${reasons}`,
-      suggestions: [
-         "Check the parameter names and values against the prompt's argument definition.",
-         "Ensure all required parameters are provided and have the correct data types.",
-         "For URI parameters, ensure they are correctly formatted.",
-      ],
-   };
-}
-
 /**
  * Generates error details for a resource not found scenario.
  * @param resourceUriOrContext The URI that was not found, or a context string (e.g., "Package 'X'", "Model 'Y' in package 'X'").
@@ -36,13 +11,9 @@ export function getInvalidParamsError(
 export function getNotFoundError(resourceUriOrContext: string): ErrorDetails {
    const baseMessage = `Resource not found: ${resourceUriOrContext}`;
    const suggestions: string[] = [
-      `Verify the identifier or URI (${resourceUriOrContext}) is spelled correctly and exists. Check capitalization and path separators.`,
-      `If using a URI, ensure it follows the correct format (e.g., malloy://environment/...) and includes the right path segments (e.g., /models/, /sources/, /queries/, /views/).`,
-   ];
-
-   suggestions.push(
+      `Verify the identifier (${resourceUriOrContext}) is spelled correctly and exists. Check capitalization and path separators.`,
       "Check if the resource exists and is correctly named in your Malloy environment structure or the specific model file.",
-   );
+   ];
 
    return {
       message: baseMessage,
@@ -52,7 +23,7 @@ export function getNotFoundError(resourceUriOrContext: string): ErrorDetails {
 
 /**
  * Generates generic error details for internal server errors.
- * @param operation The operation that failed (e.g., 'GetResource', 'ListResources').
+ * @param operation The operation that failed (e.g., 'executeQuery').
  * @param error Optional: The underlying error object or message.
  * @returns ErrorDetails object.
  */
@@ -73,7 +44,7 @@ export function getInternalError(
 
 /**
  * Generates detailed error information for Malloy compilation or query execution errors.
- * @param operation The operation that failed (e.g., 'GetResource (model)', 'executeQuery').
+ * @param operation The operation that failed (e.g., 'executeQuery (load model)', 'executeQuery').
  * @param modelIdentifier A path or URI identifying the model/notebook involved.
  * @param error The underlying Malloy error object or other error.
  * @returns ErrorDetails object.
@@ -144,21 +115,21 @@ export function getMalloyErrorDetails(
          refined = true;
          const [, viewName, sourceName] = viewNotFoundMatch;
          suggestions.unshift(
-            `Suggestion: View '${viewName}' was not found in source '${sourceName}'. Check the view name spelling or try requesting the resource details for the source URI (e.g., 'malloy://.../sources/${sourceName}') to see the list of available views. Views are defined within sources like 'source: ${sourceName} is ... extend { view: ${viewName} is { ... } }'.`,
+            `Suggestion: View '${viewName}' was not found in source '${sourceName}'. Check the view name spelling or call malloy_getContext with sourceName '${sourceName}' to see the list of available views. Views are defined within sources like 'source: ${sourceName} is ... extend { view: ${viewName} is { ... } }'.`,
          );
       } else if (sourceNotFoundMatch) {
          refined = true;
          const [, sourceName] = sourceNotFoundMatch;
          suggestions.unshift(
             `Suggestion: Source '${sourceName}' was not found or could not be accessed. Verify its definition (e.g., \`source: ${sourceName} is table('...')\` or \`duckdb.sql("...")\`) and ensure any associated connections are valid.`,
-            `Suggestion: Check the spelling of '${sourceName}'. You can list sources in the model using ListResources('malloy://.../${modelIdentifier}').`,
+            `Suggestion: Check the spelling of '${sourceName}'. You can list the sources in the package using malloy_getContext.`,
          );
       } else if (queryNotFoundMatch) {
          refined = true;
          const [, queryName] = queryNotFoundMatch;
          suggestions.unshift(
             `Suggestion: Named query '${queryName}' was not found. Verify its definition (e.g., \`query: ${queryName} is source_name -> { ... }\`) within the model '${modelIdentifier}'.`,
-            `Suggestion: Check the spelling of '${queryName}'. Ensure it's a named query (defined with \`query:\`), not a view. You can list named queries using ListResources('malloy://.../${modelIdentifier}').`,
+            `Suggestion: Check the spelling of '${queryName}'. Ensure it's a named query (defined with \`query:\`), not a view. You can list named queries using malloy_getContext.`,
          );
       } else if (fieldNotFoundMatch) {
          refined = true;
@@ -166,7 +137,7 @@ export function getMalloyErrorDetails(
             fieldNotFoundMatch;
          suggestions.unshift(
             `Suggestion: Field '${fieldName}' was not found in ${fieldContextType} '${fieldContextName}'. Check the spelling of the field name within the definition of '${fieldContextName}'.`,
-            `Suggestion: Ensure the field is defined directly or inherited correctly in the '${fieldContextName}' ${fieldContextType}. You can inspect the ${fieldContextType} definition using GetResource.`,
+            `Suggestion: Ensure the field is defined directly or inherited correctly in the '${fieldContextName}' ${fieldContextType}. You can inspect the ${fieldContextType}'s fields using malloy_getContext.`,
          );
       } else if (referenceErrorMatch) {
          refined = true;

package/src/mcp/handler_utils.spec.ts

@@ -0,0 +1,108 @@
+import { describe, expect, it } from "bun:test";
+import { MalloyError } from "@malloydata/malloy";
+import { classifyToolError } from "./handler_utils";
+import {
+   AccessDeniedError,
+   BadRequestError,
+   ModelCompilationError,
+   PackageNotFoundError,
+   ServiceUnavailableError,
+} from "../errors";
+
+/**
+ * classifyToolError decides what an agent is told to do about a failure, so
+ * every branch is pinned by the advice it produces, not just by "an error came
+ * back". Asserting only that an error exists is what let every class funnel
+ * through the Malloy helper unnoticed.
+ *
+ * The routing is by error CLASS on purpose. getMalloyErrorDetails refines on
+ * message patterns the shipped engine does not emit, so "did it refine?" would
+ * send real compile errors to the internal branch.
+ */
+describe("classifyToolError", () => {
+   const advice = (e: unknown) =>
+      JSON.stringify(classifyToolError("op", "env/pkg", e).suggestions);
+
+   it("homes a missing package as not-found, not as Malloy", () => {
+      const details = classifyToolError(
+         "op",
+         "env/pkg",
+         new PackageNotFoundError("Package 'nope' not found"),
+      );
+      expect(details.message).toContain("Resource not found");
+      expect(JSON.stringify(details.suggestions)).not.toContain("Malloy file");
+   });
+
+   it("homes back-pressure as retryable, not as Malloy", () => {
+      const details = classifyToolError(
+         "op",
+         "env/pkg",
+         new ServiceUnavailableError("Memory limit reached"),
+      );
+      expect(details.message).toContain("Memory limit reached");
+      expect(JSON.stringify(details.suggestions)).toContain("Retry");
+      expect(JSON.stringify(details.suggestions)).not.toContain("Malloy file");
+   });
+
+   it("keeps Malloy advice for a raw engine error", () => {
+      // The regression guard for executeQuery. A bad query throws MalloyError,
+      // NOT ModelCompilationError: the engine's error reaches the tool's catch
+      // unwrapped. Route it by the internal branch and a syntax error tells the
+      // agent an "unexpected internal error occurred", which is worse than the
+      // bug this classifier was written to fix.
+      const details = classifyToolError(
+         "executeQuery",
+         "env/pkg/m.malloy",
+         new MalloyError("unexpected '@'", []),
+      );
+      expect(details.message).not.toContain("unexpected internal error");
+      expect(advice(new MalloyError("unexpected '@'", []))).toContain("Malloy");
+   });
+
+   it("keeps Malloy advice for a wrapped compile error", () => {
+      // What a failed reload throws. #890's promise is that a failed reload
+      // returns the compile errors, so this must not read as an internal fault.
+      const details = classifyToolError(
+         "reloadPackage",
+         "env/pkg",
+         new ModelCompilationError({
+            message: "Error(s) compiling model: unexpected '@'",
+         }),
+      );
+      expect(details.message).not.toContain("unexpected internal error");
+   });
+
+   it("keeps Malloy advice for an authorize denial and a malformed request", () => {
+      expect(
+         classifyToolError(
+            "op",
+            "env/pkg",
+            new AccessDeniedError('Access denied for source "orders"'),
+         ).message,
+      ).not.toContain("unexpected internal error");
+      expect(
+         classifyToolError(
+            "op",
+            "env/pkg",
+            new BadRequestError("Invalid query request."),
+         ).message,
+      ).not.toContain("unexpected internal error");
+   });
+
+   it("reports anything else as internal rather than blaming the Malloy", () => {
+      // A bug in our own code, a filesystem failure, or a worker crash. Telling
+      // the agent to check its syntax sends it to edit a model that is fine.
+      for (const error of [
+         new TypeError("cannot read properties of undefined"),
+         Object.assign(new Error("EACCES: permission denied"), {
+            code: "EACCES",
+         }),
+      ]) {
+         const details = classifyToolError("op", "env/pkg", error);
+         expect(details.message).toContain("unexpected internal error");
+         expect(JSON.stringify(details.suggestions)).not.toContain(
+            "Malloy file",
+         );
+      }
+   });
+});