@ampless/runtime 1.0.0-beta.71 → 1.0.0-beta.73

package/README.ja.md

@@ -105,6 +105,19 @@ middleware はリクエストごとに AppSync から `post.format` /
 `llms.txt` は予約 slug になります — slug が `llms.txt` の投稿はテーマ
 ページに到達できなくなります。
 
+`/api/mcp` は **匿名・読み取り専用の MCP エンドポイント**（POST での
+JSON-RPC 2.0）で、`createPublicMcpRouteHandler(ampless)` が生成し
+`app/api/mcp/route.ts` にマウントされます。`@ampless/mcp-server/public`
+の 4 ツール（`list_posts` / `get_post` / `search_posts` / `list_tags`）を
+公開投稿のみに対して提供します — 書き込み不可・draft 不可視。既定は
+無効で、`cms.config.ai.publicMcp: true` で有効化します。ルートは open
+CORS（匿名・読み取り専用）、64KB のボディ上限、粗い warm-instance 単位
+の circuit breaker（1 warm lambda あたり 600 req/min。per-IP rate limit
+ではないので、実運用の濫用対策は CloudFront / WAF を併用）を付与します。
+ファクトリは `{ POST, OPTIONS }` を返すので、テンプレートは両方を分割
+代入します（`export const POST = ...` の一括代入だと CORS preflight が
+欠落します）。
+
 また、`post.metadata.cache`（auto / deep / hot）+ `post.updatedAt` +
 `cms.config.cache.{cooldownMs, freshTtlSeconds, deepTtlSeconds}` から
 `Cache-Control` を算出してレスポンスに付与します。キャッシュ戦略の
@@ -114,7 +127,7 @@ middleware はリクエストごとに AppSync から `post.format` /
 
 - `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`、`defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`、`createStaticRouteHandler`、`createMarkdownRouteHandler`、`createLlmsTxtRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`、`createStaticRouteHandler`、`createMarkdownRouteHandler`、`createLlmsTxtRouteHandler`、`createPublicMcpRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`、`createThemePostDispatcher`、`createThemeTagDispatcher`（それぞれ対応する `*Metadata` ファクトリーあり）
 
 ## テンプレートに残るもの

package/README.md

@@ -104,6 +104,18 @@ a single-file index. Disable with `cms.config.ai.llmsTxt: false`. Note
 that `llms.txt` becomes a reserved slug either way — a post whose slug
 happens to be `llms.txt` can no longer reach the themed route.
 
+`/api/mcp` is an **anonymous, read-only MCP endpoint** (JSON-RPC 2.0
+over POST) built by `createPublicMcpRouteHandler(ampless)` and mounted
+at `app/api/mcp/route.ts`. It serves the four `@ampless/mcp-server/public`
+tools (`list_posts` / `get_post` / `search_posts` / `list_tags`) over
+published posts only — never writes, never sees drafts. Off by default;
+set `cms.config.ai.publicMcp: true` to enable. The route adds open CORS
+(anonymous read-only), a 64KB body cap, and a coarse warm-instance
+circuit breaker (600 req/min per warm lambda, not a per-IP limiter —
+pair it with CloudFront / WAF for real abuse protection). The factory
+returns `{ POST, OPTIONS }`; the template destructures both (a single
+`export const POST = ...` would drop the CORS preflight).
+
 It also computes `Cache-Control` from `post.metadata.cache` (auto /
 deep / hot) + `post.updatedAt` + `cms.config.cache.{cooldownMs,
 freshTtlSeconds, deepTtlSeconds}` and sets the header on the response.
@@ -113,7 +125,7 @@ See `docs/CONTENT.md` for the cache strategy contract.
 
 - `@ampless/runtime` — `createAmpless`, runtime types, and re-exports of `renderBody`, `renderThemeCss`, format converters
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`, `defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createRawRouteHandler`, `createStaticRouteHandler`, `createMarkdownRouteHandler`, `createLlmsTxtRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createRawRouteHandler`, `createStaticRouteHandler`, `createMarkdownRouteHandler`, `createLlmsTxtRouteHandler`, `createPublicMcpRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`, `createThemePostDispatcher`, `createThemeTagDispatcher` (each with a matching `*Metadata` factory)
 
 ## What's still in the template

package/dist/routes/index.d.ts

@@ -131,4 +131,21 @@ type LlmsTxtRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
  */
 declare function createLlmsTxtRouteHandler(ampless: Ampless): LlmsTxtRouteHandler;
 
-export { type FeedRouteHandler, type LlmsTxtRouteHandler, type MarkdownRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, createFeedRouteHandler, createLlmsTxtRouteHandler, createMarkdownRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };
+interface PublicMcpRouteHandlers {
+    POST: (request: Request) => Promise<Response>;
+    OPTIONS: (request: Request) => Promise<Response>;
+}
+/**
+ * Test hook: reset the module-scope circuit breaker between cases.
+ * Production code never calls this — the counter is intentionally
+ * process-local (mirrors middleware's `_resetFlagCache`).
+ */
+declare function _resetPublicMcpRateLimit(): void;
+/**
+ * Build `{ POST, OPTIONS }` for the public MCP route. The template must
+ * destructure both — a single `export const POST = ...(ampless)` assignment
+ * would drop OPTIONS and break the CORS preflight.
+ */
+declare function createPublicMcpRouteHandler(ampless: Ampless): PublicMcpRouteHandlers;
+
+export { type FeedRouteHandler, type LlmsTxtRouteHandler, type MarkdownRouteHandler, type OgRouteHandler, type PublicMcpRouteHandlers, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, _resetPublicMcpRateLimit, createFeedRouteHandler, createLlmsTxtRouteHandler, createMarkdownRouteHandler, createOgRouteHandler, createPublicMcpRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };

package/dist/routes/index.js

@@ -207,6 +207,7 @@ function createMarkdownRouteHandler(ampless) {
 }
 
 // src/routes/llms.ts
+import { collectBounded } from "ampless";
 var DEFAULT_LIMIT = 100;
 var MIN_LIMIT = 1;
 var MAX_LIMIT = 1e3;
@@ -241,36 +242,10 @@ function fixedEncodeURIComponent(s) {
   );
 }
 async function collectPosts(ampless, limit) {
-  const items = [];
-  const seenTokens = /* @__PURE__ */ new Set();
-  let token;
-  let truncated = null;
-  for (let page = 0; page < MAX_PAGES; page++) {
-    const remaining = limit + 1 - items.length;
-    const pageLimit = Math.min(PAGE_SIZE_CAP, remaining);
-    const res = await ampless.listPublishedPosts({ limit: pageLimit, nextToken: token });
-    items.push(...res.items);
-    if (items.length > limit) {
-      truncated = "limit";
-      break;
-    }
-    if (!res.nextToken) {
-      break;
-    }
-    if (seenTokens.has(res.nextToken)) {
-      truncated = "early";
-      break;
-    }
-    seenTokens.add(res.nextToken);
-    token = res.nextToken;
-    if (page === MAX_PAGES - 1) {
-      truncated = "early";
-    }
-  }
-  return {
-    items: truncated === "limit" ? items.slice(0, limit) : items,
-    truncated
-  };
+  return collectBounded(
+    (args) => ampless.listPublishedPosts({ limit: args.limit, nextToken: args.nextToken }),
+    { limit, pageSizeCap: PAGE_SIZE_CAP, maxPages: MAX_PAGES }
+  );
 }
 function truncationNote(truncated, limit) {
   if (truncated === "limit") {
@@ -351,11 +326,172 @@ ${lines.join("\n")}`);
     });
   };
 }
