@saltcorn/agents 0.7.11 → 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,6 +122,17 @@ 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",
@@ -1158,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 });
   }
@@ -1447,6 +1474,30 @@ const execute_user_action = async (
     });
     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,
@@ -1462,7 +1513,6 @@ const execute_user_action = async (
       json: {
         success: "ok",
         ...restResult,
-        reload_embedded_view: viewname,
       },
     };
   }

package/common.js

@@ -418,62 +418,8 @@ const process_interaction = async (
           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.add_response) {
-            if (!result.add_responses)
-              result.add_responses = [result.add_response];
-            else result.add_responses.push(result.add_response);
-          }
-
-          for (const add_resp of result.add_responses || []) {
-            const content =
-              add_resp.role && add_resp.content ? add_resp.content : add_resp;
-            raw_responses.push(content);
-            if (add_resp.md_response !== null) {
-              const renderedAddResponse = add_resp.md_response
-                ? md.render(add_resp.md_response)
-                : typeof content === "string"
-                  ? md.render(content)
-                  : content;
-              add_response(
-                wrapSegment(
-                  wrapCard(response_label, renderedAddResponse),
-                  agent_label,
-                  false,
-                  layout,
-                ),
-              );
-            }
-            if (typeof add_resp.md_response !== "undefined")
-              delete add_resp.md_response;
-
-            const result = content;
-
-            if (add_resp.role && add_resp.content) {
-              await sysState.functions.llm_add_message.run(
-                add_resp.role,
-                add_resp.content,
-                {
-                  chat: run.context.interactions,
-                },
-              );
-            } else
-              await sysState.functions.llm_add_message.run(
-                "assistant",
-
-                !result || typeof result === "string"
-                  ? result || "Action run"
-                  : JSON.stringify(result),
-
-                {
-                  chat: run.context.interactions,
-                },
-              );
-
-            await addToContext(run, {
-              interactions: run.context.interactions,
-            });
-          }
           if (result?.stop) stop = true;
           if (result?.add_user_action && viewname) {
             const user_actions = Array.isArray()
@@ -492,6 +438,7 @@ const process_interaction = async (
                 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)`,
                     },
@@ -502,13 +449,17 @@ const process_interaction = async (
             );
           }
           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(
@@ -523,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.11",
+  "version": "0.7.12",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

package/skills/PlanApproval.js

@@ -73,10 +73,14 @@ class PlanApprovalSkill {
             name: "approve_plan",
             type: "button",
             label: `Approve`,
+            click_replace_text: "Approved",
             input: {},
           },
         };
       },
+      renderToolCall({ plan }) {
+        return plan;
+      },
       function: {
         name: "submit_plan_for_approval",
         description: