friday-mcp-v2 3.0.2 → 3.0.4

package/dist/bridge-common.js

@@ -48,6 +48,14 @@ export function getBridgeLogPath() {
     return join(os.homedir(), '.local', 'share', 'friday-mcp', 'logs', 'bridge.log');
 }
 
+export function getToolLogPath() {
+    if (process.platform === 'win32') {
+        const localAppData = process.env.LOCALAPPDATA || join(os.homedir(), 'AppData', 'Local');
+        return join(localAppData, 'FridayMCP', 'logs', 'tool-calls.jsonl');
+    }
+    return join(os.homedir(), '.local', 'share', 'friday-mcp', 'logs', 'tool-calls.jsonl');
+}
+
 export function getBridgePidPath() {
     if (process.platform === 'win32') {
         const localAppData = process.env.LOCALAPPDATA || join(os.homedir(), 'AppData', 'Local');

package/dist/mcp-server.js

@@ -12,9 +12,10 @@ import { FridayWPClient, ConnectionRegistry } from "./wordpress-api.js";
 import { BridgeClient } from "./bridge-client.js";
 import fetch from "node-fetch";
 import { randomUUID } from "node:crypto";
-import { readFileSync, statSync, realpathSync } from "node:fs";
+import { readFileSync, statSync, realpathSync, appendFileSync, mkdirSync, existsSync, writeFileSync, renameSync } from "node:fs";
 import { execFile } from "node:child_process";
-import { resolve as resolvePath, sep, dirname } from "node:path";
+import { resolve as resolvePath, sep, dirname, join as joinPath } from "node:path";
+import os from "node:os";
 import { fileURLToPath } from "node:url";
 // package.json からバージョンを取得
 const __pkg_dirname = dirname(fileURLToPath(import.meta.url));
@@ -48,6 +49,39 @@ if (_envWorkspace) {
     }
 }
 
+// ========================================
+// Tool Call Logger（FRIDAY_DEBUG=1 で有効）
+// ========================================
+const _TOOL_LOG_MAX_BYTES = 10 * 1024 * 1024; // 10MB
+function _getToolLogPath() {
+    if (process.platform === 'win32') {
+        const localAppData = process.env.LOCALAPPDATA || joinPath(os.homedir(), 'AppData', 'Local');
+        return joinPath(localAppData, 'FridayMCP', 'logs', 'tool-calls.jsonl');
+    }
+    return joinPath(os.homedir(), '.local', 'share', 'friday-mcp', 'logs', 'tool-calls.jsonl');
+}
+
+function writeToolLog(record) {
+    if (process.env.FRIDAY_DEBUG !== '1') return;
+    try {
+        const logPath = _getToolLogPath();
+        const logDir = dirname(logPath);
+        if (!existsSync(logDir)) mkdirSync(logDir, { recursive: true });
+        // ローテーション: 10MB 超えたら先頭半分を切り捨て
+        try {
+            const st = statSync(logPath);
+            if (st.size > _TOOL_LOG_MAX_BYTES) {
+                const content = readFileSync(logPath, 'utf-8');
+                const lines = content.split('\n');
+                const half = Math.floor(lines.length / 2);
+                writeFileSync(logPath, lines.slice(half).join('\n'), 'utf-8');
+            }
+        } catch (_) { /* ファイル未存在時は無視 */ }
+        const line = JSON.stringify({ ts: new Date().toISOString(), ...record }) + '\n';
+        appendFileSync(logPath, line, 'utf-8');
+    } catch (_) { /* ログ書き込み失敗は無視 */ }
+}
+
 const registry = new ConnectionRegistry();
 const bridgeClient = new BridgeClient();
 
@@ -991,10 +1025,13 @@ async function resolveRefsAndCheckRevision({
     mode, client, postId, sessionId, siteName,
 }) {
     const hasRef = ref || refs;
+    const _debug = process.env.FRIDAY_DEBUG === '1';
+    if (_debug) console.error(`[SNAPSHOT] resolveRefs: ref=${ref || 'none'}, refs=${refs ? refs.join(',') : 'none'}, snapshotId=${snapshotId || 'none'}, expectedRevision=${expectedRevision || 'none'}`);
 
     // Case 1: ref/refs 指定あり
     if (hasRef) {
         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 で取得してください。" }],
                 isError: true,
@@ -1007,13 +1044,16 @@ async function resolveRefsAndCheckRevision({
         try {
             if (ref) {
                 const index = resolveRefFromState(snapshotId, ref, mode, sessionId, postId, currentState);
+                if (_debug) console.error(`[SNAPSHOT] resolveRefs: ref=${ref} → index=${index}`);
                 return { index, currentState };
             }
             if (refs) {
                 const indices = refs.map(r => resolveRefFromState(snapshotId, r, mode, sessionId, postId, currentState));
+                if (_debug) console.error(`[SNAPSHOT] resolveRefs: refs=[${refs.join(',')}] → indices=[${indices.join(',')}]`);
                 return { indices, currentState };
             }
         } catch (e) {
+            if (_debug) console.error(`[SNAPSHOT] resolveRefs: ref解決失敗 — ${e.message}`);
             return { error: {
                 content: [{ type: "text", text: `❌ ref 解決エラー: ${e.message}` }],
                 isError: true,
@@ -1023,6 +1063,7 @@ async function resolveRefsAndCheckRevision({
 
     // Case 2: ref なし + expectedRevision のみ
     if (expectedRevision) {
+        if (_debug) console.error(`[SNAPSHOT] resolveRefs: index指定 (revisionチェックのみ)`);
         const { currentState, error } = await acquireFreshState({
             expectedRevision, mode, client, postId, sessionId, siteName,
         });
@@ -1031,6 +1072,7 @@ async function resolveRefsAndCheckRevision({
     }
 
     // Case 3: どちらもなし
+    if (_debug) console.error(`[SNAPSHOT] resolveRefs: ref/revision なし → index直接指定`);
     return {};
 }
 
@@ -1065,8 +1107,10 @@ function normalizeDownstreamBlocks(blocks) {
  * @returns {object|null} { snapshotId, revision, blocks[] } or null
  */
 function buildResponseSnapshotFromResult(result, mode, postId, sessionId, siteName) {
+    const _debug = process.env.FRIDAY_DEBUG === '1';
     const blocks = result?.blocks;
     if (!blocks || !Array.isArray(blocks) || blocks.length === 0) {
+        if (_debug) console.error(`[SNAPSHOT] fromResult: blocks=${blocks ? 'empty' : 'missing'}`);
         return null;
     }
     const state = normalizeDownstreamBlocks(blocks);
@@ -1086,19 +1130,26 @@ function buildResponseSnapshotFromResult(result, mode, postId, sessionId, siteNa
  * @returns {Promise<object|null>} { snapshotId, revision, blocks[] } or null
  */
 async function buildResponseSnapshot(mode, client, postId, sessionId, siteName, result) {
+    const _debug = process.env.FRIDAY_DEBUG === '1';
     // Phase 1: 下流 result.blocks があればそこから構築（再取得不要）
     if (result) {
         const fromResult = buildResponseSnapshotFromResult(result, mode, postId, sessionId, siteName);
-        if (fromResult) return fromResult;
+        if (fromResult) {
+            if (_debug) console.error(`[SNAPSHOT] buildResponseSnapshot: fromResult OK, snapshotId=${fromResult.snapshotId}, blocks=${fromResult.blocks?.length}`);
+            return fromResult;
+        }
     }
+    if (_debug) console.error(`[SNAPSHOT] buildResponseSnapshot: fromResult failed, fallback to getCurrentStructure`);
     let newState;
     try {
         newState = await getCurrentStructure(mode, client, postId, sessionId);
     } catch {
+        if (_debug) console.error(`[SNAPSHOT] buildResponseSnapshot: getCurrentStructure threw → null`);
         return null;
     }
 
     if (!newState?.allBlocks || newState.allBlocks.length === 0) {
+        if (_debug) console.error(`[SNAPSHOT] buildResponseSnapshot: allBlocks empty → null`);
         return null;
     }
 
@@ -1145,7 +1196,12 @@ async function buildResponseSnapshot(mode, client, postId, sessionId, siteName,
  * @returns {string} snapshot 行と blocks 一覧が付加されたテキスト
  */
 function appendSnapshotToTextLegacy(text, snapshot, refInfo) {
-    if (!snapshot) return text;
+    const _debug = process.env.FRIDAY_DEBUG === '1';
+    if (!snapshot) {
+        if (_debug) console.error(`[SNAPSHOT] appendLegacy: snapshot=null → タグなし`);
+        return text;
+    }
+    if (_debug) console.error(`[SNAPSHOT] appendLegacy: snapshotId=${snapshot.snapshotId}, blocks=${snapshot.blocks?.length}`);
 
     // 1→N 展開チェック（単体操作時のみ）
     let expandedLine = '';
@@ -1166,13 +1222,6 @@ function appendSnapshotToTextLegacy(text, snapshot, refInfo) {
     }
 
     let out = text + `\n\n[snapshot:${snapshot.snapshotId} rev:${snapshot.revision}]${expandedLine}`;
-    if (snapshot.blocks && snapshot.blocks.length > 0) {
-        out += '\nblocks:';
-        for (const b of snapshot.blocks) {
-            const parent = b.parentIndex !== null ? `,p:${b.parentIndex}` : '';
-            out += `\n  [${b.index}|${b.ref}] ${b.type} (d:${b.depth}${parent})`;
-        }
-    }
     return out;
 }
 
@@ -1189,9 +1238,12 @@ function appendSnapshotToTextLegacy(text, snapshot, refInfo) {
  * @returns {string}
  */
 function buildUpdateDiffResponse(text, snap, result, preState, inputRef, isInsert, refInfo) {
+    const _debug = process.env.FRIDAY_DEBUG === '1';
     if (!inputRef || !snap) {
+        if (_debug) console.error(`[SNAPSHOT] diffResponse: legacy path (inputRef=${inputRef || 'null'}, snap=${snap ? 'ok' : 'null'})`);
         return appendSnapshotToTextLegacy(text, snap, refInfo);
     }
+    if (_debug) console.error(`[SNAPSHOT] diffResponse: diff path (inputRef=${inputRef}, snapId=${snap?.snapshotId})`);
 
     if (isInsert) {
         const changeInfo = buildChangeInfoFromResult('inserted', snap, result, preState);
@@ -1294,6 +1346,7 @@ function buildUpdateDiffResponse(text, snap, result, preState, inputRef, isInser
  */
 function appendRefChangesToText(text, changeInfo) {
     if (!changeInfo) return text;
+    if (process.env.FRIDAY_DEBUG === '1') console.error(`[SNAPSHOT] appendDiff: type=${changeInfo.type}, snapshotId=${changeInfo.snapshotId}`);
 
     let out = text + `\n\n[snapshot:${changeInfo.snapshotId} rev:${changeInfo.revision}]`;
 
@@ -2823,10 +2876,12 @@ async function handleUpdateBlocksTool(args, toolName) {
 }
 
 // ツール実行のハンドラ
+const _WRITE_TOOLS = new Set(['update_blocks', 'delete_block', 'move_block', 'duplicate_block', 'insert_block', 'table_operations']);
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
+    const _toolLogStart = Date.now();
     try {
-        switch (name) {
+        const _result = await (async () => { switch (name) {
             case "get_article_structure": {
                 let { mode, postId: _postId, sessionId: _sessionId, message, client, siteName } = await resolveMode(args, name);
                 if (mode === 'error') {
@@ -4431,7 +4486,25 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
             default:
                 throw new Error(`Unknown tool: ${name}`);
+        } })();
+        // 書き込みツールの成功時ログ
+        if (_WRITE_TOOLS.has(name)) {
+            const { newSnapshotId, diffIncluded } = _extractSnapshotFromResponse(_result);
+            writeToolLog({
+                tool: name,
+                postId: args?.postId || null,
+                targetType: _detectTargetType(args),
+                snapshotIdProvided: !!args?.snapshotId,
+                snapshotId: args?.snapshotId || null,
+                operationType: _detectOperationType(name, args),
+                responsePath: diffIncluded ? 'diff' : (newSnapshotId ? 'legacy' : 'none'),
+                newSnapshotId,
+                diffIncluded,
+                isError: !!_result?.isError,
+                durationMs: Date.now() - _toolLogStart,
+            });
         }
+        return _result;
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4442,6 +4515,13 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             content: errorMessage,
             site: args?.site || 'default',
         });
+        writeToolLog({
+            tool: name,
+            postId: args?.postId || null,
+            targetType: _detectTargetType(args),
+            snapshotIdProvided: !!args?.snapshotId,
+            error: errorMessage,
+        });
         return {
             content: [{
                 type: "text",
@@ -4452,6 +4532,53 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     }
 });
 
+// ツール呼び出しログ用: ターゲット指定方法を判定
+function _detectTargetType(args) {
+    if (!args) return null;
+    const t = args.target;
+    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';
+        if (t.selected) return 'selected';
+    }
+    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;
+}
+
+// ツール呼び出しログ用: 操作タイプを判定
+function _detectOperationType(toolName, args) {
+    if (toolName === 'delete_block') return 'delete';
+    if (toolName === 'move_block') return 'move';
+    if (toolName === 'duplicate_block') return 'duplicate';
+    if (toolName === 'insert_block') return 'insert';
+    if (toolName === 'table_operations') return `table_${args?.action || 'unknown'}`;
+    // update_blocks
+    if (args?.operations) return 'batch';
+    if (args?.insert || args?._fromInsertBlock) return 'insert';
+    if (args?.newHTML) return 'newHTML';
+    if (args?.replacements?.length > 0) return 'replacements';
+    if (args?.attributeUpdates) return 'attributeUpdates';
+    return 'unknown';
+}
+
+// ツール呼び出しログ用: レスポンスから snapshotId を抽出
+function _extractSnapshotFromResponse(response) {
+    if (!response?.content?.[0]?.text) return { newSnapshotId: null, diffIncluded: false };
+    const text = response.content[0].text;
+    const snapMatch = text.match(/snapshotId: (snap_[a-f0-9]+)/);
+    const diffIncluded = /(?:updated|deleted|inserted|moved|duplicated|expanded|compressed): \[/.test(text);
+    return { newSnapshotId: snapMatch ? snapMatch[1] : null, diffIncluded };
+}
+
 // サーバー起動
 async function main() {
     try {

package/dist/ws-server.js

@@ -42,7 +42,7 @@ export class FridayWSServer {
             throw err;
         }
         this._startHeartbeatCheck();
-        console.error(`[F.R.I.D.A.Y][WS] Token: ${this.token.slice(0, 8)}...`);
+        dbg(`Token: ${this.token.slice(0, 8)}...`);
     }
 
     stop() {

package/package.json

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