@malloy-publisher/server 0.0.80 → 0.0.81

package/src/mcp/server.ts

@@ -1,16 +1,17 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ProjectStore } from "../service/project_store";
 
-import { registerProjectResource } from "./resources/project_resource";
-import { registerPackageResource } from "./resources/package_resource";
+import { logger } from "../logger";
+import { registerPromptCapability } from "./prompts/prompt_service.js";
 import { registerModelResource } from "./resources/model_resource";
-import { registerSourceResource } from "./resources/source_resource";
+import { registerNotebookResource } from "./resources/notebook_resource";
+import { registerPackageResource } from "./resources/package_resource";
+import { registerProjectResource } from "./resources/project_resource";
 import { registerQueryResource } from "./resources/query_resource";
+import { registerSourceResource } from "./resources/source_resource";
 import { registerViewResource } from "./resources/view_resource";
-import { registerNotebookResource } from "./resources/notebook_resource";
-import { registerExecuteQueryTool } from "./tools/execute_query_tool";
 import { registerTools } from "./tools/discovery_tools";
-import { registerPromptCapability } from "./prompts/prompt_service.js";
+import { registerExecuteQueryTool } from "./tools/execute_query_tool";
 
 export const testServerInfo = {
    name: "malloy-publisher-mcp-server",
@@ -20,42 +21,42 @@ export const testServerInfo = {
 };
 
 export function initializeMcpServer(projectStore: ProjectStore): McpServer {
-   console.log("[MCP Init] Starting initializeMcpServer...");
-   const startTime = Date.now();
+   logger.info("[MCP Init] Starting initializeMcpServer...");
+   const startTime = performance.now();
 
    const mcpServer = new McpServer(testServerInfo);
 
-   console.log("[MCP Init] Registering project resource...");
+   logger.info("[MCP Init] Registering project resource...");
    registerProjectResource(mcpServer, projectStore);
-   console.log("[MCP Init] Registering package resource...");
+   logger.info("[MCP Init] Registering package resource...");
    registerPackageResource(mcpServer, projectStore);
 
    // Register more specific templates first
-   console.log("[MCP Init] Registering notebook resource...");
+   logger.info("[MCP Init] Registering notebook resource...");
    registerNotebookResource(mcpServer, projectStore);
-   console.log("[MCP Init] Registering source resource...");
+   logger.info("[MCP Init] Registering source resource...");
    registerSourceResource(mcpServer, projectStore);
-   console.log("[MCP Init] Registering query resource...");
+   logger.info("[MCP Init] Registering query resource...");
    registerQueryResource(mcpServer, projectStore);
-   console.log("[MCP Init] Registering view resource...");
+   logger.info("[MCP Init] Registering view resource...");
    registerViewResource(mcpServer, projectStore);
 
    // Register the general model template last among resource types
-   console.log("[MCP Init] Registering model resource...");
+   logger.info("[MCP Init] Registering model resource...");
    registerModelResource(mcpServer, projectStore);
 
-   console.log("[MCP Init] Registering executeQuery tool...");
+   logger.info("[MCP Init] Registering executeQuery tool...");
    registerExecuteQueryTool(mcpServer, projectStore);
 
    registerTools(mcpServer, projectStore);
 
-   console.log("[MCP Init] Registering prompt capability...");
+   logger.info("[MCP Init] Registering prompt capability...");
    registerPromptCapability(mcpServer, projectStore);
 
-   const endTime = Date.now();
-   console.log(
-      `[MCP Init] Finished initializeMcpServer. Duration: ${endTime - startTime}ms`,
-   );
+   const endTime = performance.now();
+   logger.info(`[MCP Init] Finished initializeMcpServer`, {
+      duration: endTime - startTime,
+   });
 
    return mcpServer;
 }

package/src/mcp/tools/execute_query_tool.ts

@@ -1,11 +1,11 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { McpError, ErrorCode } from "@modelcontextprotocol/sdk/types.js";
+import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
+import { logger } from "../../logger";
 import { ProjectStore } from "../../service/project_store";
-import { getModelForQuery } from "../handler_utils";
 import { getMalloyErrorDetails, type ErrorDetails } from "../error_messages";
+import { buildMalloyUri, getModelForQuery } from "../handler_utils";
 import { MCP_ERROR_MESSAGES } from "../mcp_constants";
-import { buildMalloyUri } from "../handler_utils";
 
 // Zod shape defining required/optional params for executeQuery
 const executeQueryShape = {
@@ -51,10 +51,7 @@ export function registerExecuteQueryTool(
             queryName,
          } = params;
 
-         console.log(
-            "[MCP Tool executeQuery] Received params:",
-            JSON.stringify(params),
-         );
+         logger.info("[MCP Tool executeQuery] Received params:", { params });
 
          const hasAdhocQuery = !!query;
          const hasNamedQuery = !!queryName;
@@ -74,7 +71,7 @@ export function registerExecuteQueryTool(
          // Zod/SDK handles missing required fields (packageName, modelPath) based on the shape
 
          // --- Get Package and Model ---
-         console.log(
+         logger.info(
             `[MCP Tool executeQuery] Calling getModelForQuery for ${projectName}/${packageName}/${modelPath}`,
          );
          const modelResult = await getModelForQuery(
@@ -113,7 +110,7 @@ export function registerExecuteQueryTool(
 
          // --- Execute Query ---
          const { model } = modelResult;
-         console.log(
+         logger.info(
             `[MCP Tool executeQuery] Model found. Proceeding to execute query.`,
          );
          try {
@@ -192,9 +189,9 @@ export function registerExecuteQueryTool(
             );
          } catch (queryError) {
             // Handle query execution errors (syntax errors, invalid queries, etc.)
-            console.error(
+            logger.error(
                `[MCP Server Error] Error executing query in ${projectName}/${packageName}/${modelPath}:`,
-               queryError,
+               { error: queryError },
             );
             const errorDetails: ErrorDetails = getMalloyErrorDetails(
                "executeQuery",

package/src/server.ts

@@ -4,7 +4,6 @@ import cors from "cors";
 import express from "express";
 import * as http from "http";
 import { createProxyMiddleware } from "http-proxy-middleware";
-import morgan from "morgan";
 import { AddressInfo } from "net";
 import * as path from "path";
 import { ConnectionController } from "./controller/connection.controller";
@@ -14,6 +13,7 @@ import { PackageController } from "./controller/package.controller";
 import { QueryController } from "./controller/query.controller";
 import { ScheduleController } from "./controller/schedule.controller";
 import { internalErrorToHttpError, NotImplementedError } from "./errors";
+import { logger, loggerMiddleware } from "./logger";
 import { initializeMcpServer } from "./mcp/server";
 import { ProjectStore } from "./service/project_store";
 
@@ -79,7 +79,7 @@ const API_PREFIX = "/api/v0";
 const isDevelopment = process.env["NODE_ENV"] === "development";
 
 const app = express();
-app.use(morgan("tiny"));
+app.use(loggerMiddleware);
 app.use(cors());
 
 const projectStore = new ProjectStore(SERVER_ROOT);
@@ -96,7 +96,7 @@ mcpApp.use(MCP_ENDPOINT, express.json());
 mcpApp.use(MCP_ENDPOINT, cors());
 
 mcpApp.all(MCP_ENDPOINT, async (req, res) => {
-   console.log(`[MCP Debug] Handling ${req.method} (Stateless)`);
+   logger.info(`[MCP Debug] Handling ${req.method} (Stateless)`);
 
    try {
       if (req.method === "POST") {
@@ -105,35 +105,34 @@ mcpApp.all(MCP_ENDPOINT, async (req, res) => {
          });
 
          transport.onclose = () => {
-            console.log(
+            logger.info(
                `[MCP Transport Info] Stateless transport closed for a request.`,
             );
          };
          transport.onerror = (err: Error) => {
-            console.error(
-               `[MCP Transport Error] Stateless transport error:`,
-               err,
-            );
+            logger.error(`[MCP Transport Error] Stateless transport error:`, {
+               error: err,
+            });
          };
 
          const requestMcpServer = initializeMcpServer(projectStore);
          await requestMcpServer.connect(transport);
 
          res.on("close", () => {
-            console.log(
+            logger.info(
                "[MCP Transport Info] Response closed, cleaning up stateless transport.",
             );
             transport.close().catch((err) => {
-               console.error(
+               logger.error(
                   "[MCP Transport Error] Error closing stateless transport on response close:",
-                  err,
+                  { error: err },
                );
             });
          });
 
          await transport.handleRequest(req, res, req.body);
       } else if (req.method === "GET" || req.method === "DELETE") {
-         console.warn(
+         logger.warn(
             `[MCP Transport Warn] Method Not Allowed in Stateless Mode: ${req.method}`,
          );
          res.setHeader("Allow", "POST");
@@ -147,7 +146,7 @@ mcpApp.all(MCP_ENDPOINT, async (req, res) => {
          });
          return;
       } else {
-         console.warn(`[MCP Transport Warn] Method Not Allowed: ${req.method}`);
+         logger.warn(`[MCP Transport Warn] Method Not Allowed: ${req.method}`);
          res.setHeader("Allow", "POST");
          res.status(405).json({
             jsonrpc: "2.0",
@@ -157,9 +156,9 @@ mcpApp.all(MCP_ENDPOINT, async (req, res) => {
          return;
       }
    } catch (error) {
-      console.error(
+      logger.error(
          `[MCP Transport Error] Unhandled error in ${req.method} handler (Stateless):`,
-         error,
+         { error },
       );
       if (!res.headersSent) {
          res.status(500).json({
@@ -184,10 +183,7 @@ if (!isDevelopment) {
 } else {
    // In development mode, proxy requests to React dev server
    // Handle API routes first
-   app.use(`${API_PREFIX}`, (req, res, next) => {
-      console.log(`[Express] Handling API request: ${req.method} ${req.url}`);
-      next();
-   });
+   app.use(`${API_PREFIX}`, loggerMiddleware);
 
    // Proxy everything else to Vite
    app.use(
@@ -214,7 +210,7 @@ app.get(`${API_PREFIX}/projects`, async (_req, res) => {
    try {
       res.status(200).json(await projectStore.listProjects());
    } catch (error) {
-      console.error(error);
+      logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
       res.status(status).json(json);
    }
@@ -228,7 +224,7 @@ app.get(`${API_PREFIX}/projects/:projectName`, async (req, res) => {
       );
       res.status(200).json(await project.getProjectMetadata());
    } catch (error) {
-      console.error(error);
+      logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
       res.status(status).json(json);
    }
@@ -240,7 +236,7 @@ app.get(`${API_PREFIX}/projects/:projectName/connections`, async (req, res) => {
          await connectionController.listConnections(req.params.projectName),
       );
    } catch (error) {
-      console.error(error);
+      logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
       res.status(status).json(json);
    }
@@ -257,7 +253,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -275,7 +271,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -293,7 +289,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -303,17 +299,17 @@ app.get(
 app.get(
    `${API_PREFIX}/projects/:projectName/connections/:connectionName/schemas/:schemaName/tables`,
    async (req, res) => {
-      console.log("req.params", req.params);
+      logger.info("req.params", { params: req.params });
       try {
          const results = await connectionController.listTables(
             req.params.projectName,
             req.params.connectionName,
             req.params.schemaName,
          );
-         console.log("results", results);
+         logger.info("results", { results });
          res.status(200).json(results);
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -332,7 +328,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -352,7 +348,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -372,7 +368,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -391,7 +387,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -409,7 +405,7 @@ app.get(`${API_PREFIX}/projects/:projectName/packages`, async (req, res) => {
          await packageController.listPackages(req.params.projectName),
       );
    } catch (error) {
-      console.error(error);
+      logger.error(error);
       const { json, status } = internalErrorToHttpError(error as Error);
       res.status(status).json(json);
    }
@@ -432,7 +428,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -455,7 +451,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -480,7 +476,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -503,7 +499,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -528,7 +524,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -556,7 +552,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -579,7 +575,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -602,7 +598,7 @@ app.get(
             ),
          );
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          const { json, status } = internalErrorToHttpError(error as Error);
          res.status(status).json(json);
       }
@@ -615,7 +611,7 @@ if (!isDevelopment) {
 }
 
 app.use((err: Error, _req: express.Request, res: express.Response) => {
-   console.error("Unhandled error:", err);
+   logger.error("Unhandled error:", err);
    const { json, status } = internalErrorToHttpError(err);
    res.status(status).json(json);
 });
@@ -623,18 +619,18 @@ app.use((err: Error, _req: express.Request, res: express.Response) => {
 const mainServer = http.createServer(app);
 mainServer.listen(PUBLISHER_PORT, PUBLISHER_HOST, () => {
    const address = mainServer.address() as AddressInfo;
-   console.log(
+   logger.info(
       `Publisher server listening at http://${address.address}:${address.port}`,
    );
    if (isDevelopment) {
-      console.log(
+      logger.info(
          "Running in development mode - proxying to React dev server at http://localhost:5173",
       );
    }
 });
 
 const mcpHttpServer = mcpApp.listen(MCP_PORT, PUBLISHER_HOST, () => {
-   console.log(`MCP server listening at http://${PUBLISHER_HOST}:${MCP_PORT}`);
+   logger.info(`MCP server listening at http://${PUBLISHER_HOST}:${MCP_PORT}`);
 });
 
 export { app, mainServer as httpServer, mcpApp, mcpHttpServer };

package/src/service/db_utils.ts

@@ -1,17 +1,18 @@
+import { BigQuery } from "@google-cloud/bigquery";
 import fs from "fs";
-import path from "path";
 import os from "os";
-import { v4 as uuidv4 } from "uuid";
+import path from "path";
 import { Pool } from "pg";
-import { BigQuery } from "@google-cloud/bigquery";
 import * as snowflake from "snowflake-sdk";
+import { v4 as uuidv4 } from "uuid";
+import { components } from "../api";
+import { logger } from "../logger";
 import {
    ApiConnection,
+   MysqlConnection,
    PostgresConnection,
    SnowflakeConnection,
-   MysqlConnection,
 } from "./model";
-import { components } from "../api";
 
 type ApiSchemaName = components["schemas"]["SchemaName"];
 
@@ -156,7 +157,7 @@ export async function getSchemasForConnection(
       } finally {
          snowflakeConn.destroy((error) => {
             if (error) {
-               console.error(`Error closing SnowflakeConnection: ${error}`);
+               logger.error(`Error closing SnowflakeConnection: ${error}`);
             }
          });
       }
@@ -188,9 +189,9 @@ export async function getTablesForSchema(
          const [tables] = await dataset.getTables();
          return tables.map((table) => table.id).filter((id) => id) as string[];
       } catch (error) {
-         console.error(
-            `Error getting tables for BigQuery schema ${schemaName} in connection ${connection.name}:`,
-            error,
+         logger.error(
+            `Error getting tables for BigQuery schema ${schemaName} in connection ${connection.name}`,
+            { error },
          );
          throw new Error(
             `Failed to get tables for BigQuery schema ${schemaName} in connection ${connection.name}: ${(error as Error).message}`,
@@ -232,7 +233,7 @@ export async function getTablesForSchema(
       } finally {
          snowflakeConn.destroy((error) => {
             if (error) {
-               console.error(`Error closing SnowflakeConnection: ${error}`);
+               logger.error(`Error closing SnowflakeConnection`, { error });
             }
          });
       }
@@ -274,10 +275,9 @@ async function getSnowflakeTables(
          sqlText: `USE DATABASE ${connInfo?.database} `,
          complete: (err) => {
             if (err) {
-               console.error(
-                  `Error setting database ${connInfo.database}:`,
-                  err,
-               );
+               logger.error(`Error setting database ${connInfo.database}:`, {
+                  error: err,
+               });
                reject([]);
                return;
             }
@@ -293,9 +293,9 @@ async function getSnowflakeTables(
                binds: [schemaName],
                complete: (err, _, rows) => {
                   if (err) {
-                     console.error(
+                     logger.error(
                         `Error fetching tables from ${connInfo.database}:`,
-                        err,
+                        { error: err },
                      );
                      reject([]);
                   } else {
@@ -320,7 +320,7 @@ async function getSnowflakeSchemas(
             } else {
                resolve(
                   rows?.map((row) => {
-                     console.log("row", JSON.stringify(row));
+                     logger.info("row", { row });
                      return {
                         name: row.name,
                         isDefault: row.isDefault === "Y",

package/src/service/model.ts

@@ -31,6 +31,7 @@ import {
    ModelCompilationError,
    ModelNotFoundError,
 } from "../errors";
+import { logger } from "../logger";
 import {
    MODEL_FILE_SUFFIX,
    NOTEBOOK_FILE_SUFFIX,
@@ -238,7 +239,7 @@ export class Model {
       if (this.compilationError) {
          throw this.compilationError;
       }
-      console.log("queryName", queryName, "query", query);
+      logger.info("queryName", { queryName, query });
       let runnable: QueryMaterializer;
       if (!this.modelMaterializer || !this.modelDef || !this.modelInfo)
          throw new BadRequestError("Model has no queryable entities.");

package/src/service/package.ts

@@ -13,6 +13,7 @@ import recursive from "recursive-readdir";
 import { components } from "../api";
 import { API_PREFIX } from "../constants";
 import { PackageNotFoundError } from "../errors";
+import { logger } from "../logger";
 import {
    MODEL_FILE_SUFFIX,
    NOTEBOOK_FILE_SUFFIX,
@@ -116,7 +117,7 @@ export class Package {
             scheduler,
          );
       } catch (error) {
-         console.error(error);
+         logger.error("Error loading package", { error });
          const endTime = performance.now();
          const executionTime = endTime - startTime;
          this.packageLoadHistogram.record(executionTime, {
@@ -219,7 +220,7 @@ export class Package {
       try {
          files = await recursive(packagePath);
       } catch (error) {
-         console.error(error);
+         logger.error(error);
          throw new PackageNotFoundError(
             `Package config for ${packagePath} does not exist.`,
          );

package/src/service/project_store.ts

@@ -3,6 +3,7 @@ import * as path from "path";
 import { components } from "../api";
 import { API_PREFIX } from "../constants";
 import { ProjectNotFoundError } from "../errors";
+import { logger } from "../logger";
 import { Project } from "./project";
 type ApiProject = components["schemas"]["Project"];
 
@@ -68,9 +69,9 @@ export class ProjectStore {
          return JSON.parse(projectManifestContent);
       } catch (error) {
          if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
-            // eslint-disable-next-line no-console
-            console.error(
-               `Error reading publisher.config.json: ${error.message}. Generating from directory`,
+            logger.error(
+               `Error reading publisher.config.json. Generating from directory`,
+               { error },
             );
             return { projects: {} };
          } else {
@@ -87,10 +88,9 @@ export class ProjectStore {
                }
                return { projects };
             } catch (lsError) {
-               // eslint-disable-next-line no-console
-               console.error(
-                  `Error listing directories in ${serverRootPath}: ${lsError.message}`,
-               );
+               logger.error(`Error listing directories in ${serverRootPath}`, {
+                  error: lsError,
+               });
                return { projects: {} };
             }
          }

package/src/service/scheduler.ts

@@ -1,6 +1,7 @@
-import { Model } from "./model";
-import { components } from "../api";
 import cron from "node-cron";
+import { components } from "../api";
+import { logger } from "../logger";
+import { Model } from "./model";
 
 type ApiSource = components["schemas"]["Source"];
 type ApiView = components["schemas"]["View"];
@@ -72,7 +73,7 @@ class Schedule {
       // TODO: Don't split quoted strings.  Use regex instead of split.
       const annotationSplit = annotation.split(/\s+/);
       if (annotationSplit.length != 6) {
-         console.log("Length: " + annotationSplit.length);
+         logger.info("Length: " + annotationSplit.length);
          throw new Error(
             "Invalid annotation string does not have enough parts: " +
                annotation,