@intangle/mcp-server 2.5.3 → 2.5.5

package/dist/index.js

@@ -7,7 +7,7 @@ import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from "@modelcontextprotocol/sdk/types.js";
+import { CallToolRequestSchema, ErrorCode, ListResourceTemplatesRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, McpError, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { config } from "dotenv";
 import fetch from "node-fetch";
 import { TOOLS } from "./tool-definitions.js";
@@ -101,6 +101,13 @@ try {
         }
         return url.toString();
     }
+    function buildRemoteApiUrl() {
+        const url = new URL("/api/mcp-remote", API_BASE_URL);
+        if (VERCEL_BYPASS_TOKEN) {
+            url.searchParams.set("x-vercel-protection-bypass", VERCEL_BYPASS_TOKEN);
+        }
+        return url.toString();
+    }
     async function makeApiCall(endpoint, data, timeoutMs) {
         // Ensure we have client info before making requests
         ensureClientInfo();
@@ -160,6 +167,57 @@ try {
             clearTimeout(timeoutId);
         }
     }
+    async function makeRemoteRpcCall(method, params) {
+        ensureClientInfo();
+        const headers = {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${MCP_API_KEY}`,
+            "User-Agent": mcpClientName
+                ? `${mcpClientName}/${mcpClientVersion || "unknown"} (mcp-stdio)`
+                : "MCP-Client-Stdio/1.1.2 (mcp)",
+        };
+        if (mcpClientName) {
+            headers["X-MCP-Client-Name"] = mcpClientName;
+        }
+        if (mcpClientVersion) {
+            headers["X-MCP-Client-Version"] = mcpClientVersion;
+        }
+        if (VERCEL_BYPASS_TOKEN) {
+            headers["x-vercel-protection-bypass"] = VERCEL_BYPASS_TOKEN;
+        }
+        const requestId = Date.now();
+        const rpcBody = {
+            jsonrpc: "2.0",
+            id: requestId,
+            method,
+            params,
+        };
+        const response = await fetch(buildRemoteApiUrl(), {
+            method: "POST",
+            headers,
+            body: JSON.stringify(rpcBody),
+        });
+        const responseText = await response.text();
+        let responseJson = {};
+        try {
+            responseJson = responseText ? JSON.parse(responseText) : {};
+        }
+        catch {
+            throw new Error(`Failed to parse MCP remote ${method} response`);
+        }
+        if (!response.ok) {
+            const message = responseJson?.error?.message ||
+                responseJson?.message ||
+                `${response.status} ${response.statusText}`;
+            throw new Error(`MCP remote ${method} failed: ${message}`);
+        }
+        if (responseJson?.error) {
+            const code = responseJson.error.code;
+            const message = responseJson.error.message || "Unknown MCP remote error";
+            throw new Error(`MCP remote ${method} error (${code}): ${message}`);
+        }
+        return responseJson?.result ?? {};
+    }
     const server = new Server({
         name: "intangle-context",
         version: "1.0.0",
@@ -171,12 +229,33 @@ try {
         ],
     }, {
         capabilities: {
+            resources: {},
             tools: {},
         },
     });
     server.setRequestHandler(ListToolsRequestSchema, async () => ({
         tools: TOOLS,
     }));
+    server.setRequestHandler(ListResourcesRequestSchema, async () => {
+        const result = await makeRemoteRpcCall("resources/list", {});
+        return {
+            resources: Array.isArray(result?.resources) ? result.resources : [],
+            nextCursor: typeof result?.nextCursor === "string" ? result.nextCursor : undefined,
+        };
+    });
+    server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+        const uri = request?.params?.uri;
+        if (!uri || typeof uri !== "string") {
+            throw new McpError(ErrorCode.InvalidParams, "uri is required for resources/read");
+        }
+        const result = await makeRemoteRpcCall("resources/read", { uri });
+        return {
+            contents: Array.isArray(result?.contents) ? result.contents : [],
+        };
+    });
+    server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => ({
+        resourceTemplates: [],
+    }));
     async function handleSearchContext(args) {
         const { space_id, query, topics } = args;
         // Require space_id
@@ -251,18 +330,15 @@ try {
         });
     }
     async function handleMessage(args) {
-        if (!args.type || !args.content) {
-            throw new Error("type and content are required");
+        if (!args.space_id || !args.content) {
+            throw new Error("space_id and content are required");
         }
-        // Inject session_id from environment variable
-        const sessionId = process.env.INTANGLE_SESSION_ID;
-        if (!sessionId) {
-            throw new Error("INTANGLE_SESSION_ID environment variable is required for the message tool");
-        }
-        return makeApiCall("message", {
-            ...args,
-            session_id: sessionId,
-        });
+        const timeoutMs = typeof args.timeout_ms === "number" && Number.isFinite(args.timeout_ms)
+            ? Math.max(10_000, Math.min(300_000, Math.trunc(args.timeout_ms)))
+            : undefined;
+        // Give backend a little extra headroom beyond requested assistant timeout.
+        const requestTimeout = timeoutMs ? timeoutMs + 10_000 : undefined;
+        return makeApiCall("message", args, requestTimeout);
     }
     server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const { name, arguments: args } = request.params;

package/dist/tool-definitions.js

@@ -311,42 +311,51 @@ export const TOOLS = [
     },
     {
         name: "message",
-        title: "Send Message",
-        description: "Send a message to the Intangle assistant for user interaction. Use type 'approval' to request approval (blocks until user responds), 'question' to ask the user a question (blocks until answered), 'notification' for informational updates (returns immediately), 'completion' to signal task completion (returns immediately), or 'error' to report errors (returns immediately).",
+        title: "Message Assistant",
+        description: "Primary orchestration tool. Send a request to the Intangle assistant and wait for one assistant turn to complete. Returns assistant text plus continuity IDs (`session_id`, `conversation_id`) so callers can continue the same thread reliably across turns.",
         inputSchema: {
             type: "object",
             properties: {
-                type: {
+                space_id: {
                     type: "string",
-                    enum: ["approval", "question", "notification", "completion", "error"],
-                    description: "Message type. 'approval' and 'question' block until the user responds. 'notification', 'completion', and 'error' return immediately."
+                    description: "Space to run the assistant turn in (use view_spaces first)."
                 },
                 content: {
                     type: "string",
-                    description: "The message content to display to the user"
+                    description: "User message content to send to the assistant."
                 },
-                metadata: {
-                    type: "object",
-                    description: "Optional context about the message",
-                    properties: {
-                        file: {
-                            type: "string",
-                            description: "Related file path"
-                        },
-                        action: {
-                            type: "string",
-                            description: "Action being performed"
-                        },
-                        details: {
-                            type: "string",
-                            description: "Additional details"
-                        }
-                    }
+                provider: {
+                    type: "string",
+                    description: "Optional provider alias (defaults to 'tan')."
+                },
+                conversation_id: {
+                    type: "string",
+                    description: "Optional existing conversation/chat summary ID to resume a specific conversation. If omitted, Intangle uses/creates the active conversation for this space."
+                },
+                session_id: {
+                    type: "string",
+                    description: "Optional runtime session ID to reuse across calls. Reuse the returned session_id for best continuity and lower warm-up overhead."
+                },
+                project_id: {
+                    type: "string",
+                    description: "Optional project scope for the assistant turn."
+                },
+                organization_id: {
+                    type: "string",
+                    description: "Optional Clerk org ID when the space belongs to an organization graph."
+                },
+                timeout_ms: {
+                    type: "integer",
+                    description: "Optional timeout in milliseconds (10,000 to 300,000; default 120,000)."
+                },
+                timezone: {
+                    type: "string",
+                    description: "Optional IANA timezone for assistant context."
                 }
             },
-            required: ["type", "content"]
+            required: ["space_id", "content"]
         }
-    },
+    }
     // DISABLED: memory_action tool is broken and causing errors.
     // Pending OHM protocol fix. Use update_space, search, or fetch_items instead.
     // {

package/index.ts

@@ -12,8 +12,11 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import {
   CallToolRequestSchema,
   ErrorCode,
+  ListResourceTemplatesRequestSchema,
+  ListResourcesRequestSchema,
   ListToolsRequestSchema,
   McpError,
+  ReadResourceRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js"
 import { config } from "dotenv"
 import fetch from "node-fetch"
@@ -134,6 +137,16 @@ try {
     return url.toString()
   }
 
+  function buildRemoteApiUrl() {
+    const url = new URL("/api/mcp-remote", API_BASE_URL)
+
+    if (VERCEL_BYPASS_TOKEN) {
+      url.searchParams.set("x-vercel-protection-bypass", VERCEL_BYPASS_TOKEN)
+    }
+
+    return url.toString()
+  }
+
   async function makeApiCall(endpoint: string, data: any, timeoutMs?: number) {
     // Ensure we have client info before making requests
     ensureClientInfo()
@@ -187,7 +200,9 @@ try {
           )
         }
 
-        throw new Error(`API call failed: ${response.status} ${response.statusText}`)
+        throw new Error(
+          `API call failed: ${response.status} ${response.statusText}`
+        )
       }
 
       if (responseBody.trim() === "") {
@@ -207,6 +222,70 @@ try {
     }
   }
 
+  async function makeRemoteRpcCall(
+    method: string,
+    params: Record<string, unknown>
+  ) {
+    ensureClientInfo()
+
+    const headers: Record<string, string> = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${MCP_API_KEY}`,
+      "User-Agent": mcpClientName
+        ? `${mcpClientName}/${mcpClientVersion || "unknown"} (mcp-stdio)`
+        : "MCP-Client-Stdio/1.1.2 (mcp)",
+    }
+
+    if (mcpClientName) {
+      headers["X-MCP-Client-Name"] = mcpClientName
+    }
+    if (mcpClientVersion) {
+      headers["X-MCP-Client-Version"] = mcpClientVersion
+    }
+    if (VERCEL_BYPASS_TOKEN) {
+      headers["x-vercel-protection-bypass"] = VERCEL_BYPASS_TOKEN
+    }
+
+    const requestId = Date.now()
+    const rpcBody = {
+      jsonrpc: "2.0",
+      id: requestId,
+      method,
+      params,
+    }
+
+    const response = await fetch(buildRemoteApiUrl(), {
+      method: "POST",
+      headers,
+      body: JSON.stringify(rpcBody),
+    })
+
+    const responseText = await response.text()
+    let responseJson: any = {}
+
+    try {
+      responseJson = responseText ? JSON.parse(responseText) : {}
+    } catch {
+      throw new Error(`Failed to parse MCP remote ${method} response`)
+    }
+
+    if (!response.ok) {
+      const message =
+        responseJson?.error?.message ||
+        responseJson?.message ||
+        `${response.status} ${response.statusText}`
+      throw new Error(`MCP remote ${method} failed: ${message}`)
+    }
+
+    if (responseJson?.error) {
+      const code = responseJson.error.code
+      const message = responseJson.error.message || "Unknown MCP remote error"
+      throw new Error(`MCP remote ${method} error (${code}): ${message}`)
+    }
+
+    return responseJson?.result ?? {}
+  }
+
   const server = new Server(
     {
       name: "intangle-context",
@@ -220,6 +299,7 @@ try {
     },
     {
       capabilities: {
+        resources: {},
         tools: {},
       },
     }
@@ -229,6 +309,34 @@ try {
     tools: TOOLS,
   }))
 
+  server.setRequestHandler(ListResourcesRequestSchema, async () => {
+    const result = await makeRemoteRpcCall("resources/list", {})
+    return {
+      resources: Array.isArray(result?.resources) ? result.resources : [],
+      nextCursor:
+        typeof result?.nextCursor === "string" ? result.nextCursor : undefined,
+    }
+  })
+
+  server.setRequestHandler(ReadResourceRequestSchema, async (request: any) => {
+    const uri = request?.params?.uri
+    if (!uri || typeof uri !== "string") {
+      throw new McpError(
+        ErrorCode.InvalidParams,
+        "uri is required for resources/read"
+      )
+    }
+
+    const result = await makeRemoteRpcCall("resources/read", { uri })
+    return {
+      contents: Array.isArray(result?.contents) ? result.contents : [],
+    }
+  })
+
+  server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => ({
+    resourceTemplates: [],
+  }))
+
   async function handleSearchContext(args: any) {
     const { space_id, query, topics } = args as {
       space_id: string
@@ -278,11 +386,15 @@ try {
     }
 
     if (!project_id && !slug) {
-      throw new Error("Either project_id or slug (with space_id) is required. Use view_projects to get valid IDs.")
+      throw new Error(
+        "Either project_id or slug (with space_id) is required. Use view_projects to get valid IDs."
+      )
     }
 
     if (slug && !space_id) {
-      throw new Error("space_id is required when using slug. Use view_spaces to see available options.")
+      throw new Error(
+        "space_id is required when using slug. Use view_spaces to see available options."
+      )
     }
 
     return makeApiCall("view-project", { project_id, space_id, slug })
@@ -310,9 +422,7 @@ try {
     }
 
     if (!args.add && !args.update && !args.delete) {
-      throw new Error(
-        "At least one operation must be provided"
-      )
+      throw new Error("At least one operation must be provided")
     }
 
     // Ensure all add items have a type field to prevent classification timeout
@@ -320,7 +430,9 @@ try {
     if (add?.items && Array.isArray(add.items)) {
       for (const item of add.items) {
         if (!item.type) {
-          log(`WARNING: Item "${item.title}" missing type field, defaulting to "context" to prevent classification timeout`)
+          log(
+            `WARNING: Item "${item.title}" missing type field, defaulting to "context" to prevent classification timeout`
+          )
           item.type = "context"
         }
       }
@@ -337,22 +449,19 @@ try {
   }
 
   async function handleMessage(args: any) {
-    if (!args.type || !args.content) {
-      throw new Error("type and content are required")
+    if (!args.space_id || !args.content) {
+      throw new Error("space_id and content are required")
     }
 
-    // Inject session_id from environment variable
-    const sessionId = process.env.INTANGLE_SESSION_ID
-    if (!sessionId) {
-      throw new Error(
-        "INTANGLE_SESSION_ID environment variable is required for the message tool"
-      )
-    }
+    const timeoutMs =
+      typeof args.timeout_ms === "number" && Number.isFinite(args.timeout_ms)
+        ? Math.max(10_000, Math.min(300_000, Math.trunc(args.timeout_ms)))
+        : undefined
 
-    return makeApiCall("message", {
-      ...args,
-      session_id: sessionId,
-    })
+    // Give backend a little extra headroom beyond requested assistant timeout.
+    const requestTimeout = timeoutMs ? timeoutMs + 10_000 : undefined
+
+    return makeApiCall("message", args, requestTimeout)
   }
 
   server.setRequestHandler(CallToolRequestSchema, async (request: any) => {

package/package.json

@@ -1,53 +1,53 @@
 {
-	"name": "@intangle/mcp-server",
-	"version": "2.5.3",
-	"description": "Model Context Protocol server for Intangle - AI context that persists across conversations",
-	"main": "dist/index.js",
-	"type": "module",
-	"scripts": {
-		"start": "node dist/index.js",
-		"dev": "tsx watch index.ts",
-		"prebuild": "cp ../web/src/app/api/mcp-remote/tool-definitions.ts ./tool-definitions.ts",
-		"build": "tsc",
-		"lint": "biome check .",
-		"lint:fix": "biome check --fix .",
-		"prepublishOnly": "npm run build"
-	},
-	"bin": {
-		"intangle-mcp": "dist/index.js"
-	},
-	"keywords": [
-		"mcp",
-		"model-context-protocol",
-		"claude",
-		"claude-code",
-		"ai",
-		"context",
-		"knowledge-management",
-		"intangle",
-		"claude-desktop",
-		"anthropic"
-	],
-	"author": "Intangle",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/intangle/mcp-server.git"
-	},
-	"homepage": "https://intangle.app",
-	"engines": {
-		"node": ">=18.0.0"
-	},
-	"dependencies": {
-		"@modelcontextprotocol/sdk": "^1.0.0",
-		"dotenv": "^17.2.0",
-		"node-fetch": "^3.3.2"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "^1.9.4",
-		"@types/node": "^22.0.0",
-		"@types/node-fetch": "^2.6.12",
-		"tsx": "^4.0.0",
-		"typescript": "^5.0.0"
-	}
+  "name": "@intangle/mcp-server",
+  "version": "2.5.5",
+  "description": "Model Context Protocol server for Intangle - AI context that persists across conversations",
+  "main": "dist/index.js",
+  "type": "module",
+  "scripts": {
+    "start": "node dist/index.js",
+    "dev": "tsx watch index.ts",
+    "prebuild": "cp ../web/src/app/api/mcp-remote/tool-definitions.ts ./tool-definitions.ts",
+    "build": "tsc",
+    "lint": "biome check .",
+    "lint:fix": "biome check --fix .",
+    "prepublishOnly": "npm run build"
+  },
+  "bin": {
+    "intangle-mcp": "dist/index.js"
+  },
+  "keywords": [
+    "mcp",
+    "model-context-protocol",
+    "claude",
+    "claude-code",
+    "ai",
+    "context",
+    "knowledge-management",
+    "intangle",
+    "claude-desktop",
+    "anthropic"
+  ],
+  "author": "Intangle",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/intangle/mcp-server.git"
+  },
+  "homepage": "https://intangle.app",
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.0.0",
+    "dotenv": "^17.2.0",
+    "node-fetch": "^3.3.2"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
+    "@types/node": "^22.0.0",
+    "@types/node-fetch": "^2.6.12",
+    "tsx": "^4.0.0",
+    "typescript": "^5.0.0"
+  }
 }

package/tool-definitions.ts

@@ -344,44 +344,57 @@ export const TOOLS = [
   },
   {
     name: "message",
-    title: "Send Message",
+    title: "Message Assistant",
     description:
-      "Send a message to the Intangle assistant for user interaction. Use type 'approval' to request approval (blocks until user responds), 'question' to ask the user a question (blocks until answered), 'notification' for informational updates (returns immediately), 'completion' to signal task completion (returns immediately), or 'error' to report errors (returns immediately).",
+      "Primary orchestration tool. Send a request to the Intangle assistant and wait for one assistant turn to complete. Returns assistant text plus continuity IDs (`session_id`, `conversation_id`) so callers can continue the same thread reliably across turns.",
     inputSchema: {
       type: "object",
       properties: {
-        type: {
+        space_id: {
           type: "string",
-          enum: ["approval", "question", "notification", "completion", "error"],
           description:
-            "Message type. 'approval' and 'question' block until the user responds. 'notification', 'completion', and 'error' return immediately."
+            "Space to run the assistant turn in (use view_spaces first)."
         },
         content: {
           type: "string",
-          description: "The message content to display to the user"
+          description: "User message content to send to the assistant."
         },
-        metadata: {
-          type: "object",
-          description: "Optional context about the message",
-          properties: {
-            file: {
-              type: "string",
-              description: "Related file path"
-            },
-            action: {
-              type: "string",
-              description: "Action being performed"
-            },
-            details: {
-              type: "string",
-              description: "Additional details"
-            }
-          }
+        provider: {
+          type: "string",
+          description: "Optional provider alias (defaults to 'tan')."
+        },
+        conversation_id: {
+          type: "string",
+          description:
+            "Optional existing conversation/chat summary ID to resume a specific conversation. If omitted, Intangle uses/creates the active conversation for this space."
+        },
+        session_id: {
+          type: "string",
+          description:
+            "Optional runtime session ID to reuse across calls. Reuse the returned session_id for best continuity and lower warm-up overhead."
+        },
+        project_id: {
+          type: "string",
+          description: "Optional project scope for the assistant turn."
+        },
+        organization_id: {
+          type: "string",
+          description:
+            "Optional Clerk org ID when the space belongs to an organization graph."
+        },
+        timeout_ms: {
+          type: "integer",
+          description:
+            "Optional timeout in milliseconds (10,000 to 300,000; default 120,000)."
+        },
+        timezone: {
+          type: "string",
+          description: "Optional IANA timezone for assistant context."
         }
       },
-      required: ["type", "content"]
+      required: ["space_id", "content"]
     }
-  },
+  }
   // DISABLED: memory_action tool is broken and causing errors.
   // Pending OHM protocol fix. Use update_space, search, or fetch_items instead.
   // {