@saltcorn/agents 0.6.11 → 0.6.12

package/common.js

@@ -95,6 +95,24 @@ const get_initial_interactions = async (config, user, triggering_row) => {
   return interacts;
 };
 
+const getSystemPrompt = async (config, user, triggering_row, formbody) => {
+  let sysPrompts = [
+    interpolate(config.sys_prompt, triggering_row || {}, user, "System prompt"),
+  ];
+
+  const skills = get_skill_instances(config);
+  for (const skill of skills) {
+    const sysPr = await skill.systemPrompt?.({
+      ...(formbody || {}),
+      user,
+      triggering_row,
+    });
+    if (sysPr) sysPrompts.push(sysPr);
+  }
+
+  return sysPrompts.join("\n\n");
+};
+
 const getCompletionArguments = async (
   config,
   user,
@@ -326,10 +344,9 @@ const process_interaction = async (
           let stop = false,
             myHasResult = false;
           if (stream && viewname) {
-            let content = span(
-              { class: "badge text-bg-secondary me-1" },
-              tool.skill.skill_label || tool.skill.constructor.skill_name,
-            );
+            let content =
+              (tool.skill.skill_label || tool.skill.constructor.skill_name) +
+              " ";
             const view = View.findOne({ name: viewname });
             const pageLoadTag = req.body.page_load_tag;
             view.emitRealTimeEvent(
@@ -406,6 +423,12 @@ const process_interaction = async (
           if (tool.tool.postProcess && !stop) {
             const chat = run.context.interactions;
             let generateUsed = false;
+            const systemPrompt = await getSystemPrompt(
+              config,
+              req.user,
+              triggering_row,
+              req.body,
+            );
             const postprocres = await tool.tool.postProcess({
               tool_call,
               result,
@@ -416,6 +439,7 @@ const process_interaction = async (
                 return await sysState.functions.llm_generate.run(prompt, {
                   chat,
                   appendToChat: true,
+                  systemPrompt,
                   ...opts,
                 });
               },
@@ -426,7 +450,7 @@ const process_interaction = async (
                 view.emitRealTimeEvent(
                   `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
                   {
-                    content: span({ class: "badge text-bg-secondary me-1" }, s),
+                    content: s + " ",
                   },
                 );
               },

package/package.json

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

package/skills/GenerateAndRunJsCode.js

@@ -146,7 +146,10 @@ The code you write can use await at the top level, and should return
 
 Now generate the JavaScript code required by the user.`,
         );
-        getState().log(6, "Generated code: \n" + str);
+        getState().log(
+          6,
+          "Generated code:\n--BEGIN CODE--\n" + str + "\n--END CODE--\n",
+        );
         const js_code = str.includes("```javascript")
           ? str.split("```javascript")[1].split("```")[0]
           : str;