@abraca/mcp 1.1.0 → 1.1.2

package/package.json

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

package/src/hook-bridge.ts

@@ -184,7 +184,10 @@ export class HookBridge {
     const toolName: string = payload.tool_name ?? ''
     if (toolName.startsWith('mcp__abracadabra__')) return
 
-    this.server.setActiveToolCall(null)
+    // Don't clear activeToolCall — let it persist until the next PreToolUse
+    // replaces it or Stop clears everything. This prevents the status from
+    // flashing and vanishing between consecutive tool calls.
+    this.server.setAutoStatus('thinking')
   }
 
   private onSubagentStart(payload: Record<string, any>): void {
@@ -194,7 +197,8 @@ export class HookBridge {
   }
 
   private onSubagentStop(_payload: Record<string, any>): void {
-    this.server.setActiveToolCall(null)
+    // Don't clear — let it persist until the next action or Stop
+    this.server.setAutoStatus('thinking')
   }
 
   private onStop(): void {

package/src/server.ts

@@ -7,7 +7,7 @@
  */
 import * as Y from 'yjs'
 import { AbracadabraProvider, AbracadabraClient } from '@abraca/dabra'
-import type { ServerInfo, SpaceMeta } from '@abraca/dabra'
+import type { ServerInfo, SpaceMeta, DocumentMeta } from '@abraca/dabra'
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { waitForSync } from './utils.ts'
@@ -124,20 +124,35 @@ export class AbracadabraMCPServer {
     // Step 3: Discover server info
     this._serverInfo = await this.client.serverInfo()
 
-    // Step 4: Discover spaces (optional extension)
+    // Step 4: Discover root documents (try new endpoint first, fall back to /spaces)
     let initialDocId: string | null = this._serverInfo.index_doc_id ?? null
     try {
-      this._spaces = await this.client.listSpaces()
-      const hub = this._spaces.find(s => s.is_hub)
+      const roots = await this.client.listRootDocuments()
+      // Map to SpaceMeta shape for backwards compat with list_spaces tool
+      this._spaces = roots.map(docToSpaceMeta)
+      const hub = roots.find(d => d.is_hub)
       if (hub) {
-        initialDocId = hub.doc_id
-        console.error(`[abracadabra-mcp] Spaces extension active. Hub space: ${hub.name} (${hub.doc_id})`)
-      } else if (this._spaces.length > 0) {
-        initialDocId = this._spaces[0].doc_id
-        console.error(`[abracadabra-mcp] Spaces active but no hub, using first space: ${this._spaces[0].name} (${this._spaces[0].doc_id})`)
+        initialDocId = hub.id
+        console.error(`[abracadabra-mcp] Root documents discovered. Hub: ${hub.label ?? hub.id} (${hub.id})`)
+      } else if (roots.length > 0) {
+        initialDocId = roots[0].id
+        console.error(`[abracadabra-mcp] No hub, using first root doc: ${roots[0].label ?? roots[0].id} (${roots[0].id})`)
       }
     } catch {
-      console.error('[abracadabra-mcp] Spaces extension not available, using index_doc_id')
+      // Fall back to legacy /spaces endpoint for older servers
+      try {
+        this._spaces = await this.client.listSpaces()
+        const hub = this._spaces.find(s => s.is_hub)
+        if (hub) {
+          initialDocId = hub.doc_id
+          console.error(`[abracadabra-mcp] Spaces extension active. Hub space: ${hub.name} (${hub.doc_id})`)
+        } else if (this._spaces.length > 0) {
+          initialDocId = this._spaces[0].doc_id
+          console.error(`[abracadabra-mcp] Spaces active but no hub, using first space: ${this._spaces[0].name} (${this._spaces[0].doc_id})`)
+        }
+      } catch {
+        console.error('[abracadabra-mcp] Neither /docs?root=true nor /spaces available, using index_doc_id')
+      }
     }
 
     if (!initialDocId) {
@@ -479,14 +494,15 @@ export class AbracadabraMCPServer {
       this._stopTypingInterval()
     }
 
-    // Auto-clear status after 10s of no updates
+    // Auto-clear status after 30s of no updates (generous timeout so status
+    // persists visibly between consecutive tool calls instead of flickering)
     if (status) {
       this._statusClearTimer = setTimeout(() => {
         provider.awareness.setLocalStateField('status', null)
         provider.awareness.setLocalStateField('activeToolCall', null)
         provider.awareness.setLocalStateField('statusContext', null)
         this._stopTypingInterval()
-      }, 10_000)
+      }, 30_000)
     }
   }
 
@@ -557,3 +573,23 @@ export class AbracadabraMCPServer {
     console.error('[abracadabra-mcp] Shutdown complete')
   }
 }
+
+/** Map a DocumentMeta (from /docs?root=true) to the SpaceMeta shape for compat. */
+function docToSpaceMeta(doc: DocumentMeta): SpaceMeta {
+  const publicAccess = doc.public_access
+  let visibility: SpaceMeta['visibility'] = 'private'
+  if (publicAccess && publicAccess !== 'none') visibility = 'public'
+
+  return {
+    id: doc.id,
+    doc_id: doc.id,
+    name: doc.label ?? doc.id,
+    description: doc.description ?? null,
+    visibility,
+    is_hub: doc.is_hub ?? false,
+    owner_id: doc.owner_id ?? null,
+    created_at: 0,
+    updated_at: doc.updated_at ?? 0,
+    public_access: publicAccess ?? null,
+  }
+}