@saltcorn/agents 0.7.6 → 0.7.8

package/action.js

@@ -92,29 +92,32 @@ module.exports = {
     is_sub_agent,
     agent_view_config,
     dyn_updates,
+    agent_label,
     ...rest
   }) => {
     const userinput = interpolate(configuration.prompt, row, user);
 
-    const run = run_id
-      ? await WorkflowRun.findOne({ id: run_id })
-      : await WorkflowRun.create({
-          status: "Running",
-          started_by: user?.id,
-          trigger_id: trigger_id || undefined,
-          context: {
-            implemented_fcall_ids: [],
-            interactions: [{ role: "user", content: userinput }],
-            funcalls: {},
-          },
-        });
-    if (run_id)
-      run.context.interactions.push({ role: "user", content: userinput });
+    const run =
+      rest.run ||
+      (run_id
+        ? await WorkflowRun.findOne({ id: run_id })
+        : await WorkflowRun.create({
+            status: "Running",
+            started_by: user?.id,
+            trigger_id: trigger_id || undefined,
+            context: {
+              implemented_fcall_ids: [],
+              interactions: [],
+              funcalls: {},
+            },
+          }));
+
+    run.context.interactions.push({ role: "user", content: userinput });
     return await process_interaction(
       run,
       configuration,
       req,
-      undefined,
+      agent_label || undefined,
       [],
       row,
       agent_view_config || { stream: false },

package/agent-view.js

@@ -18,6 +18,7 @@ const {
   input,
   h4,
   h3,
+  h2,
   style,
   h5,
   button,
@@ -821,6 +822,21 @@ const run = async (
             .modern-chat-layout .chat-user .chat-bubble table th {
               background: rgba(255,255,255,0.1);
             }
+            /* Skill attribution badge */
+            .modern-chat-layout .chat-bubble .badge.bg-info {
+              display: inline-block;
+              margin-bottom: 6px;
+              font-size: 0.7rem;
+              font-weight: 600;
+              letter-spacing: 0.3px;
+              text-transform: uppercase;
+              opacity: 0.85;
+            }
+            .modern-chat-layout .chat-bubble .card.bg-secondary-subtle {
+              border: none;
+              background-color: rgba(0,0,0,0.03) !important;
+              margin-bottom: 0.5rem;
+            }
             /* Input area for modern chat */
             .modern-chat-layout .copilot-entry {
               border-top: 1px solid var(--tblr-border-color, var(--bs-border-color, #dee2e6));
@@ -1273,12 +1289,80 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
     );
     sysPrompt = complArgs.systemPrompt;
   }
+  const apiJson = JSON.stringify(run.context.api_interactions, null, 2);
   const debug_html = div(
-    div(h4("System prompt"), pre(text(escapeHtml(sysPrompt)))),
+    { class: "accordion", id: "debugAccordion" },
     div(
-      h4("API interactions"),
-      pre(
-        text(escapeHtml(JSON.stringify(run.context.api_interactions, null, 2))),
+      { class: "accordion-item" },
+      h2(
+        { class: "accordion-header", id: "debugHeadPrompt" },
+        button(
+          {
+            class: "accordion-button collapsed",
+            type: "button",
+            "data-bs-toggle": "collapse",
+            "data-bs-target": "#debugCollapsePrompt",
+            "aria-expanded": "false",
+            "aria-controls": "debugCollapsePrompt",
+          },
+          "System prompt",
+        ),
+      ),
+      div(
+        {
+          id: "debugCollapsePrompt",
+          class: "accordion-collapse collapse",
+          "aria-labelledby": "debugHeadPrompt",
+          "data-bs-parent": "#debugAccordion",
+        },
+        div(
+          { class: "accordion-body" },
+          pre({ style: "white-space:pre-wrap" }, text(escapeHtml(sysPrompt))),
+        ),
+      ),
+    ),
+    div(
+      { class: "accordion-item" },
+      h2(
+        { class: "accordion-header", id: "debugHeadAPI" },
+        button(
+          {
+            class: "accordion-button",
+            type: "button",
+            "data-bs-toggle": "collapse",
+            "data-bs-target": "#debugCollapseAPI",
+            "aria-expanded": "true",
+            "aria-controls": "debugCollapseAPI",
+          },
+          "API interactions",
+        ),
+      ),
+      div(
+        {
+          id: "debugCollapseAPI",
+          class: "accordion-collapse collapse show",
+          "aria-labelledby": "debugHeadAPI",
+          "data-bs-parent": "#debugAccordion",
+        },
+        div(
+          { class: "accordion-body" },
+          button(
+            {
+              class: "btn btn-sm btn-outline-secondary mb-2",
+              onclick: `
+                var t=document.getElementById('debugApiPre').textContent;
+                navigator.clipboard.writeText(t).then(function(){
+                  var b=event.target;b.textContent='Copied!';
+                  setTimeout(function(){b.textContent='Copy to clipboard'},1500)
+                })`,
+            },
+            "Copy to clipboard",
+          ),
+          pre(
+            { id: "debugApiPre", style: "white-space:pre-wrap" },
+            text(escapeHtml(apiJson)),
+          ),
+        ),
       ),
     ),
   );

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(
@@ -515,7 +513,7 @@ const process_interaction = async (
             });
             if (generateUsed)
               await addToContext(run, {
-                interactions: chat,
+                interactions: run.context.interactions,
               });
             if (postprocres.stop) stop = true;
             if (postprocres.add_system_prompt)
@@ -532,49 +530,76 @@ 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,
-                ),
-              );
-              //replace tool response with this
-              // run.context.interactions.forEach((ic) => {});
-              const result = add_resp;
-              await sysState.functions.llm_add_message.run(
-                "assistant",
-                !result || typeof result === "string"
-                  ? {
-                      type: "text",
-                      value: result || "Action run",
-                    }
-                  : {
-                      type: "json",
-                      value: JSON.parse(JSON.stringify(result)),
-                    },
-                {
-                  chat: run.context.interactions,
-                },
-              );
-              if (!postprocres.stop)
+                );
+              }
+              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(
-                  "user",
+                  add_resp.role,
+                  add_resp.content,
                   {
-                    type: "text",
-                    value: "Continue",
+                    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 (!postprocres.stop) {
+              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) {
               const user_actions = Array.isArray()
@@ -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.6",
+  "version": "0.7.8",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

package/skills/GenerateAndRunJsCode.js

@@ -18,6 +18,24 @@ const { validID } = require("@saltcorn/markup/layout_utils");
 const vm = require("vm");
 const { replaceUserContinue } = require("../common");
 
+function extractCode(str) {
+  // Try ```javascript fence
+  if (str.includes("```javascript")) {
+    return str.split("```javascript")[1].split("```")[0];
+  }
+  // Try ```js fence
+  if (str.includes("```js\n") || str.includes("```js\r")) {
+    return str.split(/```js\s/)[1].split("```")[0];
+  }
+  // Try generic ``` fence (code is between first and second ```)
+  const fenceMatch = str.match(/```\s*\n([\s\S]*?)```/);
+  if (fenceMatch) {
+    return fenceMatch[1];
+  }
+  // No fences found - return raw string
+  return str;
+}
+
 //const { fieldProperties } = require("./helpers");
 
 class GenerateAndRunJsCodeSkill {
@@ -105,6 +123,14 @@ class GenerateAndRunJsCodeSkill {
         sublabel: "Allow calls to functions from codepages and modules",
         type: "Bool",
       },
+      {
+        name: "follow_up_prompt",
+        label: "Follow-up prompt",
+        sublabel:
+          "If set, the agent will continue processing after code execution with this prompt. Leave empty to stop after code result.",
+        type: "String",
+        fieldview: "textarea",
+      },
       ...(Table.subClass
         ? [
             {
@@ -171,26 +197,53 @@ return { x, y }
 
 ${extra || ""}
 
+CRITICAL: Your response must contain ONLY a single JavaScript code block wrapped in \`\`\`javascript ... \`\`\` fences. Do not include any text, explanation, or commentary before or after the code block.
+
 Now generate the JavaScript code required by the user.`,
           );
           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;
+          const js_code = extractCode(str);
           return js_code;
         };
         const js_code = await gen_the_code();
         emit_update("Running code");
+        const ensureResult = (res) => {
+          if (res && typeof res === "object") return JSON.stringify(res);
+          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 });
-          //console.log("code response", res);
           getState().log(6, "Code answer: " + JSON.stringify(res));
+          const effectiveRes = ensureResult(res);
           return {
-            stop: typeof res === "string",
-            add_response: res,
+            stop: typeof res === "string" && !this.follow_up_prompt,
+            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 }
+              : {}),
           };
         } catch (err) {
           console.error(err);
@@ -206,15 +259,33 @@ this code produced the following error:
 ${err.message}
 \`\`\`
 
-Correct this error.
+Correct this error and generate the new Javascript code to run
 `);
-          const res = await this.runCode(retry_js_code, { user: req.user });
-          //console.log("code response", res);
-          getState().log(6, "Code retry answer: " + JSON.stringify(res));
-          return {
-            stop: typeof res === "string",
-            add_response: res,
-          };
+          try {
+            const res = await this.runCode(retry_js_code, {
+              user: req.user,
+            });
+            getState().log(6, "Code retry answer: " + JSON.stringify(res));
+            const effectiveRes = ensureResult(res);
+            return {
+              stop: typeof res === "string" && !this.follow_up_prompt,
+              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 }
+                : {}),
+            };
+          } catch (retryErr) {
+            console.error(retryErr);
+            return {
+              add_response:
+                "Error: code generation failed after retry: " +
+                retryErr.message,
+            };
+          }
         }
       },
       function: {

package/skills/Subagent.js

@@ -52,6 +52,12 @@ class SubagentToSkill {
         sublabel: `Optional. The prompt initialising the subagent. Example: "Continue answering my query using the tool now at you disposal"`,
         type: "String",
       },
+      {
+        name: "handoff_prompt",
+        label: "Handoff prompt",
+        sublabel: `Optional. A prompt to process the results of the subagent. Example: "Analyze this response in relation to my query"`,
+        type: "String",
+      },
     ];
   }
 
