@ampless/backend 1.0.0-beta.89 → 1.0.0-beta.91

package/dist/functions/mcp-handler.js

@@ -1814,12 +1814,23 @@ var tools = [
   }
 ];
 
-// ../mcp-server/dist/jsonrpc/index.js
+// ../mcp-server/dist/chunk-4REBPD2N.js
 var JSON_RPC_PARSE_ERROR = -32700;
 var JSON_RPC_INVALID_REQUEST = -32600;
 var JSON_RPC_METHOD_NOT_FOUND = -32601;
 var JSON_RPC_INVALID_PARAMS = -32602;
 var JSON_RPC_INTERNAL_ERROR = -32603;
+var TOOL_USER_ERROR_BRAND = /* @__PURE__ */ Symbol.for("ampless.mcp.toolUserError");
+var ToolUserError = class extends Error {
+  [TOOL_USER_ERROR_BRAND] = true;
+  constructor(message) {
+    super(message);
+    this.name = "ToolUserError";
+  }
+};
+function isToolUserError(error) {
+  return error instanceof Error && error[TOOL_USER_ERROR_BRAND] === true;
+}
 var SUPPORTED_PROTOCOL_VERSIONS = ["2025-03-26", "2024-11-05"];
 var LATEST_SUPPORTED_PROTOCOL_VERSION = SUPPORTED_PROTOCOL_VERSIONS[0];
 function jsonRpcResult(id, result) {
@@ -1841,6 +1852,69 @@ function hasValidJsonRpcId(req) {
 function isPlainObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
+var MAX_BATCH = 50;
+function idForError(input) {
+  if (isPlainObject(input) && hasValidJsonRpcId(input)) {
+    return input.id ?? null;
+  }
+  return null;
+}
+function validateEnvelope(input, inBatch) {
+  if (!isPlainObject(input)) {
+    return { ok: false, error: jsonRpcError(null, JSON_RPC_INVALID_REQUEST, "Invalid Request") };
+  }
+  const jsonrpc = input.jsonrpc;
+  const method = input.method;
+  if (jsonrpc !== "2.0" || typeof method !== "string" || !hasValidJsonRpcId(input)) {
+    return {
+      ok: false,
+      error: jsonRpcError(idForError(input), JSON_RPC_INVALID_REQUEST, "Invalid Request")
+    };
+  }
+  if (inBatch && method === "initialize") {
+    return {
+      ok: false,
+      error: jsonRpcError(
+        idForError(input),
+        JSON_RPC_INVALID_REQUEST,
+        "Invalid Request: `initialize` is not allowed in a batch"
+      )
+    };
+  }
+  return { ok: true, req: input };
+}
+async function dispatchJsonRpcMessage(input, opts) {
+  const maxBatch = opts.maxBatch ?? MAX_BATCH;
+  if (Array.isArray(input)) {
+    if (input.length === 0 || input.length > maxBatch) {
+      return {
+        status: "invalid",
+        body: jsonRpcError(
+          null,
+          JSON_RPC_INVALID_REQUEST,
+          input.length === 0 ? "Invalid Request: empty batch" : `Invalid Request: batch exceeds the maximum of ${maxBatch} elements`
+        )
+      };
+    }
+    const responses = [];
+    for (const element of input) {
+      const validated2 = validateEnvelope(element, true);
+      if (!validated2.ok) {
+        responses.push(validated2.error);
+        continue;
+      }
+      const res2 = await dispatchJsonRpc(validated2.req, opts);
+      if (res2 !== null) responses.push(res2);
+    }
+    return responses.length === 0 ? { status: "no-content" } : { status: "ok", body: responses };
+  }
+  const validated = validateEnvelope(input, false);
+  if (!validated.ok) {
+    return { status: "invalid", body: validated.error };
+  }
+  const res = await dispatchJsonRpc(validated.req, opts);
+  return res === null ? { status: "no-content" } : { status: "ok", body: res };
+}
 function toolAnnotations(t) {
   const annotations = {};
   if (typeof t.readOnly === "boolean") annotations.readOnlyHint = t.readOnly;
@@ -1915,11 +1989,14 @@ async function dispatchMethod(req, opts) {
         });
       } catch (err2) {
         const rawMessage = err2 instanceof Error ? err2.message : String(err2);
-        console.error("[mcp-jsonrpc] tool dispatch failed", {
-          tool: params.name,
-          message: rawMessage
-        });
-        const message = opts.formatToolError ? opts.formatToolError(err2) : rawMessage;
+        const userError = isToolUserError(err2);
+        if (!userError) {
+          console.error("[mcp-jsonrpc] tool dispatch failed", {
+            tool: params.name,
+            message: rawMessage
+          });
+        }
+        const message = userError ? rawMessage : opts.formatToolError ? opts.formatToolError(err2) : rawMessage;
         return jsonRpcResult(id, {
           isError: true,
           content: [{ type: "text", text: message }]
@@ -2140,43 +2217,37 @@ var handler = async (event) => {
     return jsonResponse(401, { error: "invalid_token" });
   }
   await touchLastUsedAt(meta.hash);
-  let req;
+  let parsed;
   try {
     const body = event.isBase64Encoded ? Buffer.from(event.body ?? "", "base64").toString("utf8") : event.body ?? "";
     if (!body) {
       return jsonResponse(400, jsonRpcError(null, JSON_RPC_INVALID_REQUEST, "Empty body"));
     }
-    req = JSON.parse(body);
+    parsed = JSON.parse(body);
   } catch {
     return jsonResponse(400, jsonRpcError(null, JSON_RPC_PARSE_ERROR, "Parse error"));
   }
-  if (typeof req !== "object" || req === null || Array.isArray(req)) {
-    return jsonResponse(400, jsonRpcError(null, JSON_RPC_INVALID_REQUEST, "Invalid Request"));
-  }
-  if (req.jsonrpc !== "2.0" || typeof req.method !== "string" || !hasValidJsonRpcId(req)) {
-    const responseId = hasValidJsonRpcId(req) ? req.id ?? null : null;
-    return jsonResponse(
-      400,
-      jsonRpcError(responseId, JSON_RPC_INVALID_REQUEST, "Invalid Request")
-    );
-  }
   try {
-    const response = await dispatchJsonRpc(req, {
+    const result = await dispatchJsonRpcMessage(parsed, {
       tools: HTTP_TOOLS,
       getContext: makeContext,
       serverInfo: { name: "ampless-mcp", version: "0.2" }
     });
-    if (response === null) {
+    if (result.status === "invalid") {
+      return jsonResponse(400, result.body);
+    }
+    if (result.status === "no-content") {
       return { statusCode: 202, body: "" };
     }
-    return jsonResponse(200, response);
+    return jsonResponse(200, result.body);
   } catch (err2) {
+    const method = typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed.method : void 0;
     const message = err2 instanceof Error ? err2.message : String(err2);
-    console.error("[mcp-handler] dispatch threw", { method: req.method, message });
-    return jsonResponse(
-      500,
-      jsonRpcError(req.id ?? null, JSON_RPC_INTERNAL_ERROR, message)
-    );
+    console.error("[mcp-handler] dispatch threw", {
+      method: typeof method === "string" ? method : void 0,
+      message
+    });
+    return jsonResponse(500, jsonRpcError(null, JSON_RPC_INTERNAL_ERROR, message));
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/backend",
-  "version": "1.0.0-beta.89",
+  "version": "1.0.0-beta.91",
   "description": "Amplify Gen 2 backend factories for ampless: auth, data, storage, event processors, API key renewer",
   "license": "MIT",
   "type": "module",
@@ -69,8 +69,8 @@
     "@smithy/protocol-http": "^5.4.4",
     "@smithy/signature-v4": "^5.4.4",
     "fflate": "^0.8.3",
-    "@ampless/mcp-server": "1.0.0-beta.66",
-    "ampless": "1.0.0-beta.59"
+    "@ampless/mcp-server": "1.0.0-beta.68",
+    "ampless": "1.0.0-beta.61"
   },
   "peerDependencies": {
     "@aws-amplify/backend": "^1.19.0",