@saltcorn/agents 0.7.7 → 0.7.8

package/action.js

@@ -92,6 +92,7 @@ module.exports = {
     is_sub_agent,
     agent_view_config,
     dyn_updates,
+    agent_label,
     ...rest
   }) => {
     const userinput = interpolate(configuration.prompt, row, user);
@@ -116,7 +117,7 @@ module.exports = {
       run,
       configuration,
       req,
-      undefined,
+      agent_label || undefined,
       [],
       row,
       agent_view_config || { stream: false },

package/common.js

@@ -234,7 +234,7 @@ const process_interaction = async (
   run,
   config,
   req,
-  agent_label = "Copilot",
+  agent_label = "Agent",
   prevResponses = [],
   triggering_row = {},
   agentsViewCfg = { stream: false },
@@ -391,6 +391,9 @@ const process_interaction = async (
               },
             );
           }
+          const response_label = is_sub_agent
+            ? agent_label
+            : tool.skill.skill_label || tool.skill.constructor.skill_name;
           if (tool.tool.renderToolCall) {
             const row = tool_call.input;
 
@@ -400,10 +403,7 @@ const process_interaction = async (
             if (rendered)
               add_response(
                 wrapSegment(
-                  wrapCard(
-                    tool.skill.skill_label || tool.skill.constructor.skill_name,
-                    rendered,
-                  ),
+                  wrapCard(response_label, rendered),
                   agent_label,
                   false,
                   layout,
@@ -427,11 +427,7 @@ const process_interaction = async (
               if (rendered)
                 add_response(
                   wrapSegment(
-                    wrapCard(
-                      tool.skill.skill_label ||
-                        tool.skill.constructor.skill_name,
-                      rendered,
-                    ),
+                    wrapCard(response_label, rendered),
                     agent_label,
                     false,
                     layout,
@@ -473,8 +469,10 @@ const process_interaction = async (
           let stop = false,
             myHasResult = false;
           if (tool.tool.postProcess && !stop) {
-            let result = toolResults[tool_call.tool_call_id];
-
+            let result = toolResults[tool_call.tool_call_id];            
+            const response_label = is_sub_agent
+              ? agent_label
+              : tool.skill.skill_label || tool.skill.constructor.skill_name;
             const chat = run.context.interactions;
             let generateUsed = false;
             const systemPrompt = await getSystemPrompt(
@@ -532,48 +530,75 @@ const process_interaction = async (
             }
 
             for (const add_resp of postprocres.add_responses || []) {
-              raw_responses.push(add_resp);
-              const renderedAddResponse =
-                typeof add_resp === "string" ? md.render(add_resp) : add_resp;
-              add_response(
-                wrapSegment(
-                  wrapCard(
-                    tool.skill.skill_label || tool.skill.constructor.skill_name,
-                    renderedAddResponse,
+              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,
                   ),
-                  agent_label,
-                  false,
-                  layout,
-                ),
-              );
+                );
+              }
+              if (typeof add_resp.md_response !== "undefined")
+                delete add_resp.md_response;
 
-              const result = add_resp;
-              await sysState.functions.llm_add_message.run(
-                "assistant",
+              const result = content;
 
-                !result || typeof result === "string"
-                  ? result || "Action run"
-                  : JSON.stringify(result),
+              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,
+                  },
+                );
 
-                {
-                  chat: run.context.interactions,
-                },
-              );
               await addToContext(run, {
                 interactions: run.context.interactions,
               });
             }
             if (!postprocres.stop) {
-              await sysState.functions.llm_add_message.run(
-                "user",
-                postprocres.follow_up_prompt || "Continue with the query",
-                {
-                  chat: run.context.interactions,
-                },
-              );
-              await addToContext(run, {
-                interactions: run.context.interactions,
-              });
+              const lastInteract =
+                run.context.interactions[run.context.interactions.length - 1];
+
+              if (
+                postprocres.follow_up_prompt ||
+                !(
+                  lastInteract?.role === "user" || lastInteract?.role === "tool"
+                )
+              ) {
+                await sysState.functions.llm_add_message.run(
+                  "user",
+                  postprocres.follow_up_prompt || "Continue with the query",
+                  {
+                    chat: run.context.interactions,
+                  },
+                );
+                await addToContext(run, {
+                  interactions: run.context.interactions,
+                });
+              }
               myHasResult = true;
             }
             if (postprocres.add_user_action && viewname) {
@@ -624,7 +649,7 @@ const process_interaction = async (
         ? answer
         : wrapSegment(md.render(answer), agent_label, false, layout),
     );
-  if (dyn_updates)
+  if (dyn_updates && !is_sub_agent)
     getState().emitDynamicUpdate(
       db.getTenantSchema(),
       {

package/package.json

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

package/skills/GenerateAndRunJsCode.js

@@ -215,13 +215,32 @@ Now generate the JavaScript code required by the user.`,
           if (res !== undefined && res !== null && res !== "") return res;
           return "Code executed successfully but returned no output.";
         };
+        const mkMdResponse = (result, code) =>
+          req?.user?.role_id === 1
+            ? `<details>
+
+<summary>Show code</summary>
+
+\`\`\`javascript
+${code}
+\`\`\`
+
+⇒
+</details>
+
+${result}`
+            : result;
         try {
           const res = await this.runCode(js_code, { user: req.user });
           getState().log(6, "Code answer: " + JSON.stringify(res));
           const effectiveRes = ensureResult(res);
           return {
             stop: typeof res === "string" && !this.follow_up_prompt,
-            add_response: effectiveRes,
+            add_response: {
+              role: "user",
+              content: `The result of running the code is: ${effectiveRes}`,
+              md_response: mkMdResponse(effectiveRes, js_code),
+            },
             ...(this.follow_up_prompt
               ? { follow_up_prompt: this.follow_up_prompt }
               : {}),
@@ -240,7 +259,7 @@ this code produced the following error:
 ${err.message}
 \`\`\`
 
-Correct this error.
+Correct this error and generate the new Javascript code to run
 `);
           try {
             const res = await this.runCode(retry_js_code, {
@@ -250,7 +269,11 @@ Correct this error.
             const effectiveRes = ensureResult(res);
             return {
               stop: typeof res === "string" && !this.follow_up_prompt,
-              add_response: effectiveRes,
+              add_response: {
+                role: "user",
+                content: `The result of running the code is: ${effectiveRes}`,
+                md_response: mkMdResponse(effectiveRes, retry_js_code),
+              },
               ...(this.follow_up_prompt
                 ? { follow_up_prompt: this.follow_up_prompt }
                 : {}),

package/skills/Subagent.js

@@ -102,6 +102,7 @@ class SubagentToSkill {
           agent_view_config,
           dyn_updates,
           req,
+          agent_label: this.agent_name,
         });
         getState().log(6, "Subagent response", JSON.stringify(subres, null, 2));
         //if (subres.json.raw_responses)