friday-mcp-v2 2.0.5 → 2.0.6

package/dist/mcp-server.js

@@ -31,24 +31,34 @@ async function resolveMode(args) {
     }
 
     try {
-        const status = await client.getStatus();
+        const requestedPostId = args?.postId ? Number(args.postId) : null;
+        const status = await client.getStatus(requestedPostId);
+
         if (status.editorConnected && status.postId) {
-            const argPostId = args?.postId;
-            if (argPostId && argPostId !== status.postId) {
-                return { mode: 'headless', postId: argPostId, client };
+            if (requestedPostId) {
+                if (requestedPostId === Number(status.postId) || status.checkedEditorConnected) {
+                    return {
+                        mode: 'error',
+                        message: `postId ${requestedPostId} はエディタで開かれています。postId を省略してエディタ経由で操作するか、エディタを閉じてから Headless モードを使用してください。`
+                    };
+                }
+                return { mode: 'headless', postId: requestedPostId, client };
             }
             return { mode: 'editor', postId: status.postId, client };
         }
-        const postId = args?.postId;
-        if (!postId) {
+
+        if (requestedPostId && status.checkedEditorConnected) {
+            return {
+                mode: 'error',
+                message: `postId ${requestedPostId} はエディタで開かれています。postId を省略してエディタ経由で操作するか、エディタを閉じてから Headless モードを使用してください。`
+            };
+        }
+
+        if (!requestedPostId) {
             return { mode: 'error', message: 'エディタ未接続です。postId を指定して Headless モードを使用してください。' };
         }
-        return { mode: 'headless', postId, client };
+        return { mode: 'headless', postId: requestedPostId, client };
     } catch (e) {
-        const postId = args?.postId;
-        if (postId) {
-            return { mode: 'headless', postId, client };
-        }
         return { mode: 'error', message: `接続エラー: ${e.message}` };
     }
 }
@@ -339,18 +349,16 @@ const tools = [
     },
     {
         name: "insert_block",
-        description: "Insert a new block at the specified position. If index is omitted, inserts at the end.",
+        description: "Insert Gutenberg HTML at the specified position. If index is omitted, appends to end.",
         inputSchema: {
             type: "object",
             properties: {
                 postId: postIdParam,
                 site: siteParam,
-                blockType: { type: "string", description: "Block type (e.g. core/paragraph, core/heading, core/list)" },
-                content: { type: "string", description: "Block content (HTML or plain text depending on block type)" },
+                rawHTML: { type: "string", description: "Gutenberg markup HTML to insert (e.g. '<!-- wp:paragraph -->\\n<p>text</p>\\n<!-- /wp:paragraph -->')." },
                 index: { type: "number", description: "Insert position (0-based flattened index). If omitted, appends to end." },
-                blocks: { type: "array", items: { type: "object", properties: { blockType: { type: "string" }, content: { type: "string" } }, required: ["blockType", "content"] }, description: "Multiple blocks to insert. Cannot be used with blockType/content." },
-                rawHTML: { type: "string", description: "Gutenberg markup HTML to insert directly. Cannot be used with blockType/content or blocks." },
             },
+            required: ["rawHTML"],
         },
     },
     {
@@ -1394,67 +1402,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
             case "insert_block": {
                 const { mode, postId, message, client } = await resolveMode(args);
-                if (mode === 'error') {
-                    return errorResponse(name, message, args?.site);
-                }
+                if (mode === 'error') return errorResponse(name, message, args?.site);
 
-                const { blockType, content, index, blocks, rawHTML } = args;
-
-                // 排他バリデーション
-                const hasLegacy = blockType !== undefined || content !== undefined;
-                const hasBlocks = blocks !== undefined;
-                const hasRawHTML = rawHTML !== undefined;
-                const modeCount = [hasLegacy, hasBlocks, hasRawHTML].filter(Boolean).length;
-                if (modeCount === 0) {
-                    return { content: [{ type: "text", text: "❌ blockType+content、blocks、rawHTML のいずれかを指定してください。" }], isError: true };
-                }
-                if (modeCount > 1) {
-                    return { content: [{ type: "text", text: "❌ blockType+content、blocks、rawHTML は同時に指定できません。" }], isError: true };
-                }
-
-                // 複数挿入モード (blocks / rawHTML)
-                if (hasBlocks || hasRawHTML) {
-                    if (hasBlocks && (!Array.isArray(blocks) || blocks.length === 0)) {
-                        return { content: [{ type: "text", text: "❌ blocks は1つ以上の要素を含む配列で指定してください。" }], isError: true };
-                    }
-
-                    if (mode === 'headless') {
-                        const params = { index };
-                        if (hasBlocks) params.blocks = blocks;
-                        if (hasRawHTML) params.rawHTML = rawHTML;
-                        const result = await client.headlessInsert(postId, params);
-                        const count = result.insertedIndices ? result.insertedIndices.length : result.count || 1;
-                        return { content: [{ type: "text", text: `✅ ${count}ブロック挿入 at ${index ?? 'end'}` }] };
-                    }
-
-                    const cmdParams = { index };
-                    if (hasBlocks) cmdParams.blocks = blocks;
-                    if (hasRawHTML) cmdParams.rawHTML = rawHTML;
-                    const result = await client.sendEditorCommand("insert_block", cmdParams);
-                    if (!result)
-                        return timeoutResponse(name, client, args?.site);
-                    if (!result.success)
-                        return errorResponse(name, result.error, args?.site);
-                    const count = result.insertedCount || result.inserted?.length || 1;
-                    return { content: [{ type: "text", text: `✅ ${count}ブロック挿入 at ${index ?? 'end'}` }] };
-                }
-
-                // 既存モード（単一 blockType + content）
-                if (!blockType || content === undefined) {
-                    return { content: [{ type: "text", text: "❌ blockType と content は必須です" }], isError: true };
+                const { rawHTML, index } = args;
+                if (!rawHTML) {
+                    return { content: [{ type: "text", text: "❌ rawHTML を指定してください。Gutenberg HTML 形式のブロックマークアップが必要です。" }], isError: true };
                 }
 
                 if (mode === 'headless') {
-                    const result = await client.headlessInsert(postId, { blockType, content, index });
-                    return { content: [{ type: "text", text: `✅ ブロック挿入: ${blockType} at ${result.newIndex}` }] };
+                    const result = await client.headlessInsert(postId, { rawHTML, index });
+                    const count = result.insertedIndices ? result.insertedIndices.length : result.count || 1;
+                    return { content: [{ type: "text", text: `✅ ${count}ブロック挿入 at ${index ?? 'end'}` }] };
                 }
 
-                const result = await client.sendEditorCommand("insert_block", { blockType, content, index });
-                if (!result)
-                    return timeoutResponse(name, client, args?.site);
-                if (!result.success)
-                    return errorResponse(name, result.error, args?.site);
-                return { content: [{ type: "text", text: `✅ ブロック挿入: ${result.inserted.type} at ${result.inserted.index}` }] };
+                const result = await client.sendEditorCommand("insert_block", { rawHTML, index });
+                if (!result) return timeoutResponse(name, client, args?.site);
+                if (!result.success) return errorResponse(name, result.error, args?.site);
+                const count = result.insertedCount || result.inserted?.length || 1;
+                return { content: [{ type: "text", text: `✅ ${count}ブロック挿入 at ${index ?? 'end'}` }] };
             }
 
             case "get_block_html": {

package/dist/wordpress-api.js

@@ -53,8 +53,11 @@ export class FridayWPClient {
     // Status
     // ========================================
 
-    async getStatus() {
-        return this.request('/status');
+    async getStatus(checkPostId) {
+        const endpoint = checkPostId
+            ? `/status?checkPostId=${checkPostId}`
+            : '/status';
+        return this.request(endpoint);
     }
 
     // ========================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "friday-mcp-v2",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "WordPress MCP Server for Claude Code - REST API direct communication",
   "type": "module",
   "main": "dist/mcp-server.js",