@ripla/godd-mcp 1.0.2-canary.7 → 1.0.2-canary.9

package/notes-app/src/lib/created-file.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import { createdFileToContent, createdFileToTreeEntry } from "./created-file";
+
+describe("created-file helpers", () => {
+  it("作成APIの戻り値からファイルツリー項目を作る", () => {
+    const entry = createdFileToTreeEntry({
+      path: "docs/project/new-note.md",
+      sha: "abc123",
+    });
+
+    expect(entry).toEqual({
+      name: "new-note.md",
+      path: "docs/project/new-note.md",
+      type: "file",
+    });
+  });
+
+  it(".md 作成直後に表示できる空のファイル内容を作る", () => {
+    const content = createdFileToContent({
+      path: "docs/project/new-note.md",
+      sha: "abc123",
+    });
+
+    expect(content).toEqual({
+      path: "docs/project/new-note.md",
+      sha: "abc123",
+      content: "",
+    });
+  });
+});

package/notes-app/src/lib/created-file.ts

@@ -0,0 +1,22 @@
+import type { FileContent, TreeEntry } from "@/types";
+
+export type CreatedFile = {
+  path: string;
+  sha: string;
+};
+
+export function createdFileToTreeEntry(file: CreatedFile): TreeEntry {
+  return {
+    name: file.path.split("/").pop() ?? file.path,
+    path: file.path,
+    type: "file",
+  };
+}
+
+export function createdFileToContent(file: CreatedFile): FileContent {
+  return {
+    path: file.path,
+    sha: file.sha,
+    content: "",
+  };
+}

package/notes-app/src/lib/tree-utils.ts

@@ -35,3 +35,42 @@ export function removeEntry(entries: TreeEntry[], targetPath: string): TreeEntry
       };
     });
 }
+
+export function moveEntry(
+  entries: TreeEntry[],
+  oldPath: string,
+  newParentDir: string,
+): TreeEntry[] {
+  if (newParentDir === oldPath || newParentDir.startsWith(oldPath + "/")) {
+    return entries;
+  }
+
+  const entry = findEntry(entries, oldPath);
+  const targetParent = findEntry(entries, newParentDir);
+  if (!entry || targetParent?.type !== "dir") return entries;
+
+  const newPath = `${newParentDir}/${entry.name}`;
+  const moved = rebaseEntryPath(entry, oldPath, newPath);
+  return insertChildEntry(removeEntry(entries, oldPath), newParentDir, moved);
+}
+
+function findEntry(entries: TreeEntry[], targetPath: string): TreeEntry | null {
+  for (const entry of entries) {
+    if (entry.path === targetPath) return entry;
+    if (entry.children) {
+      const found = findEntry(entry.children, targetPath);
+      if (found) return found;
+    }
+  }
+  return null;
+}
+
+function rebaseEntryPath(entry: TreeEntry, oldPath: string, newPath: string): TreeEntry {
+  return {
+    ...entry,
+    path: entry.path === oldPath
+      ? newPath
+      : entry.path.replace(oldPath + "/", newPath + "/"),
+    children: entry.children?.map((child) => rebaseEntryPath(child, oldPath, newPath)),
+  };
+}

package/notes-app/src/pages/MainPage.insertChildEntry.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 import type { TreeEntry } from "@/types";
-import { insertChildEntry, removeEntry } from "@/lib/tree-utils";
+import { insertChildEntry, moveEntry, removeEntry } from "@/lib/tree-utils";
 
 const baseTree: TreeEntry[] = [
   {
@@ -110,3 +110,32 @@ describe("removeEntry", () => {
     expect(result).toEqual(baseTree);
   });
 });
