@abraca/mcp 1.1.2 → 1.3.4

package/dist/index.d.ts

@@ -8731,6 +8731,7 @@ declare class AbracadabraMCPServer {
   private _statusClearTimer;
   private _typingInterval;
   private _lastChatChannel;
+  private _signFn;
   constructor(config: MCPServerConfig);
   get agentName(): string;
   get agentColor(): string;

package/package.json

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

package/src/server.ts

@@ -51,6 +51,7 @@ export class AbracadabraMCPServer {
   private _statusClearTimer: ReturnType<typeof setTimeout> | null = null
   private _typingInterval: ReturnType<typeof setInterval> | null = null
   private _lastChatChannel: string | null = null
+  private _signFn: ((challenge: string) => Promise<string>) | null = null
 
   constructor(config: MCPServerConfig) {
     this.config = config
@@ -98,6 +99,7 @@ export class AbracadabraMCPServer {
     const keypair = await loadOrCreateKeypair(this.config.keyFile)
     this._userId = keypair.publicKeyB64
     const signFn = (challenge: string) => Promise.resolve(signChallenge(challenge, keypair.privateKey))
+    this._signFn = signFn
 
     // Step 2: Authenticate via challenge-response (register on first run)
     try {
@@ -179,6 +181,13 @@ export class AbracadabraMCPServer {
       return existing
     }
 
+    // Re-authenticate if JWT has expired (prevents WS auth failures)
+    if (!this.client.isTokenValid() && this._signFn && this._userId) {
+      console.error('[abracadabra-mcp] JWT expired, re-authenticating...')
+      await this.client.loginWithKey(this._userId, this._signFn)
+      console.error('[abracadabra-mcp] Re-authenticated successfully')
+    }
+
     const doc = new Y.Doc({ guid: docId })
     const provider = new AbracadabraProvider({
       name: docId,
@@ -256,6 +265,13 @@ export class AbracadabraMCPServer {
       throw new Error('Not connected. Call connect() first.')
     }
 
+    // Re-authenticate if JWT has expired (prevents child WS auth failures)
+    if (!this.client.isTokenValid() && this._signFn && this._userId) {
+      console.error('[abracadabra-mcp] JWT expired, re-authenticating...')
+      await this.client.loginWithKey(this._userId, this._signFn)
+      console.error('[abracadabra-mcp] Re-authenticated successfully')
+    }
+
     const childProvider = await activeProvider.loadChild(docId)
     await waitForSync(childProvider)
 

package/src/tools/tree.ts

@@ -1,7 +1,7 @@
 /**
  * Document tree tools — operate on the root Y.Doc's "doc-tree" Y.Map.
  */
-import type * as Y from 'yjs'
+import * as Y from 'yjs'
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { z } from 'zod'
 import type { AbracadabraMCPServer } from '../server.ts'
@@ -17,9 +17,16 @@ function normalizeRootId(id: string | null | undefined, server: AbracadabraMCPSe
   return id === server.rootDocId ? null : id
 }
 
+/** Safely read a tree map value, converting Y.Map to plain object if needed. */
+function toPlain(val: any): any {
+  return val instanceof Y.Map ? val.toJSON() : val
+}
+
 function readEntries(treeMap: Y.Map<any>): TreeEntry[] {
   const entries: TreeEntry[] = []
-  treeMap.forEach((value: any, id: string) => {
+  treeMap.forEach((raw: any, id: string) => {
+    const value = toPlain(raw)
+    if (typeof value !== 'object' || value === null) return // skip non-entry keys (e.g. ":updatedAt" timestamps)
     entries.push({
       id,
       label: value.label || 'Untitled',
@@ -257,12 +264,13 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
         return { content: [{ type: 'text', text: 'Not connected' }] }
       }
 
-      const entry = treeMap.get(id)
-      if (!entry) {
+      const raw = treeMap.get(id)
+      if (!raw) {
         server.setActiveToolCall(null)
         return { content: [{ type: 'text', text: `Document ${id} not found` }] }
       }
 
+      const entry = toPlain(raw)
       treeMap.set(id, { ...entry, label, updatedAt: Date.now() })
       server.setActiveToolCall(null)
       return { content: [{ type: 'text', text: `Renamed to "${label}"` }] }
@@ -286,12 +294,13 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
         return { content: [{ type: 'text', text: 'Not connected' }] }
       }
 
-      const entry = treeMap.get(id)
-      if (!entry) {
+      const raw = treeMap.get(id)
+      if (!raw) {
         server.setActiveToolCall(null)
         return { content: [{ type: 'text', text: `Document ${id} not found` }] }
       }
 
+      const entry = toPlain(raw)
       treeMap.set(id, {
         ...entry,
         parentId: normalizeRootId(newParentId, server),
@@ -326,8 +335,9 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
       const now = Date.now()
       rootDoc.transact(() => {
         for (const nid of toDelete) {
-          const entry = treeMap.get(nid)
-          if (!entry) continue
+          const raw = treeMap.get(nid)
+          if (!raw) continue
+          const entry = toPlain(raw)
           trashMap.set(nid, {
             label: entry.label || 'Untitled',
             parentId: entry.parentId ?? null,
@@ -361,12 +371,13 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
         return { content: [{ type: 'text', text: 'Not connected' }] }
       }
 
-      const entry = treeMap.get(id)
-      if (!entry) {
+      const raw = treeMap.get(id)
+      if (!raw) {
         server.setActiveToolCall(null)
         return { content: [{ type: 'text', text: `Document ${id} not found` }] }
       }
 
+      const entry = toPlain(raw)
       treeMap.set(id, { ...entry, type, updatedAt: Date.now() })
       server.setActiveToolCall(null)
       return { content: [{ type: 'text', text: `Changed type to "${type}"` }] }
@@ -410,9 +421,10 @@ export function registerTreeTools(mcp: McpServer, server: AbracadabraMCPServer)
       const treeMap = server.getTreeMap()
       if (!treeMap) return { content: [{ type: 'text', text: 'Not connected' }] }
 
-      const entry = treeMap.get(id)
-      if (!entry) return { content: [{ type: 'text', text: `Document ${id} not found` }] }
+      const raw = treeMap.get(id)
+      if (!raw) return { content: [{ type: 'text', text: `Document ${id} not found` }] }
 
+      const entry = toPlain(raw)
       const newId = crypto.randomUUID()
       treeMap.set(newId, {
         ...entry,