freestyle-sandboxes 0.0.28 → 0.0.30

package/dist/ai/index.cjs

@@ -43,11 +43,10 @@ const executeTool = (config) => {
         return res;
       } catch (e) {
         console.log("ERROR: ", e.message);
-        return `Error executing script:
-
-${script}
-
-Error: ${e.message}`;
+        return {
+          message: e.message,
+          error: e.error
+        };
       }
     }
   });

package/dist/ai/index.d.cts

@@ -20,16 +20,22 @@ declare const executeCodeDescription: (envVars: string, nodeModules: string) =>
  */
 declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => ai.CoreTool<z.ZodObject<{
+}) => ai.Tool<z.ZodObject<{
     script: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     script?: string;
 }, {
     script?: string;
-}>, string | FreestyleExecuteScriptResultSuccess> & {
+}>, FreestyleExecuteScriptResultSuccess | {
+    message: any;
+    error: any;
+}> & {
     execute: (args: {
         script?: string;
-    }, options: ai.ToolExecutionOptions) => PromiseLike<string | FreestyleExecuteScriptResultSuccess>;
+    }, options: ai.ToolExecutionOptions) => PromiseLike<FreestyleExecuteScriptResultSuccess | {
+        message: any;
+        error: any;
+    }>;
 };
 /**
  * Deploy a Web project
@@ -38,7 +44,7 @@ declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration &
  */
 declare const deployWebTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => ai.CoreTool<z.ZodObject<{
+}) => ai.Tool<z.ZodObject<{
     files: z.ZodRecord<z.ZodString, z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     files?: Record<string, string>;

package/dist/ai/index.d.mts

@@ -20,16 +20,22 @@ declare const executeCodeDescription: (envVars: string, nodeModules: string) =>
  */
 declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => ai.CoreTool<z.ZodObject<{
+}) => ai.Tool<z.ZodObject<{
     script: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     script?: string;
 }, {
     script?: string;
-}>, string | FreestyleExecuteScriptResultSuccess> & {
+}>, FreestyleExecuteScriptResultSuccess | {
+    message: any;
+    error: any;
+}> & {
     execute: (args: {
         script?: string;
-    }, options: ai.ToolExecutionOptions) => PromiseLike<string | FreestyleExecuteScriptResultSuccess>;
+    }, options: ai.ToolExecutionOptions) => PromiseLike<FreestyleExecuteScriptResultSuccess | {
+        message: any;
+        error: any;
+    }>;
 };
 /**
  * Deploy a Web project
@@ -38,7 +44,7 @@ declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration &
  */
 declare const deployWebTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => ai.CoreTool<z.ZodObject<{
+}) => ai.Tool<z.ZodObject<{
     files: z.ZodRecord<z.ZodString, z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     files?: Record<string, string>;

package/dist/ai/index.mjs

@@ -41,11 +41,10 @@ const executeTool = (config) => {
         return res;
       } catch (e) {
         console.log("ERROR: ", e.message);
-        return `Error executing script:
-
-${script}
-
-Error: ${e.message}`;
+        return {
+          message: e.message,
+          error: e.error
+        };
       }
     }
   });

package/dist/index.cjs

