friday-mcp-v2 3.0.4 → 3.0.6

package/dist/mcp-server.js

@@ -249,7 +249,7 @@ function checkRevisionMismatch(expectedRevision, currentState, mode, postId, ses
         : '';
     const text = `❌ REVISION_MISMATCH: expected ${expectedRevision}, actual ${currentRevision}` +
                  snapshotLine +
-                 `\n→ get_article_structure で最新を取得してください`;
+                 `\n→ Re-fetch via get_article_structure.`;
     return { content: [{ type: "text", text }], isError: true };
 }
 
@@ -729,24 +729,6 @@ const targetSchema = {
             type: "boolean",
             description: "Target user-selected block. Editor mode only.",
         },
-        index: {
-            type: "number",
-            description: "Block index (0-based, flattened).",
-        },
-        indices: {
-            type: "array",
-            items: { type: "number" },
-            description: "Multiple indices (0-based).",
-        },
-        range: {
-            type: "object",
-            properties: {
-                start: { type: "number", description: "Start (inclusive)." },
-                end: { type: "number", description: "End (inclusive)." },
-            },
-            required: ["start", "end"],
-            description: "Index range.",
-        },
         section: {
             type: "string",
             description: "Section by heading text (partial match).",
@@ -782,7 +764,7 @@ const targetSchema = {
             description: "Multiple block refs from snapshot. Requires snapshotId.",
         },
     },
