friday-mcp-v2 3.0.5 → 3.0.7

package/dist/mcp-server.js

@@ -942,6 +942,20 @@ function resolveRefFromState(snapshotId, ref, mode, sessionId, postId, currentSt
             (c.parentIndex ?? null) === snapBlock.parentIndex
         );
         if (refined.length === 1) return refined[0].index;
+
+        // 5b-2. ordinal（出現順序）で特定
+        if (refined.length > 1) {
+            const sameInSnapshot = snap.blocks.filter(b =>
+                b.fingerprint === snapBlock.fingerprint &&
+                (b.depth || 0) === snapBlock.depth &&
+                (b.parentIndex ?? null) === snapBlock.parentIndex
+            );
+            const ordinal = sameInSnapshot.findIndex(b => b.ref === ref);
+            if (ordinal >= 0 && ordinal < refined.length) {
+                return refined[ordinal].index;
+            }
+        }
+
         throw new Error(
             `ref "${ref}" (type: ${snapBlock.type}) の解決先が ${refined.length > 0 ? refined.length : candidates.length} 件見つかりました。` +
             `一意に特定できません。Re-fetch via get_article_structure.`
@@ -2042,7 +2056,7 @@ const tools = [
     },
     {
         name: "select_block",
-        description: "Select block(s). Index is 0-based flattened.",
+        description: "Select block(s) by ref, section, blockType, or contains.",
         inputSchema: {
             type: "object",
             properties: {
@@ -2237,6 +2251,10 @@ const tools = [
                 postId: postIdParam,
                 site: siteParam,
                 target: targetSchema,
+                snapshotId: {
+                    type: "string",
+                    description: "Snapshot ID (from get_article_structure or any write response). Required when using ref/refs in target.",
+                },
             },
             required: ["target"],
         },
@@ -2581,7 +2599,7 @@ async function handleUpdateBlocksTool(args, toolName) {
     // Headless モードで target: "selected" はエラー
     if (mode === 'headless' && target === 'selected') {
         return {
-            content: [{ type: "text", text: "❌ target:'selected' はエディタ接続時のみ使用可能です。index を指定してください。" }],
+            content: [{ type: "text", text: "❌ target:'selected' はエディタ接続時のみ使用可能です。ref+snapshotId, section, blockType, contains 等を指定してください。" }],
             isError: true,
         };
     }
@@ -2592,7 +2610,7 @@ async function handleUpdateBlocksTool(args, toolName) {
         (headingLevel && headingContains);
     if (!hasTarget && !(appendToEnd && insertOnly)) {
         return {
-            content: [{ type: "text", text: "❌ ターゲットが指定されていません。\ntarget, index, indices, section, blockType, contains 等のいずれかを指定してください。" }],
+            content: [{ type: "text", text: "❌ ターゲットが指定されていません。\nref+snapshotId, section, blockType, contains 等のいずれかを指定してください。" }],
             isError: true,
         };
     }
@@ -3315,7 +3333,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     // BUG-3: select_block では selected は使用不可
                     if (tp.target === "selected") {
                         return {
-                            content: [{ type: "text", text: "❌ select_block では selected は使用できません。index, blockType, range 等を指定してください。" }],
+                            content: [{ type: "text", text: "❌ select_block では selected は使用できません。ref+snapshotId, blockType, contains 等を指定してください。" }],
                             isError: true,
                         };
                     }
@@ -3328,7 +3346,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         (headingLevel && headingContains);
                     if (!hasTarget) {
                         return {
-                            content: [{ type: "text", text: "❌ ターゲットが指定されていません。index, blockType, range, heading, contains 等のいずれかを指定してください。" }],
+                            content: [{ type: "text", text: "❌ ターゲットが指定されていません。ref+snapshotId, blockType, heading, contains 等のいずれかを指定してください。" }],
                             isError: true,
                         };
                     }
@@ -3927,7 +3945,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
 
             case "get_block_html": {
-                let { mode, postId: _postId, sessionId: _sessionId, message, client } = await resolveMode(args, name);
+                let { mode, postId: _postId, sessionId: _sessionId, message, client, siteName } = await resolveMode(args, name);
                 if (mode === 'error') {
                     return errorResponse(name, message, args?.site);
                 }
@@ -3935,16 +3953,35 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 if (_resolved.error) return { content: [{ type: "text", text: _resolved.error }], isError: true };
                 if (_resolved.editorConnected) mode = 'editor';
                 const postId = _resolved.postId ?? _postId;
+                const _siteName = siteName || args?.site || 'default';
 
                 let tp;
                 try { tp = normalizeTarget(args?.target); }
                 catch (e) { return { content: [{ type: "text", text: `❌ ${e.message}` }], isError: true }; }
 
+                // ref 解決（snapshotId + ref → index に変換）
+                const resolved = await resolveRefsAndCheckRevision({
+                    snapshotId: args?.snapshotId,
+                    ref: tp._ref,
+                    refs: tp._refs,
+                    expectedRevision: args?.expectedRevision,
+                    mode, client, postId, sessionId: _sessionId, siteName: _siteName,
+                });
+                if (resolved.error) return resolved.error;
+                if (resolved.index !== undefined) {
+                    tp.index = resolved.index;
+                    delete tp._ref;
+                }
+                if (resolved.indices !== undefined) {
+                    tp.indices = resolved.indices;
+                    delete tp._refs;
+                }
+
                 const { target, index, indices, startIndex, endIndex, section, blockType, typeIndex, contains, headingLevel, headingContains } = tp;
 
                 if (mode === 'headless' && target === 'selected') {
                     return {
-                        content: [{ type: "text", text: "❌ target:'selected' はエディタ接続時のみ使用可能です。index を指定してください。" }],
+                        content: [{ type: "text", text: "❌ target:'selected' はエディタ接続時のみ使用可能です。ref+snapshotId, section, blockType, contains 等を指定してください。" }],
                         isError: true,
                     };
                 }
@@ -3954,7 +3991,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     (headingLevel && headingContains);
                 if (!hasTarget) {
                     return {
-                        content: [{ type: "text", text: "❌ ターゲットが指定されていません。\ntarget, index, indices, section, blockType, contains 等のいずれかを指定してください。" }],
+                        content: [{ type: "text", text: "❌ ターゲットが指定されていません。\nref+snapshotId, section, blockType, contains 等のいずれかを指定してください。" }],
                         isError: true,
                     };
                 }

package/package.json

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