@@ -91,21 +97,21 @@ class SubagentToSkill {
               "Your instructions and tools have changed. Continue answering my query using the instructions and tools at you disposal, if any",
           },
           user: req.user,
-          run_id: run.id,
+          run,
           is_sub_agent: true,
           agent_view_config,
           dyn_updates,
           req,
+          agent_label: this.agent_name,
         });
-        getState().log(
-          6,
-          "Subagent response",
-          subres?.json?.raw_responses || "No response",
-        );
-
-        if (subres.json.raw_responses)
-          return { add_responses: subres.json.raw_responses };
+        getState().log(6, "Subagent response", JSON.stringify(subres, null, 2));
+        //if (subres.json.raw_responses)
+        //  return { add_responses: subres.json.raw_responses };
         return {
+          ...(this.handoff_prompt
+            ? { follow_up_prompt: this.handoff_prompt }
+            : { stop: true }),
+
           //stop: true,
           //add_response: result,
         };

package/tests/action.test.js

@@ -38,7 +38,7 @@ beforeAll(async () => {
   });
 
   await getState().refresh_triggers(false);
-  //await getState().setConfig("log_level", 6);
+  await getState().setConfig("log_level", 6);
 });
 
 jest.setTimeout(40000);
@@ -46,6 +46,13 @@ jest.setTimeout(40000);
 const user = { id: 1, role_id: 1 };
 const action = require("../action");
 
+const getLastInteraction = async ({ run_id }) => {
+  const run = await WorkflowRuns.findOne({ id: run_id });
+  return JSON.stringify(
+    run.context.interactions[run.context.interactions.length - 1],
+  );
+};
+
 for (const nameconfig of require("./configs")) {
   const { name, ...config } = nameconfig;
   describe("agent action with " + name, () => {
@@ -114,7 +121,10 @@ for (const nameconfig of require("./configs")) {
         user,
         req: { user },
       });
-      expect(result.json.response).toContain("987");
+
+      const lastInteraction = await getLastInteraction(result.json);
+
+      expect(result.json.response || lastInteraction).toContain("987");
     });
     it("run multiple subagents concurrenty", async () => {
       const configuration = { ...require("./agentcfg").agent1 };
@@ -134,7 +144,8 @@ for (const nameconfig of require("./configs")) {
         user,
         req: { user },
       });
-      expect(result.json.response).toContain("987");
+      const lastInteraction = await getLastInteraction(result.json);
+      expect(lastInteraction).toContain("987");
     });
   });