mmm-mcp-server 0.1.1 → 0.1.3

package/dist/src/tools/autoStructureThought.js

@@ -1,12 +1,8 @@
 import { z } from "zod";
-import { mergeWritesByPath } from "../firestore/restClient.js";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsAppendWrites, locateInLevels } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails } from "../domain/body.js";
-import { buildForestFromTree, buildAppendWrites } from "../domain/appendForest.js";
-import { assertLevelsRootExists, buildAppendLevelWrites, levelsDocExists } from "../domain/levels.js";
+import { ancestorDetailsInLevels, buildLevelsAppendWrites, locateInLevels, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
+import { buildForestFromTree } from "../domain/appendForest.js";
 const treeNodeSchema = z.lazy(() => z.object({
     detail: z.string().min(1).describe("要素の本文"),
     done: z.boolean().optional().describe("TODOマップのときのチェック状態(省略時false)"),
@@ -29,57 +25,22 @@ export function registerAutoStructureThought(server) {
         const map = await resolveMap(client, session, mapId);
         assertCanEditMap(map, session);
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
         const targetParentId = parentElementId ?? null;
         const forest = buildForestFromTree(nodes);
-        if (await isLevelsOnly(client)) {
-            let levelsPathResult = "";
-            await client.runOptimistic(async () => {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                if (targetParentId !== null && !locateInLevels(snapshot, targetParentId)) {
-                    throw new Error(`parentElementId(${targetParentId})がこのマップに見つかりません。list_elementsで確認してください。`);
-                }
-                levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, targetParentId));
-                return buildLevelsAppendWrites(levelsPath, snapshot, forest, targetParentId, map.header.isTodo);
-            });
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify({ path: levelsPathResult, addedElementCount: forest.length }, null, 2),
-                    },
-                ],
-            };
-        }
-        // 読み取り(bodies一覧・levels存在確認)から書き込みまでを楽観的
-        // ロックでまとめる。読み取り後に対象ドキュメントが他から変更される
-        // とコミットがFAILED_PRECONDITIONになり、読み取りからやり直す。
-        let createdIds = [];
-        let existingBodiesForPath = [];
+        let levelsPathResult = "";
         await client.runOptimistic(async () => {
-            assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            existingBodiesForPath = existingBodies;
-            if (targetParentId !== null && !existingBodies.some((b) => b.id === targetParentId)) {
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
+            if (targetParentId !== null && !locateInLevels(snapshot, targetParentId)) {
                 throw new Error(`parentElementId(${targetParentId})がこのマップに見つかりません。list_elementsで確認してください。`);
             }
-            const { writes, createdIds: ids } = buildAppendWrites(bodiesPath, existingBodies, forest, targetParentId, map.header.isTodo);
-            createdIds = ids;
-            // 挿入先のlevelsドキュメントが実際に存在するかを直接確認する
-            // (bodies側の状態から推測すると、levelsとbodiesが食い違っている
-            // 場合にarrayUnion書き込みが「ドキュメントが無い」で失敗しうるため)。
-            const targetLevelId = targetParentId ?? "root";
-            const targetHasLevelsDoc = targetLevelId === "root" || (await levelsDocExists(client, levelsPath, targetLevelId));
-            const levelWrites = buildAppendLevelWrites(levelsPath, forest, targetParentId, targetHasLevelsDoc, map.header.isTodo);
-            return mergeWritesByPath([...writes, ...levelWrites]);
+            levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, targetParentId));
+            return buildLevelsAppendWrites(levelsPath, snapshot, forest, targetParentId, map.header.isTodo);
         });
-        const path = formatPath(map.header.title, ancestorDetails(existingBodiesForPath, targetParentId));
         return {
             content: [
                 {
                     type: "text",
-                    text: JSON.stringify({ path, addedElementCount: createdIds.length }, null, 2),
+                    text: JSON.stringify({ path: levelsPathResult, addedElementCount: forest.length }, null, 2),
                 },
             ],
         };

package/dist/src/tools/createMap.js