@@ -203,8 +203,8 @@ class FreestyleSandboxes {
     if (response.data) {
       return response.data;
     }
-    throw new Error(
-      `Failed to execute script: 
+    throw {
+      message: `Failed to execute script: 
 
 ${script}
 
@@ -212,8 +212,9 @@ Error:
 
 ${JSON.stringify(
         response
-      )}`
-    );
+      )}`,
+      error: response.error
+    };
   }
   /**
    * Deploy a Web project to a sandbox.

package/dist/index.mjs

@@ -201,8 +201,8 @@ class FreestyleSandboxes {
     if (response.data) {
       return response.data;
     }
-    throw new Error(
-      `Failed to execute script: 
+    throw {
+      message: `Failed to execute script: 
 
 ${script}
 
@@ -210,8 +210,9 @@ Error:
 
 ${JSON.stringify(
         response
-      )}`
-    );
+      )}`,
+      error: response.error
+    };
   }
   /**
    * Deploy a Web project to a sandbox.

package/dist/langgraph/index.mjs

@@ -1,6 +1,6 @@
 import { FreestyleSandboxes } from '../index.mjs';
 import { DynamicStructuredTool } from '@langchain/core/tools';
-import { executeCodeDescription, executeCodeSchema } from '../ai/index.mjs';
+import { executeCodeSchema, executeCodeDescription } from '../ai/index.mjs';
 import '@hey-api/client-fetch';
 import 'ai';
 import 'zod';

package/dist/mastra/index.d.cts

@@ -1,10 +1,11 @@
+import * as _mastra_core_tools from '@mastra/core/tools';
 import * as _mastra_core from '@mastra/core';
 import { z } from 'zod';
 import { F as FreestyleExecuteScriptParamsConfiguration } from '../types.gen-BzRtj_TA.js';
 
 declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => _mastra_core.Tool<"Execute a TypeScript or JavaScript Script", z.ZodObject<{
+}) => _mastra_core_tools.Tool<z.ZodObject<{
     script: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     script?: string;
@@ -40,6 +41,6 @@ declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration &
     script?: string;
 }, {
     script?: string;
-}>, _mastra_core.WorkflowContext<any>>>;
+}>>, unknown>;
 
 export { executeTool };

package/dist/mastra/index.d.mts

@@ -1,10 +1,11 @@
+import * as _mastra_core_tools from '@mastra/core/tools';
 import * as _mastra_core from '@mastra/core';
 import { z } from 'zod';
 import { F as FreestyleExecuteScriptParamsConfiguration } from '../types.gen-BzRtj_TA.js';
 
 declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-}) => _mastra_core.Tool<"Execute a TypeScript or JavaScript Script", z.ZodObject<{
+}) => _mastra_core_tools.Tool<z.ZodObject<{
     script: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     script?: string;
@@ -40,6 +41,6 @@ declare const executeTool: (config: FreestyleExecuteScriptParamsConfiguration &
     script?: string;
 }, {
     script?: string;
-}>, _mastra_core.WorkflowContext<any>>>;
+}>>, unknown>;
 
 export { executeTool };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestyle-sandboxes",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -73,7 +73,7 @@
     "@hey-api/client-fetch": "^0.5.7",
     "@langchain/core": "^0.3.38",
     "@langchain/langgraph": "^0.2.44",
-    "@mastra/core": "^0.1.27-alpha.66",
+    "@mastra/core": "^0.6.0",
     "ai": "^4.0.25",
     "glob": "^11.0.1",
     "humanlayer": "^0.7.0",

package/src/ai/index.ts

@@ -62,7 +62,10 @@ export const executeTool = (
         return res;
       } catch (e) {
         console.log("ERROR: ", e.message);
-        return `Error executing script:\n\n${script}\n\nError: ${e.message}`;
+        return {
+          message: e.message,
+          error: e.error,
+        };
       }
     },
   });

package/src/index.ts

@@ -118,11 +118,15 @@ export class FreestyleSandboxes {
     if (response.data) {
       return response.data;
     }
-    throw new Error(
-      `Failed to execute script: \n\n${script}\n\nError:\n\n${JSON.stringify(
+    throw {
+      message: `Failed to execute script: \n\n${script}\n\nError:\n\n${JSON.stringify(
         response
-      )}`
-    );
+      )}`,
+      error: response.error,
+    };
+    // `Failed to execute script: \n\n${script}\n\nError:\n\n${JSON.stringify(
+    //   response
+    // )}`
   }
 
   /**

package/src/mastra/index.ts

@@ -7,11 +7,11 @@ import { FreestyleSandboxes } from "..";
 export const executeTool = (
   config: FreestyleExecuteScriptParamsConfiguration & {
     apiKey: string;
-  },
+  }
 ) => {
   const description = executeCodeDescription(
     Object.keys(config.envVars ?? {}).join(", "),
-    Object.keys(config.nodeModules ?? {}).join(", "),
+    Object.keys(config.nodeModules ?? {}).join(", ")
   );
 
   const client = new FreestyleSandboxes({
@@ -30,7 +30,7 @@ export const executeTool = (
         z.object({
           message: z.string(),
           type: z.string(),
-        }),
+        })
       ),
       result: z.unknown(),
     }),