create-ampless 0.2.0-alpha.20 → 0.2.0-alpha.22

package/dist/index.js

@@ -1761,6 +1761,14 @@ import { join as join3, relative, extname as extname2, dirname } from "path";
 import { log as log3, outro } from "@clack/prompts";
 import pc3 from "picocolors";
 import { execa as execa4 } from "execa";
+var AMPLESS_MANAGED_APP_PATHS = [
+  "app/(admin)/admin",
+  "app/api/admin",
+  "app/api/media",
+  "app/api/mcp",
+  "app/login",
+  "app/site"
+];
 var AMPLESS_PACKAGES = /* @__PURE__ */ new Set([
   "ampless",
   "@ampless/admin",
@@ -1882,6 +1890,63 @@ async function walkDir(dir, base, out) {
     }
   }
 }
+async function listFilesRecursive(root) {
+  const out = [];
+  async function walk(current, relPrefix) {
+    const entries = await readdir3(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const rel = relPrefix ? `${relPrefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) {
+        await walk(join3(current, entry.name), rel);
+      } else if (entry.isFile()) {
+        out.push(rel);
+      }
+    }
+  }
+  if (!existsSync5(root)) return out;
+  await walk(root, "");
+  return out;
+}
+async function pruneEmptyDirs(root) {
+  if (!existsSync5(root)) return;
+  const entries = await readdir3(root, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      await pruneEmptyDirs(join3(root, entry.name));
+    }
+  }
+  const remaining = await readdir3(root);
+  if (remaining.length === 0) {
+    await rm2(root, { recursive: true, force: true });
+  }
+}
+async function findObsoleteAppFiles(destDir, sharedDir) {
+  const obsolete = [];
+  for (const managedPath of AMPLESS_MANAGED_APP_PATHS) {
+    const userPath = join3(destDir, managedPath);
+    if (!existsSync5(userPath)) continue;
+    const templatePath2 = join3(sharedDir, managedPath);
+    const templateFiles = new Set(await listFilesRecursive(templatePath2));
+    const userFiles = await listFilesRecursive(userPath);
+    for (const f of userFiles) {
+      if (!templateFiles.has(f)) {
+        obsolete.push(`${managedPath}/${f}`);
+      }
+    }
+  }
+  return obsolete;
+}
+async function removeObsoleteAppFiles(destDir, paths) {
+  for (const rel of paths) {
+    const abs = join3(destDir, rel);
+    if (existsSync5(abs)) {
+      await rm2(abs, { force: true });
+    }
+  }
+  for (const managedPath of AMPLESS_MANAGED_APP_PATHS) {
+    await pruneEmptyDirs(join3(destDir, managedPath));
+  }
+}
 function substituteVars(content, vars) {
   return content.replace(/\{\{(\w+)\}\}/g, (_, key) => vars[key] ?? `{{${key}}}`);
 }
@@ -1935,6 +2000,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
   const shippedThemes = themeSyncEnabled ? await listShippedThemes(templatesRoot) : [];
   const existingThemes = themeSyncEnabled ? await discoverInstalledThemes(destDir) : [];
   const preservedThemes = existingThemes.filter((t) => !shippedThemes.includes(t));
+  const obsoleteFiles = await findObsoleteAppFiles(destDir, sharedDir);
   log3.info(
     `replace: ${pc3.green(`\u8FFD\u52A0 ${replaceNew.length}`)} / ${pc3.yellow(`\u66F4\u65B0 ${replaceUpdate.length}`)}`
   );
@@ -1949,6 +2015,9 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
       `themes:  ${pc3.cyan(`\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30DE\u3092\u540C\u671F: ${shippedThemes.length}`)} / ${pc3.dim(`\u30AB\u30B9\u30BF\u30E0\u30C6\u30FC\u30DE (my-*) \u3092\u4FDD\u6301: ${preservedThemes.length}`)}`
     );
   }
+  if (obsoleteFiles.length > 0) {
+    log3.info(`cleanup: ${pc3.yellow(`\u524A\u9664 ${obsoleteFiles.length}`)} (ampless-managed app/ \u914D\u4E0B\u3067\u30C6\u30F3\u30D7\u30EC\u306B\u7121\u3044\u30D5\u30A1\u30A4\u30EB)`);
+  }
   log3.info(`protected: ${pc3.dim(`\u30C6\u30F3\u30D7\u30EC\u306B\u5B58\u5728\u3059\u308B\u304C\u89E6\u3089\u306A\u3044: ${classification.protected.length} \u500B`)}`);
   if (opts.dryRun) {
     return {
@@ -1958,7 +2027,8 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
       protected: classification.protected,
       themesSynced: shippedThemes,
       themesPreserved: preservedThemes,
-      packageJsonMerged: false
+      packageJsonMerged: false,
+      obsoleteRemoved: obsoleteFiles
     };
   }
   for (const rel of classification.replace) {
@@ -1972,6 +2042,7 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     await copyWithSubstitution(src, dst, vars);
   }
   const themeResult = themeSyncEnabled ? await syncThemes(destDir, templatesRoot) : { synced: [], preserved: [] };
+  await removeObsoleteAppFiles(destDir, obsoleteFiles);
   const templatePkgRaw = await readFile3(join3(sharedDir, "package.json"), "utf-8");
   const templatePkg = JSON.parse(templatePkgRaw);
   const indent = detectIndent(projectPkgRaw);
@@ -2011,7 +2082,8 @@ async function runUpgradeIn(destDir, sharedDir, opts = {}) {
     protected: classification.protected,
     themesSynced: themeResult.synced,
     themesPreserved: themeResult.preserved,
-    packageJsonMerged: true
+    packageJsonMerged: true,
+    obsoleteRemoved: obsoleteFiles
   };
 }
 async function runUpgrade(args) {

package/dist/templates/_shared/AGENTS.ja.md

@@ -60,9 +60,7 @@
 
 エージェントが投稿コンテンツを直接クエリ・編集できる。公開ツール: `list_posts`、`get_post`、`create_post`、`update_post`、`delete_post`、`upload_media`、`get_schema`。
 
-登録方法は 2 つ:
-
-**ローカル stdio（Claude Code / Cursor 向け、推奨）:**
+登録方法:
 
 プロジェクトルートの `.mcp.json` に追加する:
 ```json
@@ -80,8 +78,6 @@
 }
 ```
 
-**管理者発行トークンによる HTTP**（ホスト型エージェント向け）: `/admin/mcp-tokens` で Bearer トークンを発行し、エージェントクライアントを公開 MCP HTTP エンドポイントに向ける。エンドポイント URL は管理 UI で確認できる。
-
 投稿本文は `markdown`、`html`、`tiptap`（JSON ドキュメント）の 3 フォーマットに対応している。
 
 ## 動作確認の基準

package/dist/templates/_shared/AGENTS.md

@@ -60,9 +60,7 @@ This file is written for AI coding agents (Claude Code, Cursor, Codex, etc.). Fo
 
 Lets agents query and modify post content directly. Tools exposed: `list_posts`, `get_post`, `create_post`, `update_post`, `delete_post`, `upload_media`, `get_schema`.
 
-Two registration options:
-
-**Local stdio (recommended for Claude Code / Cursor):**
+Registration:
 
 Add to `.mcp.json` at the project root:
 ```json
@@ -80,8 +78,6 @@ Add to `.mcp.json` at the project root:
 }
 ```
 
-**HTTP via admin-issued token** (for hosted agents): issue a Bearer token at `/admin/mcp-tokens` and point the agent client at the public MCP HTTP endpoint. See the admin UI for the exact endpoint URL.
-
 Post bodies accept three formats: `markdown`, `html`, or `tiptap` (JSON document).
 
 ## Verification expectations

package/dist/templates/_shared/README.ja.md

@@ -137,8 +137,6 @@ export default defineConfig({
 | 変数 | 利用箇所 |
 | --- | --- |
 | `WEBHOOK_SECRET` | `@ampless/plugin-webhook` の HMAC 署名 |
-| `AMPLESS_MCP_SERVICE_EMAIL` | HTTP MCP サービスユーザーのメール — `/api/mcp` を有効化するのに必須 |
-| `AMPLESS_MCP_SERVICE_PASSWORD` | HTTP MCP サービスユーザーのパスワード |
 
 env 変数追加 / 変更後は再デプロイをトリガーしてください。
 
@@ -157,7 +155,6 @@ ampless は 1 つの Amplify Hosting デプロイで複数のサイトを配信
 ampless は MCP（Model Context Protocol）サーバーを同梱しているので、Claude Desktop / Cursor / Claude Code など MCP に対応した AI クライアントから投稿の読み書きができます。
 
 - **ローカル / sandbox** — グローバルに 1 度入れる: `npx -y @ampless/mcp-server@alpha` に `amplify_outputs.json` のパスを渡す
-- **本番（HTTP）** — `/admin/mcp-tokens` で Bearer トークンを発行し、MCP クライアントを `https://<your-domain>/api/mcp` に向ける。フルセットアップ: [docs/mcp-http-setup.ja.md](https://github.com/heavymoons/ampless/blob/main/docs/mcp-http-setup.ja.md) ([English](https://github.com/heavymoons/ampless/blob/main/docs/mcp-http-setup.md))
 
 ## ampless の更新
 

package/dist/templates/_shared/README.md

@@ -137,8 +137,6 @@ Set per-environment values in **Amplify Hosting console → Hosting → Environm
 | Variable | Used by |
 | --- | --- |
 | `WEBHOOK_SECRET` | `@ampless/plugin-webhook` HMAC signing |
-| `AMPLESS_MCP_SERVICE_EMAIL` | HTTP MCP service-user email — required to enable `/api/mcp` |
-| `AMPLESS_MCP_SERVICE_PASSWORD` | HTTP MCP service-user password |
 
 Trigger a redeploy after adding/changing env vars.
 
@@ -157,7 +155,6 @@ There's a caching trade-off in multi-site mode; details in [RUNBOOK.md → Multi
 ampless ships an MCP (Model Context Protocol) server so Claude Desktop / Cursor / Claude Code / anything that speaks MCP can read and write your posts.
 
 - **Local / sandbox** — install once globally: `npx -y @ampless/mcp-server@alpha` with the path to your `amplify_outputs.json`.
-- **Production (HTTP)** — issue a Bearer token at `/admin/mcp-tokens` and point your MCP client at `https://<your-domain>/api/mcp`. Full setup: [docs/mcp-http-setup.md](https://github.com/heavymoons/ampless/blob/main/docs/mcp-http-setup.md) ([日本語](https://github.com/heavymoons/ampless/blob/main/docs/mcp-http-setup.ja.md)).
 
 ## Updating ampless
 

package/dist/templates/_shared/amplify/backend.ts

@@ -8,6 +8,7 @@ import { eventDispatcher } from './events/dispatcher/resource.js'
 import { processorTrusted } from './events/processor-trusted/resource.js'
 import { processorUntrusted } from './events/processor-untrusted/resource.js'
 import { apiKeyRenewer } from './functions/api-key-renewer/resource.js'
+import { mcpHandler } from './functions/mcp-handler/resource.js'
 import { userAdmin } from './functions/user-admin/resource.js'
 import { customizeBackend } from './backend.custom.js'
 
@@ -27,6 +28,7 @@ const backend = defineAmplessBackend({
   processorTrusted,
   processorUntrusted,
   apiKeyRenewer,
+  mcpHandler,
   userAdmin,
 })
 

package/dist/templates/_shared/amplify/functions/mcp-handler/handler.ts

@@ -0,0 +1 @@
+export { handler } from '@ampless/backend/functions/mcp-handler'

package/dist/templates/_shared/amplify/functions/mcp-handler/resource.ts

@@ -0,0 +1,11 @@
+import { defineFunction } from '@aws-amplify/backend'
+
+export const mcpHandler = defineFunction({
+  name: 'mcp-handler',
+  entry: './handler.ts',
+  // Co-locate with the data stack so the function has the KvStore
+  // table ARN available without cross-stack references at synth time.
+  resourceGroupName: 'data',
+  memoryMB: 512,
+  timeoutSeconds: 30,
+})

package/dist/templates/_shared/package.json

@@ -26,8 +26,8 @@
     "@ampless/plugin-rss": "^0.2.0-alpha.6",
     "@ampless/plugin-seo": "^0.2.0-alpha.6",
     "@ampless/plugin-webhook": "^0.2.0-alpha.6",
-    "@ampless/admin": "^0.2.0-alpha.18",
-    "@ampless/backend": "^0.2.0-alpha.8",
+    "@ampless/admin": "^0.2.0-alpha.19",
+    "@ampless/backend": "^0.2.0-alpha.9",
     "@ampless/runtime": "^0.2.0-alpha.9",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",
     "ampless": "^0.2.0-alpha.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "0.2.0-alpha.20",
+  "version": "0.2.0-alpha.22",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",

package/dist/templates/_shared/app/api/admin/mcp-tokens/route.ts

@@ -1,6 +0,0 @@
-import { admin } from '@/lib/admin'
-import { createMcpTokensRoute } from '@ampless/admin/api'
-
-export const dynamic = 'force-dynamic'
-export const runtime = 'nodejs'
-export const { GET, POST, DELETE } = createMcpTokensRoute(admin)

package/dist/templates/_shared/app/api/mcp/route.ts

@@ -1,9 +0,0 @@
-import { admin } from '@/lib/admin'
-import { createMcpRoute } from '@ampless/admin/api'
-
-// `force-dynamic` keeps CloudFront from caching MCP responses. Each
-// tool call must hit the SSR Lambda — caching would serve stale or
-// cross-token responses.
-export const dynamic = 'force-dynamic'
-export const runtime = 'nodejs'
-export const { POST } = createMcpRoute(admin)