@@ -12,12 +12,8 @@ export function registerCreateMap(server) {
         const { client, session } = getContext();
         const existing = await client.listDocuments(`users/${session.uid}/headers`);
         const maxOrder = existing.reduce((max, doc) => Math.max(max, Number(doc.data.order ?? 0)), 0);
-        // levels移行: 自前でIDを採番し、header本体と空のlevels/rootを1回の
-        // commitWritesにまとめて作る。levels/rootを最初から持たせておくことで、
-        // 直後に書き込み系ツールを呼んでも「アプリで一度開いてください」で
-        // 弾かれない(移行ではなく単なる初期化なので問題ない)。
-        // migratedはアプリの新規作成(header_add_model.dart)と揃える。無いと、
-        // 切替前のアプリが開いたときに未移行とみなしてbodiesから作り直してしまう。
+        // 自前でIDを採番し、header本体と空のlevels/rootを1回のcommitWritesに
+        // まとめて作る(アプリの新規作成 header_add_model.dart と揃える)。
         const headerId = newDocId();
         const headerPath = `users/${session.uid}/headers/${headerId}`;
         await client.commitWrites([
@@ -25,7 +21,7 @@ export function registerCreateMap(server) {
                 path: headerPath,
                 fields: { title, order: maxOrder + 1, isTodo, editors: [], viewers: [] },
             },
-            { path: `${headerPath}/levels/root`, fields: { children: [], migrated: true } },
+            { path: `${headerPath}/levels/root`, fields: { children: [] } },
         ]);
         return {
             content: [

package/dist/src/tools/deleteElements.js

@@ -1,11 +1,7 @@
 import { z } from "zod";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsDeleteWrites, locateInLevels, subtreeIdsInLevels } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails, collectSubtreeIds } from "../domain/body.js";
-import { assertLevelsRootExists, levelsDocExists } from "../domain/levels.js";
-import { buildDeleteElementWrites } from "../domain/deleteElements.js";
+import { ancestorDetailsInLevels, buildLevelsDeleteWrites, locateInLevels, subtreeIdsInLevels, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
 export function registerDeleteElements(server) {
     server.tool("delete_elements", "既存マップから要素を削除する。指定した要素とその配下(子孫)を丸ごと削除する。" +
         "削除は取り返しがつかないため、まずconfirmedを省略(またはfalse)で呼び、" +
@@ -22,84 +18,20 @@ export function registerDeleteElements(server) {
         const map = await resolveMap(client, session, mapId);
         assertCanEditMap(map, session);
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
-        assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
-        if (await isLevelsOnly(client)) {
-            if (confirmed !== true) {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                const allTargets = new Set();
-                const targets = [];
-                for (const elementId of elementIds) {
-                    if (!locateInLevels(snapshot, elementId)) {
-                        throw new Error(`elementId(${elementId})がこのマップに見つかりません。list_elementsで確認してください。`);
-                    }
-                    const subtree = subtreeIdsInLevels(snapshot, elementId);
-                    for (const id of subtree)
-                        allTargets.add(id);
-                    targets.push({
-                        elementId,
-                        path: formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId)),
-                        subtreeCount: subtree.length,
-                    });
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: JSON.stringify({
-                                confirmationRequired: true,
-                                message: "削除は取り返しがつきません。以下の内容をユーザーに提示して明示的な同意を得てから、" +
-                                    "confirmed: trueで呼び直してください。",
-                                targets,
-                                totalElementCount: allTargets.size,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            const levelsDeleted = [];
-            let levelsTotal = 0;
-            await client.runOptimistic(async () => {
-                levelsDeleted.length = 0;
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                for (const elementId of elementIds) {
-                    if (!locateInLevels(snapshot, elementId))
-                        continue; // 既に削除済み(リトライ時など)
-                    levelsDeleted.push({
-                        elementId,
-                        path: formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId)),
-                        subtreeCount: subtreeIdsInLevels(snapshot, elementId).length,
-                    });
-                }
-                const { writes, deletedIds } = buildLevelsDeleteWrites(levelsPath, snapshot, elementIds);
-                levelsTotal = deletedIds.size;
-                return writes;
-            });
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify({ deleted: levelsDeleted, totalElementCount: levelsTotal }, null, 2),
-                    },
-                ],
-            };
-        }
         if (confirmed !== true) {
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            const byId = new Map(existingBodies.map((b) => [b.id, b]));
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
             const allTargets = new Set();
             const targets = [];
             for (const elementId of elementIds) {
-                if (!byId.has(elementId)) {
+                if (!locateInLevels(snapshot, elementId)) {
                     throw new Error(`elementId(${elementId})がこのマップに見つかりません。list_elementsで確認してください。`);
                 }
-                const subtree = collectSubtreeIds(existingBodies, elementId);
+                const subtree = subtreeIdsInLevels(snapshot, elementId);
                 for (const id of subtree)
                     allTargets.add(id);
                 targets.push({
                     elementId,
-                    path: formatPath(map.header.title, ancestorDetails(existingBodies, elementId)),
+                    path: formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId)),
                     subtreeCount: subtree.length,
                 });
             }
@@ -118,31 +50,29 @@ export function registerDeleteElements(server) {
                 ],
             };
         }
