@abraca/mcp 1.0.1 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abraca/mcp",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "MCP server for Abracadabra — AI agent collaboration on CRDT documents",
   "license": "MIT",
   "type": "module",

package/src/server.ts

@@ -100,8 +100,8 @@ export class AbracadabraMCPServer {
     // Step 1b: Get user profile for publicKey identity
     try {
       const me = await this.client.getMe()
-      this._userId = me.id
-      console.error(`[abracadabra-mcp] User ID: ${this._userId}`)
+      this._userId = me.publicKey ?? me.id
+      console.error(`[abracadabra-mcp] User ID (pubkey): ${this._userId}`)
     } catch {
       console.error('[abracadabra-mcp] Could not fetch user profile, proceeding without userId')
     }

package/src/tools/tree.ts

@@ -32,7 +32,10 @@ function childrenOf(entries: TreeEntry[], parentId: string | null): TreeEntry[]
 
 function descendantsOf(entries: TreeEntry[], id: string | null): TreeEntry[] {
   const result: TreeEntry[] = []
+  const visited = new Set<string>()
   function collect(pid: string) {
+    if (visited.has(pid)) return
+    visited.add(pid)
     for (const child of childrenOf(entries, pid)) {
       result.push(child)
       collect(child.id)
@@ -42,20 +45,37 @@ function descendantsOf(entries: TreeEntry[], id: string | null): TreeEntry[] {
   return result
 }
 
-function buildTree(entries: TreeEntry[], rootId: string | null, maxDepth: number, currentDepth = 0): any[] {
+function buildTree(entries: TreeEntry[], rootId: string | null, maxDepth: number, currentDepth = 0, visited = new Set<string>()): any[] {
   if (maxDepth >= 0 && currentDepth >= maxDepth) return []
   const children = childrenOf(entries, rootId)
-  return children.map(entry => ({
-    id: entry.id,
-    label: entry.label,
-    type: entry.type,
-    meta: entry.meta,
-    order: entry.order,
-    children: buildTree(entries, entry.id, maxDepth, currentDepth + 1),
-  }))
+  return children.filter(e => !visited.has(e.id)).map(entry => {
+    const next = new Set(visited)
+    next.add(entry.id)
+    return {
+      id: entry.id,
+      label: entry.label,
+      type: entry.type,
+      meta: entry.meta,
+      order: entry.order,
+      children: buildTree(entries, entry.id, maxDepth, currentDepth + 1, next),
+    }
+  })
 }
 
 export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer) {
+  // Temporary diagnostic: list ALL entries with their parentId (no recursion)
+  mcp.tool(
+    '_debug_list_all',
+    'List ALL tree entries with their raw parentId. For debugging circular references.',
+    {},
+    async () => {
+      const treeMap = server.getTreeMap()
+      if (!treeMap) return { content: [{ type: 'text', text: 'Not connected' }] }
+      const entries = readEntries(treeMap)
+      return { content: [{ type: 'text', text: JSON.stringify(entries.map(e => ({ id: e.id, label: e.label, parentId: e.parentId, type: e.type })), null, 2) }] }
+    }
+  )
+
   mcp.tool(
     'list_documents',
     'List direct children of a document (defaults to root). Returns id, label, type, meta, order.',
@@ -108,7 +128,7 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
     {
       parentId: z.string().optional().describe('Parent document ID. Omit for top-level pages. Use a document ID for nested/child pages.'),
       label: z.string().describe('Display name / title for the document.'),
-      type: z.string().optional().describe('Page type: "doc", "kanban", "calendar", "table", "outline", "gallery", "slides", "timeline", "whiteboard", "map", "desktop", "mindmap", "graph". Omit to inherit parent view.'),
+      type: z.string().optional().describe('Page type: "doc", "kanban", "calendar", "table", "outline", "gallery", "slides", "timeline", "whiteboard", "map", "dashboard", "mindmap", "graph". Omit to inherit parent view.'),
       meta: z.record(z.unknown()).optional().describe('Initial metadata (PageMeta fields: color as hex string, icon as Lucide kebab-case name like "star"/"code-2"/"users" — never emoji, dateStart, dateEnd, priority 0-4, tags array, etc). Omit icon entirely to use page type default.'),
     },
     async ({ parentId, label, type, meta }) => {
@@ -224,7 +244,7 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
     'Change the page type view of a document (data is preserved).',
     {
       id: z.string().describe('Document ID.'),
-      type: z.string().describe('New page type (e.g. "doc", "kanban", "table", "calendar", "outline", "gallery", "slides", "timeline", "whiteboard", "map", "desktop", "mindmap", "graph").'),
+      type: z.string().describe('New page type (e.g. "doc", "kanban", "table", "calendar", "outline", "gallery", "slides", "timeline", "whiteboard", "map", "dashboard", "mindmap", "graph").'),
     },
     async ({ id, type }) => {
       const treeMap = server.getTreeMap()