-    description: "Target: one of selected/index/indices/range/heading/ref/refs + optional filters.",
+    description: "Target: one of selected/ref/refs/heading/section/blockType + optional filters (contains/nth). Requires snapshotId when using ref/refs.",
 };
 
 const targetSchemaNoSelected = {
@@ -790,7 +772,7 @@ const targetSchemaNoSelected = {
     properties: { ...targetSchema.properties },
 };
 delete targetSchemaNoSelected.properties.selected;
-targetSchemaNoSelected.description = "Target: one of index/range/heading + optional filters.";
+targetSchemaNoSelected.description = "Target: one of ref/refs/heading/section/blockType + optional filters (contains/nth). Requires snapshotId when using ref/refs.";
 
 const insertSchema = {
     type: "object",
@@ -815,9 +797,6 @@ function normalizeTarget(target) {
     // --- 排他バリデーション ---
     const primaries = [
         target.selected && 'selected',
-        target.index !== undefined && 'index',
-        target.indices && 'indices',
-        target.range && 'range',
         target.heading && 'heading',
         target.ref && 'ref',
         target.refs && 'refs',
@@ -830,19 +809,6 @@ function normalizeTarget(target) {
     if (target.ref) result._ref = target.ref;
     if (target.refs) result._refs = target.refs;
     if (target.selected) result.target = "selected";
-    if (target.index !== undefined) result.index = target.index;
-    if (target.indices) result.indices = target.indices;
-    if (target.range) {
-        const s = target.range.start;
-        const e = target.range.end;
-        if (s === undefined || s === null || e === undefined || e === null ||
-            typeof s !== "number" || typeof e !== "number" ||
-            !Number.isInteger(s) || !Number.isInteger(e) || s < 0 || e < 0) {
-            throw new Error("range.start と range.end は 0 以上の整数で両方指定してください。");
-        }
-        result.startIndex = s;
-        result.endIndex = e;
-    }
     if (target.section) result.section = target.section;
     if (target.blockType) result.blockType = target.blockType;
     if (target.nth !== undefined) result.typeIndex = target.nth;
@@ -931,15 +897,15 @@ function resolveRefFromState(snapshotId, ref, mode, sessionId, postId, currentSt
     // 1. snapshot 取得
     const snap = snapshotCache.get(snapshotId);
     if (!snap) {
-        throw new Error(`snapshot "${snapshotId}" が見つかりません（期限切れまたは無効）。get_article_structure を再取得してください。`);
+        throw new Error(`snapshot "${snapshotId}" が見つかりません（期限切れまたは無効）。Re-fetch via get_article_structure.`);
     }
 
     // 2. 状態ソース束縛チェック
     if (snap.mode !== mode) {
-        throw new Error(`snapshot は ${snap.mode} モードで取得されましたが、現在は ${mode} モードです。get_article_structure を再取得してください。`);
+        throw new Error(`snapshot は ${snap.mode} モードで取得されましたが、現在は ${mode} モードです。Re-fetch via get_article_structure.`);
     }
     if (mode === 'editor' && snap.sessionId && sessionId && snap.sessionId !== sessionId) {
-        throw new Error(`snapshot は sessionId "${snap.sessionId}" で取得されましたが、現在の sessionId は "${sessionId}" です。get_article_structure を再取得してください。`);
+        throw new Error(`snapshot は sessionId "${snap.sessionId}" で取得されましたが、現在の sessionId は "${sessionId}" です。Re-fetch via get_article_structure.`);
     }
     if (snap.postId !== postId) {
         throw new Error(`snapshot は postId ${snap.postId} 用ですが、postId ${postId} に対して使用されています。`);
@@ -976,16 +942,30 @@ 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} 件見つかりました。` +
-            `一意に特定できません。get_article_structure を再取得してください。`
+            `一意に特定できません。Re-fetch via get_article_structure.`
         );
     }
 
     // 5c. 一致 0件 → エラー
     throw new Error(
         `ref "${ref}" (${snapBlock.type}, fingerprint: ${snapBlock.fingerprint}) に一致するブロックが見つかりません。` +
-        `構造が大幅に変更された可能性があります。get_article_structure を再取得してください。`
+        `構造が大幅に変更された可能性があります。Re-fetch via get_article_structure.`
     );
 }
 
@@ -1033,7 +1013,7 @@ async function resolveRefsAndCheckRevision({
         if (!snapshotId) {
             if (_debug) console.error(`[SNAPSHOT] resolveRefs: ref指定あり but snapshotId missing → error`);
             return { error: {
-                content: [{ type: "text", text: "❌ ref/refs を使用するには snapshotId が必要です。get_article_structure で取得してください。" }],
+                content: [{ type: "text", text: "❌ snapshotId required for ref/refs. Get it from get_article_structure or any prior write response." }],
                 isError: true,
             }};
         }
@@ -1365,13 +1345,13 @@ function appendRefChangesToText(text, changeInfo) {
                 .join(', ');
             break;
         case 'updated':
-            out += `\nupdated: [${changeInfo.updatedRefs.join(', ')}] (use new snapshot)`;
+            out += `\nupdated: [${changeInfo.updatedRefs.join(', ')}] (reuse this snapshotId for next operation)`;
             break;
         case 'expanded':
             out += `\nexpanded: ${changeInfo.expanded.oldRef} \u2192 [${changeInfo.expanded.newRefs.join(', ')}]`;
             break;
         case 'duplicated':
-            out += `\nduplicated: ${changeInfo.sourceRef} \u2192 ${changeInfo.newRef} (source:[${changeInfo.sourceIndex}], new:[${changeInfo.newIndex}]) (use new snapshot)`;
+            out += `\nduplicated: ${changeInfo.sourceRef} \u2192 ${changeInfo.newRef} (source:[${changeInfo.sourceIndex}], new:[${changeInfo.newIndex}]) (reuse this snapshotId for next operation)`;
             break;
     }
 
@@ -2089,40 +2069,33 @@ const tools = [
     },
     {
         name: "delete_block",
-        description: "Delete block(s) by index, ref, or selection.",
+        description: "Delete block(s) by ref or selection.",
         inputSchema: {
             type: "object",
             properties: {
                 postId: postIdParam,
                 site: siteParam,
-                index: { type: "number", description: "Index (0-based). Omit for selected." },
-                count: { type: "number", description: "Consecutive count (default: 1)" },
-                indices: { type: "array", items: { type: "number" }, description: "Multiple indices (exclusive with index/count)" },
-                snapshotId: { type: "string", description: "Snapshot ID from get_article_structure. Required when using ref/refs." },
-                ref: { type: "string", description: "Block ref from snapshot (exclusive with index/indices)." },
-                refs: { type: "array", items: { type: "string" }, description: "Multiple block refs (exclusive with index/indices)." },
+                snapshotId: { type: "string", description: "Snapshot ID (from get_article_structure or any write response). Required." },
+                ref: { type: "string", description: "Block ref from snapshot." },
+                refs: { type: "array", items: { type: "string" }, description: "Multiple block refs from snapshot." },
                 expectedRevision: { type: "string", description: "Revision from snapshot. Rejects if structure changed." },
             },
         },
     },
     {
         name: "move_block",
-        description: "Move block(s). Use from/to (top-level), fromFlat/toFlat (nested), or fromRef+beforeRef/afterRef (ref-based).",
+        description: "Move block(s). Use fromRef + beforeRef or afterRef. Requires snapshotId.",
         inputSchema: {
             type: "object",
             properties: {
                 postId: postIdParam,
                 site: siteParam,
-                from: { type: "number", description: "Source top-level index" },
-                to: { type: "number", description: "Target position" },
-                fromFlat: { type: "number", description: "Source flattened index" },
-                toFlat: { type: "number", description: "Target flattened position" },
                 count: { type: "integer", description: "Consecutive count (default: 1)" },
-                snapshotId: { type: "string", description: "Snapshot ID from get_article_structure. Required when using ref." },
+                snapshotId: { type: "string", description: "Snapshot ID (from get_article_structure or any write response). Required." },
                 expectedRevision: { type: "string", description: "Revision from snapshot. Rejects if structure changed." },
-                fromRef: { type: "string", description: "Source block ref (exclusive with from/fromFlat)." },
-                beforeRef: { type: "string", description: "Move before this ref (exclusive with to/toFlat/afterRef)." },
-                afterRef: { type: "string", description: "Move after this ref (exclusive with to/toFlat/beforeRef)." },
+                fromRef: { type: "string", description: "Source block ref." },
+                beforeRef: { type: "string", description: "Move before this ref (exclusive with afterRef)." },
+                afterRef: { type: "string", description: "Move after this ref (exclusive with beforeRef)." },
             },
         },
     },
@@ -2152,15 +2125,14 @@ const tools = [
     },
     {
         name: "duplicate_block",
-        description: "Duplicate block by index, ref, or selection.",
+        description: "Duplicate block by ref or selection.",
         inputSchema: {
             type: "object",
             properties: {
                 postId: postIdParam,
                 site: siteParam,
-                index: { type: "number", description: "Index (0-based). Omit for selected." },
-                snapshotId: { type: "string", description: "Snapshot ID from get_article_structure. Required when using ref." },
-                ref: { type: "string", description: "Block ref from snapshot (exclusive with index)." },
+                snapshotId: { type: "string", description: "Snapshot ID (from get_article_structure or any write response). Required." },
+                ref: { type: "string", description: "Block ref from snapshot." },
                 expectedRevision: { type: "string", description: "Revision from snapshot. Rejects if structure changed." },
             },
         },
@@ -2244,7 +2216,7 @@ const tools = [
     },
     {
         name: "insert_block",
-        description: "Insert Gutenberg HTML. Omit index to append. Use beforeRef/afterRef for ref-based positioning.",
+        description: "Insert Gutenberg HTML. Use beforeRef/afterRef for positioning. Omit both to append to end.",
         inputSchema: {
             type: "object",
             properties: {
@@ -2252,12 +2224,10 @@ const tools = [
                 site: siteParam,
                 rawHTML: { type: "string", description: "HTML to insert (exclusive with filePath)" },
                 filePath: { type: "string", description: "Local file path (exclusive with rawHTML)" },
-                index: { type: "number", description: "Position (0-based). Omit to append." },
-                position: { type: "string", enum: ["before", "after"], description: "Insert relative to index: 'before' (default) or 'after'. Requires index." },
-                snapshotId: { type: "string", description: "Snapshot ID. Required when using beforeRef/afterRef." },
+                snapshotId: { type: "string", description: "Snapshot ID (from get_article_structure or any write response). Required when using beforeRef/afterRef. Omit to append to end." },
                 expectedRevision: { type: "string", description: "Revision from snapshot. Rejects if structure changed." },
-                beforeRef: { type: "string", description: "Insert before this ref (exclusive with index)." },
-                afterRef: { type: "string", description: "Insert after this ref (exclusive with index)." },
+                beforeRef: { type: "string", description: "Insert before this ref." },
+                afterRef: { type: "string", description: "Insert after this ref." },
             },
         },
     },
@@ -2281,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"],
         },
@@ -2295,7 +2269,7 @@ const tools = [
                 site: siteParam,
                 snapshotId: {
                     type: "string",
-                    description: "Snapshot ID from get_article_structure. Required when using ref/refs in target.",
+                    description: "Snapshot ID (from get_article_structure or any write response). Required when using ref/refs in target.",
                 },
                 expectedRevision: {
                     type: "string",
@@ -2380,16 +2354,12 @@ const tools = [
     },
     {
         name: "table_operations",
-        description: "Table operations (get/update/add/delete rows/columns/cells). Use ref+snapshotId for safe index resolution.",
+        description: "Table operations (get/update/add/delete rows/columns/cells). Requires ref+snapshotId to identify the table block.",
         inputSchema: {
             type: "object",
             properties: {
                 postId: postIdParam,
                 site: siteParam,
-                index: {
-                    type: "number",
-                    description: "Table index (0-based)",
-                },
                 action: {
                     type: "string",
                     enum: ["get_structure", "update_cell", "add_row", "delete_row", "add_column", "delete_column", "move_row", "move_column", "update_row", "update_column"],
@@ -2416,8 +2386,8 @@ const tools = [
                     items: { type: "string" },
                     description: "add_row: new cells, add_column: init values, update_row/column: replacements. Omit for empty.",
                 },
-                snapshotId: { type: "string", description: "Snapshot ID from get_article_structure. Required when using ref." },
-                ref: { type: "string", description: "Block ref from snapshot (exclusive with index)." },
+                snapshotId: { type: "string", description: "Snapshot ID (from get_article_structure or any write response). Required." },
+                ref: { type: "string", description: "Table block ref from snapshot." },
                 expectedRevision: { type: "string", description: "Revision from snapshot. Rejects if structure changed." },
             },
             required: ["action"],
@@ -2533,7 +2503,7 @@ async function handleUpdateBlocksTool(args, toolName) {
         }
         if (!snapshotId) {
             return {
-                content: [{ type: "text", text: `❌ operations には snapshotId が必要です。get_article_structure で取得してください。` }],
+                content: [{ type: "text", text: `❌ snapshotId required for operations. Get it from get_article_structure or any prior write response.` }],
                 isError: true,
             };
         }
@@ -3418,9 +3388,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     if (_guard) return _guard;
                 }
 
-                // ref/refs と index/indices 排他チェック
-                if ((args?.ref || args?.refs) && (args?.index !== undefined || args?.indices !== undefined)) {
-                    return { content: [{ type: "text", text: "❌ ref/refs と index/indices は同時に指定できません。" }], isError: true };
+                // ref または refs が必須（選択ブロック削除はeditorコマンド経由で処理）
+                if (!args?.ref && !args?.refs) {
+                    return { content: [{ type: "text", text: "❌ ref or refs required, along with snapshotId." }], isError: true };
                 }
 
                 // ref 解決 + revision チェック
@@ -3432,20 +3402,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 if (resolved.error) return resolved.error;
                 const _preState = resolved.currentState || null;  // Phase 2: 差分計算用
 
-                let { index, count, indices } = args;
-                if (resolved.index !== undefined) { index = resolved.index; count = count || 1; }
-                if (resolved.indices !== undefined) { indices = resolved.indices; }
+                let index = resolved.index;
+                let indices = resolved.indices;
+                const count = (index !== undefined) ? 1 : undefined;
 
-                // Phase 3: 入力 ref を保持（ref + count > 1 は差分化できないので Legacy）
+                // Phase 3: 入力 ref を保持
                 const _inputRefs = args?.refs ? [...new Set(args.refs)]
-                    : (args?.ref && (count || 1) <= 1) ? [args.ref]
+                    : args?.ref ? [args.ref]
                     : null;
 
-                // indices と index/count の排他バリデーション
-                if (indices !== undefined && (index !== undefined || count !== undefined)) {
-                    return { content: [{ type: "text", text: "❌ indices と index/count は同時に指定できません。" }], isError: true };
-                }
-
                 // indices モード（非連続一括削除）
                 if (indices !== undefined) {
                     if (!Array.isArray(indices) || indices.length === 0) {
@@ -3490,10 +3455,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     return { content: [{ type: "text", text: appendSnapshotToTextLegacy(_msg, _snap) }] };
                 }
 
-                // 既存モード（index + count）
+                // 単一 ref モード（ref → index 解決済み）
                 if (mode === 'headless') {
                     if (index === undefined) {
-                        return { content: [{ type: "text", text: "❌ Headless モードでは index の指定が必須です。" }], isError: true };
+                        return { content: [{ type: "text", text: "❌ ref resolution failed. Check snapshotId and ref." }], isError: true };
                     }
                     try {
                         const result = await client.headlessDelete(postId, index, count || 1);
@@ -3544,8 +3509,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     if (_guard) return _guard;
                 }
 
-                const { from, to } = args;
-                let { fromFlat, toFlat } = args;
+                let fromFlat, toFlat;
                 const count = args.count ?? 1;
 
                 // count バリデーション
@@ -3553,70 +3517,41 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     return { content: [{ type: "text", text: "❌ count は1以上の整数を指定してください。" }], isError: true };
                 }
 
-                // 3 モード排他バリデーション
-                const hasTopLevel = from !== undefined || to !== undefined;
-                const hasFlat = fromFlat !== undefined || toFlat !== undefined;
-                const hasRef = args?.fromRef !== undefined || args?.beforeRef !== undefined || args?.afterRef !== undefined;
-                const _modeCount = [hasTopLevel, hasFlat, hasRef].filter(Boolean).length;
-
-                if (_modeCount > 1) {
-                    return { content: [{ type: "text", text: "❌ from/to, fromFlat/toFlat, ref(fromRef/beforeRef/afterRef) は同時に指定できません。" }], isError: true };
+                // fromRef + beforeRef/afterRef 必須チェック
+                if (!args.fromRef) {
+                    return { content: [{ type: "text", text: "❌ fromRef is required." }], isError: true };
                 }
-                if (_modeCount === 0) {
-                    return { content: [{ type: "text", text: "❌ from/to, fromFlat/toFlat, または fromRef+beforeRef/afterRef を指定してください。" }], isError: true };
+                if (!args.beforeRef && !args.afterRef) {
+                    return { content: [{ type: "text", text: "❌ beforeRef or afterRef is required." }], isError: true };
                 }
-
-                // expectedRevision チェック（全モード共通）
-                // ref モード以外でも expectedRevision が指定されていれば revision チェックを実施
-                let _preState = null;  // Phase 2: 差分計算用
-                if (args?.expectedRevision && !hasRef) {
-                    const { currentState, error: _revError } = await acquireFreshState({
-                        expectedRevision: args.expectedRevision,
-                        mode, client, postId, sessionId: _sessionId, siteName: _siteName,
-                    });
-                    if (_revError) return _revError;
-                    _preState = currentState || null;
+                if (args.beforeRef && args.afterRef) {
+                    return { content: [{ type: "text", text: "❌ beforeRef と afterRef は同時に指定できません。" }], isError: true };
+                }
+                if (!args.snapshotId) {
+                    return { content: [{ type: "text", text: "❌ snapshotId required. Get it from get_article_structure or any prior write response." }], isError: true };
                 }
 
-                // ref モード: fromRef + beforeRef/afterRef
-                if (hasRef) {
-                    if (!args.fromRef) {
-                        return { content: [{ type: "text", text: "❌ ref モードでは fromRef が必須です。" }], isError: true };
-                    }
-                    if (!args.beforeRef && !args.afterRef) {
-                        return { content: [{ type: "text", text: "❌ ref モードでは beforeRef または afterRef が必須です。" }], isError: true };
-                    }
-                    if (args.beforeRef && args.afterRef) {
-                        return { content: [{ type: "text", text: "❌ beforeRef と afterRef は同時に指定できません。" }], isError: true };
-                    }
-                    if (!args.snapshotId) {
-                        return { content: [{ type: "text", text: "❌ ref を使用するには snapshotId が必要です。get_article_structure で取得してください。" }], isError: true };
-                    }
-
-                    // acquireFreshState で 1 回だけ state 取得 + revision チェック
-                    const { currentState, error: _stateError } = await acquireFreshState({
-                        expectedRevision: args.expectedRevision,
-                        mode, client, postId, sessionId: _sessionId, siteName: _siteName,
-                    });
-                    if (_stateError) return _stateError;
-                    _preState = currentState || null;  // Phase 2: 差分計算用
-
-                    // ref 解決（同じ currentState で 2 つの ref を解決）
-                    try {
-                        fromFlat = resolveRefFromState(args.snapshotId, args.fromRef, mode, _sessionId, postId, currentState);
-                        const destRef = args.beforeRef || args.afterRef;
-                        const resolvedDest = resolveRefFromState(args.snapshotId, destRef, mode, _sessionId, postId, currentState);
-                        // 位置計算: beforeRef → そのまま, afterRef → +1
-                        toFlat = args.beforeRef ? resolvedDest : resolvedDest + 1;
-                    } catch (e) {
-                        return { content: [{ type: "text", text: `❌ ref 解決エラー: ${e.message}` }], isError: true };
-                    }
+                // acquireFreshState で state 取得 + revision チェック
+                let _preState = null;
+                const { currentState, error: _stateError } = await acquireFreshState({
+                    expectedRevision: args.expectedRevision,
+                    mode, client, postId, sessionId: _sessionId, siteName: _siteName,
+                });
+                if (_stateError) return _stateError;
+                _preState = currentState || null;
 
-                    // ref → flat に変換完了。以降 flat モードに合流
+                // ref 解決（同じ currentState で 2 つの ref を解決）
+                try {
+                    fromFlat = resolveRefFromState(args.snapshotId, args.fromRef, mode, _sessionId, postId, currentState);
+                    const destRef = args.beforeRef || args.afterRef;
+                    const resolvedDest = resolveRefFromState(args.snapshotId, destRef, mode, _sessionId, postId, currentState);
+                    toFlat = args.beforeRef ? resolvedDest : resolvedDest + 1;
+                } catch (e) {
+                    return { content: [{ type: "text", text: `❌ ref 解決エラー: ${e.message}` }], isError: true };
                 }
 
-                // Phase 4: 入力 ref 保持（ref モード + count <= 1 のみ差分化）
-                const _inputRefs = (hasRef && count <= 1) ? [args.fromRef] : null;
+                // 入力 ref 保持（count <= 1 のみ差分化）
+                const _inputRefs = (count <= 1) ? [args.fromRef] : null;
 
                 // 移動結果のレスポンス生成ヘルパー
                 const moveMsg = (moved) => {
@@ -3628,56 +3563,21 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         : `✅ ブロック移動 (${typeLabel})${_mt_mb}`;
                 };
 
-                // fromFlat/toFlat モード（フラットインデックス移動）— ref モードもここに合流
-                if (hasFlat || hasRef) {
-                    if (fromFlat === undefined || toFlat === undefined) {
-                        return { content: [{ type: "text", text: "❌ fromFlat と toFlat の両方を指定してください。" }], isError: true };
-                    }
-                    if (fromFlat === toFlat || toFlat === fromFlat + count) {
-                        return { content: [{ type: "text", text: `✅ 移動不要（同じ位置）${_mt_mb}` }] };
-                    }
-
-                    if (mode === 'headless') {
-                        try {
-                            const result = await client.headlessMoveFlat(postId, fromFlat, toFlat, count);
-                            const _snap = await buildResponseSnapshot(mode, client, postId, _sessionId, _siteName, result);
-                            const _msg = moveMsg(result.moved);
-                            if (_inputRefs) {
-                                const changeInfo = buildChangeInfoFromResult('moved', _snap, result, _preState, { inputRefs: _inputRefs });
-                                if (changeInfo) return { content: [{ type: "text", text: appendRefChangesToText(_msg, changeInfo) }] };
-                            }
-                            return { content: [{ type: "text", text: appendSnapshotToTextLegacy(_msg, _snap) }] };
-                        } catch (e) {
-                            const formatted = formatHeadlessConflictError(e);
-                            if (formatted) return formatted;
-                            throw e;
-                        }
-                    }
-
-                    const result = await client.sendEditorCommand("move_block", { fromFlat, toFlat, count }, 90000, _postId, _sessionId);
-                    if (!result || result.timeout)
-                        return timeoutResponse(name, client, args?.site);
-                    if (!result.success)
-                        return errorResponse(name, result.error, args?.site);
-                    const _snap = await buildResponseSnapshot(mode, client, postId, _sessionId, _siteName, result);
-                    const _msg = moveMsg(result.moved);
-                    if (_inputRefs) {
-                        const changeInfo = buildChangeInfoFromResult('moved', _snap, result, _preState, { inputRefs: _inputRefs });
-                        if (changeInfo) return { content: [{ type: "text", text: appendRefChangesToText(_msg, changeInfo) }] };
-                    }
-                    return { content: [{ type: "text", text: appendSnapshotToTextLegacy(_msg, _snap) }] };
-                }
-
-                // 既存モード（from/to トップレベル）
-                if (from === undefined || to === undefined) {
-                    return { content: [{ type: "text", text: "❌ from と to の両方を指定してください" }], isError: true };
+                // 同位置チェック
+                if (fromFlat === toFlat || toFlat === fromFlat + count) {
+                    return { content: [{ type: "text", text: `✅ 移動不要（同じ位置）${_mt_mb}` }] };
                 }
 
                 if (mode === 'headless') {
                     try {
-                        const result = await client.headlessMove(postId, from, to, count);
+                        const result = await client.headlessMoveFlat(postId, fromFlat, toFlat, count);
                         const _snap = await buildResponseSnapshot(mode, client, postId, _sessionId, _siteName, result);
-                        return { content: [{ type: "text", text: appendSnapshotToTextLegacy(moveMsg(result.moved), _snap) }] };
+                        const _msg = moveMsg(result.moved);
+                        if (_inputRefs) {
+                            const changeInfo = buildChangeInfoFromResult('moved', _snap, result, _preState, { inputRefs: _inputRefs });
+                            if (changeInfo) return { content: [{ type: "text", text: appendRefChangesToText(_msg, changeInfo) }] };
+                        }
+                        return { content: [{ type: "text", text: appendSnapshotToTextLegacy(_msg, _snap) }] };
                     } catch (e) {
                         const formatted = formatHeadlessConflictError(e);
                         if (formatted) return formatted;
@@ -3685,13 +3585,18 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     }
                 }
 
-                const result = await client.sendEditorCommand("move_block", { from, to, count }, 90000, _postId, _sessionId);
+                const result = await client.sendEditorCommand("move_block", { fromFlat, toFlat, count }, 90000, _postId, _sessionId);
                 if (!result || result.timeout)
                     return timeoutResponse(name, client, args?.site);
                 if (!result.success)
                     return errorResponse(name, result.error, args?.site);
                 const _snap = await buildResponseSnapshot(mode, client, postId, _sessionId, _siteName, result);
-                return { content: [{ type: "text", text: appendSnapshotToTextLegacy(moveMsg(result.moved), _snap) }] };
+                const _msg = moveMsg(result.moved);
+                if (_inputRefs) {
+                    const changeInfo = buildChangeInfoFromResult('moved', _snap, result, _preState, { inputRefs: _inputRefs });
+                    if (changeInfo) return { content: [{ type: "text", text: appendRefChangesToText(_msg, changeInfo) }] };
+                }
+                return { content: [{ type: "text", text: appendSnapshotToTextLegacy(_msg, _snap) }] };
             }
 
             case "undo": {
@@ -3738,9 +3643,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 const _mt_dup = process.env.FRIDAY_DEBUG === '1' ? `\n[DEBUG] mode=${mode}` : '';
                 const _siteName = siteName || args?.site || 'default';
 
-                // ref と index 排他チェック
-                if (args?.ref && args?.index !== undefined) {
-                    return { content: [{ type: "text", text: "❌ ref と index は同時に指定できません。" }], isError: true };
+                // ref 必須チェック
+                if (!args?.ref) {
+                    return { content: [{ type: "text", text: "❌ ref and snapshotId are required." }], isError: true };
                 }
 
                 // ref 解決 + revision チェック
@@ -3750,18 +3655,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     mode, client, postId, sessionId: _sessionId, siteName: _siteName,
                 });
                 if (resolved.error) return resolved.error;
-                const _preState = resolved.currentState || null;  // Phase 2: 差分計算用
-
-                const index = resolved.index !== undefined ? resolved.index : args?.index;
+                const _preState = resolved.currentState || null;
 
-                // Phase 3: 入力 ref を保持（index 経路は差分化しない）
-                const _inputRef = args?.ref || null;
+                const index = resolved.index;
+                const _inputRef = args.ref;
 
                 if (mode === 'headless') {
                     const _guard = await guardHeadlessConflict(postId, client, name);
                     if (_guard) return _guard;
                     if (index === undefined) {
-                        return { content: [{ type: "text", text: "❌ Headless モードでは index の指定が必須です。" }], isError: true };
+                        return { content: [{ type: "text", text: "❌ ref resolution failed. Check snapshotId and ref." }], isError: true };
                     }
                     try {
                         const result = await client.headlessDuplicate(postId, index);
@@ -3995,38 +3898,18 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
 
             case "insert_block": {
-                let { rawHTML, filePath, index, position } = (args || {});
-
-                // parentIndex は廃止済み（v3.0.0 Phase 5）— position を使用
-                if (args?.parentIndex !== undefined) {
-                    return { content: [{ type: "text", text: "❌ parentIndex は廃止されました。代わりに index + position ('before'/'after') を使用してください。" }], isError: true };
-                }
+                let { rawHTML, filePath } = (args || {});
 
                 // 排他チェック
                 if (rawHTML && filePath) {
                     return { content: [{ type: "text", text: "❌ rawHTML と filePath は同時に指定できません。どちらか一方を指定してください。" }], isError: true };
                 }
 
-                // Phase 4b: beforeRef/afterRef と index/position の排他チェック
                 const _hasRefPosition = args?.beforeRef !== undefined || args?.afterRef !== undefined;
-                const _hasIndexPosition = index !== undefined || position !== undefined;
-                if (_hasRefPosition && _hasIndexPosition) {
-                    return { content: [{ type: "text", text: "❌ beforeRef/afterRef と index/position は同時に指定できません。" }], isError: true };
-                }
                 if (args?.beforeRef && args?.afterRef) {
                     return { content: [{ type: "text", text: "❌ beforeRef と afterRef は同時に指定できません。" }], isError: true };
                 }
 
-                // position 指定時は index 必須（ref モードでないとき）
-                if (!_hasRefPosition && position !== undefined && index === undefined) {
-                    return { content: [{ type: "text", text: "❌ position を指定する場合は index も指定してください。末尾追加は index を省略してください。" }], isError: true };
-                }
-
-                // position バリデーション
-                if (position !== undefined && position !== "before" && position !== "after") {
-                    return { content: [{ type: "text", text: `❌ position は 'before' または 'after' を指定してください: ${position}` }], isError: true };
-                }
-
                 // filePath → rawHTML 解決
                 if (filePath) {
                     try { rawHTML = readHTMLFromFile(filePath).html; }
@@ -4036,13 +3919,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     return { content: [{ type: "text", text: "❌ rawHTML または filePath を指定してください。Gutenberg HTML 形式のブロックマークアップが必要です。" }], isError: true };
                 }
 
-                // index バリデーション（現行 Editor 互換: 整数 >= 0）— ref モードでないとき
-                if (!_hasRefPosition && index !== undefined && (!Number.isInteger(index) || index < 0)) {
-                    return { content: [{ type: "text", text: `❌ Invalid index: ${index}` }], isError: true };
-                }
-
                 // update_blocks コードパスに委譲
-                // expectedRevision は全モードで委譲（ref/index/append 問わず）
                 const delegatedArgs = {
                     postId: args.postId,
                     site: args.site,
@@ -4058,11 +3935,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     delegatedArgs.insert = { position: args.beforeRef ? 'before' : 'after' };
                     delegatedArgs.snapshotId = args.snapshotId;
                     delegatedArgs.appendToEnd = false;
-                } else if (index !== undefined) {
-                    // 既存: index モード
-                    delegatedArgs.target = { index };
-                    delegatedArgs.insert = { position: position ?? 'before' };
-                    delegatedArgs.appendToEnd = false;
                 } else {
                     // 末尾追加
                     delegatedArgs.insert = { position: 'before' };
@@ -4073,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);
                 }
@@ -4081,11 +3953,30 @@ 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') {
@@ -4234,9 +4125,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     return { content: [{ type: "text", text: "❌ action は必須です" }], isError: true };
                 }
 
-                // ref と index 排他チェック
-                if (args?.ref && args?.index !== undefined) {
-                    return { content: [{ type: "text", text: "❌ ref と index は同時に指定できません。" }], isError: true };
+                // ref 必須チェック
+                if (!args?.ref) {
+                    return { content: [{ type: "text", text: "❌ ref and snapshotId are required." }], isError: true };
                 }
 
                 // ref 解決 + revision チェック
@@ -4246,11 +4137,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     mode, client, postId, sessionId: _sessionId, siteName: _siteName,
                 });
                 if (resolved.error) return resolved.error;
-                const _preState = resolved.currentState || null;  // Phase 2: 差分計算用
+                const _preState = resolved.currentState || null;
 
-                const index = resolved.index !== undefined ? resolved.index : args?.index;
+                const index = resolved.index;
                 if (index === undefined) {
-                    return { content: [{ type: "text", text: "❌ table_operations では index または ref のいずれかが必要です。" }], isError: true };
+                    return { content: [{ type: "text", text: "❌ ref resolution failed. Check snapshotId and ref." }], isError: true };
                 }
 
                 const tableParams = {
@@ -4539,9 +4430,6 @@ function _detectTargetType(args) {
     if (t) {
         if (t.ref) return 'ref';
         if (t.refs) return 'refs';
-        if (t.index !== undefined) return 'index';
-        if (t.indices) return 'indices';
-        if (t.range) return 'range';
         if (t.section) return 'section';
         if (t.heading) return 'heading';
         if (t.blockType) return 'blockType';
@@ -4549,8 +4437,6 @@ function _detectTargetType(args) {
     }
     if (args.ref || args.beforeRef || args.afterRef || args.fromRef) return 'ref';
     if (args.refs) return 'refs';
-    if (args.index !== undefined || args.fromFlat !== undefined || args.from !== undefined) return 'index';
-    if (args.indices) return 'indices';
     return null;
 }
 

package/package.json

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