@saltcorn/agents 0.6.12 → 0.7.0

package/common.js

@@ -37,6 +37,7 @@ const get_skills = () => {
     require("./skills/RunJsCode"),
     require("./skills/GenerateAndRunJsCode"),
     require("./skills/Fetch"),
+    require("./skills/Subagent"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -250,7 +251,14 @@ const process_interaction = async (
       }
     };
   }
-  const answer = await sysState.functions.llm_generate.run("", complArgs);
+
+  const lastInteract =
+    run.context.interactions[run.context.interactions.length - 1];
+
+  const answer = await sysState.functions.llm_generate.run(
+    lastInteract?.role === "user" ? "" : "Continue",
+    complArgs,
+  );
 
   //console.log("answer", answer);
 
@@ -330,7 +338,7 @@ const process_interaction = async (
     if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
     if (answer.hasToolCalls)
       for (const tool_call of answer.getToolCalls()) {
-        console.log("call function", tool_call.tool_name);
+        getState().log(6, "call function " + tool_call.tool_name);
 
         await addToContext(run, {
           funcalls: {
@@ -434,6 +442,7 @@ const process_interaction = async (
               result,
               chat,
               req,
+              run,
               async generate(prompt, opts = {}) {
                 generateUsed = true;
                 return await sysState.functions.llm_generate.run(prompt, {
@@ -481,7 +490,7 @@ const process_interaction = async (
               // run.context.interactions.forEach((ic) => {});
               const result = postprocres.add_response;
               await sysState.functions.llm_add_message.run(
-                "tool_response",
+                "assistant",
                 !result || typeof result === "string"
                   ? {
                       type: "text",
@@ -493,9 +502,19 @@ const process_interaction = async (
                     },
                 {
                   chat: run.context.interactions,
-                  tool_call,
                 },
               );
+              if (!postprocres.stop)
+                await sysState.functions.llm_add_message.run(
+                  "user",
+                  {
+                    type: "text",
+                    value: "Continue",
+                  },
+                  {
+                    chat: run.context.interactions,
+                  },
+                );
             }
             if (postprocres.add_user_action && viewname) {
               const user_actions = Array.isArray()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.6.12",
+  "version": "0.7.0",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {
@@ -19,7 +19,7 @@
     "jest": "^29.7.0"
   },
   "scripts": {
-    "test": "jest tests --runInBand"
+    "test": "jest tests --runInBand --verbose"
   },
   "eslintConfig": {
     "extends": "eslint:recommended",

package/skills/Fetch.js

@@ -33,6 +33,9 @@ class FetchSkill {
   static async configFields() {
     return [];
   }
+  systemPrompt() {
+    return "If you need to retrieve the contents of a web page, use the fetch_web_page to make a GET request to a specified URL.";
+  }
 
   provideTools = () => {
     return {

package/skills/GenerateAndRunJsCode.js

@@ -142,7 +142,29 @@ ${this.allow_fetch ? "\nYou can use the standard fetch JavaScript function to ma
 ${this.allow_table ? getTablePrompt(this.read_only) : ""}
 
 The code you write can use await at the top level, and should return 
-(at the top level) a string (which can contain HTML tags) with the response which will be shown to the user.
+(at the top level) either a string (which can contain HTML tags) with the response which will be shown 
+to the user, or a JSON object which will then be further summarized for the user.
+
+Example:
+
+\`\`\`javascript
+
+const x = await myAsyncFunction()
+const y = await anotherAsyncFunction(x)
+
+return \`The eggs are \${x} and the why is \${y}\`
+\`\`\`
+
+or
+
+\`\`\`javascript
+
+const x = await myAsyncFunction()
+const y = await anotherAsyncFunction(x)
+
+return { x, y }
+\`\`\`
+
 
 Now generate the JavaScript code required by the user.`,
         );
@@ -156,9 +178,9 @@ Now generate the JavaScript code required by the user.`,
         emit_update("Running code");
         const res = await this.runCode(js_code, { user: req.user });
         //console.log("code response", res);
-        getState().log(6, "Code answer: " + JSON.stringify(res));
+        getState().log(6, "Code answer: " + JSON.stringify(res));        
         return {
-          //stop: true,
+          stop: typeof res ==="string",
           add_response: res,
         };
       },

package/skills/Subagent.js

@@ -0,0 +1,94 @@
+const { div, pre, a } = require("@saltcorn/markup/tags");
+const Workflow = require("@saltcorn/data/models/workflow");
+const Form = require("@saltcorn/data/models/form");
+const Table = require("@saltcorn/data/models/table");
+const View = require("@saltcorn/data/models/view");
+const Trigger = require("@saltcorn/data/models/trigger");
+const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+const { fieldProperties } = require("./helpers");
+const agent_action = require("../action");
+
+class SubagentToSkill {
+  static skill_name = "Subagent";
+
+  get skill_label() {
+    return this.agent_name;
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  systemPrompt() {
+    const trigger = Trigger.findOne({ name: this.agent_name });
+    if (trigger.description)
+      return `${this.agent_name} tool: ${trigger.description}`;
+    else return "";
+  }
+
+  static async configFields() {
+    const actions = await Trigger.find({ action: "Agent" });
+
+    return [
+      {
+        name: "agent_name",
+        label: "Agent",
+        sublabel: a(
+          {
+            "data-dyn-href": `\`/actions/configure/\${agent_name}\``,
+            target: "_blank",
+          },
+          "Configure",
+        ),
+        type: "String",
+        required: true,
+        attributes: { options: actions.map((a) => a.name) },
+      },
+      // TODO: confirm, show response, show argument
+    ];
+  }
+
+  provideTools = () => {
+    let properties = {};
+
+    const trigger = Trigger.findOne({ name: this.agent_name });
+    if (!trigger)
+      throw new Error(`Trigger skill: cannot find trigger ${this.agent_name}`);
+
+    return {
+      type: "function",
+      process: async (row, { req }) => {
+        //const result = await trigger.runWithoutRow({ user: req?.user, row });
+        return "Workflow started";
+      },
+      /*renderToolCall({ phrase }, { req }) {
+        return div({ class: "border border-primary p-2 m-2" }, phrase);
+      },*/
+      postProcess: async ({ tool_call, req, generate, emit_update, run }) => {
+        await agent_action.run({
+          row: {},
+          configuration: { ...trigger.configuration, prompt: "continue" },
+          user: req.user,
+          run_id: run.id,
+          req,
+        });
+        return {
+          //stop: true,
+          //add_response: result,
+        };
+      },
+      function: {
+        name: trigger.name,
+        description: trigger.description,
+        parameters: {
+          type: "object",
+          //required: ["action_javascript_code", "action_name"],
+          properties,
+        },
+      },
+    };
+  };
+}
+
+module.exports = SubagentToSkill;

package/tests/action.test.js

@@ -3,6 +3,7 @@ const View = require("@saltcorn/data/models/view");
 const WorkflowRuns = require("@saltcorn/data/models/workflow_run");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
+const Trigger = require("@saltcorn/data/models/trigger");
 
 const { mockReqRes } = require("@saltcorn/data/tests/mocks");
 const { afterAll, beforeAll, describe, it, expect } = require("@jest/globals");
@@ -20,6 +21,17 @@ beforeAll(async () => {
   await require("@saltcorn/data/db/fixtures")();
 
   getState().registerPlugin("base", require("@saltcorn/data/base-plugin"));
+
+  await Trigger.create({
+    name: "MathsAgent",
+    description: "Answer questions about arithmetic",
+    action: "Agent",
+    when_trigger: "Never",
+    configuration: require("./agentcfg").maths_agent_cfg,
+  });
+
+  await getState().refresh_triggers(false);
+  //await getState().setConfig("log_level", 6);
 });
 
 jest.setTimeout(30000);
@@ -52,7 +64,7 @@ for (const nameconfig of require("./configs")) {
     it("generates text", async () => {
       const result = await action.run({
         row: { theprompt: "What is the word of the day?" },
-        configuration: require("./agentcfg"),
+        configuration: require("./agentcfg").agent1,
         user,
         req: { user },
       });
@@ -67,7 +79,7 @@ for (const nameconfig of require("./configs")) {
           theprompt:
             "How many pages are there in the book by Herman Melville in the database?",
         },
-        configuration: require("./agentcfg"),
+        configuration: require("./agentcfg").agent1,
         user,
         run_id: run.id,
         req: { ...mockReqRes.req, user },
@@ -75,6 +87,28 @@ for (const nameconfig of require("./configs")) {
       expect(result.json.response).toContain("967");
       //const run1 = await WorkflowRuns.findOne({});
     });
+    it("generates and runs js code", async () => {
+      const result = await action.run({
+        row: {
+          theprompt: "What is the 16th Fibonacci number (when F1=1 and F2=1) ?",
+        },
+        configuration: require("./agentcfg").maths_agent_cfg,
+        user,
+        req: { user },
+      });
+      expect(result.json.response).toContain("987");
+    });
+    it("run subagent", async () => {
+      const result = await action.run({
+        row: {
+          theprompt: "What is the 16th Fibonacci number (when F1=1 and F2=1) ?",
+        },
+        configuration: require("./agentcfg").agent1,
+        user,
+        req: { user },
+      });
+      expect(result.json.response).toContain("987");
+    });
   });
   //break;
 }

package/tests/agentcfg.js

@@ -1,4 +1,4 @@
-module.exports = {
+const agent1 = {
   model: "",
   prompt: "{{theprompt}}",
   skills: [
@@ -41,6 +41,28 @@ module.exports = {
       add_sys_prompt:
         "Use this tool to search information about books in a book database. Each book is indexed by author and has page counts. If the user asks for information about books by a specific author, use this tool.",
     },
+    {
+      agent_name: "MathsAgent",
+      skill_type: "Subagent",
+    },
   ],
   sys_prompt: "",
 };
+
+const maths_agent_cfg = {
+  model: "",
+  prompt: "{{theprompt}}",
+  skills: [
+    {
+      tool_name: "generate_arithmetic_code",
+      skill_type: "Generate and run JavaScript code",
+      add_sys_prompt: "",
+      code_description: "",
+      tool_description: "Generate Javascript code to solve arithmetic problems",
+    },
+  ],
+  sys_prompt:
+    "If the user asks an arithmetic question, generate javascript code to solve it with the generate_arithmetic_code tool",
+};
+
+module.exports = { agent1, maths_agent_cfg };

package/tests/configs.js

@@ -31,4 +31,13 @@ module.exports = [
     temperature: 0.7,
     ai_sdk_provider: "OpenAI",
   },
+  {
+    name: "AI SDK Anthropic",
+    model: "claude-sonnet-4-6",
+    api_key: process.env.ANTHROPIC_API_KEY,
+    backend: "AI SDK",
+    image_model: "gpt-image-1",
+    temperature: 0.7,
+    ai_sdk_provider: "Anthropic",
+  },
 ];

package/tests/view.test.js

@@ -42,10 +42,10 @@ for (const nameconfig of require("./configs")) {
         description: "",
         action: "Agent",
         when_trigger: "Never",
-        configuration: require("./agentcfg"),
+        configuration: require("./agentcfg").agent1,
       });
-      
-      await getState().refresh_triggers(false)
+
+      await getState().refresh_triggers(false);
       const view = await View.create({
         name: "AgentView",
         description: "",
@@ -79,10 +79,10 @@ for (const nameconfig of require("./configs")) {
         default_render_page: "",
         exttable_name: null,
       });
-      await getState().refresh_views(false)
+      await getState().refresh_views(false);
 
-      const result = await view.run({}, mockReqRes);  
-      expect(result).toContain(">Pirate<")
+      const result = await view.run({}, mockReqRes);
+      expect(result).toContain(">Pirate<");
     });
   });
   break; //only need to test one config iteration