@saltcorn/agents 0.7.10 → 0.7.12

package/agent-view.js

@@ -61,6 +61,14 @@ const configuration_workflow = (req) =>
       {
         name: "Agent action",
         form: async (context) => {
+          let run_id_field_opts;
+          if (context.table_id) {
+            const table = Table.findOne({ id: context.table_id });
+            run_id_field_opts = table.fields
+              .filter((f) => f.type?.name === "Integer" && !f.primary_key)
+              .map((f) => f.name);
+          }
+
           const agent_actions = await Trigger.find({ action: "Agent" });
           return new Form({
             fields: [
@@ -114,13 +122,29 @@ const configuration_workflow = (req) =>
                 sublabel:
                   "Appears below the input box. Use for additional instructions.",
               },
+              ...(run_id_field_opts
+                ? [
+                    {
+                      name: "run_id_field",
+                      type: "String",
+                      label: "Run ID field",
+                      sublabel: "Set this field to the run ID",
+                      attributes: { options: run_id_field_opts },
+                    },
+                  ]
+                : []),
               {
                 name: "layout",
                 label: "Layout",
                 type: "String",
                 required: true,
                 attributes: {
-                  options: ["Standard", "No card", "Modern chat", "Modern chat - no card"],
+                  options: [
+                    "Standard",
+                    "No card",
+                    "Modern chat",
+                    "Modern chat - no card",
+                  ],
                 },
               },
               {
@@ -289,9 +313,7 @@ const run = async (
             if (interact.content?.[0]?.type === "image_url") {
               const image_url = interact.content[0].image_url.url;
               if (image_url.startsWith("data"))
-                interactMarkups.push(
-                  wrapSegment("File", "You", true, layout),
-                );
+                interactMarkups.push(wrapSegment("File", "You", true, layout));
               else
                 interactMarkups.push(
                   wrapSegment(
@@ -303,12 +325,7 @@ const run = async (
                 );
             } else
               interactMarkups.push(
-                wrapSegment(
-                  md.render(interact.content),
-                  "You",
-                  true,
-                  layout,
-                ),
+                wrapSegment(md.render(interact.content), "You", true, layout),
               );
             break;
           case "assistant":
@@ -494,8 +511,7 @@ const run = async (
         ),
       explainer && small({ class: "explainer" }, i(explainer)),
     ),
-    stream &&
-      realTimeCollabScript(viewname, rndid, layout),
+    stream && realTimeCollabScript(viewname, rndid, layout),
   );
 
   const isModernSidebar = layout && layout.startsWith("Modern chat");
@@ -527,7 +543,8 @@ const run = async (
             )
           : div(
               {
-                class: "d-flex flex-wrap justify-content-between align-middle mb-2",
+                class:
+                  "d-flex flex-wrap justify-content-between align-middle mb-2",
               },
               div(
                 { class: "d-flex" },
@@ -564,7 +581,10 @@ const run = async (
                     (isActive ? " active-session" : ""),
                 },
                 div(
-                  { class: "d-flex justify-content-between align-items-center mb-1" },
+                  {
+                    class:
+                      "d-flex justify-content-between align-items-center mb-1",
+                  },
                   small(
                     { class: "text-muted text-truncate", style: "min-width:0" },
                     localeDateTime(run.started_at),
@@ -592,10 +612,7 @@ const run = async (
                     onclick: `delprevrun(event, ${run.id})`,
                   }),
                 ),
-                p(
-                  { class: "prevrun_content" },
-                  preview,
-                ),
+                p({ class: "prevrun_content" }, preview),
               );
         }),
       )
@@ -1108,7 +1125,10 @@ const run = async (
   const isModern = layout && layout.startsWith("Modern chat");
   const main_chat =
     layout === "Modern chat"
-      ? div({ class: "card" }, div({ class: "card-body modern-chat-layout" }, main_inner))
+      ? div(
+          { class: "card" },
+          div({ class: "card-body modern-chat-layout" }, main_inner),
+        )
       : layout === "Modern chat - no card"
         ? div({ class: "modern-chat-layout" }, main_inner)
         : layout === "No card"
@@ -1157,6 +1177,14 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
         triggering_row_id,
       },
     });
+    if (table_id && config.run_id_field && triggering_row_id) {
+      const table = Table.findOne(table_id);
+      await table.updateRow(
+        { [config.run_id_field]: run.id },
+        triggering_row_id,
+      );
+      if (triggering_row) triggering_row[config.run_id_field] = run.id;
+    }
   } else {
     run = await WorkflowRun.findOne({ id: +run_id });
   }
@@ -1437,6 +1465,57 @@ const execute_user_action = async (
     ...uadata.tool_call.input,
     ...uadata.input,
   });
