@superinterface/server 1.5.0 → 1.6.0

package/dist/lib/computerCalls/handleComputerCall/index.js

@@ -50,13 +50,15 @@ export const handleComputerCall = async ({ assistant, toolCall, thread, prisma,
             output: 'No computer use tool configured.',
         };
     }
-    const { mcpConnection } = await connectMcpServer({
-        thread,
-        assistant,
-        mcpServer: tool.computerUseTool.mcpServer,
-        prisma,
-    });
+    let mcpConnection = null;
     try {
+        const connection = await connectMcpServer({
+            thread,
+            assistant,
+            mcpServer: tool.computerUseTool.mcpServer,
+            prisma,
+        });
+        mcpConnection = connection.mcpConnection;
         const mcpServerToolOutput = (await mcpConnection.client.callTool({
             name: 'computer_call',
             arguments: {
@@ -66,9 +68,6 @@ export const handleComputerCall = async ({ assistant, toolCall, thread, prisma,
         }, CallToolResultSchema, {
             timeout: 300000,
         }));
-        await closeMcpConnection({
-            mcpConnection,
-        });
         const acknowledgedSafetyChecks = 
         // @ts-expect-error compat
         toolCall.computer_call.pending_safety_checks.map((psc) => ({
@@ -95,6 +94,7 @@ export const handleComputerCall = async ({ assistant, toolCall, thread, prisma,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }
     catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
         createLog({
             log: {
                 requestMethod: LogRequestMethod.POST,
@@ -102,7 +102,7 @@ export const handleComputerCall = async ({ assistant, toolCall, thread, prisma,
                 level: LogLevel.ERROR,
                 status: 500,
                 // @ts-expect-error compat
-                message: `Error calling computer_call with action ${JSON.stringify(toolCall.computer_call.action)}: ${e.message}`,
+                message: `Error calling computer_call with action ${JSON.stringify(toolCall.computer_call.action)}: ${message}`,
                 workspaceId: assistant.workspaceId,
                 assistantId: assistant.id,
                 threadId: thread.id,
@@ -112,7 +112,19 @@ export const handleComputerCall = async ({ assistant, toolCall, thread, prisma,
         return {
             tool_call_id: toolCall.id,
             // @ts-expect-error compat
-            output: `Error calling computer_call with action ${JSON.stringify(toolCall.computer_call.action)}: ${e.message}`,
+            output: `Error calling computer_call with action ${JSON.stringify(toolCall.computer_call.action)}: ${message}`,
         };
     }
+    finally {
+        if (mcpConnection) {
+            try {
+                await closeMcpConnection({
+                    mcpConnection,
+                });
+            }
+            catch (_c) {
+                // Ignore close errors so the tool output is still returned.
+            }
+        }
+    }
 };

package/dist/lib/functions/handleFunction/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/functions/handleFunction/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EACL,MAAM,EAEN,MAAM,EAIN,KAAK,YAAY,EAClB,MAAM,gBAAgB,CAAA;AAgBvB,eAAO,MAAM,cAAc,GAAU,2DAOlC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,YAAY,EAAE,IAAI,CAAA;iBACnB,CAAA;aACF,CAAA;YACD,SAAS,EAAE;gBACT,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP,cAAc,EAAE,IAAI,CAAA;4BACpB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,iBAAiB,EAAE,IAAI,CAAA;yBACxB,CAAA;qBACF,CAAA;iBACF,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAA;IACjE,UAAU,EAAE,+BAA+B,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;CACrB;;;EAkbA,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/functions/handleFunction/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EACL,MAAM,EAEN,MAAM,EAIN,KAAK,YAAY,EAClB,MAAM,gBAAgB,CAAA;AAgBvB,eAAO,MAAM,cAAc,GAAU,2DAOlC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,YAAY,EAAE,IAAI,CAAA;iBACnB,CAAA;aACF,CAAA;YACD,SAAS,EAAE;gBACT,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP,cAAc,EAAE,IAAI,CAAA;4BACpB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,gBAAgB,EAAE,IAAI,CAAA;4BACtB,iBAAiB,EAAE,IAAI,CAAA;4BACvB,iBAAiB,EAAE,IAAI,CAAA;yBACxB,CAAA;qBACF,CAAA;iBACF,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAA;IACjE,UAAU,EAAE,+BAA+B,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;CACrB;;;EAucA,CAAA"}

package/dist/lib/functions/handleFunction/index.js

@@ -19,13 +19,32 @@ export const handleFunction = async ({ assistant, toolCall, controller, run, thr
         assistant,
     });
     if (!fn) {
-        const { mcpConnection } = await getToolCallMcpServer({
+        const { mcpConnection, error } = await getToolCallMcpServer({
             toolCall,
             assistant,
             thread,
             prisma,
         });
         if (!mcpConnection) {
+            if (error) {
+                createLog({
+                    log: {
+                        requestMethod: LogRequestMethod.POST,
+                        requestRoute: LogRequestRoute.MESSAGES,
+                        level: LogLevel.ERROR,
+                        status: 500,
+                        message: `Error calling function ${toolCall.function.name}: ${error.message}`,
+                        workspaceId: assistant.workspaceId,
+                        assistantId: assistant.id,
+                        threadId: thread.id,
+                    },
+                    prisma,
+                });
+                return {
+                    tool_call_id: toolCall.id,
+                    output: `Error calling function ${toolCall.function.name}: ${error.message}`,
+                };
+            }
             createLog({
                 log: {
                     requestMethod: LogRequestMethod.POST,

package/dist/lib/mcpServers/getToolCallMcpServer.d.ts

@@ -18,5 +18,6 @@ export declare const getToolCallMcpServer: ({ assistant, toolCall, thread, prism
     prisma: PrismaClient;
 }) => Promise<{
     mcpConnection: McpConnection | null;
+    error: Error | null;
 }>;
 //# sourceMappingURL=getToolCallMcpServer.d.ts.map

package/dist/lib/mcpServers/getToolCallMcpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getToolCallMcpServer.d.ts","sourceRoot":"","sources":["../../../src/lib/mcpServers/getToolCallMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,eAAO,MAAM,oBAAoB,GAAU,0CAKxC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,YAAY,EAAE,IAAI,CAAA;iBACnB,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAA;IACjE,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;CACrB;mBAiCmC,aAAa,GAAG,IAAI;EAEvD,CAAA"}
+{"version":3,"file":"getToolCallMcpServer.d.ts","sourceRoot":"","sources":["../../../src/lib/mcpServers/getToolCallMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,eAAO,MAAM,oBAAoB,GAAU,0CAKxC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,YAAY,EAAE,IAAI,CAAA;iBACnB,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAA;IACjE,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;CACrB;mBAiDmC,aAAa,GAAG,IAAI;;EAGvD,CAAA"}

package/dist/lib/mcpServers/getToolCallMcpServer.js

@@ -2,31 +2,50 @@ import { connectMcpServer } from '../../lib/mcpServers/connectMcpServer';
 import { closeMcpConnection } from '../../lib/mcpServers/closeMcpConnection';
 export const getToolCallMcpServer = async ({ assistant, toolCall, thread, prisma, }) => {
     let mcpConnection = null;
+    let error = null;
     for (const mcpServer of assistant.mcpServers) {
         if (mcpConnection)
             break;
-        const { mcpConnection: innerMcpConnection } = await connectMcpServer({
-            mcpServer,
-            thread,
-            assistant,
-            prisma,
-        });
-        const listToolsResponse = 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (await innerMcpConnection.client.listTools());
-        const tool = listToolsResponse.tools.find(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (tool) => tool.name === toolCall.function.name);
-        if (!tool) {
-            await closeMcpConnection({
-                mcpConnection: innerMcpConnection,
+        let innerMcpConnection = null;
+        try {
+            const connection = await connectMcpServer({
+                mcpServer,
+                thread,
+                assistant,
+                prisma,
             });
-            continue;
+            innerMcpConnection = connection.mcpConnection;
+            const listToolsResponse = 
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (await innerMcpConnection.client.listTools());
+            const tool = listToolsResponse.tools.find(
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (tool) => tool.name === toolCall.function.name);
+            if (!tool) {
+                await closeMcpConnection({
+                    mcpConnection: innerMcpConnection,
+                });
+                continue;
+            }
+            mcpConnection = innerMcpConnection;
+            break;
+        }
+        catch (e) {
+            error = e instanceof Error ? e : new Error(String(e));
+            if (innerMcpConnection) {
+                try {
+                    await closeMcpConnection({
+                        mcpConnection: innerMcpConnection,
+                    });
+                }
+                catch (_a) {
+                    // Ignore close errors so tool errors propagate.
+                }
+            }
         }
-        mcpConnection = innerMcpConnection;
-        break;
     }
     return {
         mcpConnection: mcpConnection,
+        error,
     };
 };

package/dist/lib/threads/managedOpenaiThreadId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"managedOpenaiThreadId.d.ts","sourceRoot":"","sources":["../../../src/lib/threads/managedOpenaiThreadId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAK/E,eAAO,MAAM,qBAAqB,GAAU,kCAIzC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,mBAAmB,EAAE,IAAI,CAAA;oBACzB,mBAAmB,EAAE,IAAI,CAAA;oBACzB,eAAe,EAAE,IAAI,CAAA;iBACtB,CAAA;aACF,CAAA;YACD,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,eAAe,EAAE,IAAI,CAAA;oBACrB,cAAc,EAAE,IAAI,CAAA;oBACpB,YAAY,EAAE,IAAI,CAAA;oBAClB,aAAa,EAAE,IAAI,CAAA;iBACpB,CAAA;aACF,CAAA;YACD,SAAS,EAAE,IAAI,CAAA;YACf,aAAa,EAAE,IAAI,CAAA;SACpB,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,YAAY,CAAA;CACrB,oBA6CA,CAAA"}
+{"version":3,"file":"managedOpenaiThreadId.d.ts","sourceRoot":"","sources":["../../../src/lib/threads/managedOpenaiThreadId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAK/E,eAAO,MAAM,qBAAqB,GAAU,kCAIzC;IACD,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI,CAAA;oBACpB,aAAa,EAAE,IAAI,CAAA;oBACnB,mBAAmB,EAAE,IAAI,CAAA;oBACzB,mBAAmB,EAAE,IAAI,CAAA;oBACzB,eAAe,EAAE,IAAI,CAAA;iBACtB,CAAA;aACF,CAAA;YACD,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,eAAe,EAAE,IAAI,CAAA;oBACrB,cAAc,EAAE,IAAI,CAAA;oBACpB,YAAY,EAAE,IAAI,CAAA;oBAClB,aAAa,EAAE,IAAI,CAAA;iBACpB,CAAA;aACF,CAAA;YACD,SAAS,EAAE,IAAI,CAAA;YACf,aAAa,EAAE,IAAI,CAAA;SACpB,CAAA;KACF,CAAC,CAAA;IACF,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,YAAY,CAAA;CACrB,oBA4CA,CAAA"}

package/dist/lib/threads/managedOpenaiThreadId.js

@@ -26,8 +26,7 @@ export const managedOpenaiThreadId = async ({ assistant, threadId, prisma, }) =>
             ? {
                 openaiConversationId: newStorageThread.id,
             }
-            : {})), (assistant.storageProviderType ===
-            StorageProviderType.AZURE_RESPONSES
+            : {})), (assistant.storageProviderType === StorageProviderType.AZURE_RESPONSES
             ? {
                 azureOpenaiConversationId: newStorageThread.id,
             }

package/dist/lib/threads/storageThreadId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storageThreadId.d.ts","sourceRoot":"","sources":["../../../src/lib/threads/storageThreadId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAA;AAI5D,eAAO,MAAM,eAAe,GAAI,aAE7B;IACD,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;QAC9B,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,MAAM,EAAE;oBACN,mBAAmB,EAAE,IAAI,CAAA;iBAC1B,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;CACH,kBAyCA,CAAA"}
+{"version":3,"file":"storageThreadId.d.ts","sourceRoot":"","sources":["../../../src/lib/threads/storageThreadId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAA;AAI5D,eAAO,MAAM,eAAe,GAAI,aAE7B;IACD,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;QAC9B,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,MAAM,EAAE;oBACN,mBAAmB,EAAE,IAAI,CAAA;iBAC1B,CAAA;aACF,CAAA;SACF,CAAA;KACF,CAAC,CAAA;CACH,kBAwCA,CAAA"}

package/dist/lib/threads/storageThreadId.js

@@ -11,8 +11,7 @@ export const storageThreadId = ({ thread, }) => {
         StorageProviderType.OPENAI_RESPONSES) {
         return thread.openaiConversationId;
     }
-    if (thread.assistant.storageProviderType ===
-        StorageProviderType.AZURE_RESPONSES) {
+    if (thread.assistant.storageProviderType === StorageProviderType.AZURE_RESPONSES) {
         return thread.azureOpenaiConversationId;
     }
     if (thread.assistant.storageProviderType ===

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superinterface/server",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "type": "module",
   "bin": {
     "superinterface-server": "./bin/index.cjs"