+
+describe("moveEntry", () => {
+  it("moves a file to another folder and updates its path", () => {
+    const result = moveEntry(baseTree, "docs/index.md", "docs/project");
+    const docsChildren = result[0].children ?? [];
+    const project = docsChildren.find((entry) => entry.path === "docs/project");
+
+    expect(docsChildren.some((entry) => entry.path === "docs/index.md")).toBe(false);
+    expect(project?.children?.some((entry) => entry.path === "docs/project/index.md")).toBe(true);
+  });
+
+  it("moves a folder and rebases child paths", () => {
+    const tree: TreeEntry[] = [
+      ...baseTree,
+      { name: "archive", path: "archive", type: "dir", children: [] },
+    ];
+    const result = moveEntry(tree, "docs/project", "archive");
+    const archive = result.find((entry) => entry.path === "archive");
+    const moved = archive?.children?.find((entry) => entry.path === "archive/project");
+
+    expect(JSON.stringify(result)).not.toContain("docs/project/readme.md");
+    expect(moved?.children?.[0].path).toBe("archive/project/readme.md");
+  });
+
+  it("does not move into itself", () => {
+    const result = moveEntry(baseTree, "docs/project", "docs/project");
+    expect(result).toEqual(baseTree);
+  });
+});

package/notes-app/src/pages/MainPage.tsx

@@ -34,7 +34,8 @@ import BranchSelectorModal from "@/components/BranchSelectorModal";
 import IssueList from "@/components/IssueList";
 import type { TreeEntry, FileContent, ApiState, FileStyles } from "@/types";
 import { getFileExt } from "@/types";
-import { insertChildEntry, removeEntry } from "@/lib/tree-utils";
+import { insertChildEntry, moveEntry, removeEntry } from "@/lib/tree-utils";
+import { createdFileToContent, createdFileToTreeEntry } from "@/lib/created-file";
 
 const MarkdownEditor = lazy(() => import("@/components/MarkdownEditor"));
 const SpreadsheetEditor = lazy(() => import("@/components/SpreadsheetEditor"));
@@ -394,19 +395,36 @@ export default function MainPage() {
   const handleCreateFile = useCallback(
     async (fileName: string) => {
       if (!dialog || dialog.type !== "create") return;
+      const unsaved = autoSave.status === "unsaved" || autoSave.status === "saving";
+      if (unsaved && !window.confirm("未保存の変更があります。ファイルを切り替えてもよろしいですか？")) {
+        return;
+      }
       const parentPath = dialog.entry.path;
       const fullPath = `${parentPath}/${fileName}`;
       setDialog(null);
       try {
-        await createFileApi(fullPath);
+        const created = await createFileApi(fullPath);
         showToast(`${fileName} を作成しました`, "success");
-        loadTree();
-        handleFileSelect(fullPath);
+        fetchAbortRef.current?.abort();
+        autoSave.reset();
+        pendingStylesRef.current = null;
+        setSelectedIssue(null);
+        setSelectedFile(created.path);
+        setActiveDir(parentPath);
+        setSearchParams({ file: created.path }, { replace: true });
+        setFileLoading(false);
+        setEditing(false);
+        setShowOriginal(false);
+        setEditedContent(null);
+        setFileContent(createdFileToContent(created));
+        setTree((prev) => insertChildEntry(prev, parentPath, createdFileToTreeEntry(created)));
+        if (treeSyncTimerRef.current) clearTimeout(treeSyncTimerRef.current);
+        treeSyncTimerRef.current = setTimeout(() => loadTree(), 1500);
       } catch (e) {
         showToast(`作成に失敗しました: ${getErrorMessage(e)}`, "error");
       }
     },
-    [dialog, showToast, loadTree, handleFileSelect],
+    [dialog, showToast, autoSave, setSearchParams, loadTree],
   );
 
   const handleCreateFolder = useCallback(
@@ -529,7 +547,9 @@ export default function MainPage() {
             handleFileSelect(newPath);
           }
         }
-        loadTree();
+        setTree((prev) => moveEntry(prev, oldPath, newParentDir));
+        if (treeSyncTimerRef.current) clearTimeout(treeSyncTimerRef.current);
+        treeSyncTimerRef.current = setTimeout(() => loadTree(), 1500);
       } catch (e) {
         showToast(`移動に失敗しました: ${getErrorMessage(e)}`, "error");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripla/godd-mcp",
-  "version": "1.0.2-canary.7",
+  "version": "1.0.2-canary.9",
   "type": "module",
   "description": "GoDD (Governance-orchestrated Driven Development) MCP Server - Encrypted prompt distribution via Model Context Protocol",
   "main": "dist/index.js",