+  if (result.generate_prompt) {
+    const action =
+      config.agent_action || (await Trigger.findOne({ id: config.action_id }));
+    run.context.interactions.push({
+      role: "user",
+      content: result.generate_prompt,
+    });
+    const dyn_updates = getState().getConfig("enable_dynamic_updates", true);
+
+    if (dyn_updates && uadata.click_replace_text) {
+      getState().emitDynamicUpdate(
+        db.getTenantSchema(),
+        {
+          eval_js: `spin_send_button();${`$("button[data-useraction-id=${uadata.rndid}]").replaceWith("${uadata.click_replace_text}")`}`,
+          page_load_tag: req?.headers?.["page-load-tag"],
+        },
+        [req.user.id],
+      );
+      // remove from html_interactions
+      run.context.html_interactions = run.context.html_interactions.map(
+        (hi) => {
+          if (hi.includes(`button data-useraction-id="${uadata.rndid}"`))
+            return wrapSegment(
+              uadata.click_replace_text,
+              "You",
+              true,
+              config.layout,
+            );
+          return hi;
+        },
+      );
+      await run.update({ context: run.context });
+    }
+    await process_interaction(
+      run,
+      action.configuration,
+      req,
+      action.name,
+      [],
+      {}, //row?
+      config,
+      dyn_updates,
+    );
+    const { generate_prompt, ...restResult } = result;
+    return {
+      json: {
+        success: "ok",
+        ...restResult,
+      },
+    };
+  }
   return {
     json: {
       success: "ok",

package/common.js

@@ -41,6 +41,7 @@ const get_skills = () => {
     require("./skills/WebSearch"),
     require("./skills/Subagent"),
     require("./skills/ExternalSkill"),
+    require("./skills/PlanApproval"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -416,17 +417,49 @@ const process_interaction = async (
           myHasResult = true;
           let result = await tool.tool.process(tool_call.input, {
             req,
-          });        
+          });
+          const tool_response = result.add_response || result;
           toolResults[tool_call.tool_call_id] = result;
           if (result?.stop) stop = true;
+          if (result?.add_user_action && viewname) {
+            const user_actions = Array.isArray()
+              ? result.add_user_action
+              : [result.add_user_action];
+            for (const uact of user_actions) {
+              uact.rndid = Math.floor(Math.random() * 16777215).toString(16);
+              uact.tool_call = tool_call;
+            }
+            await addToContext(run, {
+              user_actions,
+            });
+            add_response(
+              div(
+                { class: "d-flex mb-2" },
+                user_actions.map((ua) =>
+                  button(
+                    {
+                      "data-useraction-id": ua.rndid,
+                      class: "btn btn-primary", //press_store_button(this, true);
+                      onclick: `view_post('${viewname}', 'execute_user_action', {uaname: "${ua.name}",rndid: "${ua.rndid}", run_id: ${run.id}}, processExecuteResponse)`,
+                    },
+                    ua.label,
+                  ),
+                ),
+              ),
+            );
+          }
           if (
-            (typeof result === "object" && Object.keys(result || {}).length) ||
-            typeof result === "string"
+            (typeof tool_response === "object" &&
+              Object.keys(tool_response || {}).length) ||
+            typeof tool_response === "string"
           ) {
             if (tool.tool.renderToolResponse) {
-              const rendered = await tool.tool.renderToolResponse(result, {
-                req,
-              });
+              const rendered = await tool.tool.renderToolResponse(
+                tool_response,
+                {
+                  req,
+                },
+              );
               if (rendered)
                 add_response(
                   wrapSegment(
@@ -441,14 +474,14 @@ const process_interaction = async (
           }
           await sysState.functions.llm_add_message.run(
             "tool_response",
-            !result || typeof result === "string"
+            !tool_response || typeof tool_response === "string"
               ? {
                   type: "text",
-                  value: result || "Action run",
+                  value: tool_response || "Action run",
                 }
               : {
                   type: "json",
-                  value: JSON.parse(JSON.stringify(result)),
+                  value: JSON.parse(JSON.stringify(tool_response)),
                 },
             {
               chat: run.context.interactions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

package/skills/PlanApproval.js

@@ -0,0 +1,103 @@
+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 User = require("@saltcorn/data/models/user");
+const File = require("@saltcorn/data/models/file");
+const View = require("@saltcorn/data/models/view");
+const Trigger = require("@saltcorn/data/models/trigger");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+const { eval_expression } = require("@saltcorn/data/models/expression");
+const { interpolate, sleep } = require("@saltcorn/data/utils");
+const { features } = require("@saltcorn/data/db/state");
+const { button } = require("@saltcorn/markup/tags");
+const { validID } = require("@saltcorn/markup/layout_utils");
+
+const vm = require("vm");
+
+//const { fieldProperties } = require("./helpers");
+
+class PlanApprovalSkill {
+  static skill_name = "Plan approval";
+
+  get skill_label() {
+    return "Plan approval";
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  static async configFields() {
+    return [
+      {
+        name: "ini_sys_prompt",
+        label: "Initial system prompt",
+        type: "String",
+        fieldview: "textarea",
+        sublabel: "Refer to the tool as <code>submit_plan_for_approval</code>",
+      },
+      {
+        name: "approval_prompt",
+        label: "Prompt on approval",
+        type: "String",
+        fieldview: "textarea",
+        sublabel: "If the user approves the plan, what should the agent do?",
+      },
+    ];
+  }
+  systemPrompt() {
+    return this.ini_sys_prompt;
+  }
+
+  get userActions() {
+    return {
+      approve_plan: async () => {
+        return { generate_prompt: this.approval_prompt };
+      },
+    };
+  }
+
+  provideTools = () => {
+    return {
+      type: "function",
+      process: async (row) => {
+        console.log("process plan row", row);
+
+        return {
+          stop: true,
+          add_response: row.plan,
+          add_user_action: {
+            name: "approve_plan",
+            type: "button",
+            label: `Approve`,
+            click_replace_text: "Approved",
+            input: {},
+          },
+        };
+      },
+      renderToolCall({ plan }) {
+        return plan;
+      },
+      function: {
+        name: "submit_plan_for_approval",
+        description:
+          "Submit a plan for approval by the user. If the plan is approved, further instructions about executing it may be given",
+        parameters: {
+          type: "object",
+          required: ["plan"],
+          properties: {
+            plan: {
+              description: "The plan",
+              type: "string",
+            },
+          },
+        },
+      },
+    };
+  };
+}
+
+module.exports = PlanApprovalSkill;