-        const deletedPaths = [];
-        let totalDeleted = 0;
+        const levelsDeleted = [];
+        let levelsTotal = 0;
         await client.runOptimistic(async () => {
-            deletedPaths.length = 0;
-            totalDeleted = 0;
-            const currentDocs = await client.listDocuments(bodiesPath);
-            const currentBodies = currentDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
+            levelsDeleted.length = 0;
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
             for (const elementId of elementIds) {
-                if (!currentBodies.some((b) => b.id === elementId))
+                if (!locateInLevels(snapshot, elementId))
                     continue; // 既に削除済み(リトライ時など)
-                deletedPaths.push({
+                levelsDeleted.push({
                     elementId,
-                    path: formatPath(map.header.title, ancestorDetails(currentBodies, elementId)),
-                    subtreeCount: collectSubtreeIds(currentBodies, elementId).length,
+                    path: formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId)),
+                    subtreeCount: subtreeIdsInLevels(snapshot, elementId).length,
                 });
             }
-            const { writes, deletedIds } = await buildDeleteElementWrites(client, bodiesPath, levelsPath, currentBodies, elementIds);
-            totalDeleted = deletedIds.size;
+            const { writes, deletedIds } = buildLevelsDeleteWrites(levelsPath, snapshot, elementIds);
+            levelsTotal = deletedIds.size;
             return writes;
         });
         return {
             content: [
                 {
                     type: "text",
-                    text: JSON.stringify({ deleted: deletedPaths, totalElementCount: totalDeleted }, null, 2),
+                    text: JSON.stringify({ deleted: levelsDeleted, totalElementCount: levelsTotal }, null, 2),
                 },
             ],
         };

package/dist/src/tools/editElement.js

@@ -1,11 +1,7 @@
 import { z } from "zod";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsPatchWrites } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails } from "../domain/body.js";
