mcp-ts-template 3.0.5 → 3.0.7

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-3.0.5-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.27.1-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) 
+[![Version](https://img.shields.io/badge/Version-3.0.7-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.27.1-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) 
 
 [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/mcp-ts-template/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^5.9.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.3.2-blueviolet.svg?style=flat-square)](https://bun.sh/) [![Code Coverage](https://img.shields.io/badge/Coverage-86.30%25-brightgreen.svg?style=flat-square)](./coverage/index.html)
 

package/dist/index.js

@@ -25830,7 +25830,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     return n;
   }
   function parseMailtoQueryString(queryString) {
-    var allowedParams = new Set(["subject", "body", "cc", "bcc"]), query = {
+    var allowedParams = new Set(["subject", "body", "cc", "bcc"]), query2 = {
       cc: "",
       bcc: ""
     };
@@ -25849,7 +25849,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           break;
         }
         if (value && (key === "cc" || key === "bcc")) {
-          query[key] = value;
+          query2[key] = value;
         }
         if (key) {
           allowedParams.delete(key);
@@ -25860,7 +25860,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     } finally {
       _iterator.f();
     }
-    return isParseFailed ? false : query;
+    return isParseFailed ? false : query2;
   }
   function isMailtoURI(url2, options) {
     (0, _assertString.default)(url2);
@@ -25871,11 +25871,11 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     if (!to && !queryString) {
       return true;
     }
-    var query = parseMailtoQueryString(queryString);
-    if (!query) {
+    var query2 = parseMailtoQueryString(queryString);
+    if (!query2) {
       return false;
     }
-    return "".concat(to, ",").concat(query.cc, ",").concat(query.bcc).split(",").every(function(email3) {
+    return "".concat(to, ",").concat(query2.cc, ",").concat(query2.bcc).split(",").every(function(email3) {
       email3 = (0, _trim2.default)(email3, " ");
       if (email3) {
         return (0, _isEmail.default)(email3, options);
@@ -30314,9 +30314,9 @@ var require_schemes = __commonJS((exports, module) => {
       wsComponent.secure = undefined;
     }
     if (wsComponent.resourceName) {
-      const [path3, query] = wsComponent.resourceName.split("?");
+      const [path3, query2] = wsComponent.resourceName.split("?");
       wsComponent.path = path3 && path3 !== "/" ? path3 : undefined;
-      wsComponent.query = query;
+      wsComponent.query = query2;
       wsComponent.resourceName = undefined;
     }
     wsComponent.fragment = undefined;
@@ -47745,7 +47745,7 @@ var require_sqs = __commonJS((exports) => {
   var MessageAttributes_1 = require_MessageAttributes();
 
   class SqsServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const queueUrl = this.extractQueueUrl(request.commandInput);
       const queueName = this.extractQueueNameFromUrl(queueUrl);
       let spanKind = api_1.SpanKind.CLIENT;
@@ -48481,7 +48481,7 @@ var require_dynamodb = __commonJS((exports) => {
         spanName
       };
     }
-    responseHook(response, span, _tracer, _config) {
+    responseHook(response, span, _tracer, _config2) {
       if (response.data?.ConsumedCapacity) {
         span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY, toArray(response.data.ConsumedCapacity).map((x2) => JSON.stringify(x2)));
       }
@@ -48513,7 +48513,7 @@ var require_secretsmanager = __commonJS((exports) => {
   var semconv_1 = require_semconv4();
 
   class SecretsManagerServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const secretId = request.commandInput?.SecretId;
       const spanKind = api_1.SpanKind.CLIENT;
       let spanName;
@@ -48559,7 +48559,7 @@ var require_sns = __commonJS((exports) => {
   var MessageAttributes_1 = require_MessageAttributes();
 
   class SnsServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       let spanKind = api_1.SpanKind.CLIENT;
       let spanName = `SNS ${request.commandName}`;
       const spanAttributes = {
@@ -48624,7 +48624,7 @@ var require_stepfunctions = __commonJS((exports) => {
   var semconv_1 = require_semconv4();
 
   class StepFunctionsServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const stateMachineArn = request.commandInput?.stateMachineArn;
       const activityArn = request.commandInput?.activityArn;
       const spanKind = api_1.SpanKind.CLIENT;
@@ -48659,7 +48659,7 @@ var require_lambda = __commonJS((exports) => {
   }
 
   class LambdaServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const functionName = this.extractFunctionName(request.commandInput);
       let spanAttributes = {};
       let spanName;
@@ -48740,7 +48740,7 @@ var require_s3 = __commonJS((exports) => {
   var enums_1 = require_enums();
 
   class S3ServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const bucketName = request.commandInput?.Bucket;
       const spanKind = api_1.SpanKind.CLIENT;
       const spanAttributes = {};
@@ -48766,7 +48766,7 @@ var require_kinesis = __commonJS((exports) => {
   var enums_1 = require_enums();
 
   class KinesisServiceExtension {
-    requestPreSpanHook(request, _config) {
+    requestPreSpanHook(request, _config2) {
       const streamName = request.commandInput?.StreamName;
       const spanKind = api_1.SpanKind.CLIENT;
       const spanAttributes = {};
@@ -49701,7 +49701,7 @@ var require_instrumentation5 = __commonJS((exports) => {
         };
       };
     }
-    startSpan({ op, query }, client2) {
+    startSpan({ op, query: query2 }, client2) {
       const attributes = {};
       if (this._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
         attributes[semconv_1.ATTR_DB_SYSTEM] = semconv_1.DB_SYSTEM_VALUE_CASSANDRA;
@@ -49709,8 +49709,8 @@ var require_instrumentation5 = __commonJS((exports) => {
       if (this._dbSemconvStability & instrumentation_1.SemconvStability.STABLE) {
         attributes[semantic_conventions_1.ATTR_DB_SYSTEM_NAME] = semconv_1.DB_SYSTEM_NAME_VALUE_CASSANDRA;
       }
-      if (this._shouldIncludeDbStatement() && query !== undefined) {
-        const statement = truncateQuery(query, this._getMaxQueryLength());
+      if (this._shouldIncludeDbStatement() && query2 !== undefined) {
+        const statement = truncateQuery(query2, this._getMaxQueryLength());
         if (this._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
           attributes[semconv_1.ATTR_DB_STATEMENT] = statement;
         }
@@ -49757,7 +49757,7 @@ var require_instrumentation5 = __commonJS((exports) => {
     span.end();
   }
   function combineQueries(queries) {
-    return queries.map((query) => typeof query === "string" ? query : query.query).join(`
+    return queries.map((query2) => typeof query2 === "string" ? query2 : query2.query).join(`
 `);
   }
   function wrapPromise(span, promise3, successCallback) {
@@ -49781,8 +49781,8 @@ var require_instrumentation5 = __commonJS((exports) => {
       });
     });
   }
-  function truncateQuery(query, maxQueryLength) {
-    return String(query).substring(0, maxQueryLength);
+  function truncateQuery(query2, maxQueryLength) {
+    return String(query2).substring(0, maxQueryLength);
   }
 });
 
@@ -56010,10 +56010,10 @@ var require_instrumentation19 = __commonJS((exports) => {
     createQueryWrapper(moduleVersion) {
       const instrumentation = this;
       return function wrapQuery(original) {
-        return function wrapped_logging_method(query) {
+        return function wrapped_logging_method(query2) {
           const config3 = this.client.config;
           const table = utils.extractTableName(this.builder);
-          const operation = query?.method;
+          const operation = query2?.method;
           const name2 = config3?.connection?.filename || config3?.connection?.database;
           const { maxQueryLength } = instrumentation.getConfig();
           const attributes = {
@@ -56043,7 +56043,7 @@ var require_instrumentation19 = __commonJS((exports) => {
             });
           }
           if (maxQueryLength) {
-            const queryText = utils.limitLength(query?.sql, maxQueryLength);
+            const queryText = utils.limitLength(query2?.sql, maxQueryLength);
             if (instrumentation._semconvStability & instrumentation_1.SemconvStability.STABLE) {
               attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = queryText;
             }
@@ -56067,7 +56067,7 @@ var require_instrumentation19 = __commonJS((exports) => {
             return result;
           }).catch((err) => {
             const formatter = utils.getFormatter(this);
-            const fullQuery = formatter(query.sql, query.bindings || []);
+            const fullQuery = formatter(query2.sql, query2.bindings || []);
             const message2 = err.message.replace(fullQuery + " - ", "");
             const exc = utils.otelExceptionFromKnexError(err, message2);
             span.recordException(exc);
@@ -56380,18 +56380,18 @@ var require_utils21 = __commonJS((exports) => {
   var semconv_1 = require_semconv12();
   var semantic_conventions_1 = require_src2();
   var instrumentation_1 = require_src6();
-  var getPeerAttributes = (client2, server2, query, netSemconvStability) => {
+  var getPeerAttributes = (client2, server2, query2, netSemconvStability) => {
     if (!server2) {
       if (client2.servers.length === 1) {
         server2 = client2.servers[0];
       } else {
         let redundancy = client2.redundancy && client2.redundancy < client2.servers.length;
-        const queryRedundancy = query.redundancyEnabled;
+        const queryRedundancy = query2.redundancyEnabled;
         if (redundancy && queryRedundancy) {
-          redundancy = client2.HashRing.range(query.key, client2.redundancy + 1, true);
+          redundancy = client2.HashRing.range(query2.key, client2.redundancy + 1, true);
           server2 = redundancy.shift();
         } else {
-          server2 = client2.HashRing.get(query.key);
+          server2 = client2.HashRing.get(query2.key);
         }
       }
     }
@@ -56509,30 +56509,30 @@ var require_instrumentation22 = __commonJS((exports) => {
     wrapQueryCompiler(original, client2, server2, callbackContext, span) {
       const instrumentation = this;
       return function() {
-        const query = original.apply(this, arguments);
-        const callback = query.callback;
-        span.updateName(`memcached ${query.type}`);
+        const query2 = original.apply(this, arguments);
+        const callback = query2.callback;
+        span.updateName(`memcached ${query2.type}`);
         const attributes = {
-          "db.memcached.key": query.key,
-          "db.memcached.lifetime": query.lifetime,
-          ...utils.getPeerAttributes(client2, server2, query, instrumentation._netSemconvStability)
+          "db.memcached.key": query2.key,
+          "db.memcached.lifetime": query2.lifetime,
+          ...utils.getPeerAttributes(client2, server2, query2, instrumentation._netSemconvStability)
         };
         if (instrumentation._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
-          attributes[semconv_1.ATTR_DB_OPERATION] = query.type;
+          attributes[semconv_1.ATTR_DB_OPERATION] = query2.type;
         }
         if (instrumentation._dbSemconvStability & instrumentation_1.SemconvStability.STABLE) {
-          attributes[semantic_conventions_1.ATTR_DB_OPERATION_NAME] = query.type;
+          attributes[semantic_conventions_1.ATTR_DB_OPERATION_NAME] = query2.type;
         }
         if (instrumentation.getConfig().enhancedDatabaseReporting) {
           if (instrumentation._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
-            attributes[semconv_1.ATTR_DB_STATEMENT] = query.command;
+            attributes[semconv_1.ATTR_DB_STATEMENT] = query2.command;
           }
           if (instrumentation._dbSemconvStability & instrumentation_1.SemconvStability.STABLE) {
-            attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = query.command;
+            attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = query2.command;
           }
         }
         span.setAttributes(attributes);
-        query.callback = api2.context.bind(callbackContext, function(err) {
+        query2.callback = api2.context.bind(callbackContext, function(err) {
           if (err) {
             span.recordException(err);
             span.setStatus({
@@ -56545,7 +56545,7 @@ var require_instrumentation22 = __commonJS((exports) => {
             return callback.apply(this, arguments);
           }
         });
-        return query;
+        return query2;
       };
     }
     ensureWrapped(obj, methodName, wrapper) {
@@ -57109,12 +57109,12 @@ var require_instrumentation23 = __commonJS((exports) => {
         const { dbStatementSerializer: configDbStatementSerializer } = this.getConfig();
         const dbStatementSerializer = typeof configDbStatementSerializer === "function" ? configDbStatementSerializer : this._defaultDbStatementSerializer.bind(this);
         (0, instrumentation_1.safeExecuteInTheMiddle)(() => {
-          const query = dbStatementSerializer(commandObj);
+          const query2 = dbStatementSerializer(commandObj);
           if (this._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
-            attributes[semconv_1.ATTR_DB_STATEMENT] = query;
+            attributes[semconv_1.ATTR_DB_STATEMENT] = query2;
           }
           if (this._dbSemconvStability & instrumentation_1.SemconvStability.STABLE) {
-            attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = query;
+            attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = query2;
           }
         }, (err) => {
           if (err) {
@@ -60572,40 +60572,40 @@ var require_src35 = __commonJS((exports) => {
   exports.addSqlCommenterComment = undefined;
   var api_1 = require_src();
   var core_1 = require_src34();
-  function hasValidSqlComment(query) {
-    const indexOpeningDashDashComment = query.indexOf("--");
+  function hasValidSqlComment(query2) {
+    const indexOpeningDashDashComment = query2.indexOf("--");
     if (indexOpeningDashDashComment >= 0) {
       return true;
     }
-    const indexOpeningSlashComment = query.indexOf("/*");
+    const indexOpeningSlashComment = query2.indexOf("/*");
     if (indexOpeningSlashComment < 0) {
       return false;
     }
-    const indexClosingSlashComment = query.indexOf("*/");
+    const indexClosingSlashComment = query2.indexOf("*/");
     return indexOpeningDashDashComment < indexClosingSlashComment;
   }
   function fixedEncodeURIComponent(str2) {
     return encodeURIComponent(str2).replace(/[!'()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`);
   }
-  function addSqlCommenterComment(span, query) {
-    if (typeof query !== "string" || query.length === 0) {
-      return query;
+  function addSqlCommenterComment(span, query2) {
+    if (typeof query2 !== "string" || query2.length === 0) {
+      return query2;
     }
-    if (hasValidSqlComment(query)) {
-      return query;
+    if (hasValidSqlComment(query2)) {
+      return query2;
     }
     const propagator = new core_1.W3CTraceContextPropagator;
     const headers = {};
     propagator.inject(api_1.trace.setSpan(api_1.ROOT_CONTEXT, span), headers, api_1.defaultTextMapSetter);
     const sortedKeys = Object.keys(headers).sort();
     if (sortedKeys.length === 0) {
-      return query;
+      return query2;
     }
     const commentString = sortedKeys.map((key) => {
       const encodedValue = fixedEncodeURIComponent(headers[key]);
       return `${key}='${encodedValue}'`;
     }).join(",");
-    return `${query} /*${commentString}*/`;
+    return `${query2} /*${commentString}*/`;
   }
   exports.addSqlCommenterComment = addSqlCommenterComment;
 });
@@ -60658,8 +60658,8 @@ var require_utils25 = __commonJS((exports) => {
     }
     return jdbcString;
   }
-  function getQueryText(query, format, values2, maskStatement = false, maskStatementHook = defaultMaskingHook) {
-    const [querySql, queryValues] = typeof query === "string" ? [query, values2] : [query.sql, hasValues(query) ? values2 || query.values : values2];
+  function getQueryText(query2, format, values2, maskStatement = false, maskStatementHook = defaultMaskingHook) {
+    const [querySql, queryValues] = typeof query2 === "string" ? [query2, values2] : [query2.sql, hasValues(query2) ? values2 || query2.values : values2];
     try {
       if (maskStatement) {
         return maskStatementHook(querySql);
@@ -60673,14 +60673,14 @@ var require_utils25 = __commonJS((exports) => {
     }
   }
   exports.getQueryText = getQueryText;
-  function defaultMaskingHook(query) {
-    return query.replace(/\b\d+\b/g, "?").replace(/(["'])(?:(?=(\\?))\2.)*?\1/g, "?");
+  function defaultMaskingHook(query2) {
+    return query2.replace(/\b\d+\b/g, "?").replace(/(["'])(?:(?=(\\?))\2.)*?\1/g, "?");
   }
   function hasValues(obj) {
     return "values" in obj;
   }
-  function getSpanName(query) {
-    const rawQuery = typeof query === "object" ? query.sql : query;
+  function getSpanName(query2) {
+    const rawQuery = typeof query2 === "object" ? query2.sql : query2;
     const firstSpace = rawQuery?.indexOf(" ");
     if (typeof firstSpace === "number" && firstSpace !== -1) {
       return rawQuery?.substring(0, firstSpace);
@@ -60787,7 +60787,7 @@ var require_instrumentation24 = __commonJS((exports) => {
     _patchQuery(format, isPrepared) {
       return (originalQuery) => {
         const thisPlugin = this;
-        return function query(query, _valuesOrCallback, _callback) {
+        return function query2(query2, _valuesOrCallback, _callback) {
           let values2;
           if (Array.isArray(_valuesOrCallback)) {
             values2 = _valuesOrCallback;
@@ -60796,7 +60796,7 @@ var require_instrumentation24 = __commonJS((exports) => {
           }
           const { maskStatement, maskStatementHook, responseHook } = thisPlugin.getConfig();
           const attributes = (0, utils_1.getConnectionAttributes)(this.config, thisPlugin._dbSemconvStability, thisPlugin._netSemconvStability);
-          const dbQueryText = (0, utils_1.getQueryText)(query, format, values2, maskStatement, maskStatementHook);
+          const dbQueryText = (0, utils_1.getQueryText)(query2, format, values2, maskStatement, maskStatementHook);
           if (thisPlugin._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
             attributes[semconv_1.ATTR_DB_SYSTEM] = semconv_1.DB_SYSTEM_VALUE_MYSQL;
             attributes[semconv_1.ATTR_DB_STATEMENT] = dbQueryText;
@@ -60805,13 +60805,13 @@ var require_instrumentation24 = __commonJS((exports) => {
             attributes[semantic_conventions_1.ATTR_DB_SYSTEM_NAME] = semantic_conventions_1.DB_SYSTEM_NAME_VALUE_MYSQL;
             attributes[semantic_conventions_1.ATTR_DB_QUERY_TEXT] = dbQueryText;
           }
-          const span = thisPlugin.tracer.startSpan((0, utils_1.getSpanName)(query), {
+          const span = thisPlugin.tracer.startSpan((0, utils_1.getSpanName)(query2), {
             kind: api2.SpanKind.CLIENT,
             attributes
           });
           if (!isPrepared && thisPlugin.getConfig().addSqlCommenterCommentToQueries) {
-            arguments[0] = query = typeof query === "string" ? (0, sql_common_1.addSqlCommenterComment)(span, query) : Object.assign(query, {
-              sql: (0, sql_common_1.addSqlCommenterComment)(span, query.sql)
+            arguments[0] = query2 = typeof query2 === "string" ? (0, sql_common_1.addSqlCommenterComment)(span, query2) : Object.assign(query2, {
+              sql: (0, sql_common_1.addSqlCommenterComment)(span, query2.sql)
             });
           }
           const endSpan = (0, utils_1.once)((err, results) => {
@@ -60836,8 +60836,8 @@ var require_instrumentation24 = __commonJS((exports) => {
             span.end();
           });
           if (arguments.length === 1) {
-            if (typeof query.onResult === "function") {
-              thisPlugin._wrap(query, "onResult", thisPlugin._patchCallbackQuery(endSpan));
+            if (typeof query2.onResult === "function") {
+              thisPlugin._wrap(query2, "onResult", thisPlugin._patchCallbackQuery(endSpan));
             }
             const streamableQuery = originalQuery.apply(this, arguments);
             streamableQuery.once("error", (err) => {
@@ -60923,24 +60923,24 @@ var require_utils26 = __commonJS((exports) => {
     return jdbcString;
   }
   exports.getJDBCString = getJDBCString;
-  function getDbQueryText(query) {
-    if (typeof query === "string") {
-      return query;
+  function getDbQueryText(query2) {
+    if (typeof query2 === "string") {
+      return query2;
     } else {
-      return query.sql;
+      return query2.sql;
     }
   }
   exports.getDbQueryText = getDbQueryText;
-  function getDbValues(query, values2) {
-    if (typeof query === "string") {
+  function getDbValues(query2, values2) {
+    if (typeof query2 === "string") {
       return arrayStringifyHelper(values2);
     } else {
-      return arrayStringifyHelper(values2 || query.values);
+      return arrayStringifyHelper(values2 || query2.values);
     }
   }
   exports.getDbValues = getDbValues;
-  function getSpanName(query) {
-    const rawQuery = typeof query === "object" ? query.sql : query;
+  function getSpanName(query2) {
+    const rawQuery = typeof query2 === "object" ? query2.sql : query2;
     const firstSpace = rawQuery?.indexOf(" ");
     if (typeof firstSpace === "number" && firstSpace !== -1) {
       return rawQuery?.substring(0, firstSpace);
@@ -61047,7 +61047,7 @@ var require_instrumentation25 = __commonJS((exports) => {
     _patchCreatePool() {
       return (originalCreatePool) => {
         const thisPlugin = this;
-        return function createPool(_config) {
+        return function createPool(_config2) {
           const pool = originalCreatePool(...arguments);
           thisPlugin._wrap(pool, "query", thisPlugin._patchQuery(pool));
           thisPlugin._wrap(pool, "getConnection", thisPlugin._patchGetConnection(pool));
@@ -61074,7 +61074,7 @@ var require_instrumentation25 = __commonJS((exports) => {
     _patchCreatePoolCluster() {
       return (originalCreatePoolCluster) => {
         const thisPlugin = this;
-        return function createPool(_config) {
+        return function createPool(_config2) {
           const cluster = originalCreatePoolCluster(...arguments);
           thisPlugin._wrap(cluster, "getConnection", thisPlugin._patchGetConnection(cluster));
           thisPlugin._wrap(cluster, "add", thisPlugin._patchAdd(cluster));
@@ -61141,7 +61141,7 @@ var require_instrumentation25 = __commonJS((exports) => {
     _patchQuery(connection) {
       return (originalQuery) => {
         const thisPlugin = this;
-        return function query(query, _valuesOrCallback, _callback) {
+        return function query2(query2, _valuesOrCallback, _callback) {
           if (!thisPlugin["_enabled"]) {
             thisPlugin._unwrap(connection, "query");
             return originalQuery.apply(connection, arguments);
@@ -61149,7 +61149,7 @@ var require_instrumentation25 = __commonJS((exports) => {
           const attributes = {};
           const { host, port, database, user } = (0, utils_1.getConfig)(connection.config);
           const portNumber = parseInt(port, 10);
-          const dbQueryText = (0, utils_1.getDbQueryText)(query);
+          const dbQueryText = (0, utils_1.getDbQueryText)(query2);
           if (thisPlugin._dbSemconvStability & instrumentation_1.SemconvStability.OLD) {
             attributes[semconv_1.ATTR_DB_SYSTEM] = semconv_1.DB_SYSTEM_VALUE_MYSQL;
             attributes[semconv_1.ATTR_DB_CONNECTION_STRING] = (0, utils_1.getJDBCString)(host, port, database);
@@ -61174,7 +61174,7 @@ var require_instrumentation25 = __commonJS((exports) => {
               attributes[semantic_conventions_1.ATTR_SERVER_PORT] = portNumber;
             }
           }
-          const span = thisPlugin.tracer.startSpan((0, utils_1.getSpanName)(query), {
+          const span = thisPlugin.tracer.startSpan((0, utils_1.getSpanName)(query2), {
             kind: api_1.SpanKind.CLIENT,
             attributes
           });
@@ -61185,7 +61185,7 @@ var require_instrumentation25 = __commonJS((exports) => {
             } else if (arguments[2]) {
               values2 = [_valuesOrCallback];
             }
-            span.setAttribute(AttributeNames_1.AttributeNames.MYSQL_VALUES, (0, utils_1.getDbValues)(query, values2));
+            span.setAttribute(AttributeNames_1.AttributeNames.MYSQL_VALUES, (0, utils_1.getDbValues)(query2, values2));
           }
           const cbIndex = Array.from(arguments).findIndex((arg) => typeof arg === "function");
           const parentContext = api_1.context.active();
@@ -67615,7 +67615,7 @@ var require_EnvDetector = __commonJS((exports) => {
     _MAX_LENGTH = 255;
     _COMMA_SEPARATOR = ",";
     _LABEL_KEY_VALUE_SPLITTER = "=";
-    detect(_config) {
+    detect(_config2) {
       const attributes = {};
       const rawAttributes = (0, core_1.getStringFromEnv)("OTEL_RESOURCE_ATTRIBUTES");
       const serviceName = (0, core_1.getStringFromEnv)("OTEL_SERVICE_NAME");
@@ -67902,7 +67902,7 @@ var require_HostDetector = __commonJS((exports) => {
   var utils_1 = require_utils38();
 
   class HostDetector {
-    detect(_config) {
+    detect(_config2) {
       const attributes = {
         [semconv_1.ATTR_HOST_NAME]: (0, os_1.hostname)(),
         [semconv_1.ATTR_HOST_ARCH]: (0, utils_1.normalizeArch)((0, os_1.arch)()),
@@ -67923,7 +67923,7 @@ var require_OSDetector = __commonJS((exports) => {
   var utils_1 = require_utils38();
 
   class OSDetector {
-    detect(_config) {
+    detect(_config2) {
       const attributes = {
         [semconv_1.ATTR_OS_TYPE]: (0, utils_1.normalizeType)((0, os_1.platform)()),
         [semconv_1.ATTR_OS_VERSION]: (0, os_1.release)()
@@ -67943,7 +67943,7 @@ var require_ProcessDetector = __commonJS((exports) => {
   var os = __require("os");
 
   class ProcessDetector {
-    detect(_config) {
+    detect(_config2) {
       const attributes = {
         [semconv_1.ATTR_PROCESS_PID]: process.pid,
         [semconv_1.ATTR_PROCESS_EXECUTABLE_NAME]: process.title,
@@ -67980,7 +67980,7 @@ var require_ServiceInstanceIdDetector = __commonJS((exports) => {
   var crypto_1 = __require("crypto");
 
   class ServiceInstanceIdDetector {
-    detect(_config) {
+    detect(_config2) {
       return {
         attributes: {
           [semconv_1.ATTR_SERVICE_INSTANCE_ID]: (0, crypto_1.randomUUID)()
@@ -144588,7 +144588,7 @@ config(en_default());
 // package.json
 var package_default = {
   name: "mcp-ts-template",
-  version: "3.0.5",
+  version: "3.0.7",
   mcpName: "io.github.cyanheads/mcp-ts-template",
   description: "TypeScript template for MCP servers with declarative tools/resources, pluggable auth, multi-backend storage, OpenTelemetry observability, and Cloudflare Workers support.",
   main: "dist/index.js",
@@ -144667,7 +144667,7 @@ var package_default = {
   },
   devDependencies: {
     "@cloudflare/workers-types": "^4.20260305.1",
-    "@biomejs/biome": "2.4.5",
+    "@biomejs/biome": "2.4.6",
     "@hono/mcp": "^0.2.4",
     "@traversable/registry": "^0.0.49",
     "@traversable/zod-test": "^0.0.28",
@@ -144675,7 +144675,7 @@ var package_default = {
     "@types/bun": "^1.3.10",
     "@types/diff": "^8.0.0",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.3.5",
     "@types/node-cron": "^3.0.11",
     "@types/papaparse": "^5.5.2",
     "@types/sanitize-html": "^2.16.0",
@@ -144763,10 +144763,10 @@ var package_default = {
     dotenv: "^17.3.1",
     "fast-xml-parser": "^5.4.2",
     hono: "^4.12.5",
-    jose: "^6.1.3",
+    jose: "^6.2.0",
     "js-yaml": "^4.1.1",
     "node-cron": "^4.2.1",
-    openai: "^6.25.0",
+    openai: "^6.27.0",
     papaparse: "^5.5.3",
     "partial-json": "^0.1.7",
     "pdf-lib": "^1.17.1",
@@ -145174,7 +145174,35 @@ var parseConfig = () => {
   }
   return parsedConfig.data;
 };
-var config2 = parseConfig();
+var _config;
+var config2 = new Proxy({}, {
+  get(_target, prop) {
+    _config ??= parseConfig();
+    return _config[prop];
+  },
+  set(_target, prop, value) {
+    _config ??= parseConfig();
+    _config[prop] = value;
+    return true;
+  },
+  defineProperty(_target, prop, descriptor) {
+    _config ??= parseConfig();
+    Object.defineProperty(_config, prop, descriptor);
+    return true;
+  },
+  has(_target, prop) {
+    _config ??= parseConfig();
+    return prop in _config;
+  },
+  ownKeys() {
+    _config ??= parseConfig();
+    return Reflect.ownKeys(_config);
+  },
+  getOwnPropertyDescriptor(_target, prop) {
+    _config ??= parseConfig();
+    return Object.getOwnPropertyDescriptor(_config, prop);
+  }
+});
 
 // src/container/core/container.ts
 function token(description) {
@@ -145511,7 +145539,7 @@ var safeJSON = (text) => {
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 // node_modules/openai/version.mjs
-var VERSION = "6.25.0";
+var VERSION = "6.27.0";
 
 // node_modules/openai/internal/detect-platform.mjs
 var isRunningInBrowser = () => {
@@ -146031,6 +146059,12 @@ function stringify(object2, opts = {}) {
   }
   return joined.length > 0 ? prefix + joined : "";
 }
+
+// node_modules/openai/internal/utils/query.mjs
+function stringifyQuery(query) {
+  return stringify(query, { arrayFormat: "brackets" });
+}
+
 // node_modules/openai/internal/utils/bytes.mjs
 function concatBytes(buffers) {
   let length = 0;
@@ -149088,9 +149122,9 @@ class Runs extends APIResource {
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
   }
-  list(threadID, query = {}, options) {
+  list(threadID, query2 = {}, options) {
     return this._client.getAPIList(path`/threads/${threadID}/runs`, CursorPage, {
-      query,
+      query: query2,
       ...options,
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
@@ -149271,9 +149305,9 @@ class Files extends APIResource {
     const { container_id } = params;
     return this._client.get(path`/containers/${container_id}/files/${fileID}`, options);
   }
-  list(containerID, query = {}, options) {
+  list(containerID, query2 = {}, options) {
     return this._client.getAPIList(path`/containers/${containerID}/files`, CursorPage, {
-      query,
+      query: query2,
       ...options
     });
   }
@@ -149299,8 +149333,8 @@ class Containers extends APIResource {
   retrieve(containerID, options) {
     return this._client.get(path`/containers/${containerID}`, options);
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/containers", CursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/containers", CursorPage, { query: query2, ...options });
   }
   delete(containerID, options) {
     return this._client.delete(path`/containers/${containerID}`, {
@@ -149321,11 +149355,11 @@ class Items extends APIResource {
     });
   }
   retrieve(itemID, params, options) {
-    const { conversation_id, ...query } = params;
-    return this._client.get(path`/conversations/${conversation_id}/items/${itemID}`, { query, ...options });
+    const { conversation_id, ...query2 } = params;
+    return this._client.get(path`/conversations/${conversation_id}/items/${itemID}`, { query: query2, ...options });
   }
-  list(conversationID, query = {}, options) {
-    return this._client.getAPIList(path`/conversations/${conversationID}/items`, ConversationCursorPage, { query, ...options });
+  list(conversationID, query2 = {}, options) {
+    return this._client.getAPIList(path`/conversations/${conversationID}/items`, ConversationCursorPage, { query: query2, ...options });
   }
   delete(itemID, params, options) {
     const { conversation_id } = params;
@@ -149390,8 +149424,8 @@ class OutputItems extends APIResource {
     return this._client.get(path`/evals/${eval_id}/runs/${run_id}/output_items/${outputItemID}`, options);
   }
   list(runID, params, options) {
-    const { eval_id, ...query } = params;
-    return this._client.getAPIList(path`/evals/${eval_id}/runs/${runID}/output_items`, CursorPage, { query, ...options });
+    const { eval_id, ...query2 } = params;
+    return this._client.getAPIList(path`/evals/${eval_id}/runs/${runID}/output_items`, CursorPage, { query: query2, ...options });
   }
 }
 
@@ -149408,9 +149442,9 @@ class Runs2 extends APIResource {
     const { eval_id } = params;
     return this._client.get(path`/evals/${eval_id}/runs/${runID}`, options);
   }
-  list(evalID, query = {}, options) {
+  list(evalID, query2 = {}, options) {
     return this._client.getAPIList(path`/evals/${evalID}/runs`, CursorPage, {
-      query,
+      query: query2,
       ...options
     });
   }
@@ -149440,8 +149474,8 @@ class Evals extends APIResource {
   update(evalID, body, options) {
     return this._client.post(path`/evals/${evalID}`, { body, ...options });
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/evals", CursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/evals", CursorPage, { query: query2, ...options });
   }
   delete(evalID, options) {
     return this._client.delete(path`/evals/${evalID}`, options);
@@ -149456,8 +149490,8 @@ class Files2 extends APIResource {
   retrieve(fileID, options) {
     return this._client.get(path`/files/${fileID}`, options);
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/files", CursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/files", CursorPage, { query: query2, ...options });
   }
   delete(fileID, options) {
     return this._client.delete(path`/files/${fileID}`, options);
@@ -149513,12 +149547,15 @@ class Permissions extends APIResource {
   create(fineTunedModelCheckpoint, body, options) {
     return this._client.getAPIList(path`/fine_tuning/checkpoints/${fineTunedModelCheckpoint}/permissions`, Page, { body, method: "post", ...options });
   }
-  retrieve(fineTunedModelCheckpoint, query = {}, options) {
+  retrieve(fineTunedModelCheckpoint, query2 = {}, options) {
     return this._client.get(path`/fine_tuning/checkpoints/${fineTunedModelCheckpoint}/permissions`, {
-      query,
+      query: query2,
       ...options
     });
   }
+  list(fineTunedModelCheckpoint, query2 = {}, options) {
+    return this._client.getAPIList(path`/fine_tuning/checkpoints/${fineTunedModelCheckpoint}/permissions`, ConversationCursorPage, { query: query2, ...options });
+  }
   delete(permissionID, params, options) {
     const { fine_tuned_model_checkpoint } = params;
     return this._client.delete(path`/fine_tuning/checkpoints/${fine_tuned_model_checkpoint}/permissions/${permissionID}`, options);
@@ -149536,8 +149573,8 @@ Checkpoints.Permissions = Permissions;
 
 // node_modules/openai/resources/fine-tuning/jobs/checkpoints.mjs
 class Checkpoints2 extends APIResource {
-  list(fineTuningJobID, query = {}, options) {
-    return this._client.getAPIList(path`/fine_tuning/jobs/${fineTuningJobID}/checkpoints`, CursorPage, { query, ...options });
+  list(fineTuningJobID, query2 = {}, options) {
+    return this._client.getAPIList(path`/fine_tuning/jobs/${fineTuningJobID}/checkpoints`, CursorPage, { query: query2, ...options });
   }
 }
 
@@ -149553,14 +149590,14 @@ class Jobs extends APIResource {
   retrieve(fineTuningJobID, options) {
     return this._client.get(path`/fine_tuning/jobs/${fineTuningJobID}`, options);
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/fine_tuning/jobs", CursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/fine_tuning/jobs", CursorPage, { query: query2, ...options });
   }
   cancel(fineTuningJobID, options) {
     return this._client.post(path`/fine_tuning/jobs/${fineTuningJobID}/cancel`, options);
   }
-  listEvents(fineTuningJobID, query = {}, options) {
-    return this._client.getAPIList(path`/fine_tuning/jobs/${fineTuningJobID}/events`, CursorPage, { query, ...options });
+  listEvents(fineTuningJobID, query2 = {}, options) {
+    return this._client.getAPIList(path`/fine_tuning/jobs/${fineTuningJobID}/events`, CursorPage, { query: query2, ...options });
   }
   pause(fineTuningJobID, options) {
     return this._client.post(path`/fine_tuning/jobs/${fineTuningJobID}/pause`, options);
@@ -150057,8 +150094,8 @@ function finalizeResponse(snapshot, params) {
 
 // node_modules/openai/resources/responses/input-items.mjs
 class InputItems extends APIResource {
-  list(responseID, query = {}, options) {
-    return this._client.getAPIList(path`/responses/${responseID}/input_items`, CursorPage, { query, ...options });
+  list(responseID, query2 = {}, options) {
+    return this._client.getAPIList(path`/responses/${responseID}/input_items`, CursorPage, { query: query2, ...options });
   }
 }
 
@@ -150084,11 +150121,11 @@ class Responses extends APIResource {
       return rsp;
     });
   }
-  retrieve(responseID, query = {}, options) {
+  retrieve(responseID, query2 = {}, options) {
     return this._client.get(path`/responses/${responseID}`, {
-      query,
+      query: query2,
       ...options,
-      stream: query?.stream ?? false
+      stream: query2?.stream ?? false
     })._thenUnwrap((rsp) => {
       if ("object" in rsp && rsp.object === "response") {
         addOutputText(rsp);
@@ -150153,9 +150190,9 @@ class Versions extends APIResource {
     const { skill_id } = params;
     return this._client.get(path`/skills/${skill_id}/versions/${version4}`, options);
   }
-  list(skillID, query = {}, options) {
+  list(skillID, query2 = {}, options) {
     return this._client.getAPIList(path`/skills/${skillID}/versions`, CursorPage, {
-      query,
+      query: query2,
       ...options
     });
   }
@@ -150182,8 +150219,8 @@ class Skills extends APIResource {
   update(skillID, body, options) {
     return this._client.post(path`/skills/${skillID}`, { body, ...options });
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/skills", CursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/skills", CursorPage, { query: query2, ...options });
   }
   delete(skillID, options) {
     return this._client.delete(path`/skills/${skillID}`, options);
@@ -150262,8 +150299,8 @@ class FileBatches extends APIResource {
     return await this.poll(vectorStoreId, batch.id, options);
   }
   listFiles(batchID, params, options) {
-    const { vector_store_id, ...query } = params;
-    return this._client.getAPIList(path`/vector_stores/${vector_store_id}/file_batches/${batchID}/files`, CursorPage, { query, ...options, headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers]) });
+    const { vector_store_id, ...query2 } = params;
+    return this._client.getAPIList(path`/vector_stores/${vector_store_id}/file_batches/${batchID}/files`, CursorPage, { query: query2, ...options, headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers]) });
   }
   async poll(vectorStoreID, batchID, options) {
     const headers = buildHeaders([
@@ -150348,9 +150385,9 @@ class Files3 extends APIResource {
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
   }
-  list(vectorStoreID, query = {}, options) {
+  list(vectorStoreID, query2 = {}, options) {
     return this._client.getAPIList(path`/vector_stores/${vectorStoreID}/files`, CursorPage, {
-      query,
+      query: query2,
       ...options,
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
@@ -150442,9 +150479,9 @@ class VectorStores extends APIResource {
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
   }
-  list(query = {}, options) {
+  list(query2 = {}, options) {
     return this._client.getAPIList("/vector_stores", CursorPage, {
-      query,
+      query: query2,
       ...options,
       headers: buildHeaders([{ "OpenAI-Beta": "assistants=v2" }, options?.headers])
     });
@@ -150474,15 +150511,15 @@ class Videos extends APIResource {
   retrieve(videoID, options) {
     return this._client.get(path`/videos/${videoID}`, options);
   }
-  list(query = {}, options) {
-    return this._client.getAPIList("/videos", ConversationCursorPage, { query, ...options });
+  list(query2 = {}, options) {
+    return this._client.getAPIList("/videos", ConversationCursorPage, { query: query2, ...options });
   }
   delete(videoID, options) {
     return this._client.delete(path`/videos/${videoID}`, options);
   }
-  downloadContent(videoID, query = {}, options) {
+  downloadContent(videoID, query2 = {}, options) {
     return this._client.get(path`/videos/${videoID}/content`, {
-      query,
+      query: query2,
       ...options,
       headers: buildHeaders([{ Accept: "application/binary" }, options?.headers]),
       __binaryResponse: true
@@ -150656,8 +150693,8 @@ https://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety
   async authHeaders(opts) {
     return buildHeaders([{ Authorization: `Bearer ${this.apiKey}` }]);
   }
-  stringifyQuery(query) {
-    return stringify(query, { arrayFormat: "brackets" });
+  stringifyQuery(query2) {
+    return stringifyQuery(query2);
   }
   getUserAgent() {
     return `${this.constructor.name}/JS ${VERSION}`;
@@ -150686,15 +150723,15 @@ https://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety
     this.apiKey = token2;
     return true;
   }
-  buildURL(path2, query, defaultBaseURL) {
+  buildURL(path2, query2, defaultBaseURL) {
     const baseURL = !__classPrivateFieldGet(this, _OpenAI_instances, "m", _OpenAI_baseURLOverridden).call(this) && defaultBaseURL || this.baseURL;
     const url2 = isAbsoluteURL(path2) ? new URL(path2) : new URL(baseURL + (baseURL.endsWith("/") && path2.startsWith("/") ? path2.slice(1) : path2));
     const defaultQuery = this.defaultQuery();
     if (!isEmptyObj(defaultQuery)) {
-      query = { ...defaultQuery, ...query };
+      query2 = { ...defaultQuery, ...query2 };
     }
-    if (typeof query === "object" && query && !Array.isArray(query)) {
-      url2.search = this.stringifyQuery(query);
+    if (typeof query2 === "object" && query2 && !Array.isArray(query2)) {
+      url2.search = this.stringifyQuery(query2);
     }
     return url2.toString();
   }
@@ -150886,7 +150923,7 @@ https://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety
         timeoutMillis = Date.parse(retryAfterHeader) - Date.now();
       }
     }
-    if (!(timeoutMillis && 0 <= timeoutMillis && timeoutMillis < 60 * 1000)) {
+    if (timeoutMillis === undefined) {
       const maxRetries = options.maxRetries ?? this.maxRetries;
       timeoutMillis = this.calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries);
     }
@@ -150903,8 +150940,8 @@ https://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety
   }
   async buildRequest(inputOptions, { retryCount = 0 } = {}) {
     const options = { ...inputOptions };
-    const { method, path: path2, query, defaultBaseURL } = options;
-    const url2 = this.buildURL(path2, query, defaultBaseURL);
+    const { method, path: path2, query: query2, defaultBaseURL } = options;
+    const url2 = this.buildURL(path2, query2, defaultBaseURL);
     if ("timeout" in options)
       validatePositiveInteger("timeout", options.timeout);
     options.timeout = options.timeout ?? this.timeout;
@@ -154418,12 +154455,12 @@ class SupabaseProvider {
     return await ErrorHandler.tryCatch(async () => {
       const now = new Date().toISOString();
       const limit2 = options?.limit ?? DEFAULT_LIST_LIMIT6;
-      let query = this.getClient().from(TABLE_NAME).select("key").eq("tenant_id", tenantId).like("key", `${escapeLikePattern2(prefix)}%`).or(`expires_at.is.null,expires_at.gt.${now}`).order("key", { ascending: true }).limit(limit2 + 1);
+      let query2 = this.getClient().from(TABLE_NAME).select("key").eq("tenant_id", tenantId).like("key", `${escapeLikePattern2(prefix)}%`).or(`expires_at.is.null,expires_at.gt.${now}`).order("key", { ascending: true }).limit(limit2 + 1);
       if (options?.cursor) {
         const lastKey = decodeCursor(options.cursor, tenantId, context);
-        query = query.gt("key", lastKey);
+        query2 = query2.gt("key", lastKey);
       }
-      const { data, error: error49 } = await query;
+      const { data, error: error49 } = await query2;
       if (error49)
         throw error49;
       const keys = data?.map((item) => item.key) ?? [];
@@ -173062,12 +173099,7 @@ function createMcpToolHandler({
       });
       return {
         isError: true,
-        content: [{ type: "text", text: `Error: ${mcpError.message}` }],
-        structuredContent: {
-          code: mcpError.code,
-          message: mcpError.message,
-          data: mcpError.data
-        }
+        content: [{ type: "text", text: `Error: ${mcpError.message}` }]
       };
     }
   };
@@ -177827,7 +177859,7 @@ function isCloudflareWorkers() {
 var USER_AGENT;
 if (typeof navigator === "undefined" || !navigator.userAgent?.startsWith?.("Mozilla/5.0 ")) {
   const NAME = "jose";
-  const VERSION2 = "v6.1.3";
+  const VERSION2 = "v6.2.0";
   USER_AGENT = `${NAME}/${VERSION2}`;
 }
 var customFetch = Symbol();
@@ -178567,7 +178599,7 @@ function createHttpApp(serverFactory, parentContext) {
     allowMethods: ["GET", "POST", "DELETE", "OPTIONS"],
     allowHeaders: ["Content-Type", "Authorization", "Mcp-Session-Id", "MCP-Protocol-Version"],
     exposeHeaders: ["Mcp-Session-Id"],
-    credentials: true
+    ...allowedOrigin !== "*" && { credentials: true }
   }));
   app.onError(httpErrorHandler);
   app.use(config2.mcpHttpEndpointPath, async (c, next) => {
@@ -178668,7 +178700,6 @@ function createHttpApp(serverFactory, parentContext) {
       }, 400);
     }
     const providedSessionId = c.req.header("mcp-session-id");
-    const sessionId = providedSessionId ?? generateSecureSessionId();
     const authInfo = authContext.getStore()?.authInfo;
     const sessionIdentity = authInfo ? Object.fromEntries(Object.entries({
       tenantId: authInfo.tenantId,
@@ -178684,22 +178715,23 @@ function createHttpApp(serverFactory, parentContext) {
       });
       return c.json({ error: "Session not found or expired" }, 404);
     }
-    if (sessionStore) {
-      sessionStore.getOrCreate(sessionId, sessionIdentity);
-    }
+    const sessionId = providedSessionId ?? generateSecureSessionId();
     const transport = new McpSessionTransport(sessionId);
     const handleRpc = async () => {
       const server2 = await serverFactory();
       await server2.connect(transport);
       const response = await transport.handleRequest(c);
-      if (response && config2.mcpSessionMode === "stateful") {
-        response.headers.set("Mcp-Session-Id", sessionId);
-        logger.debug("Added Mcp-Session-Id header to response", {
-          ...transportContext,
-          sessionId
-        });
-      }
       if (response) {
+        if (sessionStore && response.ok) {
+          sessionStore.getOrCreate(sessionId, sessionIdentity);
+        }
+        if (config2.mcpSessionMode === "stateful" && response.ok) {
+          response.headers.set("Mcp-Session-Id", sessionId);
+          logger.debug("Added Mcp-Session-Id header to response", {
+            ...transportContext,
+            sessionId
+          });
+        }
         return response;
       }
       return c.body(null, 204);
@@ -178718,7 +178750,7 @@ function createHttpApp(serverFactory, parentContext) {
     }
   });
   logger.info("Hono application setup complete.", transportContext);
-  return app;
+  return { app, sessionStore };
 }
 function isPortInUse(port, host, parentContext) {
   const context2 = { ...parentContext, operation: "isPortInUse", port, host };
@@ -178783,18 +178815,22 @@ async function startHttpTransport(serverFactory, parentContext) {
     component: "HttpTransportStart"
   };
   logger.info("Starting HTTP transport.", transportContext);
-  const app = createHttpApp(serverFactory, transportContext);
+  const { app, sessionStore } = createHttpApp(serverFactory, transportContext);
   const server2 = await startHttpServerWithRetry(app, config2.mcpHttpPort, config2.mcpHttpHost, config2.mcpHttpMaxPortRetries, transportContext);
   logger.info("HTTP transport started successfully.", transportContext);
-  return server2;
+  return {
+    server: server2,
+    stop: (ctx) => stopHttpTransport(server2, sessionStore, ctx)
+  };
 }
-function stopHttpTransport(server2, parentContext) {
+function stopHttpTransport(server2, sessionStore, parentContext) {
   const operationContext = {
     ...parentContext,
     operation: "stopHttpTransport",
     transportType: "Http"
   };
   logger.info("Attempting to stop http transport...", operationContext);
+  sessionStore?.destroy();
   return new Promise((resolve, reject) => {
     server2.close((err) => {
       if (err) {
@@ -178958,9 +178994,9 @@ class TransportManager {
     });
     this.logger.info(`Starting transport: ${this.config.mcpTransportType}`, context2);
     if (this.config.mcpTransportType === "http") {
-      const server2 = await startHttpTransport(this.createMcpServer, context2);
-      this.serverInstance = server2;
-      this.shutdown = (ctx) => stopHttpTransport(server2, ctx);
+      const handle = await startHttpTransport(this.createMcpServer, context2);
+      this.serverInstance = handle.server;
+      this.shutdown = (ctx) => handle.stop(ctx);
     } else if (this.config.mcpTransportType === "stdio") {
       const mcpServer = await this.createMcpServer();
       this.serverInstance = await startStdioTransport(mcpServer, context2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-ts-template",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "mcpName": "io.github.cyanheads/mcp-ts-template",
   "description": "TypeScript template for MCP servers with declarative tools/resources, pluggable auth, multi-backend storage, OpenTelemetry observability, and Cloudflare Workers support.",
   "main": "dist/index.js",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260305.1",
-    "@biomejs/biome": "2.4.5",
+    "@biomejs/biome": "2.4.6",
     "@hono/mcp": "^0.2.4",
     "@traversable/registry": "^0.0.49",
     "@traversable/zod-test": "^0.0.28",
@@ -87,7 +87,7 @@
     "@types/bun": "^1.3.10",
     "@types/diff": "^8.0.0",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.3.5",
     "@types/node-cron": "^3.0.11",
     "@types/papaparse": "^5.5.2",
     "@types/sanitize-html": "^2.16.0",
@@ -175,10 +175,10 @@
     "dotenv": "^17.3.1",
     "fast-xml-parser": "^5.4.2",
     "hono": "^4.12.5",
-    "jose": "^6.1.3",
+    "jose": "^6.2.0",
     "js-yaml": "^4.1.1",
     "node-cron": "^4.2.1",
-    "openai": "^6.25.0",
+    "openai": "^6.27.0",
     "papaparse": "^5.5.3",
     "partial-json": "^0.1.7",
     "pdf-lib": "^1.17.1",