chore: use structured error when code execution tool errors

Author: stainless-app[bot]

packages/mcp-server/src/code-tool.ts

@@ -3,7 +3,7 @@
 import { dirname } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import Finch, { ClientOptions } from '@tryfinch/finch-api';
-import { Endpoint, ContentBlock, Metadata } from './tools/types';
+import { ContentBlock, Endpoint, Metadata, ToolCallResult } from './tools/types';
 
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 
@@ -31,7 +31,7 @@ export async function codeTool(): Promise<Endpoint> {
   const { newDenoHTTPWorker } = await import('@valtown/deno-http-worker');
   const { workerPath } = await import('./code-tool-paths.cjs');
 
-  const handler = async (client: Finch, args: unknown) => {
+  const handler = async (client: Finch, args: unknown): Promise<ToolCallResult> => {
     const baseURLHostname = new URL(client.baseURL).hostname;
     const { code } = args as { code: string };
 
@@ -100,7 +100,7 @@ export async function codeTool(): Promise<Endpoint> {
         } satisfies WorkerInput);
 
         req.write(body, (err) => {
-          if (err !== null && err !== undefined) {
+          if (err != null) {
             reject(err);
           }
         });
@@ -111,12 +111,12 @@ export async function codeTool(): Promise<Endpoint> {
       if (resp.status === 200) {
         const { result, logLines, errLines } = (await resp.json()) as WorkerSuccess;
         const returnOutput: ContentBlock | null =
-          result === null ? null
-          : result === undefined ? null
-          : {
+          result == null ? null : (
+            {
               type: 'text',
-              text: typeof result === 'string' ? (result as string) : JSON.stringify(result),
-            };
+              text: typeof result === 'string' ? result : JSON.stringify(result),
+            }
+          );
         const logOutput: ContentBlock | null =
           logLines.length === 0 ?
             null
@@ -136,10 +136,11 @@ export async function codeTool(): Promise<Endpoint> {
         };
       } else {
         const { message } = (await resp.json()) as WorkerError;
-        throw new Error(message);
+        return {
+          content: message == null ? [] : [{ type: 'text', text: message }],
+          isError: true,
+        };
       }
-    } catch (e) {
-      throw e;
     } finally {
       worker.terminate();
     }