+
+// src/routes/public-mcp.ts
+import {
+  dispatchJsonRpcMessage,
+  jsonRpcError,
+  JSON_RPC_PARSE_ERROR,
+  JSON_RPC_INVALID_REQUEST,
+  JSON_RPC_INTERNAL_ERROR,
+  MAX_BATCH
+} from "@ampless/mcp-server/jsonrpc";
+import { publicTools } from "@ampless/mcp-server/public";
+var MAX_BODY_BYTES = 64 * 1024;
+var RATE_WINDOW_MS = 6e4;
+var RATE_MAX = 600;
+var rateState = { count: 0, windowExpires: 0 };
+function reserve(n) {
+  const now = Date.now();
+  if (now >= rateState.windowExpires) {
+    rateState = { count: 0, windowExpires: now + RATE_WINDOW_MS };
+  }
+  if (rateState.count + n > RATE_MAX) return false;
+  rateState.count += n;
+  return true;
+}
+function retryAfterSeconds() {
+  return Math.max(1, Math.ceil((rateState.windowExpires - Date.now()) / 1e3));
+}
+function _resetPublicMcpRateLimit() {
+  rateState = { count: 0, windowExpires: 0 };
+}
+function corsHeaders(extra = {}) {
+  return {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "POST, OPTIONS",
+    "Access-Control-Allow-Headers": "content-type, mcp-protocol-version",
+    "Access-Control-Max-Age": "86400",
+    ...extra
+  };
+}
+function jsonResponse(status, body) {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: corsHeaders({ "Content-Type": "application/json", "Cache-Control": "no-store" })
+  });
+}
+function notFound() {
+  return new Response("Not Found", { status: 404, headers: corsHeaders() });
+}
+function rateLimited() {
+  return new Response(JSON.stringify(jsonRpcError(null, -32e3, "Rate limit exceeded")), {
+    status: 429,
+    headers: corsHeaders({
+      "Content-Type": "application/json",
+      "Cache-Control": "no-store",
+      "Retry-After": String(retryAfterSeconds())
+    })
+  });
+}
+function payloadTooLarge() {
+  return new Response(
+    JSON.stringify(jsonRpcError(null, JSON_RPC_INVALID_REQUEST, "Payload too large")),
+    {
+      status: 413,
+      headers: corsHeaders({ "Content-Type": "application/json", "Cache-Control": "no-store" })
+    }
+  );
+}
+async function readBodyCapped(request) {
+  const body = request.body;
+  if (!body) return "";
+  const reader = body.getReader();
+  const chunks = [];
+  let total = 0;
+  for (; ; ) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    if (!value) continue;
+    total += value.byteLength;
+    if (total > MAX_BODY_BYTES) {
+      await reader.cancel();
+      return null;
+    }
+    chunks.push(value);
+  }
+  if (total === 0) return "";
+  const merged = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    merged.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return new TextDecoder("utf-8").decode(merged);
+}
+function createPublicMcpRouteHandler(ampless) {
+  const publicCtx = {
+    listPublishedPosts: (opts) => ampless.listPublishedPosts(opts),
+    getPublishedPost: (slug) => ampless.getPublishedPost(slug),
+    postToMarkdown: (post, opts) => ampless.postToMarkdown(post, opts)
+  };
+  function formatToolError(err) {
+    console.error("[ampless] public MCP tool error", err);
+    return "Internal error while executing the tool.";
+  }
+  function gateOpen() {
+    return ampless.cmsConfig.ai?.publicMcp === true;
+  }
+  async function POST(request) {
+    try {
+      if (!gateOpen()) return notFound();
+      if (!reserve(1)) return rateLimited();
+      const contentLength = request.headers.get("content-length");
+      if (contentLength) {
+        const declared = Number(contentLength);
+        if (Number.isFinite(declared) && declared > MAX_BODY_BYTES) {
+          return payloadTooLarge();
+        }
+      }
+      const bodyText = await readBodyCapped(request);
+      if (bodyText === null) return payloadTooLarge();
+      if (bodyText.length === 0) {
+        return jsonResponse(400, jsonRpcError(null, JSON_RPC_INVALID_REQUEST, "Empty body"));
+      }
+      let parsed;
+      try {
+        parsed = JSON.parse(bodyText);
+      } catch {
+        return jsonResponse(400, jsonRpcError(null, JSON_RPC_PARSE_ERROR, "Parse error"));
+      }
+      if (Array.isArray(parsed) && parsed.length >= 1 && parsed.length <= MAX_BATCH) {
+        if (!reserve(parsed.length - 1)) return rateLimited();
+      }
+      const result = await dispatchJsonRpcMessage(parsed, {
+        tools: publicTools,
+        getContext: () => publicCtx,
+        serverInfo: { name: "ampless-mcp", version: "0.2" },
+        formatToolError,
+        maxBatch: MAX_BATCH
+      });
+      if (result.status === "invalid") {
+        return jsonResponse(400, result.body);
+      }
+      if (result.status === "no-content") {
+        return new Response(null, {
+          status: 202,
+          headers: corsHeaders({ "Cache-Control": "no-store" })
+        });
+      }
+      return jsonResponse(200, result.body);
+    } catch (err) {
+      console.error("[ampless] public MCP route error", err);
+      return jsonResponse(500, jsonRpcError(null, JSON_RPC_INTERNAL_ERROR, "Internal error"));
+    }
+  }
+  async function OPTIONS(_request) {
+    if (!gateOpen()) return notFound();
+    return new Response(null, { status: 204, headers: corsHeaders() });
+  }
+  return { POST, OPTIONS };
+}
 export {
+  _resetPublicMcpRateLimit,
   createFeedRouteHandler,
   createLlmsTxtRouteHandler,
   createMarkdownRouteHandler,
   createOgRouteHandler,
+  createPublicMcpRouteHandler,
   createRawRouteHandler,
   createSitemapRouteHandler,
   createStaticRouteHandler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-beta.71",
+  "version": "1.0.0-beta.73",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,9 @@
     "marked": "^18.0.4",
     "sanitize-html": "^2.17.4",
     "tailwind-merge": "^3.6.0",
-    "@ampless/plugin-og-image": "0.2.0-beta.58",
-    "ampless": "1.0.0-beta.58"
+    "@ampless/mcp-server": "1.0.0-beta.67",
+    "ampless": "1.0.0-beta.60",
+    "@ampless/plugin-og-image": "0.2.0-beta.60"
   },
   "peerDependencies": {
     "@aws-amplify/adapter-nextjs": "^1",