@saltcorn/agents 0.7.7 → 0.7.9

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

@@ -40,6 +40,7 @@ const get_skills = () => {
     require("./skills/Fetch"),
     require("./skills/WebSearch"),
     require("./skills/Subagent"),
+    require("./skills/ExternalSkill"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -234,7 +235,7 @@ const process_interaction = async (
   run,
   config,
   req,
-  agent_label = "Copilot",
+  agent_label = "Agent",
   prevResponses = [],
   triggering_row = {},
   agentsViewCfg = { stream: false },
@@ -245,16 +246,16 @@ const process_interaction = async (
   const sysState = getState();
   const complArgs = await getCompletionArguments(
     config,
-    req.user,
+    req?.user,
     triggering_row,
-    req.body,
+    req?.body,
   );
   complArgs.appendToChat = true;
   complArgs.chat = run.context.interactions;
   const use_alt_config = complArgs.alt_config;
   //complArgs.debugResult = true;
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
-  const debugMode = is_debug_mode(config, req.user);
+  const debugMode = is_debug_mode(config, req?.user);
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
   if (stream && viewname) {
@@ -265,10 +266,11 @@ const process_interaction = async (
           ? response
           : response.choices[0].content || response.choices[0].delta?.content;
       if (content) {
-        const pageLoadTag = req.body.page_load_tag;
-        view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
-          content,
-        });
+        const pageLoadTag = req?.body?.page_load_tag;
+        if (pageLoadTag)
+          view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
+            content,
+          });
       }
     };
   }
@@ -303,7 +305,7 @@ const process_interaction = async (
           eval_js: `processCopilotResponse({response: ${JSON.stringify(resp)}, run_id: ${run.id}}, true)`,
           page_load_tag: req?.headers?.["page-load-tag"],
         },
-        [req.user.id],
+        [req?.user?.id],
       );
     else responses.push(resp);
     await addToContext(run, {
@@ -342,7 +344,7 @@ const process_interaction = async (
     }
     if (answer.content && !answer.tool_calls)
       add_response(
-        req.disable_markdown_render
+        req?.disable_markdown_render
           ? answer
           : wrapSegment(md.render(answer.content), agent_label, false, layout),
       );
@@ -355,7 +357,7 @@ const process_interaction = async (
   ) {
     if (answer.content)
       add_response(
-        req.disable_markdown_render
+        req?.disable_markdown_render
           ? answer
           : wrapSegment(md.render(answer.content), agent_label, false, layout),
       );
@@ -383,14 +385,18 @@ const process_interaction = async (
               (tool.skill.skill_label || tool.skill.constructor.skill_name) +
               " ";
             const view = View.findOne({ name: viewname });
-            const pageLoadTag = req.body.page_load_tag;
-            view.emitRealTimeEvent(
-              `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
-              {
-                content,
-              },
-            );
+            const pageLoadTag = req?.body?.page_load_tag;
+            if (pageLoadTag)
+              view.emitRealTimeEvent(
+                `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
+                {
+                  content,
+                },
+              );
           }
+          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 +406,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,
@@ -411,11 +414,11 @@ const process_interaction = async (
               );
           }
           myHasResult = true;
-          const result = await tool.tool.process(tool_call.input, {
+          let result = await tool.tool.process(tool_call.input, {
             req,
-          });
+          });        
           toolResults[tool_call.tool_call_id] = result;
-          if (result.stop) stop = true;
+          if (result?.stop) stop = true;
           if (
             (typeof result === "object" && Object.keys(result || {}).length) ||
             typeof result === "string"
@@ -427,11 +430,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,
@@ -474,14 +473,16 @@ const process_interaction = async (
             myHasResult = false;
           if (tool.tool.postProcess && !stop) {
             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(
               config,
-              req.user,
+              req?.user,
               triggering_row,
-              req.body,
+              req?.body,
             );
             const postprocres = await tool.tool.postProcess({
               tool_call,
@@ -504,13 +505,14 @@ const process_interaction = async (
               emit_update(s) {
                 if (!stream || !viewname) return;
                 const view = View.findOne({ name: viewname });
-                const pageLoadTag = req.body.page_load_tag;
-                view.emitRealTimeEvent(
-                  `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
-                  {
-                    content: s + " ",
-                  },
-                );
+                const pageLoadTag = req?.body?.page_load_tag;
+                if (pageLoadTag)
+                  view.emitRealTimeEvent(
+                    `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
+                    {
+                      content: s + " ",
+                    },
+                  );
               },
             });
             if (generateUsed)
@@ -532,48 +534,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) {
@@ -620,18 +649,18 @@ const process_interaction = async (
       );
   } else if (typeof answer === "string")
     add_response(
-      req.disable_markdown_render
+      req?.disable_markdown_render
         ? answer
         : wrapSegment(md.render(answer), agent_label, false, layout),
     );
-  if (dyn_updates)
+  if (dyn_updates && !is_sub_agent)
     getState().emitDynamicUpdate(
       db.getTenantSchema(),
       {
         eval_js: `final_agent_response()`,
         page_load_tag: req?.headers?.["page-load-tag"],
       },
-      [req.user.id],
+      [req?.user?.id],
     );
 
   return {

package/index.js

@@ -25,13 +25,13 @@ module.exports = {
       script: `/plugins/public/agents@${
         require("./package.json").version
       }/markdown-it.min.js`,
-      onlyViews: ["Agent Chat"],
+      onlyViews: ["Agent Chat", "Saltcorn Agent copilot"],
     },
     {
       script: `/plugins/public/agents@${
         require("./package.json").version
       }/jquery.autogrow-textarea.js`,
-      onlyViews: ["Agent Chat"],
+      onlyViews: ["Agent Chat", "Saltcorn Agent copilot"],
     },
   ],
   actions: {

package/package.json

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

package/skills/ExternalSkill.js

@@ -0,0 +1,38 @@
+const path = require("path");
+const fs = require("fs").promises;
+
+class ExternalSkill {
+  static skill_name = "External Skill (SKILL.md)";
+
+  get skill_label() {
+    return "External Skill";
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  static async configFields() {
+    return [
+      {
+        name: "skills_dir",
+        label: "Skill directory",
+        type: "String",
+        required: true,
+        sublabel: "Path to the directory containing SKILL.md",
+      },
+    ];
+  }
+
+  async systemPrompt() {
+    if (!this.skills_dir) return;
+    const skillMdPath = path.join(this.skills_dir, "SKILL.md");
+    try {
+      return await fs.readFile(skillMdPath, "utf8");
+    } catch (e) {
+      return `[ExternalSkill: could not read ${skillMdPath}: ${e.message}]`;
+    }
+  }
+}
+
+module.exports = ExternalSkill;

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 }
                 : {}),
@@ -284,10 +307,11 @@ const getTablePrompt = (read_only) => {
   tables.forEach((table) => {
     const fieldLines = table.fields.map(
       (f) =>
-        `  * ${f.name} with type: ${f.pretty_type.replace(
-          "Key to",
-          "ForeignKey referencing",
-        )}.${f.description ? ` ${f.description}` : ""}`,
+        `  * ${f.name} with type: ${
+          f?.pretty_type
+            ? f.pretty_type.replace("Key to", "ForeignKey referencing")
+            : "Unknown"
+        }.${f?.description ? ` ${f.description}` : ""}`,
     );
     tableLines.push(
       `${table.name}${

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)