-import { mergeWritesByPath } from "../firestore/restClient.js";
-import { assertLevelsRootExists, buildUpdateEntryWrites, levelsDocExists } from "../domain/levels.js";
+import { ancestorDetailsInLevels, buildLevelsPatchWrites, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
 export function registerEditElement(server) {
     server.tool("edit_element", "既存マップの要素1件の本文(detail)を書き換える。要素の追加はauto_structure_thought・" +
         "import_markdown_contextを、チェック状態の変更はupdate_task_statusを使うこと。", {
@@ -17,49 +13,20 @@ export function registerEditElement(server) {
         const map = await resolveMap(client, session, mapId);
         assertCanEditMap(map, session);
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
-        if (await isLevelsOnly(client)) {
-            let levelsPathResult = null;
-            await client.runOptimistic(async () => {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                const { writes, found } = buildLevelsPatchWrites(levelsPath, snapshot, [
-                    { elementId, patch: { detail } },
-                ]);
-                if (!found.has(elementId)) {
-                    throw new Error(`elementId(${elementId})がこのマップに見つかりません。list_elementsで確認してください。`);
-                }
-                levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId));
-                return writes;
-            });
-            return {
-                content: [{ type: "text", text: JSON.stringify({ path: levelsPathResult }, null, 2) }],
-            };
-        }
-        assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
-        let path = null;
+        let levelsPathResult = null;
         await client.runOptimistic(async () => {
-            const bodyDoc = await client.getDocument(`${bodiesPath}/${elementId}`);
-            if (!bodyDoc) {
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
+            const { writes, found } = buildLevelsPatchWrites(levelsPath, snapshot, [
+                { elementId, patch: { detail } },
+            ]);
+            if (!found.has(elementId)) {
                 throw new Error(`elementId(${elementId})がこのマップに見つかりません。list_elementsで確認してください。`);
             }
-            const body = bodyFromFirestore(elementId, bodyDoc.data, bodyDoc.updateTime);
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            path = formatPath(map.header.title, ancestorDetails(existingBodies, elementId));
-            const writes = [
-                {
-                    path: `${bodiesPath}/${elementId}`,
-                    fields: { detail },
-                    requireUpdateTime: body.updateTime,
-                },
-            ];
-            const levelWrites = await buildUpdateEntryWrites(client, levelsPath, [
-                { parentId: body.parent, elementId, patch: { detail } },
-            ]);
-            return mergeWritesByPath([...writes, ...levelWrites]);
+            levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, elementId));
+            return writes;
         });
         return {
-            content: [{ type: "text", text: JSON.stringify({ path }, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify({ path: levelsPathResult }, null, 2) }],
         };
     });
 }

package/dist/src/tools/importMarkdownContext.js

@@ -1,13 +1,8 @@
 import { z } from "zod";
-import { mergeWritesByPath } from "../firestore/restClient.js";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsAppendWrites, locateInLevels } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails } from "../domain/body.js";
-import { buildAppendWrites } from "../domain/appendForest.js";
+import { ancestorDetailsInLevels, buildLevelsAppendWrites, locateInLevels, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
 import { parseMarkdownForImport } from "../domain/markdownParser.js";
-import { assertLevelsRootExists, buildAppendLevelWrites, levelsDocExists } from "../domain/levels.js";
 export function registerImportMarkdownContext(server) {
     server.tool("import_markdown_context", "任意の深さのMarkdown(インデントで階層を表現したリスト、見出しは`#`)を組み立てて、" +
         "既存のマップに流し込む。見出しも1つの要素として取り込む。" +
@@ -26,66 +21,27 @@ export function registerImportMarkdownContext(server) {
         const map = await resolveMap(client, session, mapId);
         assertCanEditMap(map, session);
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
         const targetParentId = parentElementId ?? null;
         const parsed = parseMarkdownForImport(markdown, { headingsAsNodes: true });
         if (parsed.nodes.length === 0) {
             throw new Error("Markdownからリスト項目・見出しが見つかりませんでした。");
         }
-        if (await isLevelsOnly(client)) {
-            let levelsPathResult = "";
-            await client.runOptimistic(async () => {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                if (targetParentId !== null && !locateInLevels(snapshot, targetParentId)) {
-                    throw new Error(`parentElementId(${targetParentId})がこのマップに見つかりません。list_elementsで確認してください。`);
-                }
-                levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, targetParentId));
-                return buildLevelsAppendWrites(levelsPath, snapshot, parsed.nodes, targetParentId, map.header.isTodo);
-            });
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify({
-                            path: levelsPathResult,
-                            addedElementCount: parsed.nodes.length,
-                            checkboxIgnored: !map.header.isTodo && parsed.hasCheckbox,
-                        }, null, 2),
-                    },
-                ],
-            };
-        }
-        // 読み取り(bodies一覧・levels存在確認)から書き込みまでを楽観的
-        // ロックでまとめる。読み取り後に対象ドキュメントが他から変更される
-        // とコミットがFAILED_PRECONDITIONになり、読み取りからやり直す。
-        let createdIds = [];
-        let existingBodiesForPath = [];
+        let levelsPathResult = "";
         await client.runOptimistic(async () => {
-            assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            existingBodiesForPath = existingBodies;
-            if (targetParentId !== null && !existingBodies.some((b) => b.id === targetParentId)) {
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
+            if (targetParentId !== null && !locateInLevels(snapshot, targetParentId)) {
                 throw new Error(`parentElementId(${targetParentId})がこのマップに見つかりません。list_elementsで確認してください。`);
             }
-            const { writes, createdIds: ids } = buildAppendWrites(bodiesPath, existingBodies, parsed.nodes, targetParentId, map.header.isTodo);
-            createdIds = ids;
-            // 挿入先のlevelsドキュメントが実際に存在するかを直接確認する
-            // (bodies側の状態から推測すると、levelsとbodiesが食い違っている
-            // 場合にarrayUnion書き込みが「ドキュメントが無い」で失敗しうるため)。
-            const targetLevelId = targetParentId ?? "root";
-            const targetHasLevelsDoc = targetLevelId === "root" || (await levelsDocExists(client, levelsPath, targetLevelId));
-            const levelWrites = buildAppendLevelWrites(levelsPath, parsed.nodes, targetParentId, targetHasLevelsDoc, map.header.isTodo);
-            return mergeWritesByPath([...writes, ...levelWrites]);
+            levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, targetParentId));
+            return buildLevelsAppendWrites(levelsPath, snapshot, parsed.nodes, targetParentId, map.header.isTodo);
         });
-        const path = formatPath(map.header.title, ancestorDetails(existingBodiesForPath, targetParentId));
         return {
             content: [
                 {
                     type: "text",
                     text: JSON.stringify({
-                        path,
-                        addedElementCount: createdIds.length,
+                        path: levelsPathResult,
+                        addedElementCount: parsed.nodes.length,
                         checkboxIgnored: !map.header.isTodo && parsed.hasCheckbox,
                     }, null, 2),
                 },

package/dist/src/tools/listElements.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { getContext } from "../mcpContext.js";
 import { resolveMap, levelsPathOf } from "../domain/mapResolver.js";
-import { assertLevelsInitialized, buildTreeFromLevels, readAllLevelDocs, } from "../domain/levels.js";
+import { buildTreeFromLevels, readAllLevelDocs, } from "../domain/levels.js";
 // ElementNodeの`done`を`checked`という名前で公開する(仕様書の用語に合わせる)。
 function toChecked(nodes) {
     return nodes.map((n) => ({
@@ -77,8 +77,8 @@ export function registerListElements(server) {
                 return { content: [{ type: "text", text: buildConfirmationRequestText(map.header.title) }] };
             }
         }
+        // levels/rootが無いマップは空のマップとして返す(アプリで開いてもrootは作られない)。
         const levelsById = await readAllLevelDocs(client, levelsPathOf(map));
-        assertLevelsInitialized(levelsById, map.header.title);
         const tree = buildTreeFromLevels(levelsById);
         return {
             content: [

package/dist/src/tools/moveElement.js

@@ -1,11 +1,7 @@
 import { z } from "zod";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsMoveWrites, locateInLevels } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails } from "../domain/body.js";
-import { assertLevelsRootExists, levelsDocExists } from "../domain/levels.js";
-import { buildMoveElementWrites } from "../domain/moveElement.js";
+import { ancestorDetailsInLevels, buildLevelsMoveWrites, locateInLevels, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
 export function registerMoveElement(server) {
     server.tool("move_element", "既存マップの要素1件(配下ごと)を、同じマップ内の別の場所へ移動する。" +
         "階層をまたいだ移動(昇格・降格)も、同じ階層内の並べ替えも、これ1つで行える。", {
@@ -24,58 +20,24 @@ export function registerMoveElement(server) {
         const map = await resolveMap(client, session, mapId);
         assertCanEditMap(map, session);
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
-        assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
         if (elementId === newParentElementId) {
             throw new Error("要素を自分自身の子にすることはできません。");
         }
         if (elementId === afterElementId) {
             throw new Error("afterElementIdにelementId自身は指定できません。");
         }
-        if (await isLevelsOnly(client)) {
-            let levelsPathResult = null;
-            await client.runOptimistic(async () => {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                if (afterElementId !== null && !locateInLevels(snapshot, afterElementId)) {
-                    throw new Error(`afterElementId(${afterElementId})がこのマップに見つかりません。`);
-                }
-                const writes = buildLevelsMoveWrites(levelsPath, snapshot, elementId, newParentElementId, afterElementId);
-                levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, newParentElementId));
-                return writes;
-            });
-            return {
-                content: [{ type: "text", text: JSON.stringify({ path: levelsPathResult }, null, 2) }],
-            };
-        }
-        let path = null;
+        let levelsPathResult = null;
         await client.runOptimistic(async () => {
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            const byId = new Map(existingBodies.map((b) => [b.id, b]));
-            const body = byId.get(elementId);
-            if (!body) {
-                throw new Error(`elementId(${elementId})がこのマップに見つかりません。list_elementsで確認してください。`);
-            }
-            if (newParentElementId !== null && !byId.has(newParentElementId)) {
-                throw new Error(`newParentElementId(${newParentElementId})がこのマップに見つかりません。`);
-            }
-            if (afterElementId !== null && !byId.has(afterElementId)) {
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
+            if (afterElementId !== null && !locateInLevels(snapshot, afterElementId)) {
                 throw new Error(`afterElementId(${afterElementId})がこのマップに見つかりません。`);
             }
-            // 移動先が自分自身の配下(子孫)だと、木構造が壊れる(循環になる)。
-            for (let cur = newParentElementId; cur !== null; cur = byId.get(cur)?.parent ?? null) {
-                if (cur === elementId) {
-                    throw new Error("要素を自分自身の配下(子孫)の中へ移動することはできません。");
-                }
-            }
-            const writes = await buildMoveElementWrites(client, bodiesPath, levelsPath, existingBodies, elementId, newParentElementId, afterElementId);
-            path = formatPath(map.header.title, newParentElementId === null
-                ? []
-                : ancestorDetails(existingBodies, newParentElementId));
+            const writes = buildLevelsMoveWrites(levelsPath, snapshot, elementId, newParentElementId, afterElementId);
+            levelsPathResult = formatPath(map.header.title, ancestorDetailsInLevels(snapshot, newParentElementId));
             return writes;
         });
         return {
-            content: [{ type: "text", text: JSON.stringify({ path }, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify({ path: levelsPathResult }, null, 2) }],
         };
     });
 }

package/dist/src/tools/updateTaskStatus.js

@@ -1,11 +1,7 @@
 import { z } from "zod";
 import { getContext } from "../mcpContext.js";
-import { isLevelsOnly, readLevelsSnapshot } from "../domain/levelsMode.js";
-import { ancestorDetailsInLevels, buildLevelsPatchWrites } from "../domain/levelsOps.js";
-import { resolveMap, bodiesPathOf, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
-import { bodyFromFirestore, ancestorDetails } from "../domain/body.js";
-import { mergeWritesByPath } from "../firestore/restClient.js";
-import { assertLevelsRootExists, buildUpdateEntryWrites, levelsDocExists } from "../domain/levels.js";
+import { ancestorDetailsInLevels, buildLevelsPatchWrites, readLevelsSnapshot } from "../domain/levelsOps.js";
+import { resolveMap, levelsPathOf, formatPath, assertCanEditMap, } from "../domain/mapResolver.js";
 export function registerUpdateTaskStatus(server) {
     server.tool("update_task_status", "TODOマップの要素のチェック状態を書き換える。1件でも複数件でもよい。" +
         "「親をチェックすると配下も完了扱いになる」というアプリ内の表示上の挙動は" +
@@ -26,62 +22,22 @@ export function registerUpdateTaskStatus(server) {
             throw new Error(`「${map.header.title}」はTODOマップではないため、チェック状態を持ちません。`);
         }
         const levelsPath = levelsPathOf(map);
-        const bodiesPath = bodiesPathOf(map);
-        if (await isLevelsOnly(client)) {
-            let levelsResults = [];
-            await client.runOptimistic(async () => {
-                const snapshot = await readLevelsSnapshot(client, levelsPath, map.header.title);
-                const { writes, found } = buildLevelsPatchWrites(levelsPath, snapshot, updates.map((u) => ({ elementId: u.elementId, patch: { done: u.checked } })));
-                levelsResults = updates.map((u) => ({
-                    elementId: u.elementId,
-                    path: found.has(u.elementId)
-                        ? formatPath(map.header.title, ancestorDetailsInLevels(snapshot, u.elementId))
-                        : null,
-                    checked: u.checked,
-                    found: found.has(u.elementId),
-                }));
-                return writes;
-            });
-            return {
-                content: [{ type: "text", text: JSON.stringify({ results: levelsResults }, null, 2) }],
-            };
-        }
-        // 読み取り(bodies一覧・levelsの該当ドキュメント)から書き込みまでを
-        // 楽観的ロックでまとめる。読み取り後に他の操作が同じlevelsドキュメントを
-        // 書き換えていた場合はコミットがFAILED_PRECONDITIONになり、
-        // 読み取りからやり直す(runOptimisticが自動でリトライする)。
-        let results = [];
+        let levelsResults = [];
         await client.runOptimistic(async () => {
-            assertLevelsRootExists(await levelsDocExists(client, levelsPath, "root"), map.header.title);
-            const existingDocs = await client.listDocuments(bodiesPath);
-            const existingBodies = existingDocs.map((d) => bodyFromFirestore(d.id, d.data, d.updateTime));
-            const byId = new Map(existingBodies.map((b) => [b.id, b]));
-            const writes = [];
-            const levelUpdates = [];
-            results = [];
-            for (const update of updates) {
-                const body = byId.get(update.elementId);
-                if (!body) {
-                    results.push({ elementId: update.elementId, path: null, checked: update.checked, found: false });
-                    continue;
-                }
-                writes.push({
-                    path: `${bodiesPath}/${update.elementId}`,
-                    fields: { done: update.checked },
-                });
-                levelUpdates.push({
-                    parentId: body.parent,
-                    elementId: update.elementId,
-                    patch: { done: update.checked },
-                });
-                const path = formatPath(map.header.title, ancestorDetails(existingBodies, update.elementId));
-                results.push({ elementId: update.elementId, path, checked: update.checked, found: true });
-            }
-            const levelWrites = await buildUpdateEntryWrites(client, levelsPath, levelUpdates);
-            return mergeWritesByPath([...writes, ...levelWrites]);
+            const snapshot = await readLevelsSnapshot(client, levelsPath);
+            const { writes, found } = buildLevelsPatchWrites(levelsPath, snapshot, updates.map((u) => ({ elementId: u.elementId, patch: { done: u.checked } })));
+            levelsResults = updates.map((u) => ({
+                elementId: u.elementId,
+                path: found.has(u.elementId)
+                    ? formatPath(map.header.title, ancestorDetailsInLevels(snapshot, u.elementId))
+                    : null,
+                checked: u.checked,
+                found: found.has(u.elementId),
+            }));
+            return writes;
         });
         return {
-            content: [{ type: "text", text: JSON.stringify({ results }, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify({ results: levelsResults }, null, 2) }],
         };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mmm-mcp-server",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "mcpName": "io.github.nhorie-canal/mmm-mcp-server",
   "description": "Matryoshka Mind Map の自分のデータをClaudeから直接読み書きするMCPサーバー",
   "license": "MIT",
@@ -28,10 +28,10 @@
     "!dist/**/*.test.js"
   ],
   "scripts": {
-    "build": "tsc -p tsconfig.json",
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json",
     "start": "node dist/src/server.js",
     "login": "node dist/bin/login.js",
-    "test": "tsc -p tsconfig.json && node --test \"dist/src/**/*.test.js\"",
+    "test": "npm run build && node --test \"dist/src/**/*.test.js\"",
     "prepublishOnly": "npm test"
   },
   "dependencies": {